Commit graph

211 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
48410d1df0 Added --lhs-out option.
+ 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-02 22:42:16 +00:00
fiddlosopher
c815c2feab LaTeX reader: Added parser for literate haskell code blocks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1499 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:42:08 +00:00
fiddlosopher
95c16bfa3b Moved failUnlessLHS to Text.Pandoc.Shared.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1498 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:42:00 +00:00
fiddlosopher
42ba781b3d Added literate haskell support for markdown reader.
+ 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-12-02 22:41:51 +00:00
fiddlosopher
996e1ad1b3 Markdown reader: relax spacing rules for $$ in display math.
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-25 00:09:02 +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
22549e19c6 Fixed parsing of RST comment blocks.
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-06 16:49:45 +00:00
fiddlosopher
c02e0f76fe Revert "Markdown reader: Ignore blank line after ~~~~~~~~ in delimited code blocks."
This reverts commit 7ad17fe5cf.
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-02 16:44:26 +00:00
fiddlosopher
412315b530 Markdown reader: Allow blank space at end of horizontal rules.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1480 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-01 22:58:44 +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
0e4eb83749 Markdown reader: cleaner handling of spaces in URLs.
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-11-01 21:05:33 +00:00
fiddlosopher
ddf2dc6896 Markdown reader: allow URLs containing spaces.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1475 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-31 22:34:38 +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
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
0b3d8581a3 Changed compactify in Text.Pandoc.Shared - better heuristic.
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-25 22:07:45 +00:00
fiddlosopher
66d459a545 Don't print a line break between a footnote and immediately following nonspace
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-19 00:33:12 +00:00
fiddlosopher
a2422504ff HTML reader: Don't interpret contents of <pre> blocks as markdown.
Added rawVerbatimBlock parser.  Resolves Issue #94.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1468 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-18 23:42:23 +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
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
f08ebf5a9b Added colons to protocols in unsanitaryURI in HTML reader.
Closes Issue #88.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1462 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-10-16 01:00:51 +00:00
fiddlosopher
3b58456673 Moved odt-styles/ to data/. Removed unneeded variable in Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1458 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-23 15:55:30 +00:00
fiddlosopher
7ad17fe5cf Markdown reader: Ignore blank line after ~~~~~~~~ in delimited code blocks.
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-16 01:39:05 +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
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
943c2f353d Changed list parser so that only the starting list marker matters:
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-12 00:05:32 +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
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
2e893b43c4 Fixed haddock bug in Text/Pandoc/LaTexMathML.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1427 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-08 02:54:17 +00:00
fiddlosopher
5c02959483 LaTeX reader: Refactored math parsers, limited support for eqnarray.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1426 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06 21:24:33 +00:00
fiddlosopher
87aa458446 LaTeX reader: Removed specialEnvironment parser.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1425 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06 21:24:24 +00:00
fiddlosopher
b422711451 LaTeX reader: minor improvements.
+ 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-06 20:45:53 +00:00
fiddlosopher
ae30b5ae37 LaTeX reader: Fixed regression in list parsing
(introduced by recent changes to unknownCommand).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1423 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-06 20:45:42 +00:00
fiddlosopher
fc24c79db6 LaTeX reader: improvements in raw LaTeX parsing.
+ "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-06 18:05:18 +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
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
9b7ec2d366 Modified Text.Pandoc.Biblio to fit new citeproc API.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1416 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-02 02:54:00 +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
4f14802831 LaTeX reader: Parse "code" environments as verbatim (lhs).
Refactored parsers for verbatim environments.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1414 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-26 20:36:06 +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
8388427d23 PDF writer: Close output file handle after waitForProcess.
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-14 01:32:15 +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
17a41e6ebc Small haddock documentation fix. (Andrea Rossato)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1407 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-12 00:52:17 +00:00
fiddlosopher
24bf0cfe8c Patches to Text.Pandoc.Biblio for new citeproc API.
(Andrea Rossato)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1406 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-12 00:52:08 +00:00
fiddlosopher
c8a56a2864 Parse raw ConTeXt environments as TeX in markdown reader.
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-11 07:04:36 +00:00
fiddlosopher
68ffc7eb6d ODT writer: Use '/', even on Windows, as path separator in xlink attribute
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-11 06:38:16 +00:00