Commit graph

1283 commits

Author SHA1 Message Date
John MacFarlane
7b971517b0 Parsing: Changed type of escaped to return Char 2011-12-05 20:22:27 -08:00
John MacFarlane
b2c58c11b2 Added more failing tests relating to issue #312. 2011-12-05 19:07:17 -08:00
John MacFarlane
a4364b3784 Added failing test for escape in markdown link title. 2011-12-04 22:37:28 -08:00
John MacFarlane
e53e538524 WebTeX math - use 'vertical-align:middle' for better results. 2011-12-04 16:07:04 -08:00
John MacFarlane
42eb96a8b3 SelfContained: Get mime type from HTTP request if possible.
--webtex --self-contained now works.
2011-12-04 15:58:31 -08:00
John MacFarlane
0126843751 SelfContained: Convert all url()s in css to data: uris. 2011-12-04 12:19:35 -08:00
John MacFarlane
fb5f9a90f1 New slidy directory for "self-contained." 2011-12-03 22:10:18 -08:00
John MacFarlane
bdec07bac9 Shared: Removed unescapeURI, modified escapeURI.
escapeURI now only escapes space characters, leaving unicode characters
as they are, instead of converting them to octets and URL-encoding them,
as before.  This gives more readable URIs.  User agents now do the
percent-encoding themselves.

URIs are no longer unescaped at all on conversion to markdown, asciidoc,
rst, org.

Closes #349.
2011-12-02 19:39:30 -08:00
John MacFarlane
7a09873a0b Added failing test case for issue #312. 2011-12-01 19:47:25 -08:00
John MacFarlane
3270c838b5 S5/slidy writer: Make footnotes appear on separate slide at end. 2011-11-29 13:36:50 -08:00
John MacFarlane
6eb6a99013 Use separate variables for meta-date, meta-author.
This makes footnotes work in author and date fields.
Closes #301.
2011-11-29 13:31:39 -08:00
John MacFarlane
05a26aef3a HTML writer: Put citations in span with class="citation".
See #313.
2011-11-29 12:49:39 -08:00
John MacFarlane
ce40d0d0c2 Markdown writer: Use setext headers for levels 1-2. 2011-11-24 11:14:32 -08:00
John MacFarlane
f027fd0eff --self-contained now works with <video> as well as <img>. 2011-11-24 10:04:25 -08:00
John MacFarlane
41eded5dd2 pandoc.hs : changed a couple writerName to writerName'.
This fixes a bug in which `pandoc --self-contained` would only
work properly if `-t html` were specified explicitly.
2011-11-23 20:15:24 -08:00
John MacFarlane
db1c16e856 Set --standalone implicitly when non-text output format.
(ODT, EPUB).  This restores pandoc's previous behavior.
You can again do `pandoc test.txt -o test.odt` and get a standalone
ODT file.

Resolves #351.
2011-11-22 14:22:22 -08:00
John MacFarlane
21d74289ce Removed Text.Pandoc.S5 -- no longer needed. 2011-11-21 15:26:11 -08:00
John MacFarlane
af085e0c60 Added --self-contained, integrated into src/pandoc.hs.
--offline is now a deprecated synonym for --self-contained.

