76 Commits
Author SHA1 Message Date
John MacFarlane d76a6e2372 OpenDocument writer: don't use font-face-decls variable. 2013-09-24 18:41:43 -07:00
John MacFarlane f5726924c5 HTML5 template: Add meta tag to allow user scaling.
(Erik Evenson)
2013-09-07 22:58:04 -07:00
John MacFarlane deb59b6235 Removed dependency on citeproc-hs.
Going forward we'll use pandoc-citeproc, as an external filter.

The `--bibliography`, `--csl`, and `--citation-abbreviation` fields
have been removed.  Instead one must include `bibliography`, `csl`,
or `csl-abbrevs` fields in the document's YAML metadata.  The filter
can then be used as follows:

    pandoc --filter pandoc-citeproc

The `Text.Pandoc.Biblio` module has been removed.  Henceforth,
`Text.CSL.Pandoc` from pandoc-citations can be used by library users.

The Markdown and LaTeX readers now longer format bibliographies and
citations.  That must be done using `processCites` or `processCites'`
from Text.CSL.Pandoc.

All bibliography-related fields have been removed from `ReaderOptions`
and `WriterOptions`: `writerBiblioFiles`, `readerReferences`,
`readerCitationStyle`.

API change.
2013-08-24 22:33:01 -07:00
John MacFarlane 544d0bbf31 reference.odt: Change generator in meta.xml to Pandoc. 2013-08-11 17:19:22 -07:00
John MacFarlane eb0c0b86ed ODT/OpenDocument writer: Minor changes for ODF 1.2 conformance.
See #939.  We leave the nonconforming contextual-spacing attribute,
which is provided by LibreOffice itself and seems to be supported.
2013-08-11 17:13:46 -07:00
John MacFarlane e9de0f0e22 Preliminary support for new Div and Span elements in writers.
Currently these are "transparent" containers, except in HTML,
where they produce div and span elements with attributes.
2013-08-08 23:14:12 -07:00
John MacFarlane 208a9e076d Beamer template: Added fonttheme variable. 2013-08-06 18:08:38 -07:00
John MacFarlane a5df042e28 LaTeX template: Added biblio-style variable.
Closes #920.
2013-07-20 10:53:11 -07:00
John MacFarlane 7d75b913bd LaTeX/Beamer template: Added classoption variable.
This is intended for class options like `oneside`; it may
be repeated with different options.  Thanks to Oliver Matthews.
2013-07-17 15:06:43 -07:00
John MacFarlane cd399d1b9d Updated sample.lua for new metadata. 2013-07-14 20:43:21 -07:00
John MacFarlane 851703044e Simplified margin fields in default epub CSS file. 2013-07-13 14:48:14 -07:00
John MacFarlane 7445fc5382 Default epub CSS: Removed highlighting styles.
These are added automatically to individual chapter files,
depending on the highlighting style selected on the command line.
2013-07-13 14:45:12 -07:00
John MacFarlane 9d9390a75a default.latex: Use tex-ansi mapping for monofont.
This ensures that straight quotes appear as straight, rather than
being treated as curly.  See #889.
2013-07-04 14:50:14 -07:00
John MacFarlane 644e3239a9 Custom writer: Pass full metadata, not just tit/auth/date. 2013-06-27 22:55:10 -07:00
John MacFarlane dd96213c05 Man writer: give more fine-grained control in template.
Now the `title`, `section`, `header`, and `footer` can all be set
individually in metadata.  The `description` variable has been
removed.

Quotes have been added so that spaces are allowed in the title.

If you have a title that begins

    COMMAND(1) footer here | header here

pandoc will parse it as before into a title, section, header, and
footer.  But you can also specify these elements explicitly.

Closes #885.
2013-06-27 19:32:28 -07:00
John MacFarlane f7f32af293 Use latest chicago-author-date.csl. 2013-06-25 22:37:03 -07:00
John MacFarlane f869f7e08d Use new flexible metadata type.
* Depend on pandoc 1.12.
* Added yaml dependency.
* `Text.Pandoc.XML`: Removed `stripTags`.  (API change.)
* `Text.Pandoc.Shared`:  Added `metaToJSON`.
  This will be used in writers to create a JSON object for use
  in the templates from the pandoc metadata.
