Commit graph

2320 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
d611568237 Updated tests for new latex templates. 2011-07-22 13:56:04 -07:00
John MacFarlane
581ec74a18 Version bump to 1.8.1.3. 2011-07-22 13:20:49 -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
0590d7e4c2 Updated templates. 2011-07-22 12:51:22 -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
e3e9225ab3 Modified submodules. 2011-07-22 12:12:03 -07:00
John MacFarlane
49fdf273ab Updated contributor list. 2011-07-22 12:01:57 -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
bd18a80ebe Document pandoc-templates repository in README. 2011-07-20 08:41:15 -07: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
b43873a9ea Added templates as a git submodule.
This should make it easier for people to track updates to their
custom templates.
2011-07-19 16:24:35 -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
cc20421471 Leaner reference.odt. 2011-07-17 23:21:50 -07:00
John MacFarlane
e980627769 Added getMimeType to Text.Pandoc.Shared. 2011-07-17 19:33:52 -07:00
John MacFarlane
aeb1349894 Bumped version in windows setup iss. 2011-07-16 14:53:36 -07:00
John MacFarlane
97610981f6 Updated changelog. 2011-07-16 14:47:02 -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
fd46f610e3 Version bump to 1.8.1.2. 2011-07-16 10:13:04 -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
cda9d2a655 Used yuicompressor to minify slidy css and js. 2011-07-06 17:24:41 -07:00
John MacFarlane
eb6cdbb6f8 Slidy: Use 'titlepage' instead of 'cover' for title div. 2011-07-06 17:24:41 -07:00
John MacFarlane
5c3b1575ac Slidy template: Add $duration$ variable.
Setting this activates the timer.
2011-07-06 17:24:41 -07:00
John MacFarlane
2ff9672fdc Minimized slidy files. 2011-07-06 17:24:41 -07:00
John MacFarlane
a3c0c410b8 slidy.js: Avoid string literal "</script>".
It causes problems when the script is embedded with the
--offline option.
2011-07-06 17:24:41 -07:00
John MacFarlane
ea0a09aef1 Fixed bug in slidy writer: unclosed div tag. 2011-07-06 17:24:40 -07:00
John MacFarlane
4b31e4f5cf Updated slidy/ directory with Slidy2 js and css.
Note:  This still needs to be run through jsmin.
2011-07-06 17:24:40 -07:00
John MacFarlane
5f0ed50ca8 Updated slidy template to use Slidy2. 2011-07-06 17:24:40 -07:00
John MacFarlane
201e680964 Merge pull request #270 from khightower/master
EPUB writer: Add a meta element specify the cover.
2011-07-05 13:46:29 -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