TODO: Documentation, remove old S5 module.
2011-11-21 15:24:28 -08:00
John MacFarlane
10b23e85b7 Changed Offline module to SelfContained, offline to makeSelfContained. 2011-11-21 15:09:42 -08:00
John MacFarlane
1cd928b591 Added userdata directory parameter to fns in Offline. 2011-11-21 00:41:08 -08:00
John MacFarlane
9383260e20 Offline: Look for relative URLs in data directory if not found. 2011-11-20 12:32:54 -08:00
John MacFarlane
ef9395ced7 HTML writer: change s5-url to s5/default. 2011-11-20 12:11:38 -08:00
John MacFarlane
12a1ecc8b4 Offline: Recursively resolve @imports in css files. 2011-11-20 12:04:47 -08:00
John MacFarlane
3370fbe7c6 Converted Offline to use Tag String. 2011-11-19 19:30:27 -08:00
John MacFarlane
24d8961d05 Added Text.Pandoc.Offline module. 2011-11-19 00:20:00 -08:00
John MacFarlane
bea0fdf6e6 AsciiDoc: Don't use Roman numerals in ordered lists.
AsiiDoc doesn't support them.
2011-11-18 21:26:25 -08:00
John MacFarlane
1561d51cc5 Renamed to AsciiDoc. Fixed display math and escapes.
AsciiDoc does not seem to have consistent escaping rules.
2011-11-18 21:09:49 -08:00
John MacFarlane
c1710f9bde Skip raw HTML blocks in asciidoc. 2011-11-18 19:44:15 -08:00
John MacFarlane
457571e0c8 Fixed continuations in asciidoc definition lists. 2011-11-18 19:38:00 -08:00
John MacFarlane
f5af4903df Removed link title in asciidoc.
Apparently it is not supported.
2011-11-18 18:31:32 -08:00
John MacFarlane
965c9415b0 Ensure blank line before html passthrough. 2011-11-18 18:22:09 -08:00
John MacFarlane
11f6177670 Implemented ordered lists in asciidoc. 2011-11-18 18:19:47 -08:00
John MacFarlane
40c7d096cc Implemented bullet lists in asciidoc writer. 2011-11-18 17:50:41 -08:00
John MacFarlane
a9a4e24d29 Added fields to track list levels. 2011-11-18 17:01:38 -08:00
John MacFarlane
e8e5ad210f Added comment about limitations of asciidoc conversion. 2011-11-18 13:23:09 -08:00
John MacFarlane
f6a0e75389 Supported tables in asciidoc, added table tests. 2011-11-18 13:19:22 -08:00
John MacFarlane
23c26bbc65 Pretty: Added chomp combinator. 2011-11-18 13:19:22 -08:00
John MacFarlane
823c0bcda9 Indicate when a multiblock footnote is omitted. 2011-11-17 23:13:29 -08:00
John MacFarlane
fcfbbd2caa Supported definition lists. 2011-11-17 22:35:39 -08:00
John MacFarlane
b7cbd42d07 Use attributes for author/date. 2011-11-17 00:52:45 -08:00
John MacFarlane
fc1c17b174 Added an asciidoc writer (partial).
Still TODO:

- documentation in README
- add default.asciidoc to templates/
- lists
- tables
- proper escaping
- footnotes with blank lines - print separately at end?
  currently they are just ignored.
- fix header (date gives weird result on pandoc README)
2011-11-16 19:14:55 -08:00
John MacFarlane
bf4f8ffe55 LaTeX reader: Don't crash on commands like \itemsep.
Closes #314.
2011-11-12 13:20:29 -08:00
John MacFarlane
da57775171 LaTeX reader: Ignore empty groups {}, { }.
Closes #322.
2011-11-12 13:03:11 -08:00
John MacFarlane
8ed33f6662 Add date to EPUB titlepage and metadata.
Closes #323.  Thanks to Ralf Stephan for the patch (slightly modified).
2011-11-12 12:25:43 -08:00
John MacFarlane
9a46d75506 Implemented --citation-abbreviations option.
Mostly due to Andrea Rossato.
2011-11-11 17:54:34 -08:00
John MacFarlane
14620579c0 Changed misleading documentation on markdown2pdf.
markdown2pdf used to create a backup file if the output file
exists; it doesn't any longer, but the documentation still said
it does.
2011-11-10 15:37:52 -08:00
John MacFarlane
fc3826e078 markdown2pdf: Use proper temp directory for latex processing.
Previously /tmp/pandoc was used, which was problematic for
several reasons. Closes #339.
2011-11-10 11:55:09 -08:00
John MacFarlane
d74e8d14a5 Markdown citations: don't strip off initial space in locator.
Previously `[@item1 and nowhere else]` yielded the locator ", and nowhere
else", or, with the new citeproc-hs, "and nowhere else".
Now it yields " and nowhere else".
2011-11-09 13:18:01 -08:00
John MacFarlane
c2f7ba3b69 TeXMath writer: Use unicode thin spaces for thin spaces.
Partially resolves issue #333.
2011-11-08 18:22:28 -08:00
John MacFarlane
4f95aeb6d2 HTML writer: Use <section> for footnotes if html5. 2011-11-07 12:23:05 -08:00
John MacFarlane
05fa195bf7 Biblio: Fixed mess created by my removing procInlines.
Now I see that procInlines was needed to prevent bottomUp
from acting on sublists.

