aboutsummaryrefslogtreecommitdiff
path: root/Text/Pandoc
AgeCommit message (Collapse)AuthorFilesLines
2008-12-02Markdown writer: Use setext style headers only if --lhs-out specified.fiddlosopher1-1/+10
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-02Markdown writer: proper handling of block quotes in lhs mode.fiddlosopher1-1/+6
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-02Handle --lhs-out option in HTML, LaTeX, and Markdown writers.fiddlosopher3-5/+14
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-02Added --lhs-out option.fiddlosopher1-0/+2
+ Added writerLiterateHaskell to WriterOptions. + Added --lhs-out option to Main. + Added --lhs option (combines --lhs-out and --lhs-in) git-svn-id: https://pandoc.googlecode.com/svn/trunk@1500 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02LaTeX reader: Added parser for literate haskell code blocks.fiddlosopher1-3/+9
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1499 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02Moved failUnlessLHS to Text.Pandoc.Shared.fiddlosopher2-6/+7
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1498 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02Added literate haskell support for markdown reader.fiddlosopher2-0/+29
+ Added stateLiterateHaskell to parser state. + Added parser for lhsCodeBlock to Markdown reader. + Added --lhs-in option, to treat input as literate haskell. + If first source has extension .lhs, assume --lhs-in. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1497 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-25Markdown reader: relax spacing rules for $$ in display math.fiddlosopher1-1/+4
Now space and newlines are allowed after the opening $$ and before the closing $$. However, the display math cannot contain an entirely blank line. Resolves Issue #105. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1494 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-11LaTeX writer: fixed bug with empty table cells.fiddlosopher1-1/+1
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-06Fixed parsing of RST comment blocks.fiddlosopher1-4/+5
Modified 'unknown directive' in RST reader. Added RST reader tests for comment blocks. Resolves Issue #86 and Debian Bug#500662. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1484 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-02Revert "Markdown reader: Ignore blank line after ~~~~~~~~ in delimited code ↵fiddlosopher1-2/+0
blocks." This reverts commit 7ad17fe5cff04e0b68be5c4a08339bb53d3d176d. We will soon have a better way of handling literate haskell. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1481 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-01Markdown reader: Allow blank space at end of horizontal rules.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1480 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-01Support horizontal rules in OpenDocument and ODT writers.fiddlosopher1-1/+1
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-01Markdown reader: cleaner handling of spaces in URLs.fiddlosopher1-11/+6
Consecutive spaces are now collapsed into one %20, and final spaces are removed. Also, a test case has been added. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1477 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-31Markdown reader: allow URLs containing spaces.fiddlosopher1-6/+11
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1475 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-28Added --jsmath option.fiddlosopher2-0/+9
- 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-25Changed compactify in Text.Pandoc.Shared - better heuristic.fiddlosopher1-16/+15
Final Para is changed to Plain if all other list items *end* with a Plain block. Addresses Issue #99. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1470 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-19Don't print a line break between a footnote and immediately following nonspacefiddlosopher1-6/+15
in LaTeX and ConTeXt output, as it is interpreted as a space. This is problematic for cases like "text^[note]---". Modified wrappedTeX (in Text.Pandoc.Shared). Resolves Issue #93. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1469 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-18HTML reader: Don't interpret contents of <pre> blocks as markdown.fiddlosopher1-1/+13
Added rawVerbatimBlock parser. Resolves Issue #94. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1468 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-18Include classes on tr elements in HTML output: "header", "odd", "even".fiddlosopher1-4/+5
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-16Added colons to protocols in unsanitaryURI in HTML reader.fiddlosopher1-10/+10
Closes Issue #88. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1462 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-23Moved odt-styles/ to data/. Removed unneeded variable in Makefile.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1458 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-16Markdown reader: Ignore blank line after ~~~~~~~~ in delimited code blocks.fiddlosopher1-0/+2
Rationale: these are useful for literate haskell, but lhs requires a blank line before the haskell code, and we don't want spurious blank lines in the output. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1454 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-15HTML writer: Enclose all LaTeXMathML bits in <span class="LaTeX">.fiddlosopher1-3/+7
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-12Changed list parser so that only the starting list marker matters:fiddlosopher1-45/+34
1. one - two (b) three produces an ordered list with 1., 2., 3. This is the behavior of Markdown.pl. Modified README to document the new behavior. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1438 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-08Use Data.List's 'intercalate' instead of custom 'joinWithSep'.fiddlosopher13-50/+44
+ 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-08Fixed haddock bug in Text/Pandoc/LaTexMathML.hs.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1427 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06LaTeX reader: Refactored math parsers, limited support for eqnarray.fiddlosopher1-3/+10
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1426 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06LaTeX reader: Removed specialEnvironment parser.fiddlosopher1-7/+0
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1425 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06LaTeX reader: minor improvements.fiddlosopher1-7/+9
+ parse '{}', if present, after \textless, \textgreater, \textbar, \textbackslash, \ldots. + Parse unescaped special characters verbatim rather than changing them to spaces. This way arguments of unknown commands will appear in braces. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1424 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06LaTeX reader: Fixed regression in list parsingfiddlosopher1-3/+3
(introduced by recent changes to unknownCommand). git-svn-id: https://pandoc.googlecode.com/svn/trunk@1423 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06LaTeX reader: improvements in raw LaTeX parsing.fiddlosopher1-20/+41
+ "loose punctuation" (like {}) parsed as Space + Para elements must contain more than Str "" and Space elements + Added parser for "\ignore" command used in literate haskell. + Reworked unknownCommand and rawLaTeXInline: when not in "parse raw" mode, these parsers simply strip off the command part and allow the arguments to be parsed normally. So, for example, \blorg{\emph{hi}} will be parsed as Emph "hi" rather than Str "{\\emph{hi}}". git-svn-id: https://pandoc.googlecode.com/svn/trunk@1420 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06MediaWiki writer: print class attributes in <pre> for code blocks, if any.fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1419 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06Changed Float to Double in definition of Table element.fiddlosopher8-15/+15
(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-04Reworked Text.Pandoc.ODT to use zip-archive instead of calling external 'zip'.fiddlosopher3-116/+68
+ 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-02Modified Text.Pandoc.Biblio to fit new citeproc API.fiddlosopher1-5/+5
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1416 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-27Removed PDF writer from core pandoc, restored markdown2pdf.fiddlosopher1-134/+0
+ 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-26LaTeX reader: Parse "code" environments as verbatim (lhs).fiddlosopher1-15/+9
Refactored parsers for verbatim environments. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1414 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-14Simplified and improved UTF8 handling:fiddlosopher5-95/+1
+ 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-14PDF writer: Close output file handle after waitForProcess.fiddlosopher1-1/+2
It should be closed automatically, but perhaps this fails on Windows, especially when the process is interrupted? git-svn-id: https://pandoc.googlecode.com/svn/trunk@1410 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-13Support for display math; changed ASCIIMathML -> LaTeXMathML:fiddlosopher17-77/+91
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-12Don't expose Text.Pandoc.Biblio module unless citeproc option is selected.fiddlosopher1-8/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1408 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-12Small haddock documentation fix. (Andrea Rossato)fiddlosopher1-2/+2
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1407 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-12Patches to Text.Pandoc.Biblio for new citeproc API.fiddlosopher1-13/+10
(Andrea Rossato) git-svn-id: https://pandoc.googlecode.com/svn/trunk@1406 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-11Parse raw ConTeXt environments as TeX in markdown reader.fiddlosopher2-13/+37
Resolves Issue #73. Also made some structural changes to parsing of raw LaTeX environments. Previously there was a special block parser for LaTeX environments. It returned a Para element containing the raw TeX inline. This has been removed, and the raw LaTeX environment parser is now used in the rawLaTeXInline parser. The effect is exactly the same, except that we can now handle consecutive LaTeX and ConTeXt environments not separated by spaces. This new flexibility is required by the example in Issue #73: \placeformula \startformula L_{1} = L_{2} \stopformula API change: The LaTeX reader now exports rawLaTeXEnvironment' (which returns a string) rather than rawLaTeXEnvironment (which returns a block element). This is more likely to be useful in other applications. Added test cases for raw ConTeXt environments to markdown-reader-more.txt. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1405 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-11ODT writer: Use '/', even on Windows, as path separator in xlink attributefiddlosopher1-4/+4
for images. Otherwise OpenOffice can't find the image files. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1403 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10Allow newline before URL in markdown link references. Resolves Issue #81.fiddlosopher1-6/+4
Added tests for this issue in new "markdown-reader-more" tests. Changed RunTests.hs to run these tests. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1401 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10Man writer: don't escape " as \".fiddlosopher1-1/+1
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1399 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10Debian packaging changes:fiddlosopher1-1/+1
+ Updated README.Debian with information on the changes to markdown2pdf. + Made latex and zip required dependencies, since they are now required for 'odt' and 'pdf' targets of pandoc. + Fixed typo in warning message. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1396 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-10Added Text.Pandoc.PDF module, 'pdf' as new output option.fiddlosopher1-104/+98
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