Commit Graph
222 Commits
Author SHA1 Message Date
fiddlosopher ed58846497 Fixed bug in mediawiki writer: improper closing tags in tables.
<th> instead of </th>, <td> instead of </td>.
Thanks to Benct Philip Jonsson for reporting the bug.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1524 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 19:59:00 +00:00
fiddlosopher 2806aee9b2 Added --email-obfuscation option.
+ Added writer option for email obfuscation.
+ Implemented email obfuscation options in HTML writer.
+ Added option to option parser.
+ Documented in README and pandoc man page.
+ Resolves Issue #97.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1523 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 19:58:48 +00:00
fiddlosopher 720e9ce3a5 Renamed processIn -> processWith, queryIn -> queryWith.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1521 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 19:58:26 +00:00
fiddlosopher 874c3e0dea Added a plugin system, based on hint.
+ In Text.Pandoc.Definition, added processIn, processInM,
  and queryIn, and deprecated processPandoc and queryPandoc
  for these more general functions, which are useful in writing
  plugins.

+ Added module Text.Pandoc.Plugins.

+ Added a --plugins option to Main, and code to run the parsed pandoc
  document through all the plugins.

+ Provided five sample plugin files in the plugins/ directory.

+ Documented --plugin in the pandoc man page and README.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1519 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 19:58:06 +00:00
fiddlosopher df4d5b96c7 More fixes to get markdown writer working with pretty-1.0.1.0.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1517 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-29 00:32:09 +00:00
fiddlosopher 751aa15abc Fixed problems in RST and markdown output due to bug in pretty-1.0.1.0
+ Added hang' function to Text.Pandoc.Shared; this will be used instead
  of hang, which doesn't work properly in pretty-1.0.1.0.  When pretty
  is upgraded, we can go back to hang.
  See  http://article.gmane.org/gmane.comp.lang.haskell.general/16687
+ Use hang' (and some different techniques) in RST and markdown writers.
  Some output is now a bit different.
+ Modify test suites accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1515 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-17 15:34:25 +00:00
fiddlosopher f8ab1c7890 LaTeX reader: parse |inline lhs| if source is lhs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1511 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:43:49 +00:00
fiddlosopher d4b9307ce4 LaTeX and Markdown readers: Add sourceCode class to haskell code.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1510 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:43:42 +00:00
fiddlosopher ebe9ac50b0 Added lhs support to RST reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1509 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:43:33 +00:00
fiddlosopher c84c3b0c36 Added lhs support to RST writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1508 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:43:25 +00:00
fiddlosopher 67508f986f Allow LaTeX-style code sections as well as bird-style in lhs markdown.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1504 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:42:55 +00:00
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