This should fix the problem where '@item1, @item1' yielded
"Doe (1999), Doe Doe Doe Doe (1999)".
2011-11-07 11:32:08 -08:00
John MacFarlane
1af2ebce43 Biblio - fixed author-in-text citations so they don't double. 2011-11-07 11:03:33 -08:00
John MacFarlane
e95e6f3664 Biblio - Removed redundancy. 2011-11-07 10:31:25 -08:00
John MacFarlane
ca98cd8f18 Biblio: Put whole author-in-text citation in a Cite.
Previously just the date and other info went in the Cite.
2011-11-06 17:28:39 -08:00
John MacFarlane
ca5f4434c2 Further simplification of Biblio. 2011-11-06 16:48:16 -08:00
John MacFarlane
380fa06720 Further cleanup of Biblio. 2011-11-06 16:37:50 -08:00
John MacFarlane
3bf1984df6 Simplified Biblio, removed procInlines, use generics instead. 2011-11-06 16:16:06 -08:00
John MacFarlane
dd6ed88707 Markdown reader: allow punctuation only internally in cite keys.
The characters '.',':',';','$','<','>','~','#','-','_' can
be used only between two letters or digits in a citation key.

This means that '@item1.' will be parsed as a citation, 'item1',
followed by a period, instead of a citation 'item1.', as was the
case previously.

Thanks to David Sanson for alerting us to the problem.
2011-11-06 16:00:23 -08:00
John MacFarlane
e8bfabeeeb Don't add comma+space to prefix if it ends in punctuation.
Patch from Andrea Rossato.
2011-11-04 17:38:18 -07:00
John MacFarlane
f4dbd85347 Text.Pandoc.Biblio: Expand citations recursively inside nested inlines.
Closes #331.
2011-10-28 13:18:58 -07:00
John MacFarlane
565113fb6b Biblio: Treat \160 as space when parsing locator and suffix.
This fixes a bug with "p. 33" when `--smart` is used. Previously
the whole "p. 33" would be included in the suffix, with no locator.
2011-10-27 13:58:10 -07:00
John MacFarlane
40cb070fe6 Don't generate superfluous file cover-image.jpg.
Closes #319.
2011-10-27 12:53:46 -07:00
John MacFarlane
1a1f6cb08b Added TOC identifier in EPUB page template.
Closes #329.
2011-10-27 12:00:34 -07:00
John MacFarlane
dea38326ab Removed redundant import. 2011-10-26 17:36:21 -07:00
John MacFarlane
1b81981c5f HTML reader now recognizes DocBook block and inline tags.
It was always possible to include raw DocBook tags in a markdown
document, but now pandoc will be able to distinguish block from
inline tags and behave accordingly. Thus, for example,

    <sidebar>
    hello
    </sidebar>

will not be wrapped in `<para>` tags.
2011-10-25 12:44:20 -07:00
John MacFarlane
c335b6cbd8 HTML slides: only add id to div/section if --section-divs selected. 2011-10-02 23:19:03 -07:00
John MacFarlane
072df3f5dd Simplified slide creation in HTML writer.
A horizontal rule now gets transformed into an empty H1 header
before 'hierarchicalize' is called.

If the document that does not begin with an H1 header, an
empty one is provided.

This avoids the need for kludgy raw HTML.

Also, the 'titleslide' class is added to any section containing
just a title:

----

----
2011-10-02 11:49:56 -07:00
John MacFarlane
9b37c9cc35 Added dzslides output option.
* Added DZSlides to HTMLSlideVariant.
* Added support for dzslides in HTML writer.
* Added dzslides template.
2011-10-01 23:02:24 -07:00
John MacFarlane
44bcb5da51 LaTeX writer: don't escape # or ~ inside href{...}.
Closes #309.
2011-10-01 22:21:39 -07:00
John MacFarlane
f8df0f50fd Added escaping of euro character to LaTeX writer.
Partially resolves #309.
2011-09-23 14:58:16 -07:00
John MacFarlane
e3c560ac3d RST writer: Fixed bug involving empty table cells.
isSimple was being calculated in a way that assumed there
were no non-empty cells.