* Revised readers and writers to use the new Meta type.
* `Text.Pandoc.Options`: Added `Ext_yaml_title_block`.
* Markdown reader:  Added support for YAML metadata block.
  Note that it must come at the beginning of the document.
* `Text.Pandoc.Parsing.ParserState`:  Replace `stateTitle`,
  `stateAuthors`, `stateDate` with `stateMeta`.
* RST reader:  Improved metadata.
  Treat initial field list as metadata when standalone specified.
  Previously ALL fields "title", "author", "date" in field lists
  were treated as metadata, even if not at the beginning.
  Use `subtitle` metadata field for subtitle.
* `Text.Pandoc.Templates`:  Export `renderTemplate'` that takes a string
  instead of a compiled template..
* OPML template:  Use 'for' loop for authors.
* Org template: '#+TITLE:' is inserted before the title.
  Previously the writer did this.
2013-06-24 20:29:41 -07:00
John MacFarlane 96f25f924a Latest template changes: title attribute on title section in dzslides. 2013-06-02 14:39:26 -07:00
John MacFarlane 2e3eb9ef6a Made \includegraphics more flexible in LaTeX template.
Now it can be used with options, if needed.

Thanks to Bernhard Weichel.
2013-05-07 17:42:35 -07:00
John MacFarlane 9b0bd19632 Fixed errors in revealjs template. 2013-05-01 12:45:49 -07:00
John MacFarlane c36f3b46e1 revealjs templates: use query hashes for defaults, include remotes. 2013-04-30 17:34:36 -07:00
John MacFarlane 466cc17664 LaTeX template: Changes to make mathfont work with xelatex.
We need the mathspec library, not just fontspec, for this.
We also need to set options for setmathfont.  Closes #734.
2013-04-25 21:07:26 -07:00
John MacFarlane f34ccf900f DocBook template: Use DocBook 4.5 doctype. 2013-04-15 19:41:45 -07:00
John MacFarlane 4fa2a94759 Added Text.Pandoc.Writers.Custom, --print-custom-lua-writer.
pandoc -t data/sample.lua

will load the script sample.lua and use it as a custom writer.
data/sample.lua is provided as an example.

Added `--print-custom-lua-writer` option to print the sample
script.
2013-04-14 00:31:39 -05:00
John MacFarlane 72020f1773 Docx writer: Use Compact style for Plain block elements.
This differentiates between tight and loose lists.
Closes #775.
2013-03-30 22:11:00 -07:00
John MacFarlane 942b7b8f9c Slidy: Use slidy.js rather than slidy.js.gz.
Reason:  some browsers have trouble with the gzipped js file,
at least on the local file system.

Closes #795.
2013-03-25 19:48:42 -07:00
John MacFarlane f2f3c3301f revealjs template: include pdf stylesheet by default. 2013-03-24 19:57:53 -07:00
John MacFarlane 388acaa5f1 New revealjs template. 2013-03-23 21:46:09 -04:00
John MacFarlane df78a9935d Updated templates to include reveal.js. 2013-03-22 01:17:28 -04:00
Jamie F. Olson 6b53a905c4 Added basic support for reveal.js.
Support unordered and ordered lists with "fragment" elements.

Modified by JGM to remove the --reveal_js-url command-line option.
Instead use -V reveal_js-url=... as with slidy and the other slide
formats.  Also cleaned up the list code in the HTML writer.
2013-03-21 14:54:17 -07:00
John MacFarlane 5b4d239b85 Added OPML template, tests.
Minor fixes to OPML writer.
Improved OPML reader tests.
2013-03-20 10:17:59 -07:00
John MacFarlane b2b38a6c0f beamer template: Provide \Oldincludegraphics as in LaTeX template.
The template redefines `\includegraphics` to give special treatment
for too-wide images.  But this causes problems for literal uses
of `\includegraphics`. This change allows authors to use
`\Oldincludegraphics`, as in the latex template.
2013-03-03 17:20:03 -08:00
John MacFarlane 76c5ebf141 EPUB writer: Include html TOC even in epub2.
* The TOC is included in `<spine>`, but `linear` is set
  to `no` unless the `--toc` option is specified.
