Commit graph

188 commits

Author SHA1 Message Date
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
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
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
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
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
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 " ". 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
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
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
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
fiddlosopher
d5c73ac42a Code cleanup in TexMath reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1318 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 23:58:35 +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
e9dc5aa02e Code cleanup in Text.Pandoc.Blocks to eliminate -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1309 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 22:50:57 +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
7447ecc255 Escape '\160' as " ", not " " in XML.
"nbsp" isn't a predefined XML entity.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1303 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-13 16:31:34 +00:00
fiddlosopher
752adcd45a Added type signatures and fixed other -Wall warnings in Markdown reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1301 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-11 16:33:21 +00:00
fiddlosopher
45044ff536 Added a few more recognized abbreviations to 'abbrev' parser.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1300 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-11 03:00:35 +00:00
fiddlosopher
a85dfb83bb Print unicode \160 literally in markdown writer, rather than as  .
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1299 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-11 02:15:10 +00:00
fiddlosopher
824bb2d22e In smart mode, use nonbreaking spaces after abbreviations in markdown parser.
Thus, for example, "Mr. Brown" comes out as "Mr.~Brown" in LaTeX, and does
not produce a sentence-separating space.  Resolves Issue #75.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1298 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-07-11 02:14:57 +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
6b73389328 Added type signatures, etc., to eliminate -Wall warnings.
(except for two warnings about unneeded functions, which might
come in handy some day...)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1291 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-17 22:15:39 +00:00
fiddlosopher
24c1d71a37 Cleaned up Text/Pandoc/CharacterReferences.hs to avoid -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1289 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-17 19:07:17 +00:00
fiddlosopher
18e44501a7 Cleaned up Text/Pandoc/Shared.hs to avoid -Wall warnings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1288 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-17 19:07:11 +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
fiddlosopher
2f88263833 OpenDocument writer: Return empty Doc in title block for null author, title, date.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1282 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-09 21:07:59 +00:00
fiddlosopher
8add1cf821 OpenDocument writer: don't convert 4 spaces to tab in verbatim block.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1281 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-09 21:07:52 +00:00
fiddlosopher
3337b46e30 Use \textsubscr instead of \textsubscript for LaTeX subscript macro.
\textsubscript conflicts with a definition in the memoir class.
Resolves Issue #65.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1280 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-08 03:29:09 +00:00
fiddlosopher
cd38d4ae79 Markdown smart typography: Em dashes no longer eat surrounding whitespace.
Resolves Issue #69.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1279 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-06-08 03:20:15 +00:00
fiddlosopher
69c2bde7d9 HTML writer: In code blocks, change leading newlines to <br /> tags.
(Some browsers ignore them.)  Resolves Issue #71.
See http://six.pairlist.net/pipermail/markdown-discuss/2008-May/001297.html


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1277 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-05-15 00:54:33 +00:00
fiddlosopher
6a46ffc0ad Count anything that isn't a known block (HTML) tag as an inline tag
(rather than the other way around).  Added "html", "head", and
"body" to list of block tags.  Resolves Issue #66, allowing
<lj> to count as an inline tag.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1276 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-04-20 03:12:42 +00:00
fiddlosopher
2fdcd1701a Fixed haddock documentation error
(affects latest version of haddock only).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1275 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-31 20:20:02 +00:00
fiddlosopher
447efa0f9f Fixed bug in RTF writer:
Extra spaces were being printed after emphasized, boldface, and
other inline elements.  Resolves Issue #64.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1274 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-26 21:46:12 +00:00
fiddlosopher
8624ed9bd3 The '--sanitize-html' option now examines URIs in markdown links
and images, and in HTML href and src attributes.  If the URI scheme
is not on a whitelist of safe schemes, it is rejected.  The main point
is to prevent cross-site scripting attacks using 'javascript:' URIs.
See http://www.mail-archive.com/markdown-discuss@six.pairlist.net/msg01186.html
and http://ha.ckers.org/xss.html.  Resolves Issue #62.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1262 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-22 20:41:56 +00:00
fiddlosopher
4988441f3c Fixed handling of Quoted inline elements to use unicode left & right quotes.
Added inQuotes auxiliary function.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1261 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-21 15:45:54 +00:00
fiddlosopher
97a3b2234a OpenDocument: use the new Definition_20_Term and
Definition_20_Definition styles and some other minor cleanup.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1256 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19 18:46:27 +00:00
fiddlosopher
d2643c25e2 Code cleanup only.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1255 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19 18:46:18 +00:00
fiddlosopher
ee644ddda0 OpenDocument writer: Don't print raw HTML.
(Note: For the DocBook writer, it makes sense to pass through
HTML raw, since the "HTML" might be DocBook XML.  But this isn't
desirable for the OpenDocument writer, it seems to me.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1254 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19 18:46:09 +00:00
fiddlosopher
dcb37d32d1 Moved XML-formatting functions to new unexported module Text.Pandoc.XML.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1253 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19 18:46:01 +00:00
fiddlosopher
2baf6d09ee Andrea Rossato's patch for OpenDocument support.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1252 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-03-19 18:45:51 +00:00
fiddlosopher
94dcbab55f Modified disallowedInNode in Texinfo writer to correct list of disallowed characters.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1246 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-24 18:21:19 +00:00
fiddlosopher
839f77d81e Use style attributes rather than css classes for strikethrough and ordered list styles.
This works better when fragments, rather than standalone documents, are generated.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1245 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-24 18:15:36 +00:00
fiddlosopher
858269dd20 Changes to Texinfo writer:
+ No space between paragraph and following @verbatim (provides more
  pleasing appearance in text formats)
+ Blank line consistently after list environments.
+ Removed deVerb.
+ Use @code instead of @verb for inline code (this solves the character
  escaping problem for texi2dvi and texi2pdf).
+ Modified test suite accordingly.
+ Added Peter Wang to copyright statement (for Texinfo.hs).
+ Added news of Texinfo writer to README.
+ Added Texinfo to list of formats in man page, and removed extra 'groff'.
+ Updated macports with Texinfo format.
+ Updated FreeBSD pkg-descr with Texinfo format.
+ Updated web page with Texinfo writer.
+ Added demos for Texinfo writer.
+ Added Texinfo to package description in debian/control.
+ Added texi & texinfo extensions to Main.hs, and fixed bug in determining
  default output extension.
+ Changed from texinfo to texi extension in web demo.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1244 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-24 05:48:59 +00:00
fiddlosopher
49e0e507b7 Committed novalazy's initial patch for texinfo output,
including tests for texinfo writer.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1243 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-24 05:48:41 +00:00
fiddlosopher
270eb7bed4 Moved BlockWrapper and wrappedBlocksToDoc from ConTeXt writer to Shared.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1242 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-24 05:48:31 +00:00
fiddlosopher
9a7ca4d9aa Minor changes due to changes in highlighting-kate API.
defaultHighlightingCss now imported rather than duplicated.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1235 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-10 18:59:54 +00:00
fiddlosopher
742a465980 Support for startFrom="nn" to select starting line number in syntax highlighting.
Changed argument of highlightHtml to Attr, not [String], for generality.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1232 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-10 18:59:34 +00:00
fiddlosopher
04b32451be Added build option for syntax highlighting, with *optional* dependency on highlighting-kate.
+ pandoc.cabal includes a flag, 'highlighting', that causes a dependency
  on highlighting-kate.
+ if Setup.hs detects this dependency, it copies templates/Highlighting.yes.hs
  to Text/Pandoc/Highlighting.hs.  Otherwise, it copies templates/Highlighting.no.hs.
+ The HTML writer imports this new module instead of Text.Highlighting.Kate.
  The new module exports highlightHtml, which either uses highlighting-kate to
  perform syntax highlighting or automatically returns a failure code, depending
  on whether highlighting support was selected.
+ --version now prints information about whether syntax highlighting support is compiled in.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1221 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:21:19 +00:00
fiddlosopher
ba6981a4a1 Removed Text.Regex dependencies by rewriting using plain Haskell:
+ from Text.Pandoc.Writers.RTF
+ from Text.Pandoc.Writers.HTML
+ from Main
+ from pandoc.cabal


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1219 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:21:04 +00:00
fiddlosopher
087739ad7a Moved Text.Pandoc.Writers.DefaultHeaders -> Text.Pandoc.DefaultHeaders.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1218 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:20:55 +00:00
fiddlosopher
c150e84d3c Add default CSS to document header if syntax highlighting used.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1215 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:20:25 +00:00
fiddlosopher
b3709022ef Added preliminary support for syntax highlighting to HTML writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1213 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:20:13 +00:00
fiddlosopher
06b544360e Factored codeBlock into separate codeBlockIndented and codeBlockDelimited.
Do not use codeBlockDelimited in strict mode.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1211 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:20:02 +00:00
fiddlosopher
614547b38e Use generic attributes type, not a string, for CodeBlocks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1209 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:19:43 +00:00
fiddlosopher
f2354590f9 Put language class information in pre tag, not code tag, in HTML code blocks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1207 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:19:24 +00:00
fiddlosopher
2e683e8b53 Fixed delimited code blocks: eat blank lines afterwards, and allow end line
to contain more tildes than beginning line.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1206 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:19:17 +00:00
fiddlosopher
24f22ee7ac Added a needed try to {} attribute parser.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1205 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:19:10 +00:00
fiddlosopher
046c6b0d0d Added support for multiple classes in delimited code block.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1204 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:19:01 +00:00
fiddlosopher
b06ddad4bc Initial support for delimited code blocks in markdown reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1203 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:18:54 +00:00
fiddlosopher
769e2f3cf5 HTML writer: if language specified for code block, print as <code> class.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1202 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:18:47 +00:00
fiddlosopher
2c13782fdf Modified writers for new argument place in CodeBlock.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1200 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:18:22 +00:00
fiddlosopher
9f7a14c210 Modified readers for new parameter in CodeBlock.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1199 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:18:03 +00:00
fiddlosopher
6a921f0966 Added parameter for class to CodeBlock (for syntax highlighting).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1198 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-02-09 03:17:49 +00:00
fiddlosopher
42359e63c9 Fixed bug in RST reader, which would choke on: "p. one\ntwo\n".
Added some try's in ordered list parsers.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1191 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-17 02:14:20 +00:00
fiddlosopher
d474852f56 Removed unnecessary imports.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1189 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-16 02:18:23 +00:00
fiddlosopher
6795ffd93f Bumped version to 0.47.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1187 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-08 20:25:46 +00:00
fiddlosopher
8fca649d05 Changed copyright dates where appropriate to include 2008.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1181 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-08 17:26:16 +00:00
fiddlosopher
2df432dc60 Changed comment used to replace unsafe HTML if sanitize-html option
selected.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1178 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-08 04:53:01 +00:00
fiddlosopher
b9e30ca8b7 RST reader: Fixed bug in parsing explicit links (resolves Issue #44).
The problem was that we were looking for inlines until a '<' character
signaled the start of the URL.  So if you hit a reference-style link,
it would keep looking til the end of the document.  Fix:  change
inline => (notFollowedBy (char '`') >> inline).  Note that this won't
allow code inlines in links, but these aren't allowed in resT anyway.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1175 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-06 19:46:55 +00:00
fiddlosopher
85657add6a RST reader: cleaned up parsing of reference names in key blocks and links.
Allow nonquoted reference links to contain isolated '.', '-', '_', so
so that strings like 'a_b_' count as links.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1174 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-06 19:46:43 +00:00
fiddlosopher
e4837c140c RST reader: Removed unnecessary check for following link in str.
This is unnecessary now that link is above str in the definition of
'inline'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1173 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-06 19:46:38 +00:00
fiddlosopher
d271473044 Fixed markdown reader to handle "*hi **there***" as a strong nested in an emph.
(A '*' is only recognized as the end of the emphasis if it's not the beginning
of a strong emphasis.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1172 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-01-06 19:46:31 +00:00