Resolves #299. Thanks to rmunoz for reporting the bug.
2011-09-05 19:13:30 -07:00
Antoine Latter
afdffec763 TypeSynonymInstances no longer implies FlexibleInstances in GHC 7.2 2011-09-02 17:50:17 -05:00
takahashim
724de8314c allow footnotes followed by newline without space chars 2011-08-23 09:56:58 +09:00
John MacFarlane
24095e0615 ConTeXt writer: Changed 'descr' to 'description', fixed alignment. 2011-08-20 15:30:57 -07:00
John MacFarlane
fa03bf52cb ConTeXt: Use buffering for footnotes containing code blocks.
Closes #291.
2011-08-18 19:23:34 -07:00
John MacFarlane
f9ae93d854 ConTeXt: Escape # in link URLs.
Partially addresses #291.
2011-08-18 12:16:39 -07:00
John MacFarlane
f2fb733e0d Templates: Return empty string for json template.
Thanks to Dirk Laurie for pointing out the bug.
2011-08-18 10:49:19 -07:00
John MacFarlane
6c639d3420 HTML reader: Fixed bug parsing tables w both thead and tbody.
See bug #274, which was not completely fixed by the last patch.
2011-08-01 11:56:15 -07:00
John MacFarlane
77cf7f9cac Tweaked Arbitrary instance to help avoid timeouts in tests. 2011-07-31 08:47:11 -07:00
John MacFarlane
8be6cc210c Added PRAGMA needed for ghc 6.12. 2011-07-30 19:58:46 -07:00
John MacFarlane
81381a9305 Removed applicative stuff in Markdown reader.
It requires parsec 3, and currently pandoc can build with parsec 2.
2011-07-30 19:43:20 -07:00
John MacFarlane
b66b7a791c Markdown reader: Improved emph/strong parsing.
Ported code from pandoc2.
Now all tests pass.
2011-07-30 18:08:49 -07:00
John MacFarlane
2d14c9b436 Added nonspaceChar to Text.Pandoc.Parsing. 2011-07-30 18:08:02 -07:00
John MacFarlane
8ed75af42c markdown2pdf: Added -interaction nonstopmode.
Otherwise it can hang if the error requests user input!
2011-07-30 00:03:55 -07:00
John MacFarlane
45b8520af8 Fix template problem for epub. 2011-07-28 18:53:59 -07:00
John MacFarlane
57821e1cdf Added s5-url and slidy-url variables, instead of hard-coding.
If you want to put your slidy files in the slidy subdirectory,
for example, you can do

    pandoc -t slidy -V slidy-url=slidy -s
2011-07-28 17:35:26 -07:00
John MacFarlane
0f0c1579f8 Smart quotes: handle '...hi' properly.
Also added test case.
2011-07-25 23:49:45 -07:00
John MacFarlane
a3327835be Docbook writer: Use programlisting for code blocks.
Instead of screen, as before.
2011-07-24 23:36:30 -07:00
John MacFarlane
07c7cd1945 Docbook writer: Use CALS tables (instead of XHTML tables).
Reason:  Some older docbook software does not work with XHTML
tables.

Closes #77.
2011-07-24 23:24:03 -07:00
John MacFarlane
3162adbd9b HTML writer: Removed English title on footnote back links.
This is incongruous in non-English documents.
2011-07-24 16:24:27 -07:00
John MacFarlane
7b4c1b171c Use data: protocol to embed s5 css in <link> tags.
Using inline css didn't work properly with Chrome and Safari.
2011-07-24 11:36:54 -07:00
John MacFarlane
d6df566a75 Reordered offline slidy includes. 2011-07-24 10:39:46 -07:00
John MacFarlane
d5e0c449bd Use yuicompressor-packed js for s5.
Removed s5/default/slides.js.comment,
s5/default/slides.js.packed. Added s5/default/slides.min.js.
2011-07-24 09:27:08 -07:00
John MacFarlane
fa16e31f89 Fixed slidy css.
* Use non-minimized version of `slidy.css` with `--offline` option,
  so users can more easily edit it.