* Include `<guide>` element in OPF.
* This should allow the TOC to be useable in Kindles when
  converted with kindlegen.
* Results validate with epubcheck 3.0 for both epub and epub3
  output.
* Closes #773.
2013-03-03 08:42:45 -08:00
John MacFarlane 1a09a0b921 LaTeX template: Load microtype after fonts.
Microtype needs to know what fonts are being used.
Thanks to dfc for the patch.
2013-02-27 09:52:26 -08:00
John MacFarlane 3fca434737 Changed style names in reference docx.
FootnoteReference -> FootnoteRef.
Hyperlink -> Link.

Why?  Because the old names got changed by Word when the
reference.docx was edited.  I don't understand why, but this
fixes things.

Closes #414.
2013-02-26 22:01:47 -08:00
John MacFarlane f40eab3540 Added PDF to content types in reference.docx. 2013-02-23 23:04:24 -08:00
John MacFarlane aa4105d190 reference.docx: Added default content type for emf. 2013-02-23 22:47:10 -08:00
John MacFarlane 5aaead0afa Small spacing change in context template. 2013-02-20 09:59:16 -08:00
John MacFarlane bd0a188cc8 ConTeXt template: Use \placecontent for toc.
Configure it for toc depth.  Thanks to Aditya Mahajan.
2013-02-20 06:38:37 -08:00
John MacFarlane 25988ea3f0 ConTeXt writer: Removed \placecontent.
This produced a duplicate toc, in conjunction with `\placelist`.
2013-02-19 21:57:08 -08:00
John MacFarlane f9e6433d24 LaTeX template: set secnumdepth to 5 if --number-sections specified.
This yields behavior equivalent to the other writers, numbering
level 4 and 5 headers too.

Closes #753.
2013-02-18 08:50:25 -08:00
John MacFarlane 111ce7ec87 Beamer template: Lines to fix captions with longtable.
Thanks to Joost Kremers.
2013-02-03 10:42:52 -08:00
John MacFarlane f468db9277 LaTeX template: Use \urlstyle{same} to avoid monospace URLs. 2013-01-21 11:52:00 -08:00
John MacFarlane 83a4e50f76 Updated templates.
Use upquote package if it exists.
2013-01-19 09:40:46 -08:00
John MacFarlane 8eab759a9c RTF writer: Added writeRTFWithEmbeddedImages.
* RTF writer:  Export writeRTFWithEmbeddedImages instead of
  rtfEmbedImage.
* Text.Pandoc: Use writeRTFWithEmbeddedImages for RTF.
* Moved code for embedding images in RTF out of pandoc.hs.
2013-01-18 10:33:37 -08:00
John MacFarlane eebed6bc48 Added writerHtmlQTags and --html-q-tags option.
The previous default was to use `<q>` tags in HTML5.
But `<q>` tags are also valid HTML4, and they are not very
robust in HTML5.  Some user agents don't support them,
and some CSS resets prevent pandoc's quotes CSS from working
properly (e.g. bootstrap).  It seems a better default just
to insert quote characters, but the option is provided  for
those who have gotten used to using `<q>` tags.
2013-01-15 18:50:36 -08:00
John MacFarlane 73f464b8cd reference.docx: PictureCaption style -> ImageCaption.
This was a typo originally.
Thanks to Huashan Chen.
2013-01-06 18:58:38 -08:00
John MacFarlane f779411fe2 Docx writer: Use separate footnotes.xml for notes.
This seems to help LibreOffice convert the file, even though
it was valid docx before.

Note that the references in notes must be in
word/_rels/footnotes.xml.rel.  We handle this now by simply
making that file contain all the references in
word/_rels/document.xml.rel.  Something better could be done
eventually, but this works.

Closes #637.
2013-01-06 12:26:44 -08:00
John MacFarlane 4343f0dbcd Implemented --toc-depth (and --toc!) for RTF writer. 2013-01-05 18:23:51 -08:00
John MacFarlane 65d01857fb Support --toc-depth in context writer. 2013-01-05 18:15:34 -08:00