Commit graph

752 commits

Author SHA1 Message Date
fiddlosopher
26ce0d04ec Fixed S5.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1674 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:08:46 +00:00
fiddlosopher
a42bae619a Added templates module.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1673 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:08:38 +00:00
fiddlosopher
5df3ec11c0 RST reader: Allow :: before lhs code block.
The RST spec requires the :: before verbatim blocks.
This :: should not be treated as literal colons.
Resolves Issue #189.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1668 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-22 07:27:14 +00:00
fiddlosopher
383b0b86ca Use HTML combinators for spans in section numbers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1660 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-09 04:58:29 +00:00
fiddlosopher
717767ddd1 Provide CSS hooks for section numbers in headers and TOC entries.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1659 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-08 06:53:37 +00:00
fiddlosopher
2ced785e95 Added optional section numbering in HTML output.
This involves a change to the Element data structure,
including a section number as well as an id and title
for each section.  Section numbers are lists of integers;
this should allow different numbering schemes to be used
in the future.  Currently [1,2,3] -> 1.2.3.

Resolves Issue #150.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1658 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-08 02:36:16 +00:00
fiddlosopher
0543698895 Don't print raw HTML in man output.
Resolves Issue #183.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1657 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 23:34:54 +00:00
fiddlosopher
5082b5411b Improved syntax for markdown definition lists.
Definition lists are now more compatible with PHP Markdown Extra.
Resolves Issue #24.

+ You can have multiple definitions for a term (but still not
  multiple terms).
+ Multi-block definitions no longer need a
  column before each block (indeed, this will now cause
  multiple definitions).
+ The marker no longer needs to be flush with the left margin,
  but can be indented at or two spaces.  Also, ~ as well as :
  can be used as the marker (this suggestion due to David
  Wheeler.)
+ There can now be a blank line between the term and
  the definitions.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1656 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 08:26:53 +00:00
fiddlosopher
6ddf8da444 Blank lines after lists in MediaWiki writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1655 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 08:26:32 +00:00
fiddlosopher
56ca3e8dcf Changed markdown2pdf.hs so it prints error messages on last attempt.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1654 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-07 08:26:27 +00:00
fiddlosopher
ad5450266c Allow markdown tables without headers.
Resolves Issue #50. The new syntax is described in README.
Also allow optional line of dashes at bottom of simple tables.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1652 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 21:34:46 +00:00
fiddlosopher
de38adc7f3 Docbook writer: add ids to sections. Use link for internal links.
See Issue #60.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1651 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 18:26:29 +00:00
fiddlosopher
78475498b4 Added --id-prefix option.
This adds a prefix to all automatically generated HTML identifiers,
which helps prevent duplicate identifiers when you're generating
a fragment (say a blog post).

Added writerIdentifierPrefix to WriterOptions.