* Fixed bug in slidy css that prevented proper centering of title.
2011-07-24 09:08:11 -07:00
John MacFarlane
c872d9f7ef Insert CDATA around inline js/css in HTML, slidy. 2011-07-24 08:23:38 -07:00
John MacFarlane
835dc412d2 Enclose s5 scripts and css in CDATA tags. 2011-07-24 07:52:44 -07:00
John MacFarlane
35cef01659 RST reader: Partial support for labeled footnotes.
Also made simpleReferenceName parser more accurate, which
affects several other parsers.
2011-07-23 18:51:02 -07:00
John MacFarlane
310697ce7e Changed --mathjax to link to mathjax CDN by default.
`--mathjax` now takes an optional URL argument. If it is not provided,
pandoc links directly to the (secure) mathjax CDN.
This is what they now recommend.  Thanks to dsanson.
2011-07-23 13:30:59 -07:00
John MacFarlane
81c403d2d1 Use \enquote{..} for latex quotes if template uses csquotes package.
This provides better support for foreign language quoting.
Thanks to Andreas Wagner for the idea.
2011-07-23 13:12:11 -07:00
John MacFarlane
6424e7d02c Properly handle characters in the 128..159 range.
These aren't valid in HTML, but many HTML files produced by
Windows tools contain them.  We substitute correct unicode
characters.
2011-07-23 12:43:01 -07:00
John MacFarlane
26418b7d14 HTML writer/templates: Made TOC more customizable.
The container for the TOC is now in the template, so users
can insert a header or other styling. Thanks to Bruce D'Arcus
for the suggestion.
2011-07-23 12:04:31 -07:00
John MacFarlane
48368061a1 LaTeX writer: don't set stVerbInNote unnecessarily. 2011-07-23 08:36:41 -07:00
John MacFarlane
fd34dcba85 Changed default template naming scheme.
Instead of latex.template, we now have default.latex.

An appropriate extension is added automatically if the value of
`--template` has no extension.  So, `pandoc --template=special -t latex`
looks for `special.latex`, while `pandoc --template=special -t man`
looks for `special.man`.
2011-07-22 22:49:38 -07:00
John MacFarlane
94405121ab Look for value of --template in datadir if not found.
This way, you can put your special.template.latex in ~/.pandoc
and use it from any directory.
2011-07-22 22:15:25 -07:00
John MacFarlane
fecbceb610 Added --luatex option to markdown2pdf.
This uses lualatex to create the PDF.
2011-07-22 13:17:41 -07:00
John MacFarlane
18306c74fb Deprecated --xetex option - it is no longer needed.
Deprecated `writerXeTeX` and the `--xetex` option.
The latex writer now produces a file that can be processed
by latex, pdflatex, lualatex, or xelatex, so this option isn't
needed.

The option is still neded in markdown2pdf, however, which
has been modified to take some options that aren't in pandoc.
2011-07-22 13:11:46 -07:00
John MacFarlane
0cf2a631e8 LaTeX writer: Use \texttt and escapes instead of \verb!..!.
\verb is simply too fragile; it doesn't work inside command
arguments.
2011-07-22 12:19:34 -07:00
John MacFarlane
e01ae38a77 markdown2pdf: Better error printing.
This goes with the earlier change to -halt-on-error.
2011-07-22 10:30:06 -07:00
John MacFarlane
5eec45ec40 markdown2pdf: Don't crash if pdflatex's output is not UTF-8.
This requires using a custom version of readProcessWithExitCode
that uses utf8-string's conversions instead of the system ones.
utf8-string's utf-8 conversion doesn't crash on invalid
encoding.
2011-07-22 10:28:48 -07:00
John MacFarlane
4ffb787214 Merge pull request #278 from tanimoto/master
markdown2pdf: reading log with non-UTF8 characters
2011-07-21 14:49:39 -07:00
John MacFarlane
fe14bf9447 LaTeX reader: Handle \subtitle command.
If there's a subtitle, it is added to the title,
separated by a colon and linebreak.  Closes #280.
2011-07-21 13:33:51 -07:00
John MacFarlane
6c029621ed LaTeX reader & writer: Use \and to separate authors.
Closes #279.
2011-07-21 10:09:51 -07:00
Paulo Tanimoto
c95a73bdb3 markdown2pdf: Fix issue reading log with non-UTF8 characters.
Replaced 'UTF8.readFile logFile' with 'liftM toString $ BS.readFile logFile'
2011-07-20 22:54:26 -05:00
John MacFarlane
1951c2349f Changed markdown2pdf to halt-on-error.
Before, we used -interaction=batchmode, which just ignored errors.
This leads to bad results--users should know when something goes wrong.
2011-07-20 08:13:00 -07:00
John MacFarlane
71736869bb ConTeXt writer: Made \start/stoptyping flush with margin.
This prevents extra blank lines.
2011-07-19 16:29:33 -07:00
John MacFarlane
8fd3d0bdbb LaTeX writer: make verbatim environments flush to avoid extra space.
The indented `\end{verbatim}` was causing an extra blank line in
the output.

