Commit graph

1076 commits

Author SHA1 Message Date
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
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
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
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
04e09cf031 Use minimum-sized (blank) content.xml in odt-styles.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1356 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 06:34:32 +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
c45833a392 Makefile: build reference.odt before configure.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1354 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 01:26:58 +00:00
fiddlosopher
bf6db927d8 Added note on utf8-string dependency to INSTALL.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1353 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 00:48:41 +00:00
fiddlosopher
17b4cb7ab7 Added utf8-string library to depends in debian/control.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1352 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 00:45:26 +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
283c241f9c Setup.hs: Use simpleUserHooks rather than deprecated defaultUserHooks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1348 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-31 23:16:49 +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
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
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
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
891e06d4aa Added mention of opendocument writer to pandoc man page.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1336 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-26 21:29:09 +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
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
4725e7b1a7 HTML writer test: use UTF-8 characters rather than entities.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1333 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-23 23:09:47 +00:00
fiddlosopher
61977cbd2e Fixed REFERENCEODT in markdown2odt to point to the right place in debian builds.
Resolves Issue #79.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1332 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-23 02:31:20 +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
47ac14ab33 Modified content.xml and styles.xml for better appearance of ODT documents.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1329 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-18 20:24:56 +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