Commit graph

153 commits

Author SHA1 Message Date
John MacFarlane
09b7ae4073 pandoc: Removed deprecated --xetex option. 2012-01-21 09:54:11 -08:00
John MacFarlane
a75a0762af pandoc: Check for latex program earlier. 2012-01-21 09:34:47 -08:00
John MacFarlane
58f9b3bc38 pandoc: Added optLaTeXProgram. 2012-01-21 00:50:21 -08:00
John MacFarlane
4d98815edd Refactored error reporting in pandoc.hs. 2012-01-20 22:12:03 -08:00
John MacFarlane
d7b67f48cd PDF: Use string instead of special TeXProgram type. 2012-01-20 21:36:04 -08:00
John MacFarlane
b4a6c02343 PDF: Better error message. 2012-01-20 19:52:56 -08:00
John MacFarlane
ce3653e39d pandoc: Output to pdf now works. 2012-01-20 19:39:18 -08:00
John MacFarlane
c9c78344b1 PDF: Removed TeXError type, just return a bytestring. 2012-01-20 19:11:35 -08:00
John MacFarlane
ba81cda7f1 Added Docx writer.
* New module `Text.Pandoc.Docx`.
* New output format `docx`.
* Added reference.docx.
* New option `--reference-docx`.

The writer includes support for highlighted code blocks
and math (which is converted from TeX to OMML using
texmath's new OMML module).
2012-01-19 12:10:49 -08:00
John MacFarlane
da8425598a New treatment of dashes in --smart mode.
* `---` is always em-dash, `--` is always en-dash.
* pandoc no longer tries to guess when `-` should be en-dash.
* A new option, `--old-dashes`, is provided for legacy documents.

Rationale: The rules for en-dash are too complex and
language-dependent for a guesser to work reliably.  This
change gives users greater control.  The alternative of
using unicode isn't very good, since unicode em- and en-
dashes are barely distinguishable in a monospace font.
2012-01-01 13:48:28 -08:00
John MacFarlane
600c22e7bf Unescape entities in citation refId.
Closes #357.

The refIds coming from citeproc contain XML numeric
entities, and these don't match with the citation keys
parsed by pandoc.  Solution is to unescape them.
2011-12-29 23:11:42 -08:00
John MacFarlane
31fb776c32 DZSlides: Added dzslides/template.html.
This is the unaltered file from the dzslides repository.
Pandoc now reads it, looking for the core part, and includes
this in the new dzslides template via the 'dzslides-core'
variable.

When dzslides is updated, you can just put the new
template.html in your `~/.pandoc/dzslides` directory,
and things should work -- provided the core part can
be identified as everything from

    <!-- {{{{ dzslides core

to the end of the file.

This should make it a bit easier to keep up to date.
2011-12-29 17:41:06 -08:00
John MacFarlane
cd190be09e Made --version informative about versions of dependencies. 2011-12-29 14:17:10 -08:00
John MacFarlane
763a9610cd Better formatting for list of highlighting languages. 2011-12-29 14:03:39 -08:00
John MacFarlane
0aa6269b04 Added "beamer" a few places where we test for latex. 2011-12-29 13:58:13 -08:00
John MacFarlane
f74c40b460 Don't use --smart automatically with man output.
Previously pandoc used smart mode automatically when `man`
output was selected.
2011-12-29 13:54:21 -08:00
John MacFarlane
febbf5d818 Better formatting of input/output formats in --help. 2011-12-29 13:53:25 -08:00
John MacFarlane
cdb01e6d54 Made html5 and html5+lhs output formats.
Deprecated the `--html5`/`-5` flag. Use the output format
instead.
2011-12-29 13:39:03 -08:00
John MacFarlane
16629bf1ce Added --highlight-style and --no-highlight options. 2011-12-27 23:46:47 -08:00
John MacFarlane
fca95bf43c Removed highlighting flag. Highlighting support is now standard. 2011-12-22 13:24:43 -08:00
John MacFarlane
f61e09cb9a Added writerHighlight to WriterOptions. 2011-12-22 13:12:08 -08:00
John MacFarlane
89c962a18c Use blaze-html instead of xhtml for HTML generation.
* This is a breaking API change for `writeHtml`.
* It introduces a new dependency on blaze-html.
* Pandoc now depends on highlighting-kate >= 0.4, which
  also uses blaze-html.
* The --ascii option has been removed, because of differences
  in blaze-html's and xhtml's escaping.
* Pandoc will no longer transform leading newlines in code
  blocks to `<br/>` tags.
2011-12-17 22:46:03 -08:00
John MacFarlane
fb5f9a90f1 New slidy directory for "self-contained." 2011-12-03 22:10:18 -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
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
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
9a46d75506 Implemented --citation-abbreviations option.
Mostly due to Andrea Rossato.
2011-11-11 17:54:34 -08:00
John MacFarlane
dea38326ab Removed redundant import. 2011-10-26 17:36:21 -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
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
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
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
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
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
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
459e460abb pandoc.hs: Updated copyright notice. 2011-02-06 17:28:12 -08:00
John MacFarlane
8f408e4b7b Added --ascii option.
Currently supported only in HTML writer.
2011-02-06 09:27:03 -08:00
John MacFarlane
afe90390ea pandoc.hs: Simplified code for writing result. 2011-01-30 14:02:16 -08:00
Josef Svenningsson
d8d0f46c4c Add possibility to use listings package for code blocks and
inline code in the LaTeX writer.
2011-01-28 21:09:38 -08:00
John MacFarlane
382564ed9e RTF writer: Embed images when possible.
* Resolves Issue #275.
* PNG and JPEG supported.
* Export rtfEmbedImage.
2011-01-28 08:42:04 -08:00
John MacFarlane
9f99c39caf Default to textile writer on .textile extension. 2011-01-23 00:05:10 -08:00
John MacFarlane
9bb5b54102 Added --normalize option. 2011-01-20 22:48:20 -08:00
John MacFarlane
8f7c119c0f Removed '--no-citeproc' as alias for '--natbib'.
This was confusing, I think, as no-citeproc could be either
natbib or biblatex.
2011-01-16 11:08:56 -08:00
John MacFarlane
281b36470f Minor code formatting. 2011-01-16 11:08:20 -08:00
John MacFarlane
b6d1f4bc9e Moved --chapters to before --number-sections in option list. 2011-01-16 09:34:26 -08:00
John MacFarlane
9721b87c26 Added --chapters option affecting docbook and latex.
* Added writerChapters to WriterOptions.
* Added --chapters command-line option.
* --chapters causes top-level headers to be "chapter" instead of
  "section" in LaTeX and DocBook.
* Resolves Issue #225.
2011-01-16 08:58:29 -08:00
John MacFarlane
91510a109f Improvements to --html5 support:
+ <nav> for TOC, <figure> for figures, type attribute in <ol>.
+ Don't add math javascript in html5.
+ Use style attributes instead of deprecated width, align.
+ html template: move <title> after <meta>.
  Note: charset needs to be declared before title.
+ slidy and s5 templates: move <title> after <meta>.
+ html template: Added link to html5 shim for IE.
+ Make --html5 have an effect only for 'html' writer (not s5, slidy, epub).
2011-01-11 23:15:30 -08:00
John MacFarlane
e8ad4ba43c Preliminary support for HTML5.
+ Added writerHtml5 writer option.
+ Added --html5 option.
+ Added support for lang in html tag (so you can do
  'pandoc -s --V lang=en', for example).
+ Updated html template with conditionals for HTML5.
+ When HTML5 selected, use <header> tag around title in document,
  and use <section> tags instead of <div>s if --section-divs
  specified.
2011-01-11 21:18:46 -08:00