Resolves Issue #41.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1650 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 17:56:02 +00:00
fiddlosopher
61f7a4f869 Markdown reader: Compensate for width of final table column.
Resolves Issue #144.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1649 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 07:47:09 +00:00
fiddlosopher
da6291d930 Fixed handling of footnotes in titles (HTML) and headers (LaTeX).
Resolves Issues #137.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1648 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 07:28:50 +00:00
fiddlosopher
90c335c463 Added stripTags to Text.Pandoc.XML.
This is used in the HTML writer.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1647 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 07:28:45 +00:00
fiddlosopher
8671bc5a1b Markdown reader: Treat a backslash followed by a newline as hard linebreak.
Resolves Issue #154.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1646 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 05:33:24 +00:00
fiddlosopher
94841b7602 Added "head" to list of HTML block-level tags.
Resolves Issue #108.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1645 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 04:47:08 +00:00
fiddlosopher
eb5550a6e4 Changed --default-code-classes -> --indented-code-classes.
Also changed stateDefaultCodeClasses -> stateIndentedCodeClasses.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1643 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-05 04:46:57 +00:00
fiddlosopher
a42703d3c0 Allow . and ~ in header identifiers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1638 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-01 07:44:06 +00:00
fiddlosopher
df0ce7658c Added --default-code-classes option.
This specifies classes to use for indented code blocks.
Thanks to buttock for the (slightly modified) patch.
Resolves Issue #87.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1637 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-01 06:56:47 +00:00
fiddlosopher
a84472e054 Allow _ character in automatically generated identifiers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1635 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-29 20:37:55 +00:00
fiddlosopher
80a4a03df7 Markdown reader: treat 4 or more * or _ in a row as literal text.
(Instead of trying to parse as strong or emph, which leads to
exponential performance problems.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1634 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-29 19:31:58 +00:00
fiddlosopher
93d202cbd1 Markdown reader: Use + rather than %20 for spaces in URLs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1633 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-29 19:31:50 +00:00
fiddlosopher
98ff6b2fd0 Better looking simple tables. Resolves Issue #180.
* Markdown reader: simple tables are now given column widths of 0.

* Column width of 0 is interpreted as meaning: use default column width.

* Writers now include explicit column width information only
  for multiline tables.  (Exception:  RTF writer, which requires
  column widths.  In this case, columns are given equal widths,
  adding up to the text width.)

* Simple tables should now look better in most output formats.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1631 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-28 03:22:33 +00:00
fiddlosopher
d1b80f8f35 Markdown reader: parse refs and notes in the same pass.
Previously the markdown reader made one pass for references,
a second pass for notes (which it parsed and stored in the
parser state), and a third pass for the rest.  This patch
achieves a 10% speed improvement by storing the raw notes
on the first (reference) pass, then parsing them when the
notes are inserted into the AST. This eliminates the need
for a second pass to parse notes.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1629 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-28 03:22:18 +00:00
fiddlosopher
1d440130c4 Added \int to characters handled as unicode in tex math.
Resolves Issue #177.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1628 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-28 03:22:14 +00:00
fiddlosopher
81c3bd6a54 Modified markdown2pdf so as not to create a backup file.
Resolves Issue #166.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1624 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-22 18:07:33 +00:00
fiddlosopher
db01801199 Use utf8-string IO in markdown2pdf.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1622 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-21 06:22:02 +00:00
fiddlosopher
14a25b287c Fixed htmlComment parser.
(Added a needed try.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1621 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-21 05:23:09 +00:00
fiddlosopher
39f6af5de4 Modified html+lhs output to use 'haskell' highlighter.
The bird tracks are added in the highlighting module.
This makes sense, because the kate's haskell highlighter
is much better than the literateHaskell highlighter.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1620 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-21 04:40:59 +00:00
fiddlosopher
9d20eeb019 Support for "..code-block" directive in RST reader.
Not core RST, but used in Sphinx for code blocks annotated with
syntax information.  Thanks to Luke Plant for the patch.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1619 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-17 03:36:04 +00:00
fiddlosopher
fce48c392a Specially mark code blocks that were "literate" in the input.
They can then be treated differently in the writers.  This allows
authors to distinguish bits of the literate program they are writing
from source code examples, even if the examples are marked as
Haskell for highlighting.

Resolves Issue #174.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1618 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-03 06:50:17 +00:00
fiddlosopher
683b8e10b5 Set utf-8 encoding in texinfo headers.
Resolves Issue #153.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1617 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-01 02:48:20 +00:00
fiddlosopher
313d2e40b8 Changed heuristic in compactify.
compactify has to decide whether a Para that ends a list is a Para
intentionally, or just because of the blank lines at the end of
every list.  In the latter case the Para is turned to a Plain.

The old heuristic was:  change final Para to Plain iff the other
items all end in Plain.  This produces bad results when, for example,
an item contains just a Plain and an HTML comment, as it

- a
<!--
- b
-->
-c

The new heuristic:  change final Para to Plain iff the other items
don't contain a Para.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1616 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-01 02:38:18 +00:00
fiddlosopher
eb2e560d86 Properly handle commented-out list items in markdown.
Example:
- a
<!--
- b
-->
- c

Resolves Issue #142.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1615 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-11-01 02:38:15 +00:00
fiddlosopher
75f31c9440 Added % as an rst underline character.
Resolves Issue #173.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1612 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-10-29 05:52:17 +00:00
fiddlosopher
7163a044a4 Fix inline math parser so that \$ is allowed in math.
Resolves Issue #169.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1609 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-10-12 03:40:47 +00:00
fiddlosopher
74ac66a0cb Added haddock comments warning that readers assume \n line endings.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1608 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-10-04 22:09:23 +00:00
fiddlosopher
6191a1fa74 Fixed markdown2pdf.hs to accept --longopt=val options.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1607 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-08-22 02:26:51 +00:00
fiddlosopher
1fe28483bd Fixed bug in HTML comment parser.
Resolves Issue #157.  ('try' in the wrong place.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1605 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-07-21 08:02:03 +00:00
fiddlosopher
f9ec6797bd Changed escapes in markdown writer.
- >, not <, is escapable in standard markdown.!
- also # is now escaped
- Partiall resolves Issue #96.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1600 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-07-18 19:15:42 +00:00
fiddlosopher
667b8f62ea Improved clarity of titleTransform in RST reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1592 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-07-11 01:08:31 +00:00
fiddlosopher
c177c70959 Use language attribute to indicate source language in docbook code blocks.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1587 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-07-03 02:33:58 +00:00
fiddlosopher
e577233095 Allow -, _, :, . in markdown attribute names.
These are legal in XML attribute names.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1586 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-07-03 02:33:52 +00:00
fiddlosopher
d3f4293725 Export languagesByExtension in Text.Pandoc.Highlighting.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1585 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-07-03 02:33:43 +00:00
fiddlosopher
32f357c110 RST reader: Allow # to continue list...
...even if the list was started with an explicit
marker.  For example:

    A.  my list
    #.  continued

Resolves Issue #140.  Test case also added.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1584 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-06-28 01:38:40 +00:00
fiddlosopher
313405f59a Allow continuation lines in line blocks.
Also added test cases for line blocks for RST reader.
Resolves Issue #149.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1583 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-06-25 02:01:41 +00:00
fiddlosopher
15258f66f0 Fixed duplicate text bug in markdown2pdf.hs. (Paulo Tanimoto)
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1582 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-06-25 01:12:07 +00:00
fiddlosopher
a0da2816bd Man writer: break lines at end of each sentence.
groff expects this and treats . and ? differently when
followed by line ending as opposed to ordinary space.

Also, don't escape periods.  Instead, use zero-width character
\& to avoid unwanted interpretation of periods at start of line.

Resolves Issue #148.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1580 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-06-06 21:27:46 +00:00
fiddlosopher
314c332581 Make --smart default for man output format.
Otherwise we have trouble dividing lists of endlines into
sentences.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1579 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-06-06 21:27:40 +00:00
fiddlosopher
cca2acb6db Improved LaTeX reader's coverage of math modes.
Remove displaymath* (which is not in LaTeX) and recognize
all the amsmath environments that are alternatives to eqnarray, namely
equation, equation*, gather, gather*, gathered, multline, multline*,
align, align*, alignat, alignat*, aligned, alignedat, split

Resolves Issue #103. Thanks to shreevatsa.public
for the patch.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1577 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-06-03 20:26:41 +00:00
fiddlosopher
236896bd10 RST reader: Allow explicit links with spaces in URL: link <to this>_
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1576 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-05-04 00:05:58 +00:00
fiddlosopher
2f737a97e4 Export HTMLMathMethod in Text.Pandoc.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1575 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-05-03 21:24:01 +00:00
fiddlosopher
553d91a15f Made pandoc -v more explicit about compiler options.
Resolves Issue #139.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1574 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-05-02 02:37:38 +00:00
fiddlosopher
cceede4ca2 Added new Haskell version of markdown2pdf.
Thanks to Paulo Tanimoto for the patch.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1573 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-05-01 04:18:14 +00:00
fiddlosopher
2d5f718048 pandoc.hs: Make --strict compatible with --standalone, --toc.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1572 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-05-01 04:18:07 +00:00
fiddlosopher
c584e48168 Markdown reader: change ' ' to '\160' in abbreviations.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1571 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-05-01 04:17:54 +00:00
fiddlosopher
ab100f7c5e Markdown reader: improved efficiency of abbreviation parsing.
Instead of a separate abbrev parser, we just check for abbreviations
each time we parse a string.  This gives a huge performance boost
with -S.  Resolves Issue #141.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1570 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-30 04:39:45 +00:00
fiddlosopher
532e52f2d4 Improved efficiency of hexNum parser.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1568 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-29 19:29:03 +00:00
fiddlosopher
d4d99d281d Made htmlComment parser more efficient.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1567 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-29 19:28:54 +00:00
fiddlosopher
e203c562d6 Improved efficiency of whitespace parser.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1565 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-29 19:28:39 +00:00
fiddlosopher
5182381084 Use more efficient skipNonindentSpaces instead of nonidentSpaces where possible.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1564 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-29 19:28:31 +00:00
fiddlosopher
f43ae9edb4 Took out unneeded 'try' in indentSpaces parser.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1563 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-29 19:28:23 +00:00
fiddlosopher
df5244fd48 HTML writer: wrap sections in divs. Resolves Issue #70.
+ hierarchicalize has been rationalized; it builds a hierarchical
  representation of the document from the headers, and simultaneously
  gives each section a unique identifier based on the heading title.
+ Identifiers are now attached to the divs rather than
  to the headers themselves.
+ Table of content backlinks go to the beginning of the table, rather
  than to the section reference that was clicked.  This seems better.
+ Code for constructing identifiers has been moved to Text.Pandoc.Shared
  from the HTML writer, since it is now consumed only by
  hierarchicalize.
+ In --strict mode, pandoc just prints bare headings, as before
  (unless --toc has been specified).
+ In s5 output, it does not wrap sections in divs, as that seems to
  confuse the s5 javascript.
+ Test suite updated accordingly.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1562 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-25 00:29:58 +00:00
fiddlosopher
a972a6ccbc Use Paths_pandoc to get version number.
(Instead of hard-coding it into Text/Pandoc.hs.)

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1560 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-18 16:15:56 +00:00
fiddlosopher
0395ba157e Fixed regression with --preserveTabs.
Brought back optPreserveTabs.  The trick of setting
tabStop to 0 to mean "preserve tabs" had a bad side effect:
strings of 0 spaces were interpreted as indentation.
So, with --preserve-tabs, unindented paragraphs were
treated as code.  Resolves Issue #138.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1559 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-04-08 20:19:50 +00:00
fiddlosopher
9be0d098b8 Minor changes in Text.Pandoc.Biblio.
Replaced queryPandoc w queryWith, processPandoc w processWith.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1554 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-28 07:39:45 +00:00
fiddlosopher
75c7800d90 Don't return an error status on --help or --version.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1551 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-26 16:47:36 +00:00
fiddlosopher
5f3a147dfd Removed plugin support.
Plugins will probably be added in a later version,
but for now we want to avoid the heavy GHC API dependency.
Also, plugins are very slow with the current system.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1548 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-24 22:59:44 +00:00
fiddlosopher
f1c22f3d1a Version bump to 1.2.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1546 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-14 18:30:11 +00:00
fiddlosopher
a1eadcdbc1 Changed comment header on hsmarkdown.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1543 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-14 17:24:22 +00:00
fiddlosopher
dcedb2f712 Fixed bug with header spacing in Markdown and RST writers.
A null header (Meta [] [] []) should not cause a blank line
at the beginning of output.  But a blank line is needed between
a non-null header and the main text.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1536 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-02-07 19:20:35 +00:00
fiddlosopher
9b27f59fc2 Gobble space after Plain blocks containing only raw html inline.
Otherwise following header blocks are not parsed correctly,
since the parser sees blank space before them.  Resolves
Issue #124.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1534 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-31 18:30:44 +00:00
fiddlosopher
cdd3b67a05 Rewrote hsmarkdown in Haskell for portability.
For now, keeping the old shell script too.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1533 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-31 18:30:26 +00:00
fiddlosopher
ede0d805a0 Moved tabFilter to Shared.
Removed optPreserveTabs; instead, tabstop of 0 means preserve tabs.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1532 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-31 17:13:41 +00:00
fiddlosopher
5a9e3b7445 Renamed Main.hs -> pandoc.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1531 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-31 17:13:30 +00:00
fiddlosopher
42aca57dee Moved all haskell source to src subdirectory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1528 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-01-24 20:00:26 +00:00
fiddlosopher
9a67a486c2 Moved everything from src into the top-level directory.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1104 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-29 02:02:34 +00:00
fiddlosopher
7deee9c874 Reverted changes in r1086 (implicit section header references).
This caused too much of a performance hit.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1093 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-23 03:51:21 +00:00
fiddlosopher
66efec1670 Improved and simplified setextHeader parser in markdown reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1092 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 19:09:38 +00:00
fiddlosopher
5a0179d0a0 Improved efficiency of romanNumeral parser (in Text.Pandoc.Shared)
for a big speed boost in (non-strict) markdown parsing.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1089 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 18:17:29 +00:00
fiddlosopher
fb07803be6 + Changed \useurl to \useURL in ConTeXt output.
+ Changed links from red to blue in ConTeXt output.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1087 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 17:33:12 +00:00
fiddlosopher
f7b705b44c Implemented implicit reference-style links to section headers in markdown.
For example, if you have a header '# Supported architectures', you can
link to it with '[Supported architectures]'.  If there are multiple
headers with this label, the link will point to the first of them.
Implicit references are always overridden by explicitly specified references.
Addresses Issue #20.

+ Moved isPunctuation, uniqueIdentifiers, and inlineListToIdentifier from
  Text.Pandoc.Writers.HTML to Text.Pandoc.Shared.

+ Added stHeaders to ParserState.   This holds a list of header texts
  used in the document, and is used to construct implicit header references.

+ In Text.Pandoc.Readers.Markdown, added call to headerReference
  parser in initial parsing pass, constructing a list of section header
  labels. This is then passed to uniqueIdentifiers to produce
  identifiers, and a list of implicit references is constructed. This is
  added to the end of the explicitly specified references, so it will be
  overridden by explicitly specified references. All of this processing
  is skipped if --strict was specified.

+ Modified documentation in README.



git-svn-id: https://pandoc.googlecode.com/svn/trunk@1086 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-22 17:14:21 +00:00
fiddlosopher
8d334b84cc Fixed some haddock documentation bugs in Shared.hs.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1085 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-18 01:44:08 +00:00
fiddlosopher
f4a1fa4b8d More improvements to ConTeXt writer:
+ writer options are now in state, so they don't have to be passed as
  a parameter
+ state also keeps track of ordered list level, so the right default
  numbering scheme can be used
+ extra blank line after \stopitemize
+ removed definitions of ltxenum and ltxitem from the preamble
+ both kinds of lists are now generated using \start-stopitemize, with
  appropriate options
+ in the case of bulleted lists, no options need be specified, because
  defaults are given in the preamble
+ test suite updated accordingly


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1084 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-18 01:24:43 +00:00
fiddlosopher
5fa78695bc ConTeXt writer:
+ Don't use \(sub)+subject if header level > 5.
+ Modified tests to conform to new treatment of level 4 and 5 headers.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1083 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 23:34:16 +00:00
fiddlosopher
4c9a85b821 Modified ConTeXt writer to use \subsubsubsubsection etc.,
since these are supported (up to at least sub x 5).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1082 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 23:26:51 +00:00
fiddlosopher
09b57fcf9c Adjusted formatting of LaTeX and ConTeXt footnotes:
- in ConTeXt, % is not needed at end of line before note, since
  space is gobbled.
- beginning of footnote indented four spaces.
- this required an additional parameter in wrappedTeX and
  wrapTeXIfNeeded, in Text.Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1080 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-17 18:42:11 +00:00
fiddlosopher
780b77c147 ConTeXt writer: Use itemize options, not sym{}, to produce ordered
lists with custom numbering styles.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1079 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-16 06:20:25 +00:00
fiddlosopher
13d8a75060 New, "official" definition of blockquote environment in ConTeXt header.
Also, use blank line after \startblockquote to balance blank line at the end.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1078 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-16 04:04:53 +00:00
fiddlosopher
87d6d0d069 Fixed logic in markdown smart quote parsing:
+ Added some needed 'try' statements.
+ Unicode right single-quote can double as apostrophe, so treat it
  as a quote-end only when not followed by an alphanumeric character.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1077 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 17:29:24 +00:00
fiddlosopher
ccb5fbb209 Fixed smart quote parsing in markdown reader so that unicode
characters 8216 and 8217 are recognized as single quotes,
and 8220 and 8221 as double quotes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1075 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:55:58 +00:00
fiddlosopher
ea5e945470 Changes to ConTeXt writer:
+ PrettyPrint module now used for output.
+ Text wrapping now provided, using wrapTeXIfNeeded.
+ Better treatment of footnotes:  footnotes are always on lines by themselves.
+ Use \subject, \subsubject, ... or \section, \subsection, ... for headings,
  depending on whether --number-sections option is selected.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1072 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:20:05 +00:00
fiddlosopher
851c04dfcd Improved footnote handling in LaTeX writer:
+ use wrapTeXIfNeeded instead of wrapIfNeeded
+ make sure footnotes occur on lines by themselves, with a % at the
  end of the preceding line to prevent unwanted spaces
+ added writer options to state, so it can be accessed by wrapTeXIfNeeded 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1071 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:11:33 +00:00
fiddlosopher
e73c3d3561 Added wrappedTeX and wrapTeXIfNeeded functions to Text.Pandoc.Shared.
These ensure that footnotes occur on lines by themselves (to make them
easier to move around), and that they don't screw up text wrapping.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1070 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-15 03:09:31 +00:00
fiddlosopher
bd7f5f3f7c Fixed bug in LaTeX reader (pointed out by Mark Eli Kalderon):
needed a "try" before "string" in parser for \[ math blocks.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1068 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-10 21:44:05 +00:00
fiddlosopher
fe684764e6 Reverted back to state as of r1062. The template haskell changes
are more trouble than they're worth.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1064 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 23:27:58 +00:00
fiddlosopher
4a841bfc54 Use template haskell to avoid the need for templates:
+ Added library Text.Pandoc.Include, with a template haskell
  function $(includeStrFrom fname) to include a file as a string
  constant at compile time.
+ This removes the need for the 'templates' directory or Makefile
  target.  These have been removed.
+ The base source directory has been changed from src to .
+ A new 'data' directory has been added, containing the ASCIIMathML.js
  script, writer headers, and S5 files.
+ The src/wrappers directory has been moved to 'wrappers'.
+ The Text.Pandoc.ASCIIMathML library is no longer needed, since
  Text.Pandoc.Writers.HTML can use includeStrFrom to include the
  ASCIIMathML.js code directly.  It has been removed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 22:14:03 +00:00
fiddlosopher
40fa01765b Cleaned up LaTeX footnotes:
+ Footnotes start on a separate line.  A comment % is used
  at the end of the previous line to prevent unwanted spaces.
  This makes footnotes easier to see, delete, and move around.
+ The final } now only appears on a separate line if it needs to
  (i.e. if the note ends with a Verbatim environment).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1061 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-01 17:32:59 +00:00
fiddlosopher
d5adbcb774 Fixed bug in parsing files that begin with blank lines.
+ In Text.Pandoc.Shared: rewrote lineClump to parse EITHER a string
  of blank lines OR a string of nonblanks.  Removed code for parsing
  eof.
+ In Markdown and RST readers, use 'manyTill (... <|> lineClump) eof'
  instead of many, since lineClump no longer parses eof. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1057 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-29 21:00:48 +00:00
fiddlosopher
63dfc3abf2 Modified specialChar in LaTeX reader so that '"'
characters are parsed and do not cause an error.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1056 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-28 23:30:29 +00:00
fiddlosopher
65a5db2d41 Modified fromUTF8 to strip out the BOM (byte order marker)
wherever it is present.  See
http://en.wikipedia.org/wiki/Byte_Order_Mark and
http://six.pairlist.net/pipermail/markdown-discuss/2007-October/000874.html.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1054 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-27 22:55:40 +00:00
fiddlosopher
447b99e35d '--no-wrap' option now prevents the addition of structural whitespace
in HTML output, minimizing the file size.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1053 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-18 15:36:51 +00:00
fiddlosopher
a81613df34 Removed 'version' constant from Main.hs; added 'pandocVersion' to Text.Pandoc.
This way all programs that use pandoc libraries will have access to the version
number.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1052 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-15 21:21:52 +00:00
fiddlosopher
8144c54f82 Improvements to RST reader:
+ Allow field lists to be indented.
+ Parse the contents of field lists instead of treating them as
  raw strings.
+ Represent field lists as definition lists rather than blockquotes.
+ Fixed bug in which metadata would be overridden if the document
  contained more than one field list.
+ Parse fields associated with ..image: blocks, and use the 'alt'
  field, if present, for image alt text and title.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1050 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-13 21:39:17 +00:00
fiddlosopher
11e7ad2259 Save and restore position in parseFromString, so that it doesn't
mess up accurate error location reporting.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1049 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-13 21:37:06 +00:00
fiddlosopher
403f5f4728 Undid last change: instead of blocking the internal links in the
writers, it makes more sense to block them in the HTML reader.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1048 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-12 03:03:29 +00:00
fiddlosopher
4928045915 Man writer: Don't print link source for internal links (#...).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1047 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-11 22:54:01 +00:00
fiddlosopher
ad9603231f Fixed bug in RST reader: previously, code blocks had to be
indented a full tabstop, but RST allows any amount of indentation.
Resolves Issue #27.

+ removed 'variable' parameter from indentedBlock function in
  RST reader, as it is no longer needed
+ updated test suite
+ updated changelog


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1046 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-11 05:50:28 +00:00
fiddlosopher
a1ad3b4e5f Modified html2markdown. Previously html2markdown piped all input
through html tidy before passing it to pandoc.  This causes problems
on certain sites (e.g. daringfireball.com/markdown) which have
well-formed xhtml that causes tidy to choke.  Solution is to try
pandoc on the original HTML, and run it through tidy only if that
fails.

This means that a temp file is now always used, even when input comes
from a local file or standard input.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1039 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-10-02 02:08:52 +00:00
fiddlosopher
27d3657eef Fixed bug in markdown writer: If an ordered list item began with
a marker greater than 3 characters in width, and the item took more
than one line, it would appear on the line after the list marker,
e.g.:

    (12)
        My list item.
        Multiline.

Now it works as follows:

    (12) My list item.
        Multiline.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1036 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-27 18:52:39 +00:00
fiddlosopher
5b888e8b3b Added a writer option for wrapped text and a command-line option
'--no-wrap', which disables text wrapping.  (Resolves Issue #26.)

+ Added support for '--no-wrap' to Main.hs.
+ Added wrapIfNeeded function to Text.Pandoc.Shared.
+ Use wrapIfNeeded instead of wrapped in the RST, Man, Docbook, and 
  Markdown writers.
+ Note:  Not yet implemented in HTML, LaTeX, or ConTeXt writers. 
  No documentation yet.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1034 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-27 01:23:44 +00:00
fiddlosopher
4f9814087e Fixed a bug in the Markdown writer: incorrect line wrapping in
paragraphs including hard line breaks.  Resolves Issue #25.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1032 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-25 05:43:38 +00:00
fiddlosopher
d9dedf0813 RST writer: If label for a link reference contains a colon,
surround by ` signs so the colon won't be interpreted as the
end of the link label.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1029 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-19 01:15:20 +00:00
fiddlosopher
87fb10a316 Main (tabFilter):
Treat '\r' at end of line as newline (in addition to '\r\n' and '\n').


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1027 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-18 06:48:36 +00:00
fiddlosopher
f8eac5b377 Markdown writer: Don't print title attribute if title is empty.
(This differs from the behavior of Markdown.pl, and agrees with PHP
Markdown.  But John Gruber has indicated that he prefers this behavior.)
Adjusted test suite accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1026 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-18 01:35:50 +00:00
fiddlosopher
fbb048238e Markdown reader: require space before title in links and references.
This fixes a bug in parsing URLs like http://silly/url(withparen).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1025 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-18 01:34:36 +00:00
fiddlosopher
65047e354a Remove just one leading and one trailing newline
from contents of <pre>...</pre> in codeBlock parser.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1023 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-17 03:08:14 +00:00
fiddlosopher
6f16d52c11 Changed parsing of code blocks in HTML reader:
+ <code> tag is no longer needed.  <pre> suffices.
+ all HTML tags in the code block (e.g. for syntax highlighting)
  are skipped, because they are not portable to other output formats.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1022 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-17 02:49:28 +00:00
fiddlosopher
d5b7257d7f Simplified HTML attribute parsing (HTML reader).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1016 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-15 00:44:32 +00:00
fiddlosopher
28c2ee396c Fixed two bugs in HTML reader:
+ <code>...</code> not surrounded by <pre> should count as
  inline HTML, not code block.
+ parser for minimized attributes should not swallow trailing spaces


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1015 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-14 22:40:28 +00:00
fiddlosopher
85f655c8cb Changed pandoc home page to http://johnmacfarlane.net/pandoc/.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1014 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-13 17:26:01 +00:00
fiddlosopher
9cadf53621 + Fixed bug in RST writer's handling of ordered lists. Previously,
list items with multiple lines would not always line up with single-line
  list items.  Now, list items are nested the length of the list marker + 1.
  This looks better and ensures that list items all line up.  (Note that
  list markers are padded to the length of the longest list marker in the
  series.)
+ Use 3-space indent for unordered lists.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1013 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-10 23:44:21 +00:00
fiddlosopher
4b4060b8ef Simplified parsing of reference keys and notes in markdown and RST
readers:
+ The Reference data structure from Text.Pandoc.Shared is no longer
  needed, since
+ referenceKey and noteBlock parses return strings (as many blank lines
  as are occuried by the key or note) and update state themselves.
+ getPosition and setPosition are now used to ensure that error messages
  will give the correct line number.
+ This yields cleaner (and slightly faster) code, with more accurate
  parsing error messages.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1012 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-05 23:55:38 +00:00
fiddlosopher
d5e8ab71a4 HTML writer: Don't produce HTML for table of contents if
there are no headers.  (This would be an empty list, which is
invalid XHTML.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1011 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-05 02:16:50 +00:00
fiddlosopher
9726ec04f5 Bumped version to 0.45.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1010 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-05 02:16:05 +00:00
fiddlosopher
d87b226f1f Bump version numbers to 0.44, which will be the next
bug-fix release (when enough bug fixes have accumulated).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1001 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 17:23:26 +00:00
fiddlosopher
4f3ad778ba HTML writer: put anchors around contents of headers, not around
the header tags themselves, when producing backlinks to TOC.
Resolves Issue #23.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1000 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 17:22:22 +00:00
fiddlosopher
a70c2b261e Markdown writer: escape paragraphs that begin with ordered list
markers, so they don't get interpreted as ordered lists.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@988 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 00:39:56 +00:00
fiddlosopher
0982a67585 LaTeX command and environment names can't contain numbers.
LaTeX reader updated accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@987 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-02 00:36:44 +00:00
fiddlosopher
25bbe134cb Skip notes parsing if running in strict mode. (This yields a nice
speed improvement in strict mode.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@983 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 20:26:40 +00:00
fiddlosopher
76d462c1cd Simplify autolink parsing code, using Network.URI to test for
URIs.  Added dependency on network library to debian/control
and pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@982 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 17:22:22 +00:00
fiddlosopher
f8f9fa49d6 More perspicuous definition of nonindentSpaces.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@981 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 16:08:47 +00:00
fiddlosopher
5c1632be5d Removed unneeded 'try' in 'rawLine'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@979 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 02:26:39 +00:00
fiddlosopher
85d49ee936 Combined linebreak and whitespace into a new whitespace
parser, to avoid unnecessary reparsing of space characters.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@978 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 02:18:25 +00:00
fiddlosopher
8d3bec3e4d Removed unnecessary 'try' in 'codeBlock'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@977 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 02:10:30 +00:00
fiddlosopher
bdf78fe33f Use lookAhead in parsers for setext headers and
definition lists to see if the next line begins
appropriately; if not, don't waste any more time
parsing...


git-svn-id: https://pandoc.googlecode.com/svn/trunk@976 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-09-01 02:01:12 +00:00
fiddlosopher
f55d62c04a Don't require blank lines after code block. (It's sufficient
to end code block with a nonindented line.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@975 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-31 22:21:41 +00:00
fiddlosopher
c206332558 Changed definition of 'emph': italics with '_' must not be followed
by an alphanumeric character.  This is to help prevent interpretation
of e.g. [LC_TYPE]: my_type as '[LC<em>TYPE]:my</em>type'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@974 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-31 22:15:35 +00:00
fiddlosopher
89ec99c383 Cleanup up Text.Pandoc.Shared to eliminate warnings
when compiling with -Wall.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@969 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-31 03:32:47 +00:00
fiddlosopher
dcb1dd1ee4 Replaced individual wrapping routines in RST, Man, and
Markdown writers with 'wrapped' from Text.Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@967 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-30 22:59:13 +00:00
fiddlosopher
33d47ced76 Added 'wrapped' function to Text.Pandoc.Shared.
This helps wrap text into paragraphs, using the prettyprinting
library.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@965 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-30 22:49:20 +00:00
fiddlosopher
1827ab40c3 Rewrote LaTeX writer to use the prettyprinting library,
so we get word wrapping, etc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@964 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-30 22:48:34 +00:00
fiddlosopher
8919f20abe Version bump to 0.43.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@962 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-30 19:16:12 +00:00
fiddlosopher
3b790b80f3 Fixed bug in LaTeX reader, which wrongly assumed that the
roman numeral after "enum" in "setcounter" would consist entirely
of "i"s.  enumiv is legitimate.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@961 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-30 19:12:50 +00:00
fiddlosopher
14dc520669 Cleaned up LaTeX reader.
Rearranged order of parsers in inline for slight speed improvement.
Added ` to special characters and 'unescapedChar'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@960 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 21:03:26 +00:00
fiddlosopher
451b426fd6 Removed unneeded try's in RST reader; also minor code cleanup.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@959 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 20:39:31 +00:00
fiddlosopher
2a37d8d30a Efficiency improvements to RST reader (more than doubled
speed):
+ removed tabchar
+ rearranged parsers in inline


git-svn-id: https://pandoc.googlecode.com/svn/trunk@958 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 20:22:24 +00:00
fiddlosopher
015644b60e Purely stylistic change.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@957 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 20:03:28 +00:00
fiddlosopher
7f8ec9577e Removed unneeded 'try' in 'ellipses'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@956 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 19:59:08 +00:00
fiddlosopher
60f700997c + Fixed bug introduced into referenceTitle by previous changes.
Now it works as before.
+ Improved Markdown.pl-compatibility in referenceLink:  the two
  parts of a reference-style link may be separated by one space,
  but not more... [a] [link], [not]   [a link].


git-svn-id: https://pandoc.googlecode.com/svn/trunk@955 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 19:57:01 +00:00
fiddlosopher
845a658aff Fixed markdown inline code parsing so it better accords with
Markdown.pl:  the marker for the end of the code section is
a clump of the same number of `'s with which the section began,
followed by a non-` character.  So, for example,

   ` h     ```    i ` -> <code>h     ```    i</code>.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@954 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 16:38:41 +00:00
fiddlosopher
77f63605f5 Small change to referenceTitle: should end with line-end, not ')'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@953 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 01:53:50 +00:00
fiddlosopher
21a2acaac9 Split 'title' into 'linkTitle' and 'referenceTitle', since the
rules are slightly different.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@952 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 01:51:03 +00:00
fiddlosopher
86cc8c8bf2 Rewrote charsInBalanced and charsInBalanced'.
- Documented restriction: open and close must be distinct characters.
- Rearranged options for greater efficiency.
- Changed inner call to charsInBalanced inside charsInBalanced' to
  charsInBalanced'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@951 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 01:50:36 +00:00
fiddlosopher
64023d8ba8 Removed unneeded 'try' from noteMarker.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@950 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 00:16:50 +00:00
fiddlosopher
40b870375d Minor reformatting.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@949 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 00:11:37 +00:00
fiddlosopher
3edf5834e8 Rewrote 'para' for greater efficiency.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@948 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 00:08:18 +00:00
fiddlosopher
902d6c7115 Fixed bug in LaTeX writer: autolinks would not cause
'\usepackage{url}' to be put in the document header.
Also, changes to state in enumerated list items would be
overwritten.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@947 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-29 00:03:45 +00:00
fiddlosopher
5bafe2c9fb Minor reformatting.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@946 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 22:44:01 +00:00
fiddlosopher
fcb91e8e51 Rewrote link parsers for greater efficiency.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@945 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 22:41:05 +00:00
fiddlosopher
e407279b35 anyLine now requires that the line end with a newline (not eof).
This is a harmless assumption, since we always add
newlines to the end of a block before parsing with anyLine.
Yields a 10% speed boost!


git-svn-id: https://pandoc.googlecode.com/svn/trunk@944 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 21:17:08 +00:00
fiddlosopher
365c349249 Main: Replaced tabsToSpacesInLine and tabFilter with single function
tabFilter, which operates on the whole string rather than breaking
it into lines.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@943 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 19:54:16 +00:00
fiddlosopher
8fdf8c1d4c + Removed tabsToSpaces and tabsInLine from Text.Pandoc.Shared.
(They were used only in Main.)
+ Wrote new tabsToSpacesInLine function in Main that changes tabs
  to spaces and removes DOS line-endings in one pass, for a slight
  speed improvement.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@942 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 19:33:47 +00:00
fiddlosopher
cda7e7ac21 Removed redundant 'referenceLink' in definition of inline
(it's already in 'link').


git-svn-id: https://pandoc.googlecode.com/svn/trunk@940 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 07:31:18 +00:00
fiddlosopher
6906584f47 Refactored escapeChar so it doesn't need 'try'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@939 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 07:24:56 +00:00
fiddlosopher
06a5a0e235 Removed unneeded 'try' in multilineRow.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@938 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 07:22:21 +00:00
fiddlosopher
ce800f7121 Removed unneeded 'try' in dashedLine.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@937 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 07:20:47 +00:00
fiddlosopher
3e337eb9c8 Removed unneeded try in rawHtmlBlocks (Markdown parser).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@936 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 07:19:07 +00:00
fiddlosopher
74dc62e730 Refactored hrule for performance in Markdown reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@935 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 07:04:47 +00:00
fiddlosopher
8cf4971821 Minor reformatting.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@934 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 06:59:57 +00:00
fiddlosopher
0c475bfd47 Refactored setext header parsing in Markdown reader for greater
speed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@933 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 06:58:20 +00:00
fiddlosopher
18b379c1ca More rearranging in definition of inline.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@932 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 06:44:47 +00:00
fiddlosopher
b6ebe75656 More intelligent rearranging of 'inline' for speed boosts
in Text.Pandoc.Readers.Markdown.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@931 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 06:38:38 +00:00
fiddlosopher
b94f541477 Removed unneeded 'try' from romanNumeral parser.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@930 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 06:07:06 +00:00
fiddlosopher
6765fadd12 Use notFollowedBy instead of notFollowedBy' in charsInBalanced.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@929 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 06:04:57 +00:00
fiddlosopher
f10ac4359c Removed unneeded 'try' in 'parseFromString'.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@928 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 06:02:12 +00:00
fiddlosopher
da9271c258 Removed unneeded 'try' from stringAnyCase. (Now it behaves
like 'string'.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@927 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 06:00:51 +00:00
fiddlosopher
f04df62db1 Changed definition of 'enclosed' in Text.Pandoc.Shared so that
'try' is not automatically applied to the 'end' parser.
Added 'try' in calls to 'enclosed' where needed.  Slight speed
increase.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@926 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 05:58:21 +00:00
fiddlosopher
a6da87f484 Minor code cleanup in Text.Pandoc.Shared.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@925 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 03:06:05 +00:00
fiddlosopher
1d8fe2653a Performance improvements:
+ Rearranged parsers in definition of 'inline' so that the most
frequently used would (by and large) be tried first.
+ Removed some unneeded 'try's.
+ Removed tabchar parser, as whitespace handles tabs anyway.
+ All in all, these changes, together with the last two commits,
  cut almost in half the time it takes pandoc to parse a large test file.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@924 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 02:33:53 +00:00
fiddlosopher
08fbfa37cc Removed unnecessary 'try' in 'anyLine' (Text.Pandoc.Shared).
git-svn-id: https://pandoc.googlecode.com/svn/trunk@923 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 02:31:17 +00:00
fiddlosopher
583536a138 Refactored Text.Pandoc.CharacterReferences.
Removed unnecessary 'try's for a speed improvement.
Removed unnecessary '&' and ';' from the entity table.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@922 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-28 02:30:38 +00:00
fiddlosopher
1163e622ab Don't count
p. 27
at the beginning of a line as an ordered list start, since
it's most likely a page number.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@900 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-26 03:17:40 +00:00
fiddlosopher
f609755cb6 Fixed bug in LaTeX writer. When a footnote ends with a Verbatim
environment, the close } of the footnote needs to occur on the same
line or an error occurs.  Fixed by adding a newline before the close }
in every footnote.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@897 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-25 18:17:01 +00:00
fiddlosopher
3de1f19b43 Removed incorrect "{}" around style information in
HTML tables.  Adjusted test suite accordingly.  Column
widths now work properly in HTML.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@882 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-23 23:20:54 +00:00
fiddlosopher
7bf966f934 Bumped version numbers to 0.42 in anticipation of next
bugfix release.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@881 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-23 04:26:37 +00:00
fiddlosopher
f11360f50e Added new rule for enhanced markdown ordered lists: if the list marker
is a capital letter followed by a period (including a single-letter
capital roman numeral), then it must be followed by at least two spaces.
The point of this is to avoid accidentally treating people's initials as
list markers: a paragraph may begin:

    B. Russell was an English philosopher.

and this shouldn't be treated as a list.

Modified Markdown reader and README documentation.
Added a test case.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@880 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-23 04:25:09 +00:00
fiddlosopher
e29e5c5944 Use UTF8 conversion on the extra files loaded in Main.hs
(header, before, after).  This fixes problems with unicode
characters in these files.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@879 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-23 02:16:10 +00:00
fiddlosopher
4a0e02dab7 Added a needed 'try' to listItem in Markdown reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@878 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-22 20:19:37 +00:00
fiddlosopher
cc0460f952 Code cleanup in Markdown reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@877 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-20 19:21:18 +00:00
fiddlosopher
84aa875bdb Changes to Markdown reader for better conformity to the
Markdown test suite under --strict:
+ Removed check for a following setext header in endline.
  A full test is too inefficient (doubles benchmark time), and
  the substitute we had before is not 100% accurate.
+ Don't use Code elements for autolinks if --strict specified.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@876 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-20 18:52:49 +00:00
fiddlosopher
57d52c39ec If --strict and not --toc, don't include identifiers in headers.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@875 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-20 18:42:09 +00:00
fiddlosopher
56e2200378 Bump version to 0.41.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@867 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-19 16:07:57 +00:00
fiddlosopher
81eba062f2 Refactor RST and Markdown readers using parseFromString.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@864 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-19 00:18:46 +00:00
fiddlosopher
4e149f898a Added a necessary "try" in definition of "para"
(HTML reader).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@863 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-19 00:06:03 +00:00
fiddlosopher
4399db4fd2 Bug fixes in readers:
+ LaTeX reader:  skip anything after \end{document}
+ HTML reader: fixed bug skipping material after </html> -- previously,
  stuff at the end was skipped even if no </html> was present, which
  meant only part of the file would be parsed and no error issued
+ HTML reader: added new constant eitherBlockOrInline with elements that
  may count either as block-level or inline
+ Modified isInline and isBlock to take this into account
+ modified rawHtmlBlock to accept any tag (even an inline tag);
  this is innocuous, because rawHtmlBlock is tried only if a regular
  inline element can't be parsed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@862 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-18 23:44:26 +00:00
fiddlosopher
e48f046aa0 + Fixed bug in markdown ordered list parsing. The problem was
that anyOrderedListStart did not check for a space following the
  ordered list marker. So, 'A.B. 2007' would be parsed as a list item,
  then fail because of the lack of space after 'A.' (required by
  orderedListStart). Resolves Issue #22.
+ Fixed a similar problem in RST reader.
+ Added regression test.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@861 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-18 15:26:29 +00:00
fiddlosopher
a6f3dd3755 Fixed block quote output in markdown writer: previously,
block quotes in notes would be indented only in the first line.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@859 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-17 18:48:16 +00:00
fiddlosopher
3904078e39 Cosmetic changes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@851 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 21:20:02 +00:00
fiddlosopher
1a4489ef30 LaTeX reader: parse \texttt{} as code, as long as there's
nothing fancy inside.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@846 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 17:30:37 +00:00
fiddlosopher
ec0e6e9941 Fixed bug in normalizeSpaces: Space:Str "":Space
should compress to Space.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@845 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 17:29:20 +00:00
fiddlosopher
6cc5f6b199 Allow htmlComments as rawHtmlInline in HTML reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@844 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 17:28:21 +00:00
fiddlosopher
a8e2199034 Major code cleanup in all modules. (Removed unneeded imports,
reformatted, etc.)  More major changes are documented below:

+ Removed Text.Pandoc.ParserCombinators and moved all its definitions
  to Text.Pandoc.Shared.
+ In Text.Pandoc.Shared:
  - Removed unneeded 'try' in blanklines.
  - Removed endsWith function and rewrote functions to use isSuffixOf instead.
  - Added >>~ combinator.
  - Rewrote stripTrailingNewlines, removeLeadingSpaces.
+ Moved Text.Pandoc.Entities -> Text.Pandoc.CharacterReferences.
  - Removed unneeded functions charToEntity, charToNumericalEntity.
  - Renamed functions using proper terminology (character references,
    not entities).  decodeEntities -> decodeCharacterReferences,
    characterEntity -> characterReference.
  - Moved escapeStringToXML to Docbook writer, which is the only thing
    that uses it.
  - Removed old entity parser in HTML and Markdown readers; replaced with
    new charRef parser in Text.Pandoc.Shared.
+ Fixed accent bug in Text.Pandoc.Readers.LaTeX:  \^{} now correctly
  parses as a '^' character.
+ Text.Pandoc.ASCIIMathML is no longer an exported module.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@835 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-15 06:00:58 +00:00
fiddlosopher
e814a3f6d2 Major change in the way ordered lists are handled:
+ The changes are documented in README, under Lists.
+ The OrderedList block element now stores information
  about list number style, list number delimiter, and
  starting number.
+ The readers parse this information, when possible.
+ The writers use this information to style ordered
  lists.
+ Test suites have been changed accordingly.

Motivation:  It's often useful to start lists with
numbers other than 1, and to have control over the
style of the list.

Added to Text.Pandoc.Shared:
+ camelCaseToHyphenated
+ toRomanNumeral
+ anyOrderedListMarker
+ orderedListMarker
+ orderedListMarkers

Added to Text.Pandoc.ParserCombinators:
+ charsInBalanced'
+ withHorizDisplacement
+ romanNumeral

RST writer:
+ Force blank line before lists, so that sublists will be handled
  correctly.

LaTeX reader:
+ Fixed bug in parsing of footnotes containing multiple paragraphs,
  introduced by use of charsInBalanced.  Fix: use charsInBalanced'
  instead.

LaTeX header:
+ use mathletters option in ucs package, so that basic unicode Greek
  letters will work properly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@834 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-08 02:43:15 +00:00
fiddlosopher
22a6538557 Added parsing for \url to LaTeX reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@833 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-03 22:44:47 +00:00
fiddlosopher
271c3f987e Use \url{} for autolinks in LaTeX writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@832 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-08-03 22:14:32 +00:00
fiddlosopher
ee46ee5fa9 Removed test for examplep in markdown2pdf.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@831 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 19:17:54 +00:00
fiddlosopher
44b136740b Changes to Markdown reader:
+ added try to def of indentSpaces
+ in def of 'reference', check to make sure it's not a note reference
  first.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@827 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 19:14:50 +00:00
fiddlosopher
5e13f8c320 Removed examplep specific stuff in LaTeX reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@826 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 18:23:13 +00:00
fiddlosopher
1be1f77569 LaTeX writer:
+ No longer using examplep (too many quirks, too hard to install)
+ Instead, using deVerb function for environments that don't support
  \verb
+ And fancyvrb for footnotes and verbatim environments in footnotes.
+ Add fancyvrb to header if Code inline occurs in a footnote.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@825 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 18:14:40 +00:00
fiddlosopher
9c181f0410 Removed examplep from LaTeX header.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@824 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 18:13:19 +00:00
fiddlosopher
ab6be44b21 Use 11pt font by default in ConTeXt header.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@823 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 18:12:54 +00:00
fiddlosopher
7c8dcc3db6 Cleaned up and fixed autolinks in RST. All that's needed
is a bare email address or URL.  This is now handled with
a separate matching clause in the definition of inlineToRST,
rather than with conditionals.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@821 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 15:33:58 +00:00
fiddlosopher
db0757d65b Don't put autolinks in typewriter font in ConTeXt, since
ConTeXt has its own way of printing links.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@820 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 15:33:04 +00:00
fiddlosopher
f273965e16 Fixed problems with obfuscateLink introduced by last round
of changes.  Changed type so that text parameter is String,
not HTML, which allows easier testing for autolinks.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@819 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 06:38:49 +00:00
fiddlosopher
d3404581d4 Changes in LaTeX reader to accommodate Pandoc's own use of
examplep.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@818 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 05:45:27 +00:00
fiddlosopher
17873d4639 Main: Changed putStr to putStrLn -- mainly because MacOS doesn't display
the whole output unless there's a line ending.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@817 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 05:28:30 +00:00
fiddlosopher
d65f01f467 Man page writer: modified treatment of autolinks,
in accord with recent change from Str to Code.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@816 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 04:14:32 +00:00
fiddlosopher
94ed30cf15 LaTeX writer: include fancyvrb and \VerbatimFootnotes
line in header only if absolutely needed -- that is, only
if there is actually a code block in a footnote.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@815 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 03:58:09 +00:00
fiddlosopher
465c0849ff Simplified HTML writer's treatment of autolinks.
There are now a few different cases for Link, and
less conditional logic needed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@813 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 02:43:04 +00:00
fiddlosopher
9939b0f07e Make URLs and emails in autolinks appear as Code.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@810 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 02:12:40 +00:00
fiddlosopher
cf87eb854d Fixed a bug in Docbook writer: email links with text were being
incorrectly treated as autolinks.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@809 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 02:11:04 +00:00
fiddlosopher
d488dd0f66 Reinstated dependence on fancyvrb. It is compatible with examplep.
fancyvrb is needed for verbatim environments in footnotes.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@808 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 01:40:48 +00:00
fiddlosopher
b29f221cba Changed LaTeX writer to use the examplep package instead
of fancyvrb. examplep allows verbatim text in places where
fancyvrb does not, e.g. definition list terms, and provides
for line-breaking of verbatim text.
+ examplep code put in LaTeX header instead of being dynamically
  included, since it is frequently used, and people may want to
  customize the options.
+ documented dependency on examplep
+ added texlive-latex-extra as a "Suggested" package in debian/control
+ use examplep's \Q{} is now used instead of \verb:  note that 
  \Q requires backslash- escaping symbols in its scope.
+ modified README so that the verbatim sections will look good at
  shorter line lengths.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@807 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-28 01:10:04 +00:00
fiddlosopher
4283ce3662 Use ` as default character for \verb in LaTeX output.
If ` is in the content to be escaped, another symbol
will be used as before.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@806 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-27 22:52:11 +00:00
fiddlosopher
1f9d2f8fe7 Include empty \author{} in LaTeX preamble if no
author specified; otherwise LaTeX gives an error.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@803 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-26 03:49:21 +00:00
fiddlosopher
453dc53457 Fixes in LaTeX writer:
+ put \VerbatimFootnotes right before \title block, to avoid
  bad interactions.
+ added deVerb in description list.
+ removed \texttt{} from deVerb, because it cannot go in description
  lists.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@802 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-26 03:15:35 +00:00
fiddlosopher
f2e21a8476 Changed how ASCIIMathML is handled:
+ -m|--asciimathml option now takes an *optional* argument,
  the URL to an asciiMathML.js script.  This is much better
  in situations where multiple files with math must be served,
  as the script can be cached.
+ If the argument is provided, a link is inserted; otherwise,
  the whole script is inserted as before.
+ Nothing is inserted unless there is inline LaTeX.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@799 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-26 02:19:20 +00:00
fiddlosopher
6c8bb8e9a3 Fixed bug in TOC generation in HTML writer (regression,
introduced by the revision in the WriterState type).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@793 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-24 00:11:34 +00:00
fiddlosopher
e7a49d7c12 LaTeX writer: Make sure \VerbatimFootnotes goes after the
preamble; otherwise it has bad interaction effects
with the other stuff in the header.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@791 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 23:14:26 +00:00
fiddlosopher
d8762eb436 In HTML reader, filter Nulls in lists of blocks. (These can
be caused by raw HTML when the parse-raw option isn't selected.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@787 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 02:50:29 +00:00
fiddlosopher
9f871ab1ec Fixed bug in spanStrikeout: case was not exhaustive.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@786 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 02:28:15 +00:00
fiddlosopher
9a410e1635 README: Removed the statement that the RST reader doesn't parse
definition lists.
HTML reader:  Added failIfStrict to the definitionList parser, so
definition lists will be passed through as raw HTML if --strict
specified.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@783 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 01:41:37 +00:00
fiddlosopher
6a6b1a5842 Added support for definition lists to RST reader.
Added a relevant test to the test suite.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@782 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 01:35:03 +00:00
fiddlosopher
f69d9efc83 Added definition list support to HTML reader.
Added a test for definition lists to the html-reader test suite.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@781 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 01:21:21 +00:00
fiddlosopher
1296273c85 Added support for definition lists to LaTeX reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@780 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 00:19:37 +00:00
fiddlosopher
caef362065 Renamed parseFromStr -> parseFromString.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@779 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-23 00:19:00 +00:00
fiddlosopher
4beb0b9130 Superscript and Subscript support for RST reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@777 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 21:26:22 +00:00
fiddlosopher
c1f397622d Added a "try" to the end parser in enclosed (Text.Pandoc.ParserCombinators).
This makes errors in its use less likely. Removed some now-unneeded try's
in calling code.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@776 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 21:01:17 +00:00
fiddlosopher
3ca9932ca6 Added subscript and superscript support to LaTeX reader.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@775 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 20:30:07 +00:00
fiddlosopher
e70bc56114 Removed lines from LaTeXHeader that will be supplied dynamically
by the LaTeX writer, depending on the document's content.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@772 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 20:14:59 +00:00
fiddlosopher
d016a997e6 markdown2pdf: Print a helpful message if ulem package is not found.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@771 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 20:14:20 +00:00
fiddlosopher
bb5ac55f67 Man writer: Use ~ and ^ for subscripts and superscripts.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@770 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 20:13:43 +00:00
fiddlosopher
7006d9a044 HTML writer: Use a record for state, instead of a tuple, for
easy extensibility.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@769 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 20:00:49 +00:00
fiddlosopher
b4d289c65e HTML writer: include css for .strikethrough only if strikethrough
is actually used in the document.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@768 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 19:32:39 +00:00
fiddlosopher
f7d0da28e9 Main: Relabeled asciiMathMLLink -> asciiMathML, asciiMathML -> math.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@767 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 19:20:21 +00:00
fiddlosopher
9ddd464a7e Added ~ to the list of characters the markdown
writer should backslash-escape.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@765 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 18:33:41 +00:00
fiddlosopher
4905ebadb3 LaTeX reader: Added clauses for tilde and caret.
Tilde is \ensuremath{\sim}, and caret is \^{},
not \^ as before.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@764 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 18:26:10 +00:00
fiddlosopher
b8e1e53053 Cleaned up character escaping in LaTeX writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@763 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 18:24:34 +00:00
fiddlosopher
b19c36970e Removed an extra occurance of escapedChar in definition
of inline.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@762 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 17:51:15 +00:00
fiddlosopher
9f38f9d039 Man writer:
+ Make sure to include "" if no section is specified
  in a man page TH line.
+ Updated man writer tests.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@758 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 16:17:20 +00:00
fiddlosopher
062cdfe7de Changed text to char for one character strings
in RST, Man, and Docbook writers.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@757 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 16:10:48 +00:00
fiddlosopher
2b3c2d43ef Markdown writer: Substituted char for text for single characters.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@756 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 16:08:19 +00:00
fiddlosopher
6bb6dd2bfd + Added support for superscript, subscript, and
strikeout to all writers. (Thanks to Bradley Kuhn
  for the patches for strikeout, here slightly modified.)
+ Refactored character escaping using the new functions
  escapeStringUsing and backslashEscapes.
+ Added state to LaTeX writer, which now keeps track of what
  packages need to be included in the preamble, based on the
  content of the document. (Thus, e.g., ulem is only required
  if you use strikeout.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@755 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 16:05:38 +00:00
fiddlosopher
d03ec5a4a2 Added support for strikeout (\sout) to latex
reader.  (Thanks to Bradley Sif for the patch.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@754 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-22 05:14:43 +00:00
fiddlosopher
a2194f23db Added support for Strikeout, Superscript, and Subscript to
HTML reader.  Thanks to Bradley Sif for the patch for
Strikeout (Issue #18).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@753 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-21 22:54:40 +00:00
fiddlosopher
44b11214ba + Added support for Strikeout, Superscript, and
Subscript in markdown reader.
+ Also replaced constants like emphStart with literals. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@752 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-21 22:52:07 +00:00
fiddlosopher
dc60aa3aea + Added Strikeout support to Markdown writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@751 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-21 22:07:10 +00:00
fiddlosopher
9b664073d5 Moved failIfStrict from Markdown reader to
Text.Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@750 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-21 21:55:19 +00:00
fiddlosopher
f0fb4c496b Changes to functions for character escaping:
+ Removed escapeCharAsString
+ Added escapeStringUsing
+ Changed backslashEscape to backslashEscapes, which
  now returns an association list of escapes to be
  passed to escapeStringUsing


git-svn-id: https://pandoc.googlecode.com/svn/trunk@748 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-21 21:34:13 +00:00
fiddlosopher
2f7a38e1ab Changed system for indicating man page title, section,
header and footer.  Documented in README.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@745 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-21 20:30:40 +00:00
fiddlosopher
ec0445de0a Added Strikeout, Superscript, and Subscript to
refsMatch function in Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@742 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-21 19:09:04 +00:00
fiddlosopher
a009a4b387 Added Strikeout, Superscript, and Subscript as
Inline elements (Pandoc.Definition).


git-svn-id: https://pandoc.googlecode.com/svn/trunk@741 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-21 19:07:15 +00:00
fiddlosopher
e02fb21452 Refactored character escaping in Text.Pandoc.Writers.Markdown using
escapeCharAsString.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@739 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-19 08:09:17 +00:00
fiddlosopher
7d2c9c6fe6 Added escapeCharAsString to Text.Pandoc.Shared.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@738 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-19 08:08:51 +00:00
fiddlosopher
9e4c28d5f4 markdown2pdf.in: Test for --table-of-contents as
well as --toc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@733 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-16 07:26:03 +00:00
fiddlosopher
48d67d0d1f Simplified inlinesInBalanced, using lookAhead.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@732 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-16 07:22:17 +00:00
fiddlosopher
7e1370aa87 Markdown reader: Added inlinesInBalanced parser combinator to
unify treatment of embedded brackets in links and inline footnotes.
Note that the solution adopted here causes one of John Gruber's
markdown tests to fail:
  [with_underscore](/url/with_underscore)
Here the whole phrase "underscore](/url/with" is treated as
emphasized. The previous version of the markdown reader handled
this the way Gruber's script handles it, but it ran into trouble
on the following:
  [link with verbatim `]`](/url)
where the inner ] was treated as the end of the reference link
label. I don't see any good way to handle both cases in the framework
of pandoc, so I choose to require an escape in the first example:
  [with\_underscore](/url/with_underscore)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@729 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 23:53:22 +00:00
fiddlosopher
8e71c4c388 Added charsInBalanced parser combinator to Text.Pandoc.ParserCombinators.
This is not currently used, but should be useful in parsing strings
containing balanced pairs of brackets or parentheses.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@728 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 23:48:17 +00:00
fiddlosopher
2f928d4c9d ConTeXt writer changes:
+ Use defined blockquote environment for block quotes (smaller
  font, no indent, narrower text)
+ Changed default font to 12pt
+ Changed default page layout


git-svn-id: https://pandoc.googlecode.com/svn/trunk@725 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 15:08:27 +00:00
fiddlosopher
da645eb24b Main.hs: If writer is "context", automatically select
smart quotes option.
web/demos:  Removed redundant -S in context writer demo.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@723 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 03:20:14 +00:00
fiddlosopher
8f473af610 If output file has .ctx or .context extension,
assume it is ConTeXt format unless otherwise specified.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@720 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 03:07:26 +00:00
fiddlosopher
465b2d791e Merged branches/context: addition of a ConTeXt writer
<http://www.pragma-ade.nl/>.
+ Text.Pandoc.Writers.ConTeXt added.
+ Text.Pandoc modified to export the basic ConTeXt writer.
+ Main.hs modified to recognize 'context' as a writer.
+ ConTeXtHeader added to headers
+ DefaultHeaders.hs template modified to include ConTeXt header
+ Tests added (writer.context, tables.context), and runtests.pl
  modified to run them
+ pandoc.cabal updated to include Text.Pandoc.Writers.ConTeXt. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@716 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 02:56:34 +00:00
fiddlosopher
78aeebc143 Removed an unused function in LaTeX writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@714 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-15 02:48:21 +00:00
fiddlosopher
8ce4b2fb62 Simplified special character escaping code in LaTeX writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@705 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-14 17:59:06 +00:00
fiddlosopher
ab74f97422 Small comment fix in LaTeX writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@704 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-14 17:28:26 +00:00
fiddlosopher
a786f43e8c Change to footnotes in HTML writer: Instead of putting the footnote
backlink on a line by itself, after the content of the note,
we now put it at the end of the last paragraph of the footnote.
This saves space and looks better.  More specifically:
+ If the last block of the note is a Para or Plain block, the
  backlink is put at the end of that block's contents.
+ Otherwise, the backlink is put in a separate Plain block by
  itself, after the footnote's contents. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@697 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-14 03:37:41 +00:00
fiddlosopher
30375bb847 Changed encodeUTF8 to toUTF8, decodeUTF8 to fromUTF8,
for clarity.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@692 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-13 06:34:33 +00:00
fiddlosopher
bd5a5d48e7 Cleaned up Text.Pandoc. Added lots of documentation,
including an example program.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@691 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 08:32:57 +00:00
fiddlosopher
e962c76f05 HTML reader: haddock comment fix.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@690 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 08:31:39 +00:00
fiddlosopher
ba6efb0e48 Main: use Text.Pandoc to simplify list of imported modules.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@689 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 08:31:05 +00:00
fiddlosopher
a9bd39b10e Export NoteTable in Text.Pandoc.Shared.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@688 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 08:30:17 +00:00
fiddlosopher
0ec7722363 Pandoc.hs:
+ added haddock documentation
+ added export of prettyPandoc and writeMan


git-svn-id: https://pandoc.googlecode.com/svn/trunk@686 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 07:07:51 +00:00
fiddlosopher
4f78aa9eca Change to defaultWriterOptions: standalone is False by default.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@685 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 07:06:25 +00:00
fiddlosopher
a9f894c130 If writer == "s5", don't set table of contents option.
(The TOC would have to be put on a slide, but in most cases
it won't fit anyway.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@678 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 03:40:01 +00:00
fiddlosopher
2bca833da0 Changed order of options, for aesthetic reasons.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@677 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-12 03:27:24 +00:00
fiddlosopher
aa1c8ac496 Recognize output filenames with any single-digit extension as man
format.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@668 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-10 06:18:23 +00:00
fiddlosopher
1780228b7c Markdown reader: Parse bracketed text in inline footnotes. Previously,
"test^[my [note] contains brackets]" would yield a note with contents
"my [note". Now it yields a note with contents "my [note] contains
brackets".  New function: inlinesInBrackets.

Resolves Issue 14. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@665 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 06:51:06 +00:00
fiddlosopher
d58dca502e RST reader: Allow hyperlink target URIs to be split over multiple
lines, and to start on the line after the reference.
Resolves Issue 7. 


git-svn-id: https://pandoc.googlecode.com/svn/trunk@664 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 06:23:59 +00:00
fiddlosopher
655363da51 Moved Text.ParserCombinators.Pandoc ->
Text.Pandoc.ParserCombinators.  This way, all the
Pandoc modules are in one place.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@663 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 03:39:25 +00:00
fiddlosopher
622d4e5223 Added type declaration for hsepBlocks in
Text.Pandoc.Blocks.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@662 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 03:38:03 +00:00
fiddlosopher
69072efc00 Text.Pandoc.Blocks:
+ Fixed a bug in hPad, which previously padded the rightmost
  cell.  This is fixed by introducing a case for a singleton
  list.
+ Fixed Markdown writer so that the space after a table is not
  nested two spaces.
+ Adjusted Markdown table tests accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@660 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 01:36:53 +00:00
fiddlosopher
0ceb538ecd Markdown writer:
Fixed a small problem with lengths of dashed lines in tables.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@659 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 01:24:49 +00:00
fiddlosopher
ad7bb70cce Added --toc support to Markdown writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@658 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 01:14:35 +00:00
fiddlosopher
56efd6176f Added support for --toc to RTF writer.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@657 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 00:51:07 +00:00
fiddlosopher
489a2bb1d9 Moved isHeaderBlock from Text.Pandoc.Writers.HTML
to Text.Pandoc.Shared.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@656 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-09 00:50:14 +00:00
fiddlosopher
2d4a22d0be Regularized the scheme for unique header identifiers in HTML writer:
- punctuation is now all removed (except -)
 - spaces are turned into -
 - all lowercase
This scheme should be fairly predictable.
Updated tests accordingly.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@655 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 17:33:03 +00:00
fiddlosopher
7f5638853b HTML writer changes:
+ change in scheme for construction of unique identifiers for headers:
  - all lowercase
  - spaces turn into -, not _
+ TOC items now have their own identifiers, starting with TOC-
+ when there is a TOC, headers link back to the corresponding TOC items,
  rather than the top of the TOC.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@653 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-07-08 17:09:17 +00:00