Commit graph

181 commits

Author SHA1 Message Date
John MacFarlane
2a075e9d7a test-pandoc: removed need to depend on MissingH. 2010-12-15 18:07:36 -08:00
John MacFarlane
605648cbbf Added 'tests' Cabal flag.
+ This ensures that test-pandoc gets built.
+ 'cabal test' now runs this.
+ The old tests/RunTests.hs has been removed, and
  src/test-pandoc.hs added.
2010-12-15 17:54:51 -08:00
John MacFarlane
f5c2082304 Added JSON reader and writer.
The JSON reader is about 20x faster than the native reader.
So this can be a good way to serialize a pandoc document.
2010-12-11 00:06:03 -08:00
John MacFarlane
dab645440a Added Benchmark.hs to extra-source-files. 2010-12-10 23:58:02 -08:00
John MacFarlane
167eeef6cb Added json format for reading and writing.
This is faster to parse than native.
2010-12-09 10:40:31 -08:00
John MacFarlane
3b3387b4a3 Improved process to create man page from README.
Previously it relied on pandoc already being installed.
Now it uses dist/package.conf.inplace.
2010-12-07 12:29:43 -08:00
John MacFarlane
05b8017679 Documented org-mode writer in README, cabal, man pages. 2010-12-05 09:45:55 -08:00
Puneeth Chaganti
85263ecda9 Added templates/org.template to pandoc.cabal. 2010-12-05 11:18:02 +05:30
Puneeth Chaganti
921e2b6e67 Added Org-mode writer
+ Added Text/Pandoc/Writers/Org.hs
    + Added to pandoc.cabal
    + Added to pandoc.hs and Text/Pandoc.hs exports.
2010-12-04 15:57:39 +05:30
John MacFarlane
357b965b44 Merge branch 'citeproc' into master.
Conflicts:
	src/Text/Pandoc/Definition.hs
2010-12-03 23:43:47 -08:00
Paul Rivier
a7da0672dc more support for Textile reader (explicit links, images), tests and cabal entries 2010-12-03 23:10:51 -08:00
John MacFarlane
54397a9e99 Merge branch 'master' into citeproc 2010-11-27 10:58:05 -08:00
John MacFarlane
c989bf028f Merge branch 'textile'
Conflicts:
	README
	man/man1/pandoc.1.md
	pandoc.cabal
