Commit graph

151 commits

Author SHA1 Message Date
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
05b366a0b2 Small improvements to citation parsing in markdown reader.
(Don't allow blank lines inside citations.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1382 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-06 03:34:06 +00:00
fiddlosopher
abf2dc78ac Allow parsing of multiline citations.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1381 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05 23:18:52 +00:00
fiddlosopher
81001fde56 Text/Pandoc/Biblio.hs - made getRefs point-free.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1380 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-05 23:18:42 +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
4719c78417 Added Cite element to definition and writers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1375 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-04 03:15:12 +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
b63d1c5e32 Improvements to ODT writer (for windows compatibility):
+ use Data.ByteString (not Data.ByteString.Char8, which writes
  in text mode)
+ use runProcess (with a working directory) instead of runCommand
+ only create Pictures directory if there are pictures


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1372 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-03 08:43:12 +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
6a0004acba Removed superfluous copyFile from Text/Pandoc/ODT.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1367 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 23:49:35 +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
44382a2e41 Use </> with contentsOf to ensure that paths are portable.
Do not use hardcoded '/' characters!


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1364 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:42:22 +00:00
fiddlosopher
0362298500 ODT writer: Don't use pathname in invoking "zip", as that causes problems in windows.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1363 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:01:09 +00:00
fiddlosopher
26253e475e Added pragma to HTML writer to avoid deprecation warning for use of "start" attribute.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1362 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:00:50 +00:00
fiddlosopher
aeda44c46a Added pragma to Text/Pandoc/Shared.hs to get rid of "orphan instance" warnings.
(These are caused by the Lift instance for ByteString.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1361 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 21:00:30 +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
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
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
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
504a61a97b OpenDocument writer: don't print alt text with Image.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1344 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:15:37 +00:00
fiddlosopher
14fd553fe1 Code cleanup in Text/Pandoc/Highlighting.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1340 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 06:35:58 +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
57df7f5eb6 HTML writer: override Text.XHtml's stringToHtml function,
so that characters below 0xff are not converted to numerical entity
references. Also convert '\160' to "&nbsp;". This should aid readability
and editability of the HTML source. It does presuppose that the HTML
will be served as UTF-8.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1338 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-27 03:54:07 +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
06983c9ba5 Markdown reader: Parse setext headers before atx headers.
Test case:
   # hi
   ====
parsed by Markdown.pl as an H1 header with contents "# hi".


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1334 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-23 23:10:05 +00:00
fiddlosopher
e6b7cb608a Added proper support for embedded images to opendocument writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1331 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-18 21:40:29 +00:00
fiddlosopher
333f3c607f Style fixes in opendocument writer:
+ tight definition lists
+ author/date styles
+ quotation spacing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1330 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-18 21:40:19 +00:00
fiddlosopher
dbdd37acaa More work on smallcaps support.
+ Added to refsMatch in Shared.
+ Supported all writers to the extent possible.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1328 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-15 23:26:06 +00:00
fiddlosopher
2637e3595a Add preliminary support for SmallCaps inline element. (Andrea Rossato)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1327 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-15 23:25:49 +00:00
fiddlosopher
7c35c0bc25 Fixed bug in Markdown parser: regular $s triggering math mode.
For example:  "shoes ($20) and socks ($5)."

The fix consists in two new restrictions:
+ the $ that ends a math span may not be directly followed by a digit.
+ no blank lines may be included within a math span.

Thanks to Joseph Reagle for noticing the bug.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1326 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-15 20:41:27 +00:00
fiddlosopher
235e41f246 Commented out some unneeded code in HTML reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1325 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-15 00:56:53 +00:00
fiddlosopher
7701a87a1a Code cleanup - RST reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1324 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-15 00:54:43 +00:00
fiddlosopher
e9668bc988 Added type declarations to avoid -Wall 'defaulting' warnings in writers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1323 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-15 00:32:21 +00:00
fiddlosopher
5be53bbd3f LaTeX reader - Code cleanup.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1322 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-15 00:14:58 +00:00
fiddlosopher
3f04b1d275 OpenDocument writer: Fixed typo in inline styles fix (super/sup).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1321 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-14 21:43:52 +00:00
fiddlosopher
3e2afa7a49 Code cleanup in LaTeX reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1320 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-14 16:19:42 +00:00
fiddlosopher
8f41289306 OpenDocument writer: support nested inline styles.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1319 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-14 16:19:28 +00:00
fiddlosopher
d5c73ac42a Code cleanup in TexMath reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1318 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:58:35 +00:00
fiddlosopher
43ebdafc07 Code cleanup in ConTeXt writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1317 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:53:21 +00:00
fiddlosopher
048aeabebe Code cleanup in Texinfo writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1316 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:49:32 +00:00
fiddlosopher
9f14bf7d0c Code cleanup in Man writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1315 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:39:52 +00:00
fiddlosopher
b325a5d490 Code cleanup in DocBook writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1314 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:33:27 +00:00
fiddlosopher
45a734878e Code cleanup in RTF writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1313 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:25:52 +00:00
fiddlosopher
5fb67cab88 Code cleanup in RST writer to eliminate -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1311 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:16:44 +00:00
fiddlosopher
ea31c82dbd Code cleanup in markdown writer to eliminate -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1310 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:10:58 +00:00
fiddlosopher
e9dc5aa02e Code cleanup in Text.Pandoc.Blocks to eliminate -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1309 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 22:50:57 +00:00