Closes #277.
2011-07-19 16:25:01 -07:00
John MacFarlane
1c28c5308f Added unexported Text.Pandoc.MIME.
Moved getMimeType from Text.Pandoc.Shared to Text.Pandoc.MIME,
so we won't have an API change.
2011-07-19 12:01:20 -07:00
John MacFarlane
e2aec87956 ODT writer: Construct META-INF/manifest.xml based on archive contents.
This fixes a bug in ODTs containing images.  LibreOffice would signal
that these ODTs were corrupt, because the manifest.xml did not contain
a reference to the image files.
2011-07-17 23:21:59 -07:00
John MacFarlane
e980627769 Added getMimeType to Text.Pandoc.Shared. 2011-07-17 19:33:52 -07:00
John MacFarlane
b5da7adfb8 Un-URI-escape image filenames in LaTeX, ConTeXt, RTF, Texinfo.
Also do this when copying image files into EPUBs and ODTs.

Closes #263.
2011-07-16 14:19:45 -07:00
John MacFarlane
8d13ff5bc3 HTML writer: Use embed tag for images with non-image extensions.
(e.g.  PDFs).

Closes #264.
2011-07-16 10:11:46 -07:00
John MacFarlane
dd59cd2341 HTML reader: treat Plain as Para when needed.
For example, in

    Just a few glitches remaining.
    <ul><li> In this situation, one loses the list.
    </ul>
    And in this, the preformatting.
   <pre>Preformatted text not starting with its own blank line.
   </pre>

Thansk to Dirk Laurie for noticing the issue.
2011-07-16 09:42:16 -07:00
John MacFarlane
934867f858 HTML reader: Handle tbody, thead in simple tables.
Closes #274.
2011-07-15 21:16:49 -07:00
John MacFarlane
b30afc2009 Merge pull request #273 from qerub/master
Textile reader: Make it possible to have colons after links.
2011-07-11 08:31:29 -07:00
John MacFarlane
c83b578f58 LaTeX reader: Gobble option & space after linebreak \\[10pt]. 2011-07-10 19:07:40 -07:00
John MacFarlane
4134dad500 Make HTML reader more forgiving of bad HTML.
* Skip spaces after <b>, <emph>, etc.
* Convert Plain elements into Para when they're in a list
  item with Para, Pre, BlockQuote, CodeBlock.

An example of HTML that pandoc handles better now:

~~~~
<h4> Testing html to markdown </h4>
<ul>
<li>
<b> An item in a list </b>
<p> An introductory sentence.
<pre>
Some preformatted text
at this stage comes next.

But alas! much havoc
is wrought by Pandoc.
</pre>
</ul>
~~~~

Thanks to Dirk Laurie for reporting the issues.
2011-07-10 16:54:46 -07:00
John MacFarlane
b5411c06aa Improved LaTeX tables.
* Use ctable package, which allows footnotes and
  provides additional options.
* Made cell alignments work in multiline tables.
* Closes #272.
2011-07-10 12:33:45 -07:00
John MacFarlane
09479ba7b2 LaTeX tables: more space btw lines, top-align cells.
Closes #271.
2011-07-10 12:33:34 -07:00
Christoffer Sawicki
8fa4e8bff1 Textile reader: Make it possible to have colons after links. 2011-07-10 16:30:14 +02:00
John MacFarlane
ea0a09aef1 Fixed bug in slidy writer: unclosed div tag. 2011-07-06 17:24:40 -07:00
Kelsey Hightower
cf11673d83 EPUB writer: Add a meta element specify the cover.
Some EPUB e-readers, such as the Nook, require a meta element inside the
OPF metadata block to ensure the cover image is properly displayed.

