Commit graph

146 commits

Author SHA1 Message Date
fiddlosopher
24cb44ad6c Revert "Require Cabal >= 1.6."
This reverts commit 1823bf615b.
Reason:  This requirement doesn't help, since the problem is in
compiling Setup.hs.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1550 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-26 15:58:32 +00:00
fiddlosopher
1823bf615b Require Cabal >= 1.6.
This is needed for the new test hook, because the
PackageName type is new in 1.6.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1549 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-26 15:56:15 +00:00
fiddlosopher
5f3a147dfd Removed plugin support.
Plugins will probably be added in a later version,
but for now we want to avoid the heavy GHC API dependency.
Also, plugins are very slow with the current system.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1548 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-24 22:59:44 +00:00
fiddlosopher
bb639d5506 Added new lhs tests to cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1547 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-14 18:54:30 +00:00
fiddlosopher
f1c22f3d1a Version bump to 1.2.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1546 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-14 18:30:11 +00:00
fiddlosopher
bdcd54a485 Make wrappers flag False by default.
This can change when we've got haskell versions of all
the wrappers.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1544 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-14 17:24:28 +00:00
fiddlosopher
cdd3b67a05 Rewrote hsmarkdown in Haskell for portability.
For now, keeping the old shell script too.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1533 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-31 18:30:26 +00:00
fiddlosopher
5a9e3b7445 Renamed Main.hs -> pandoc.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1531 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-31 17:13:30 +00:00
fiddlosopher
155809d220 Added TemplateHaskell to Extensions for executable, removed -threaded for library.
Thanks to duncan.coutts for the bug report.  Resolves Issue #121.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1529 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-25 17:55:47 +00:00
fiddlosopher
42aca57dee Moved all haskell source to src subdirectory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1528 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 20:00:26 +00:00
fiddlosopher
066e1cfe90 Moved some Extra-Source-Files to Data-Files.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1520 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 19:58:14 +00:00
fiddlosopher
874c3e0dea Added a plugin system, based on hint.
+ In Text.Pandoc.Definition, added processIn, processInM,
  and queryIn, and deprecated processPandoc and queryPandoc
  for these more general functions, which are useful in writing
  plugins.

+ Added module Text.Pandoc.Plugins.

+ Added a --plugins option to Main, and code to run the parsed pandoc
  document through all the plugins.

+ Provided five sample plugin files in the plugins/ directory.

