Commit graph

1530 commits

Author SHA1 Message Date
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
John MacFarlane
d1304e8356 OpenDocument writer: Use "First paragraph" style after most non-para blocks.
(Not just headers, as in the last patch.)
Patch from Andrea Rossato, slightly modified by JM.
2011-03-16 12:35:32 -07:00
John MacFarlane
f5cbb68534 Added --epub-cover-image option.
API change: Added a parameter for the cover image path to
writeEPUB.

Followed best practices outlined in
http://blog.threepress.org/2009/11/20/best-practices-in-epub-cover-images/
2011-03-13 12:42:16 -07:00
John MacFarlane
403bb521cd Fixed bug in RST field list parser.
The bug affected field lists with multi-line items at the
end of the list.
2011-03-12 17:08:23 -08:00