When generating an EPUB using the `--epub-cover-image` option, this
patch adds the following meta element to the OPF metadata block in
`content.opf`:

  <meta name="cover" content="cover-image" />
2011-07-04 23:39:50 -04:00
John MacFarlane
9b5f1cba21 Fixed test, added another markdown emph/strong test. 2011-06-22 20:37:57 -07:00
John MacFarlane
5611057e06 Added failing test case due to Perry Wagle. 2011-06-22 20:18:32 -07:00
John MacFarlane
9e71dc3f48 Support \dots and well as \ldots in LaTeX reader. 2011-06-22 20:06:29 -07:00
John MacFarlane
d324bcb0a9 Added Tests.Writers.Markdown. 2011-06-22 19:46:54 -07:00
John MacFarlane
da2301387f Markdown writer: Insert HTML comment btw list and indented code block.
This prevents the code block from being interpreted as part of the list.
2011-06-06 05:56:59 -07:00
John MacFarlane
8d54e304c6 LaTeX writer: use deVerb on table and picture captions.
Otherwise LaTeX complains about \verb inside command argument.
Thanks to bbanier for reporting the bug.
2011-05-24 23:56:23 -07:00
John MacFarlane
6e59053d32 Forbid ()s in citation item keys.
Resolves Issue #304: problems with

(@item1; @item2)

because the final paren was being parsed as part of
the item key.
2011-05-22 20:24:18 -07:00
John MacFarlane
9ff589359f Revert "Parsing: Use new type aliases, PandocParser, GeneralParser."
This reverts commit ec5410bc4e.
2011-04-29 11:34:36 -07:00
John MacFarlane
ec5410bc4e Parsing: Use new type aliases, PandocParser, GeneralParser.
This should make it easier to change the types later.
2011-04-29 11:32:24 -07:00
John MacFarlane
b9ba3847be Allow non-plain math methods in epub. 2011-04-29 10:49:45 -07:00
John MacFarlane
b42c48e919 Disallow notes within notes in reST and markdown.
These previously caused infinite looping and stack overflows.
For example:

[^1]

[^1]: See [^1]

Note references are allowed in reST notes, so this isn't a full
implementation of reST. That can come later. For now we need to
prevent the stack overflows.

Partially resolves Issue #297.
2011-04-20 11:42:27 -07:00
John MacFarlane
cfaa9acd18 Fixed Slidy/S5 output to allow --section-divs.
This is also a cleaner way of inserting the slide divs.
Resolves Issue #296.
2011-04-16 12:16:24 -07:00
John MacFarlane
8ddf7f5dc7 Whitespace cleanup. 2011-04-16 10:37:47 -07:00
John MacFarlane
220bd121d8 Allow --section-divs with slidy output. 2011-04-16 10:33:44 -07:00
John MacFarlane
679113ab02 Revert API change in EPUB writer.
Instead of passing the epub cover image as a parameter, we now pass
it in the list of variables.  This avoids the API change introduced
in f5cbb68534 without losing the
new functionality.
2011-04-16 09:54:05 -07:00
John MacFarlane
4b90ffe1bd Allow '|' followed by newline in RST line block. 2011-04-11 14:45:42 -07:00
John MacFarlane
4ad9360a97 Fixed bug in footnote order in HTML.
CircleCode pointed out that the following markdown produces
out-of-order footnote markers in HTML:

-8<------------------------

some text^[with a footnote which will be #1]

issue

some other text^[with a footnote which will be #2]
-8<------------------------

This fixes the problem.
2011-03-28 16:54:37 -07:00
John MacFarlane
69b0c15030 Added FlexibleInstances pragma.
Thanks to Sivaram Gowkana for the patch.
2011-03-19 12:05:55 -07:00
John MacFarlane
6beba76f61 Changed uri parser so it doesn't include trailing punctuation.
So, in RST, 'http://google.com.' should be parsed as a link
to 'http://google.com' followed by a period.

The parser is smart enough to recognize balanced parentheses,
as often occur in wikipedia links: 'http://foo.bar/baz_(bam)'.

Also added ()s to RST specialChars, so '(http://google.com)'
will be parsed as a link in parens.

Added test cases.

Resolves Issue #291.
2011-03-18 11:30:20 -07:00