+ Documented --plugin in the pandoc man page and README.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1519 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 19:58:06 +00:00
fiddlosopher
243008242d Brought citeproc support up to date for citeproc-hs-0.2.
(Patch by Andrea Rossato.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1518 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-29 22:45:18 +00:00
fiddlosopher
3a6bfd75cb Added Bug-Reports field to cabal file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1516 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-23 02:57:00 +00:00
fiddlosopher
035f0ff917 Conditionally depend on syb and base >= 4 if ghc >= 6.10.
Resolves Issue #109.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1496 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-01 04:54:29 +00:00
fiddlosopher
e5c28b37c2 Removed package-URL field from cabal file.
This pointed to an old version, and isn't really needed since the
cabal file comes with the source bundle.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1495 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-01 04:54:23 +00:00
fiddlosopher
95efec1e62 Updated location of odt-styles in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1488 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-06 17:12:02 +00:00
fiddlosopher
2ed83d7921 Version bump to 1.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1473 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-30 01:03:06 +00:00
fiddlosopher
51a58987b3 Bump version to 1.0.0.2.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1463 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-16 01:00:59 +00:00
fiddlosopher
d0fe8dcae0 Add BUGS to files in tarball.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1461 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-16 01:00:42 +00:00
fiddlosopher
2483d5ff5b Bumped version to 1.0.0.1.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1449 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-14 03:15:59 +00:00
fiddlosopher
087e4457d2 pandoc.cabal: Removed most upper-bounds on dependency versions.
Reason:  Upper bounds may cause problems for package managers, since
many package management systems do not (like Cabal) allow multiple
versions of libraries to be installed simultaneously.  At this point
very few packages in HackageDB use upper bounds.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1436 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-10 21:57:45 +00:00
fiddlosopher
8c182d4d99 Use versioned dependencies in pandoc.cabal, following guidelines in
<http://www.haskell.org/haskellwiki/Package_versioning_policy>.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1435 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-10 21:39:58 +00:00
fiddlosopher
e7cc9b26db Version bump to 1.0.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1434 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-10 21:39:50 +00:00
fiddlosopher
08ba270027 pandoc.cabal: removed COPYING from Extra-Source-Files;
it is already included under License-File.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1431 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-09 23:12:45 +00:00
fiddlosopher
000b89c718 Use Data.List's 'intercalate' instead of custom 'joinWithSep'.
+ Removed joinWithSep definition from Text.Pandoc.Shared.
+ Replaced joinWithSep with intercalate
+ Depend on base >= 3, since in base < 3 intercalate is not included.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1428 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-08 06:36:28 +00:00
fiddlosopher
4dca8f6e75 Reworked Text.Pandoc.ODT to use zip-archive instead of calling external 'zip'.
+ Removed utf8-string and xml-light modules, and unneeded content.xml.
+ Removed code for building reference.odt from Setup.hs.
  The ODT is now built using template haskell in Text.Pandoc.ODT.
+ Removed copyright statements for utf8-string and xml modules,
  since they are no longer included in the source.
+ README: Removed claim that 'zip' is needed for ODT production.
+ Removed dependency on 'zip' from debian/control.
+ Text.Pandoc.Shared: Removed withTempDir, added inDirectory.
+ Added makeZip to Text.Pandoc.TH.
+ pandoc.cabal: Added dependencies on old-time, zip-archive, and utf8-string.
  Added markdown2pdf files to extra-sources list.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1417 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-04 02:51:28 +00:00
fiddlosopher
3d2ff3d0a8 Removed PDF writer from core pandoc, restored markdown2pdf.
+ Added markdown2pdf.
+ Removed Text/Pandoc/PDF.hs.
+ Removed references to PDF writer from Main.hs.
+ Removed references to PDF writer from pandoc.cabal.
+ Added markdown2pdf.1 to list of man pages in Setup.hs.
+ Added markdown2pdf.1.md man page source.
+ Added reference to markdown2pdf(1) in pandoc man page.
+ Added markdown2pdf to WRAPPERS in Makefile.
+ Removed mention of pdf writer from README; added markdown2pdf.
+ Added remarks on markdown2pdf dependencies to README.Debian.
+ Added markdown2pdf to web/index.txt.in.
+ Use markdown2pdf for pdf web demos.
+ Put markdown2pdf back into debian control and rules.
+ Added markdown2pdf to macports Portfile.
+ Added markdown2pdf to freebsd package.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1415 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-27 05:50:26 +00:00
fiddlosopher
d00da31622 Simplified and improved UTF8 handling:
+ Removed utf8-string cabal configuration flag.
+ Instead, we just include System.IO.UTF8 and Codec.Binary.UTF8.String
  from utf8-string package in the source tree, avoiding a dependency
  on utf8-string and avoiding crufty custom UTF8 code. (The old
  Text.Pandoc.UTF8 had problems with the getContents function.)
+ Removed lots of CPP directives that are no longer needed.
+ In Setup.hs, use '-i..' in running RunTests.hs, so the local UTF8
  code will be found.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1411 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-14 01:32:54 +00:00
fiddlosopher
f53fb554fe Support for display math; changed ASCIIMathML -> LaTeXMathML:
Resolves Issue #47.

+ Added a DisplayMath/InlineMath selector to Math inlines.
+ Markdown parser yields DisplayMath for $$...$$.
+ LaTeX parser yields DisplayMath when appropriate.  Removed
  mathBlock parsers, since the same effect is achieved by the math
  inline parsers, now that they handle display math.
+ Writers handle DisplayMath as appropriate for the format.
+ Changed -m option to use LaTeXMathML rather than ASCIIMathML.
  LaTeXMathML is closer to LaTeX in its display of math, and
  supports many non-math LaTeX environments.
+ Modified HTML writer to print raw TeX when LaTeXMathML is
  being used instead of suppressing it.
+ Removed ASCIIMathML files from data/ and added LaTeXMathML.
+ Replaced ASCIIMathML with LaTeXMathML in source files.
+ Modified README and pandoc man page source.
+ Modified web page.
+ Added --latexmathml option (kept --asciimathml as a synonym
  for backwards compatibility)
+ Modified tests accordingly; added new tests for display math.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1409 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-13 03:02:42 +00:00
fiddlosopher
aeaf5e5108 Don't expose Text.Pandoc.Biblio module unless citeproc option is selected.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1408 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-12 01:23:17 +00:00
fiddlosopher
b7a9d3206e Added new markdown reader tests to list of extra source files in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1404 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-11 06:57:53 +00:00
fiddlosopher
1cbc974e7e Removed markdown2pdf and all references to it.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1395 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10 17:34:02 +00:00
fiddlosopher
0f4bdc6b7d Added Text.Pandoc.PDF module, 'pdf' as new output option.
The module calls pdflatex to produce the PDF, and is basically shell
scripting in haskell. But this is better than the existing markdown2pdf
script, which is limited to POSIX.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1394 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10 17:33:20 +00:00
fiddlosopher
28828979a6 Moved more of the build process from Makefile to Setup.hs:
+ tarball target now calls 'sdist'
+ Added to "Extra-source-files" and "Extra-tmp-files" in pandoc.cabal,
  so 'sdist' and 'clean' will work properly.
+ Makefile no longer generates man pages or reference.odt.
+ Setup.hs now generates man pages in a postbuild hook.
+ Added dependency-checking to Setup.hs, so it only rebuilds things
  that need rebuilding.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1389 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09 23:45:40 +00:00
fiddlosopher
5d3d2d79b3 Rewrote test suite so it doesn't depend on perl or unix tools.
+ Replaced old runtests.pl with a Haskell script RunTests.hs.
+ Added Diff.hs module to be used by RunTests.hs instead of unix 'diff'.
+ Added test hook to Setup.hs, so tests may be run from cabal.
+ Changed Makefile's 'test' target to run tests via cabal.
+ Removed old generate.sh.
+ Since we no longer have 'sed' to filter out raw HTML sections
  from the docbook writer test, or raw LaTeX sections from the
  context writer test, we now just include these sections.
  They can be taken out if it is necessary to process the files.
+ Updated latex and context writer tests to remove extra spaces
  after '\\item'
+ Added a markdown table reader test.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1385 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09 16:51:08 +00:00
fiddlosopher
80715bd126 Added Text.Pandoc.UTF8 as a backup for when utf8-string is not present.
+ Added Text.Pandoc.UTF8
+ Changed flag name from utf8 to utf8-string
+ Changed CPP MACRO from _UTF8 to _UTF8STRING
+ Import IO functions from Text.Pandoc.UTF8 when utf8-string not available.
+ Removed utf8-string dependency from debian/control.
+ Removed pandoc.cabal.ghc66; we no longer support GHC 6.6
+ Modified INSTALL instructions


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1383 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-08 00:11:58 +00:00
fiddlosopher
a560c0acc1 Mention ODT writer in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1379 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05 23:10:04 +00:00
fiddlosopher
1bfe1b84a8 Added support for Cite to Markdown reader, and conditional support for citeproc module.
+ The citeproc cabal configuration option sets the _CITEPROC macro, which conditionally
  includes code for handling citations.
+ Added Text.Pandoc.Biblio module.
+ Made highlighting option default to False.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1376 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-04 03:15:34 +00:00
fiddlosopher
6ff1e2a976 Improved configuration options and CPP macros.
+ Now all macros that serve as flags start with a single _.
+ Added message to '-v' output about UTF-8 support.
+ Made highlighting the default.  If the highlighting-kate
  library is not present, cabal will deselect the option
  (unless it was explicitly set).
+ Add UTF8 support to test function in Text.Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1374 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-03 23:33:40 +00:00
fiddlosopher
ed4b003997 Added 'utf8' configuration flag to pandoc.cabal.
This makes it possible to compile pandoc without utf8, using
'-f-utf8' at configuration time.  Utf-8 support is still the
default.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1373 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-03 08:43:28 +00:00
fiddlosopher
1e2f2bc4f6 Improved template handling:
+ Split template haskell functions into new module,
  Text.Pandoc.TH
+ Distinguish contentsOf and binaryContentsOf; the former
  uses text mode in Windows, while the latter uses binary mode


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1368 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-02 17:22:55 +00:00
fiddlosopher
e371db97d7 Fixes to make haddock work with template haskell:
+ Added CPP, TemplateHaskell, FlexibleInstances to cabal file "Extensions" field
+ Added #ifndef __HADDOCK__ cpp declarations in the files using template haskell.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1366 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 23:29:55 +00:00
fiddlosopher
5c1c786d65 Removed FlexibleInstances Extension line from pandoc.cabal; it isn't needed
because the relevant files have pragmas.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1365 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:48:16 +00:00
fiddlosopher
5383db206b Removed 'CPP' from Extension in pandoc.cabal.
It is not needed (since the relevant files have a pragma anyway),
and it causes problems on windows (Cabal thinks pandoc.cabal has
changed every time configure is run).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1360 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:00:18 +00:00
fiddlosopher
7b986acd72 Don't use OverloadedStrings in ODT writer.
Remove version dependency from bytestring.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1359 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 15:17:48 +00:00
fiddlosopher
31e261ca39 Depend on bytestring-0.9.0.1 and provide a ByteString instance for IsString manually,
in Text/Pandoc/ODT.hs.  Upgrading to 0.9.1.0 causes problems unless every package
has been built with that version, so for now we stick with 0.9.0.1.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1358 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 06:35:55 +00:00
fiddlosopher
ba32c2ec42 Simplified build process using template haskell.
+ Text/Pandoc/ASCIIMathML.hs, Text/Pandoc/DefaultHeaders.hs,
  and Text/Pandoc/Writers/S5.hs are no longer built in Setup.hs
  from templates in the templates/ directory.
+ Instead, they use template haskell to read data at compile
  time from the relevant files in data/.
+ Setup.hs is back to the default simple configuration.
+ Removed old templates and Extra-Tmp-Files field from
  pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1357 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 06:35:42 +00:00
fiddlosopher
5abc79cff1 Use template haskell to store reference.odt as blob in pandoc.
+ Added contentsOf to Text.Pandoc.Shared.
+ Use this to get contents of reference.odt at compile time in
  Text.Pandoc.ODT
+ Added bytestring and template-haskell dependencies to pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1355 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 06:34:23 +00:00
fiddlosopher
0c6dd105b7 Added code for xml library (Text.XML.Light) to source tree,
since there is currently no debian package.  Removed
dependency on xml library.  Added license to debian/copyright.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1351 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 00:45:07 +00:00
fiddlosopher
8440385f45 Compatibility fixes for CPP, Cabal, and haddock:
+ Use CPP in "Extensions" field in pandoc.cabal.
+ Removed use of backslash string continuations in source files.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1350 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:55:27 +00:00
fiddlosopher
22846086c1 Removed superfluous binary and bytestring dependencies in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1349 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:55:12 +00:00
fiddlosopher
ebcebccc32 Use utf8-string's System.IO.UTF8 to replace Text.Pandoc.UTF8.
+ removed Text/Pandoc/UTF8.hs
+ removed UTF8.hs notice from debian/copyright
+ adjusted main.hs, Text/Pandoc.hs, and Text/Pandoc/ODT.hs to use
  System.IO.UTF8 instead of Text.Pandoc.UTF8
+ Added dependency on utf8-string to pandoc.cabal


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1347 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:16:31 +00:00
fiddlosopher
774dc0776d Added 'library' and 'executable' configuration flags.
Cabal can now be told to build just the library or just the executable.
Updated INSTALL accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1346 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:16:12 +00:00
fiddlosopher
d072ad4b66 Added 'odt' output option to pandoc:
Not a writer, but a module that inserts the output of the OpenDocument
writer into an ODT archive.  This replaces markdown2odt.

+ Added odt output option to Main.hs.
+ Added default for .odt output file.
+ Changed defaults so that .xml and .sgml aren't automatically DocBook.
+ Added odt writer to Text.Pandoc exports.
+ Added Text.Pandoc.ODT and included in pandoc.cabal.
+ Added reference.odt as data-file in pandoc.cabal.
+ Handle picture links in OpenDocument files using xml library.
+ Removed markdown2odt and references from Makefile, README, man.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1345 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:16:02 +00:00
fiddlosopher
ab2844dc5b Fixed typo in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1343 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 07:57:32 +00:00
fiddlosopher
40e7280a52 Simplified Setup.hs by removing PostClean hooks.
Added Extra-Tmp-Files to pandoc.cabal; this does the same thing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1342 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 07:44:45 +00:00
fiddlosopher
66910eeccd Improved pandoc.cabal:
+ Added Extra-Source-Files so sdist contains everything needed to build
+ Added "Build-Type" field to avoid warning.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1341 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 07:16:56 +00:00
fiddlosopher
2751608d9b Use CPP to simplify build procedure for Highlighting.hs module.
This is no longer built by Setup.hs in the pre-configure phase.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1339 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 06:35:46 +00:00
fiddlosopher
ddaec05d8f Added MediaWiki writer.
+ Added Text/Pandoc/Writers/MediaWiki.hs
+ Added to pandoc.cabal
+ Added to Main.hs and Text/Pandoc.hs exports.
+ Added tests for mediawiki writer & table writer.
+ Added information on MediaWiki writer to README.
+ Added mediawiki markup to list of formats in pandoc(1) man page.
+ Updated debian/control with mediawiki output format.
+ Added mediawiki markup to description in macports portfile.
+ Updated freebsd package description to include mediawiki format.
+ Mention MediaWiki output format in web page index.
+ Added mediawiki demo to website.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1337 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-27 03:25:51 +00:00
fiddlosopher
88a80abc5d Added OpenDocument format to cabal description.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1335 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-24 16:25:55 +00:00
fiddlosopher
92f655019a Added -Wall to ghc-options in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1290 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-17 19:07:21 +00:00
fiddlosopher
dcb37d32d1 Moved XML-formatting functions to new unexported module Text.Pandoc.XML.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1253 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19 18:46:01 +00:00
fiddlosopher
2baf6d09ee Andrea Rossato's patch for OpenDocument support.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1252 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19 18:45:51 +00:00
fiddlosopher
42e932da6d Require parsec < 3.
The compatibility module in parsec 3.0.0 gives far worse performance than
parsec 2.1.  Eventually pandoc will be upgraded to use the new bytestring
version of parsec, and then we'll go to parsec 3.0.0.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1248 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-06 18:35:55 +00:00
fiddlosopher
74189c97b0 Added Texinfo writer to exported modules in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1247 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-24 20:40:17 +00:00
fiddlosopher
609a953a83 Updated package URL for pandoc.cabal and pandoc.cabal.ghc66.
Updated pandoc.cabal.ghc66 with highlighting modules and new
location for DefaultWriters.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1240 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-24 05:48:22 +00:00
fiddlosopher
04b32451be Added build option for syntax highlighting, with *optional* dependency on highlighting-kate.
+ pandoc.cabal includes a flag, 'highlighting', that causes a dependency
  on highlighting-kate.
+ if Setup.hs detects this dependency, it copies templates/Highlighting.yes.hs
  to Text/Pandoc/Highlighting.hs.  Otherwise, it copies templates/Highlighting.no.hs.
+ The HTML writer imports this new module instead of Text.Highlighting.Kate.
  The new module exports highlightHtml, which either uses highlighting-kate to
  perform syntax highlighting or automatically returns a failure code, depending
  on whether highlighting support was selected.
+ --version now prints information about whether syntax highlighting support is compiled in.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1221 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:21:19 +00:00
fiddlosopher
ba6981a4a1 Removed Text.Regex dependencies by rewriting using plain Haskell:
+ from Text.Pandoc.Writers.RTF
+ from Text.Pandoc.Writers.HTML
+ from Main
+ from pandoc.cabal


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1219 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:21:04 +00:00
fiddlosopher
087739ad7a Moved Text.Pandoc.Writers.DefaultHeaders -> Text.Pandoc.DefaultHeaders.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1218 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:20:55 +00:00
fiddlosopher
6bd25a10a2 Included highlighting-kate in build-depends.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1212 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:20:06 +00:00
fiddlosopher
6795ffd93f Bumped version to 0.47.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1187 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-08 20:25:46 +00:00
fiddlosopher
8fca649d05 Changed copyright dates where appropriate to include 2008.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1181 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-08 17:26:16 +00:00
fiddlosopher
246e5f9ea3 Bumped version number to 0.46.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1147 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-10 21:01:59 +00:00
fiddlosopher
d1832da9e1 Added Text.Pandoc.Readers.TeXMath and changed default handling of math.
+ Text.Pandoc.Readers.TeXMath exports readTeXMath, which reads raw TeX
  math and outputs a string of pandoc inlines that tries to render it
  as far as possible, lapsing into literal TeX when needed.
+ Added Text.Pandoc.Readers.TeXMath to pandoc.cabal + ghc66 version.
+ Modified writers so that readTeXMath is used for default HTMl output
  in HTML, S5, RTF, Docbook.
+ Updated README with information about how math is rendered in all formats.
+ Updated test suite.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1129 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-12-02 00:36:32 +00:00
fiddlosopher
2b52241928 Changed references to source directory in Makefile and pandoc.cabal.*.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1105 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:02:38 +00:00
fiddlosopher
a4e0b97bf8 Use Ghc-Prof-Options to ensure that '-auto-all' is used
when '--enable-*-profiling' is specified.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1090 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 19:08:34 +00:00
fiddlosopher
8a057e77af Modified build procedure to allow compilation with GHC 6.8:
+ pandoc.cabal now uses Cabal configurations and requires Cabal >=1.2.
+ An alternative pandoc.cabal.ghc66 is provided for those who have older
  versions of Cabal.
+ Debian build process has been modified to use pandoc.cabal.ghc66,
  as a temporary measure until GHC 6.8 gets into debian unstable.
+ INSTALL instructions have been updated.
+ Makefile has been updated to accommodate changes in pandoc.cabal.
+ pandoc.cabal.ghc68 has been removed, since the default version now
  works with GHC 6.8.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1066 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-06 00:07:17 +00:00
fiddlosopher
fe684764e6 Reverted back to state as of r1062. The template haskell changes
are more trouble than they're worth.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1064 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 23:27:58 +00:00
fiddlosopher
4a841bfc54 Use template haskell to avoid the need for templates:
+ Added library Text.Pandoc.Include, with a template haskell
  function $(includeStrFrom fname) to include a file as a string
  constant at compile time.
+ This removes the need for the 'templates' directory or Makefile
  target.  These have been removed.
+ The base source directory has been changed from src to .
+ A new 'data' directory has been added, containing the ASCIIMathML.js
  script, writer headers, and S5 files.
+ The src/wrappers directory has been moved to 'wrappers'.
+ The Text.Pandoc.ASCIIMathML library is no longer needed, since
  Text.Pandoc.Writers.HTML can use includeStrFrom to include the
  ASCIIMathML.js code directly.  It has been removed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 22:14:03 +00:00
fiddlosopher
85f655c8cb Changed pandoc home page to http://johnmacfarlane.net/pandoc/.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1014 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-13 17:26:01 +00:00
fiddlosopher
9726ec04f5 Bumped version to 0.45.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1010 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-05 02:16:05 +00:00
fiddlosopher
d87b226f1f Bump version numbers to 0.44, which will be the next
bug-fix release (when enough bug fixes have accumulated).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1001 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 17:23:26 +00:00
fiddlosopher
76d462c1cd Simplify autolink parsing code, using Network.URI to test for
URIs.  Added dependency on network library to debian/control
and pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@982 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 17:22:22 +00:00
fiddlosopher
8919f20abe Version bump to 0.43.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@962 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-30 19:16:12 +00:00
fiddlosopher
15e063ba13 Re-exposed Text.Pandoc.ASCIIMathML. We need it in Text.Pandoc.Readers.HTML.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@901 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 03:59:27 +00:00
fiddlosopher
7bf966f934 Bumped version numbers to 0.42 in anticipation of next
bugfix release.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@881 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-23 04:26:37 +00:00
fiddlosopher
56e2200378 Bump version to 0.41.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@867 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-19 16:07:57 +00:00
fiddlosopher
a8e2199034 Major code cleanup in all modules. (Removed unneeded imports,
reformatted, etc.)  More major changes are documented below:

+ Removed Text.Pandoc.ParserCombinators and moved all its definitions
  to Text.Pandoc.Shared.
+ In Text.Pandoc.Shared:
  - Removed unneeded 'try' in blanklines.
  - Removed endsWith function and rewrote functions to use isSuffixOf instead.
  - Added >>~ combinator.
  - Rewrote stripTrailingNewlines, removeLeadingSpaces.
+ Moved Text.Pandoc.Entities -> Text.Pandoc.CharacterReferences.
  - Removed unneeded functions charToEntity, charToNumericalEntity.
  - Renamed functions using proper terminology (character references,
    not entities).  decodeEntities -> decodeCharacterReferences,
    characterEntity -> characterReference.
  - Moved escapeStringToXML to Docbook writer, which is the only thing
    that uses it.
  - Removed old entity parser in HTML and Markdown readers; replaced with
    new charRef parser in Text.Pandoc.Shared.
+ Fixed accent bug in Text.Pandoc.Readers.LaTeX:  \^{} now correctly
  parses as a '^' character.
+ Text.Pandoc.ASCIIMathML is no longer an exported module.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@835 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 06:00:58 +00:00
fiddlosopher
0ba858f22d Revised package synopsis in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@731 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-16 01:51:03 +00:00
fiddlosopher
ca50140c91 Updated package description in pandoc.cabal to
include ConTeXt output format.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@717 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 02:58:30 +00:00
fiddlosopher
465b2d791e Merged branches/context: addition of a ConTeXt writer
<http://www.pragma-ade.nl/>.
+ Text.Pandoc.Writers.ConTeXt added.
+ Text.Pandoc modified to export the basic ConTeXt writer.
+ Main.hs modified to recognize 'context' as a writer.
+ ConTeXtHeader added to headers
+ DefaultHeaders.hs template modified to include ConTeXt header
+ Tests added (writer.context, tables.context), and runtests.pl
  modified to run them
+ pandoc.cabal updated to include Text.Pandoc.Writers.ConTeXt. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@716 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 02:56:34 +00:00
fiddlosopher
656dd64ed8 Fuller package description in pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@687 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 08:29:36 +00:00
fiddlosopher
655363da51 Moved Text.ParserCombinators.Pandoc ->
Text.Pandoc.ParserCombinators.  This way, all the
Pandoc modules are in one place.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@663 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 03:39:25 +00:00
fiddlosopher
f82b1f8eec Added Maintainer and Copyright fields to pandoc.cabal.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@636 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 21:57:18 +00:00
fiddlosopher
98372ea277 Renamed Pandoc.cabal -> pandoc.cabal, for better compatibility
with HackageDB, which likes the cabal file to have the same name
as the tarball.  Modified references to Pandoc.cabal in INSTALL
and Makefile.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@631 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-07 05:25:44 +00:00
Renamed from Pandoc.cabal (Browse further)