2010-11-27 10:52:44 -08:00
John MacFarlane
1b1287e888 Removed citeproc flag and CPP conditionals. 2010-11-23 21:14:31 -08:00
John MacFarlane
254c67a4fb Made citeproc flag default to True. 2010-11-20 22:00:57 -08:00
John MacFarlane
482b4b8d73 Added default.csl to data files. 2010-11-18 14:14:20 -08:00
John MacFarlane
07775b5f4f cabal file: Made library and executable build-depends match. 2010-11-06 15:00:37 -07:00
John MacFarlane
f7f6b2427d Changes to use citeproc-hs 0.3. 2010-11-06 14:43:23 -07:00
John MacFarlane
db03741847 Removed Text.Pandoc.Definition, bump version to 1.7.
We now get Text.Pandoc.Definition from the new pandoc-types package.
This will make it possible for other programs to supply output
in Pandoc format, without depending on the whole pandoc package.
2010-11-05 17:06:47 -07:00
John MacFarlane
7fdf3f5a46 Bump version to 1.6.1. 2010-10-26 19:52:24 -07:00
John MacFarlane
6b722d1b45 Process LaTeX macros in markdown, and apply to TeX math.
Example:
\newcommand{\plus}[2]{#1 + #2}

$\plus{3}{4}$

yields:

3+4
2010-10-26 09:03:03 -07:00
John MacFarlane
f94173f6a1 pandoc.cabal: Remove profiling options from 'else' clause. 2010-07-24 18:06:42 -07:00
John MacFarlane
01a191709e Moved Text.Pandoc.Writers.S5 -> Text.Pandoc.S5.
Now it doesn't export a writer, just some CSS and JS.
2010-07-22 23:37:06 -07:00
John MacFarlane
a11b530935 Moved s5 writing from S5 module to HTML.
Now s5 is handled in more or less the same way as slidy,
as a variant of HTML.
2010-07-22 22:58:48 -07:00
John MacFarlane
c5ed016616 Added new --offline option for slidy.
Added slidy/slidy.min.{css,js}.
2010-07-22 21:50:53 -07:00
John MacFarlane
2253c8ef65 Require texmath >= 0.3, adjusted for new elements. 2010-07-22 15:06:46 -07:00
John MacFarlane
5be880bd48 Reintroduced 'library' cabal flag.
It is needed for the Windows installer, since if a library
is produced, the binary can't be made relocatable.
See http://www.haskell.org/ghc/docs/6.12.2/html/Cabal/builders.html
section 4.1.2.3.
2010-07-21 11:26:13 -07:00
John MacFarlane
3adacdb04e Updated pandoc to use css for highlighting-kate 0.2.7.
Note: Update any custom CSS or templates accordingly.
2010-07-15 23:02:29 -07:00
John MacFarlane
9b833e8744 Added a slidy writer.
Resolves Issue #122.
2010-07-13 20:44:56 -07:00
John MacFarlane
10e284aaf4 Version bump to 1.6, due to removed functions. 2010-07-05 00:06:28 -07:00
John MacFarlane
3548bf6d9c Moved Pandoc prettyprinting code from Shared to new Native writer.
+ Text.Pandoc.Writers.Native
+ The function prettyPandoc is now gone.  Use writeNative instead.
2010-07-05 00:06:27 -07:00
John MacFarlane
998fd098d0 Moved parsing functions from Text.Pandoc.Shared to new module.
+ Text.Pandoc.Parsing
2010-07-05 00:06:27 -07:00
John MacFarlane
f1114733a6 Added an EPUB writer.
+ New writer module Text.Pandoc.Writers.EPUB
+ Stylesheet in epub.css
+ --epub-stylesheet command-line option.
+ New utility module Text.Pandoc.UUID to generate
  random UUIDs for EPUBs.
2010-07-05 00:06:27 -07:00
John MacFarlane
ff4d94e054 Made a proper ODT writer.
+ Transformed the old Text.Pandoc.ODT module into a proper
  writer module, Text.Pandoc.Writers.ODT.
+ Instead of saveOpenDocumentAsODT, we now have writeODT, which
  takes a Pandoc document and produces a bytestring.
  saveOpenDocumentAsODT has been removed.
+ To extract the images and insert them into the ODT, we now use
  processPandocM on the Pandoc document rather than a custom XML parser.
+ Handle the case where the image is remote (or not found) by
  converting the Image element into an Emph with the label.
+ Plumbing in pandoc.hs changed slightly to accomodate this, and to
  allow other writers that live in the IO monad.
2010-07-05 00:06:26 -07:00
John MacFarlane
d073b16892 Added Textile writer module. 2010-05-17 21:52:45 -07:00
John MacFarlane
7be82b4536 Added Text.Pandoc.UTF8 for portable UTF8 string IO. 2010-05-06 20:27:10 -07:00
John MacFarlane
2afa967ade Removed parsec < 3 restriction. 2010-04-23 22:43:47 -07:00
John MacFarlane
0d5065c1e7 Added 'threaded' flag.
+ GHC lacks a threaded runtime on some architectures.
  Provide a 'threaded' flag that can be disabled for compiling
  on these architectures.
+ Removed '-threaded' from pandoc's ghc-options.  '-threaded'
  is only needed for markdown2pdf, due to its use of readProcess.
2010-04-20 22:59:38 -07:00
John MacFarlane
7d8c8c7880 Removed 'library' Cabal flag.
Reason: starting with Cabal 1.8, installing pandoc with '-library
+executable' did not work, since the build-depends in the Library
stanza were ignored. The problem could be solved by repeating the
build-depends in the Executable stanza, but this seems non-ideal
(and might lead to errors later on).  The '-library' option isn't
so useful anyway, since to compile pandoc in the first place, you
need a large number of Haskell libraries installed, and in this
case, why balk at another? It was chiefly intended for packagers,
but packagers will need to use a chroot environment anyway, and
they can then simply copy the executable and not the library.

Thanks to Jim Pryor for calling the problem to my attention
in connection with an arch linux package.
2010-04-10 11:16:48 -07:00
John MacFarlane
5a60bfd645 Removed markdown2pdf from list of data-files. 2010-04-06 23:00:42 -07:00
John MacFarlane
41bc23709c Bumped version to 1.5.1.1, updated changelog. 2010-03-29 07:15:28 -07:00
John MacFarlane
666a51b7fc Version bump to 1.5.1. 2010-03-23 00:46:54 -07:00
John MacFarlane
0e6bb176f9 Updated changelog and bumped version to 1.5.0.1. 2010-03-21 22:51:04 -07:00
John MacFarlane
6e498fc727 cabal: included several missing test files. 2010-03-20 14:47:57 -07:00
fiddlosopher
5ae0e0d442 Depend on extensible-exceptions, remove CPP in Templates module.
It's safe to depend on extensible-exceptions, since this is
shipped with GHC 6.10 and 6.12.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1911 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-19 02:33:15 +00:00
fiddlosopher
56217f1004 Added --mathml option; removed Text.Pandoc.LaTeXMathML.
* Added data/MathMLinHTML.js, which is included when no URL is provided
  for --mathml.  This allows MathML to be displayed in better browsers,
  as text/html.
* The module was no longer necessary; its functionality (two lines)
  was incorporated into pandoc.hs.
* Consolidated the two LaTeXMathML.js files into one.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1909 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:56 +00:00
fiddlosopher
695961155a Added plain writer.
Text.Pandoc.Writers.Markdown now exports a writePlain,
which writes plain text without links, pictures, or
special formatting (not even markdown conventions).

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1907 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:43 +00:00
fiddlosopher
d7e5bb96a7 cabal: Depend on extensible-exception for GHC < 6.10.
This, I hope, will allow pandoc to be compiled on ghc 6.8
again.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1903 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 02:39:23 +00:00
fiddlosopher
c2ce51e9f5 Cabal file: depend on HTTP >= 4000.0.5.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1870 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-07 19:35:53 +00:00
fiddlosopher
997ea5ea1d Removed html2markdown and hsmarkdown.
html2markdown is no longer needed, since you can pass URI arguments
to pandoc and directly convert web pages. (Note, however, that pandoc
assumes the pages are UTF8. html2markdown made an attempt to guess the
encoding and convert them.)

hsmarkdown is pointless -- a large executable that could be replaced
by 'pandoc --strict'.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1834 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-02-06 18:55:28 +00:00