Commit graph

93 commits

Author SHA1 Message Date
fiddlosopher
6359c789a7 Markdown writer: Use setext style headers only if --lhs-out specified.
Reason:  ghc doesn't like '#' characters in lhs comment sections.  See
http://www.haskell.org/pipermail/haskell-cafe/2008-December/051300.html


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1503 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:42:46 +00:00
fiddlosopher
9aecc17c1d Markdown writer: proper handling of block quotes in lhs mode.
If in lhs mode, put space before bird tracks for block quotes,
to prevent them from being interpreted as literate Haskell
source.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1502 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:42:38 +00:00
fiddlosopher
430e55c0f1 Handle --lhs-out option in HTML, LaTeX, and Markdown writers.
Documented lhs options in man page and README.

Note:  HTML output with --lhs-out is not strictly literate haskell,
but it is designed so that the result of copying and pasting the
page in the browser will be a literate haskell file.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1501 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:42:29 +00:00
fiddlosopher
72fd19811b LaTeX writer: fixed bug with empty table cells.
Resolves Issue #107.  Thanks to rodja.trappe for the patch.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1492 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-11 03:02:56 +00:00
fiddlosopher
a24d107e6f Support horizontal rules in OpenDocument and ODT writers.
Added style for Horizontal_20_Rule to odt-styles/styles.xml.
Add support for horizontal rules in OpenDocument writer.
Resolves Issue #95.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1479 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-01 22:44:53 +00:00
fiddlosopher
4f28d47b90 Added --jsmath option.
- Added --jsmath option to Main.hs
- Added JsMath to HTMLMathMethod in Text.Pandoc.Shared.
- Handle math appropriately in HTML writer when JsMath selected.
- Documented the option in README and man page.

Resolves Issue #68.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1472 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-28 21:54:50 +00:00
fiddlosopher
5b422262d3 Include classes on tr elements in HTML output: "header", "odd", "even".
This allows tables to be styled with lines in alternating colors.
Resolves Issue #91.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1467 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-18 23:14:59 +00:00
fiddlosopher
4d5c71e183 HTML writer: Enclose all LaTeXMathML bits in <span class="LaTeX">.
This prevents parts of the document that are not math from being
interpreted as math by LaTeXMathML.js.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1453 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-15 22:43:21 +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
ee2dee238d MediaWiki writer: print class attributes in <pre> for code blocks, if any.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1419 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06 18:05:08 +00:00
fiddlosopher
2127b7d513 Changed Float to Double in definition of Table element.
(Double is more efficient in GHC.)
Truncate width in opendocument output to 2 decimal places.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1418 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06 02:51:44 +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
2fd7da07d4 Man writer: don't escape " as \".
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1399 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10 22:24:57 +00:00
fiddlosopher
f1914c21b7 Removed unneeded space after "\\item" in LaTeX and ConTeXt output.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1384 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-09 16:50:46 +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
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
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
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
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
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
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
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
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
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
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
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
b973bc9e3e Code cleanup in HTML writer to eliminate -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1308 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 17:08:55 +00:00
fiddlosopher
a76b920f03 Code cleanup in LaTeX writer to eliminate -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1307 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 16:53:06 +00:00
fiddlosopher
1b3328ca38 OpenDocument writer: Indented bulleted lists as we do enumerated lists.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1306 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 16:32:14 +00:00
fiddlosopher
be719b2a44 Added distinction between tight and loose lists in OpenDocument writer.
(For bullet and enumerated lists only.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1305 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 16:31:56 +00:00
fiddlosopher
6bbe5d435d Fixed bugs in OpenDocument writer affecting nested block quotes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1304 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 16:31:44 +00:00
fiddlosopher
a85dfb83bb Print unicode \160 literally in markdown writer, rather than as &nbsp;.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1299 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-11 02:15:10 +00:00
fiddlosopher
8ed710bc9d Treat '\ ' in (extended) markdown as nonbreaking space.
Print nonbreaking space appropriately in each writer (e.g. ~ in LaTeX).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1297 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-11 01:24:15 +00:00
fiddlosopher
2df112bdf6 Changed inDefinition and indentPara to stInDefinition and stIndentPara
(for consistency).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1295 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-10 23:26:12 +00:00
fiddlosopher
5eb204c86c OpenDocument Writer: Fixed handling of spaces and tabs in preformatted blocks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1286 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-12 17:14:36 +00:00
fiddlosopher
d07e5825d3 Small fix to indentation of code blocks inside defn lists.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1285 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-09 21:15:24 +00:00
fiddlosopher
94e2d373bc OpenDocument writer: Fixed indentation for verbatim blocks inside defn lists.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1284 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-09 21:13:25 +00:00
fiddlosopher
dd454eb5ed OpenDocument writer: Use different bullets for different list levels.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1283 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-09 21:08:06 +00:00