Commit graph

371 commits

Author SHA1 Message Date
John MacFarlane
3a9d5d878c make-reference-files: use proper path separators for Windows.
Fixes a bug with reference.docx and reference.odt in Windows
builds.
2015-05-28 09:59:08 -07:00
John MacFarlane
68b460db92 LaTeX template: Move hyperref before polyglossia.
This avoids an error "Please load package hyperref before bidi package,
and then try to run xelatex on your document again".  See
jgm/pandoc-templates #96.
2015-05-27 12:30:10 -07:00
John MacFarlane
4a9aaf6fd6 LaTeX/beamer: added setotherlanguages in polyglossia.
This uses an `otherlang` variable that takes a list of languages.

As requseted in #2174.
2015-05-27 12:15:50 -07:00
John MacFarlane
734b0bc2fb Revealjs: allow 'center' to be set to false. 2015-05-27 11:04:38 -07:00
John MacFarlane
a3d1f365bc Template changes.
* Use polyglossia with xelatex in beamer (#85).
* Provide `\tightlist` in beamer template (Anders Persson).
* Add toccolor variable to control link color in toc (Kaixhin).
2015-05-27 10:39:55 -07:00
John MacFarlane
4560447041 Don't use sup element for epub footnotes.
Instead, just use an a element with class `footnoteRef`.
This allows more styling options, and provides better results
in some readers (e.g. iBooks, where anything inside the a
tag breaks popup footnotes).

Closes #1995.
2015-05-11 21:58:01 -07:00
John MacFarlane
f0817e1952 LaTeX, Beamer templates: use bibliography instead of biblio-files.
Also use `\addbibresource` instead of `\bibliography` for biblatex.

See #1661.
2015-05-11 21:15:22 -07:00
John MacFarlane
c59e3e53e5 Fixed accidental reversion to earlier templates version.
From last commit.
2015-05-10 08:36:12 -07:00
John MacFarlane
60bf4a8bfb Improved warnings when image size can't be determined.
Closes #1834.
2015-05-09 23:56:53 -07:00
John MacFarlane
15d16e8456 LaTeX template: degrade gracefully if \paragraph not defined. 2015-05-03 22:04:24 -07:00
John MacFarlane
f420325273 latex template: use providecommand for tightlist.
This avoids a conflict when memoir class is used.
Thanks to Joseph Harriott.
2015-05-02 09:09:11 -07:00
John MacFarlane
764f677530 Merge branch 'latex-tightlist' of https://github.com/jlduran/pandoc into jlduran-latex-tightlist
Conflicts:
	data/templates
2015-04-17 19:23:13 -07:00
John MacFarlane
9ad336f586 LaTeX template: redefine \paragraph, \subparagraph...
to behave more like section headers.  Closes #1658.
2015-04-17 18:51:36 -07:00
John MacFarlane
c5acaec3b5 LaTeX template: include grffile together with graphicx.
This properly handles filenames containing spaces and dots.
Closes #2074.
2015-04-13 09:00:55 -07:00
John MacFarlane
6a83773f03 OpenDocument template: use text:p instead of text:h for title.
Using `text:h` causes problems with numbering.  Closes #2059.
Thansk to @nkalvi for diagnosing this.
2015-04-12 21:29:53 -07:00
Nikolay Yakimov
b2ba922638 ODT Writer: Figure captions
Works pretty much the same as Word writer.

Following styles are used for figures:

Figure -- for figure with empty caption
FigureWithCaption (based on Figure) -- for figure with caption
FigureCaption (based on Caption) -- for figure captions

Also, TableCaption (based on Caption) is used for table captions.

We need FigureWithCaption to set keepWithNext, in order to keep caption
with figure.
2015-04-12 00:34:03 +03:00
John MacFarlane
28497d484e RST writer: better handling of raw latex inline.
We use `` :raw-latex:`...` `` and add a definition for this
role to the template.

Closes #1961.
2015-04-07 22:07:38 -07:00
John MacFarlane
ca6a8d62f2 epub, epub3: added header-includes, include-before, include-after.
Closes #1987.
2015-04-07 21:11:43 -07:00
John MacFarlane
394cf3365f reveal.js template: move custom css after theme.
This allows custom css to modify themes, instead of being replaced
by themes.
2015-04-07 20:31:43 -07:00
John MacFarlane
cde1f3b6b4 reveal.js template: add new configurable options.
(Dmitry Smirnov, jgm/pandoc-templates#89)

  * Made option "center" configurable.
  * Added new options "maxScale" and "slideNumber".
  * Added comments to existing options.
2015-03-31 15:49:10 -07:00
John MacFarlane
2b2f7fe15e Merge pull request #2035 from lierdakil/issue2031
Docx Writer/Reference: Add keepNext to objects w/ captions
2015-03-30 20:30:15 -07:00
Nikolay Yakimov
79be04df69 Add toc heading style to reference.docx 2015-03-29 09:03:33 +03:00
Nikolay Yakimov
78cf36a392 Reference Docx: Add keepNext to table captions 2015-03-29 08:02:23 +03:00
Nikolay Yakimov
69d5085c11 Docx Writer: Add a style to figure images
Figures with empty captions use style "Figure"

Figures with nonempty captions use style "Figure with Caption", which is
based on "Figure", and additionally has keepNext set.
2015-03-29 08:02:18 +03:00
Nikolay Yakimov
d20add5b01 Reference Docx: update word/footnotes.xml 2015-03-29 05:59:09 +03:00
Nikolay Yakimov
d744b83b61 Create reference files from unpacked archives with helper program 2015-03-28 10:36:53 -07:00
Nikolay Yakimov
1710c4bd8b Add unpacked reference data 2015-03-28 10:26:08 -07:00
Nikolay Yakimov
f10a8a3239 Remove pre-built reference files 2015-03-28 10:26:08 -07:00
Nikolay Yakimov
1cb601d288 Update reference.docx
Following styles are set as custom:
* Author
* Abstract
* Compact
* Image Caption
* Table Caption
* Definition Term
* Definition
* First Paragraph

Following styles are renamed to correspond with Word Normal.dotm
* Block Quote -> Block Text
* Link -> Hyperlink
* Footnote Ref -> Footnote Reference

Following styles added:
* Caption

Following styles' inheritance changed:
* Image Caption <- Caption
* Table Caption <- Caption
2015-03-01 18:45:19 +03:00
John MacFarlane
e8cd53d1c9 Fixed revealjs template so style css is correctly included.
Closes #1949.
2015-02-16 19:57:37 -08:00
Jesse Rosenthal
ba59e5447f Docx writer: Add footnotes id -1 and 0.
Word uses, by default, footnotes with id -1 and 0 for separators. If a
user modifies reference.docx, they will end up with a settings.xml file
that references these footnotes, but no such footnotes in the
document. This will produce a corruption error. Here we add these to the
document and settings.xml file, so future modifications won't break the file.
2015-02-12 09:21:41 -05:00
Jesse Rosenthal
c2f32f4e8f Docx Writer: Alter Blockquote style slightly.
Since blockquote derives from BodyText, we just want to specify by
default that it won't indent, regardless of what BodyText does. Note
that this will not produce any visible difference in the default
configuration.
2015-02-11 15:06:48 -05:00
Jesse Rosenthal
f703198bc9 Docx Writer: Update reference.docx
This updates reference.docx to make BodyText a quick style, and inherit
from it appropriately.
2015-02-11 15:06:48 -05:00
Jesse Rosenthal
d623a5c7e9 Added FirstParagraph to docx templates. 2015-02-09 23:22:59 -05:00
John MacFarlane
24573b6a5a revealjs template - link to non-minified css, js.
The minified versions no longer ship with the library.
2015-01-20 17:20:01 -08:00
John MacFarlane
c63020d5f2 Remove SourceCode style from reference.docx.
This is added automatically by the docx writer.

If it's in the template, we'll get two copies.

See #1872.
2015-01-12 08:32:37 -08:00
John MacFarlane
3de830e4e2 EPUB templates: use div, not p, for "rights" on title page. 2014-12-28 11:26:14 -08:00
John MacFarlane
7a5cb29319 Really fix #1758. Add id="cover" to body on cover page.
Not title page!
2014-11-17 15:43:40 -08:00
John MacFarlane
65db0ede88 Removed extra body tag from epub3 template.
This fixes a bug introduced by the previous fix.
2014-11-16 21:12:25 -08:00
John MacFarlane
e1d6c73327 epub, epub3 templates: Added id="cover" to body of titlepage.
This aids styling, making it possible for example to set 0 margins
on the title page.  Closes jgm/pandoc#1758.
2014-11-16 20:58:59 -08:00
John MacFarlane
47898c54af LaTeX template: Add shorthands=off to babel options.
Closes #1648.
2014-09-27 17:05:58 -07:00
John MacFarlane
89ab95b5fc LaTeX template: load polyglossia before bibtex.
Fixes jgm/pandoc-templates#70.
Thanks to bluebirch.
2014-09-26 15:32:13 -07:00
John MacFarlane
cfda93a283 LaTeX template: Added \VerbatimFootnotes if there is verbatim in notes.
Fixes a bug when there is verbatim inside notes.
Closes #1616.
2014-09-09 09:36:32 -07:00
Jose Luis Duran
9557eb6f8e LaTeX writer: Use a declaration for tight lists
Currently, pandoc has hard-coded the following in order to make tight lists in
LaTeX:

```hs
text "\\itemsep1pt\\parskip0pt\\parsep0pt"
```

Which is fine, but does not allow customizations.  For example, the `memoir`
class already has a `\tightlist` declaration for this purpose:

```tex
\newcommand{\tightlist}{%
  \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
```

I'm proposing to use a similar solution:

```diff
@@ In Writers/LaTeX.hs:
-then text "\\itemsep1pt\\parskip0pt\\parsep0pt"
+then text "\\tightlist"

@@ In templates/default.latex:
+\newcommand{\tightlist}{%
+  \setlength{\itemsep}{1pt}\setlength{\parskip}{0pt}\setlength{\parsep}{0pt}}
```

This allows us to customize the tightness to our needs.

Backward Compatibility

If a person is using a custom LaTeX template (not based upon the `memoir`
class), the `\tightlist` declaration must be added.
2014-09-01 05:08:24 +00:00
John MacFarlane
d1948ce012 EPUB, EPUB3 templates: Handle structured metadata on titlepage.
Previously we just expected 'title', 'subtitle', 'author', 'date'.
Now we still support those, but also support the format recommended
for epub metadata in the pandoc README:

    ---
    title:
    - type: main
      text: My Book
    - type: subtitle
      text: An investigation of metadata
    creator:
    - role: author
      text: John Smith
    - role: editor
      text: Sarah Jones
    identifier:
    - scheme: DOI
      text: doi:10.234234.234/33
    publisher:  My Press
    rights:  (c) 2007 John Smith, CC BY-NC
    ...
2014-08-31 12:01:55 -07:00
John MacFarlane
0ef1f787c7 Docx writer: Bibliography entries get Bibliography style.
Closes #1559.
2014-08-23 20:52:09 -07:00
John MacFarlane
27ea34489a LaTeX template: disable microtype protrusion for typewriter font.
Closes #1549. Thanks to lemzwerg.
2014-08-20 08:17:10 -07:00
John MacFarlane
eab5fbb4fd Fixed typo in templates README. 2014-08-17 09:57:41 -07:00
John MacFarlane
118cdad8e8 Updated README in templates to indicate templates license.
The templates are duel licensed, BSD3 and GPL2+.
2014-08-16 16:48:46 -07:00
John MacFarlane
6e4c60ea28 EPUB3 template: add epub:type annotation in titlepage. 2014-08-13 16:57:28 -07:00
Jesse Rosenthal
dca55630e6 Docx Reader: Trim line breaks from the beginning and end of Section
Headers.

We might also want to do this elsewhere (for pars, for example).
2014-08-12 23:42:01 -04:00
John MacFarlane
5b1d841a6f epub3 template: Put title page in section with epub:type titlepage. 2014-08-12 17:07:12 -07:00
John MacFarlane
33a051d00d Docx writer: Print subtitle from metadata if present.
Use Subtitle style.

See #1451.
2014-07-29 20:46:55 -07:00
John MacFarlane
2610de0159 Docx writer: include abstract with Abstract style.
Addresses docx part of #1451.
2014-07-26 22:55:45 -07:00
John MacFarlane
64c7a0ab76 Include lot and lof variables in latex template.
These can be set to get `\listoftables` and `\listoffigures`.
Closes #1407.

At this point we won't add a command line argument, because
this only affects one writer.  But the variables can be set
at the command line with

    -Vlof -Vlot

or in YAML metadata.
2014-07-20 21:58:16 -07:00
John MacFarlane
0e9d3db244 Custom writers now work with --template.
Removed HTML header scaffolding from data/sample.lua.
2014-07-16 15:17:08 -07:00
John MacFarlane
2a881541a0 Made Citation information available in lua custom writer. 2014-07-16 09:32:41 -07:00
John MacFarlane
7d6da118d3 Added type attribute to link tags in epub3 template.
They are supposed to be only "advisory" in HTML5, but apparently
kindlegen needs them.
2014-07-08 00:24:17 -06:00
Clare Macrae
717e16660d Merge remote-tracking branch 'jgm/master' into dokuwiki 2014-06-29 19:22:31 +01:00
Clare Macrae
fccfc8429c Updated to latest version of jgm/pandoc-templates - including default.dokuwiki 2014-06-28 21:57:21 +01:00
Clare Macrae
0f41c6de08 Updated to latest version of jgm/pandoc-templates 2014-06-28 21:02:53 +01:00
John MacFarlane
0d364a284d Added haddock template. 2014-06-18 17:49:32 -07:00
John MacFarlane
e78db3caf6 Updated default latex template so \subtitle works properly.
Closes #1327.
2014-06-09 22:33:56 -07:00
John MacFarlane
438ccbe2e6 Removed header1.xml, footer1.xml from reference.docx. 2014-06-01 21:32:15 -07:00
John MacFarlane
6848f642e8 Docx writer: Header and footer are now carried over from reference.docx. 2014-06-01 21:17:00 -07:00
John MacFarlane
c8bc70a6bb LaTeX/Beamer templates: remove conditional around date.
Closes #1321.
2014-06-01 15:28:10 -07:00
John MacFarlane
d508c554f7 LaTeX template: Added linestretch variable.
Documented this and fontfamily.
2014-05-06 10:48:31 -07:00
John MacFarlane
ddb47ef6e8 Added fontfamily variable to latex template. (tlvince) 2014-05-06 09:55:43 -07:00
John MacFarlane
250537532a Updated templates: conditionalize author/date in latex template. 2014-05-06 09:49:13 -07:00
John MacFarlane
1134950858 Update latex/beamer templates: load upquote after fontenc. 2014-05-06 09:06:25 -07:00
John MacFarlane
9ea9b916af Use \setkeys{Gin}{} to set appropriate defaults for \includegraphics.
In pandoc and beamer templates. Thanks to Yihui Xie.
2014-04-30 23:25:07 -07:00
gwern
17d105a8a4 MathMLinHTML: Fix deprecation warning
The use of `nodeValue` on `Attr` objects causes a deprecation warning in
Firefox since version 7.  This patch causes calls to `value` instead of
`nodeValue` for all `Attr` objects.

This closes #362.
2014-04-20 08:53:59 +02:00
John MacFarlane
8bc09ce6c7 Beamer template: Consistent styles for figure and table captions
Thanks to aaronwolen.
2014-04-11 11:12:13 -07:00
John MacFarlane
a6b6ec7be3 Beamer template: Adjust widths correctly for oversized images.
Thanks to Garrick Aden-Buie for the patch.
2014-04-11 10:52:26 -07:00
John MacFarlane
e35ebd3239 Fixed PDF print function in reveal.js template.
Closes #1220.  Thanks to kevinkenan.
2014-04-05 15:24:05 -07:00
John MacFarlane
8c014967c6 DocBook template: use authorgroup if there are authors. 2014-04-04 21:43:17 -07:00
John MacFarlane
e97217f234 Added caption package to default beamer template. Closes #1200. 2014-04-04 13:13:28 -07:00
John MacFarlane
818894b7b5 beamer template: changes for better unicode handling.
Ported from LaTeX template.  Thanks to KarolS for the patch.
2014-03-19 11:11:41 -07:00
John MacFarlane
49a80e1652 Added default.icml to templates. 2014-03-04 10:29:19 -08:00
John MacFarlane
dc390258cb default.latex template: use fontenc package only for pdflatex.
See #1164.
2014-02-20 09:37:02 -08:00
John MacFarlane
5a8a247c3a Move include-after to end in revealjs template. (certainlyakey) 2014-02-18 15:36:56 -08:00
John MacFarlane
bb0f942463 reference.odt: Tidied styles.xml. 2014-01-02 12:54:33 -08:00
John MacFarlane
073b3576d0 reference.docx: Include 'FootnoteText' style.
Otherwise Word ignores the style, even when specified in the pPr element.

I believe this should help with issue #901.  You should now get
'FootnoteText' as the style of the footnote.  You'll have to adjust
the style yourself; it's currently just the same as Normal.
2013-12-27 13:54:27 -08:00
John MacFarlane
3b79246c85 Allow use of \includegraphics[size] in beamer.
This just required porting a macro definition from the default
latex template to the default beamer template.
2013-12-13 21:42:53 -08:00
John MacFarlane
b2aae73f14 Added Cite function to sample.lua. 2013-12-13 11:19:49 -08:00
John MacFarlane
46b37b4ddc latex template: Put header-includes after title.
Closes #908.
2013-12-11 22:35:33 -08:00
John MacFarlane
225bd8d599 default latex template: added abstract variable. 2013-12-11 22:05:59 -08:00
John MacFarlane
571480eb4a Updated beamer template for booktabs. 2013-12-09 19:45:51 -08:00
John MacFarlane
eebb15ba1d Use latest pandoc-templates. 2013-12-03 20:56:11 -08:00
Jose Luis Duran
fdaeec0c48 Add booktabs package for LaTeX tables
[ci skip]
2013-12-04 04:26:22 +00:00
John MacFarlane
bb0f299165 ConTeXt writer: Don't hardcode figure/table placement.
Instead, let this be set in the template, using `\setupfloat`.
Thanks to Aditya Mahajan for the suggestion.
2013-11-30 16:16:35 -08:00
John MacFarlane
526762bf22 ConTeXt writer: Use setupcaption to separate style from content.
Instead of adding 'nunumber' every time we place a figure...

Closes #1067.
2013-11-22 19:51:07 -08:00
John MacFarlane
d84624f775 Updated beamer template.
Now references should work properly (in a slide) when
`--biblatex` or `--natbib` is used.
2013-10-21 14:31:19 -07:00
John MacFarlane
e2acc46f50 Removed data files for s5, slideous, slidy.
Users of s5 and slideous will have to download the needed
files, as has been documented for some time in the README.

slidy files will be sought on the web, as before.
2013-10-20 13:35:04 -07:00
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
Clare Macrae
7eded47bcd Initial work to create dokuwiki writer (#386)
In this first version, all dokuwiki files are straight copies of the
media wiki counterparts.
2013-07-14 13:40:27 +01: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
John MacFarlane
6666277fa2 Epub CSS: left-align headers by default.
This is more consistent with the rest of the writers.
2013-01-05 12:10:25 -08:00
John MacFarlane
c45ae571cc Changed --toc-level to --toc-depth. 2013-01-05 12:03:05 -08:00
John MacFarlane
2e0894554c Implemented --toc-level for rst. 2013-01-05 11:55:29 -08:00
John MacFarlane
123b94ad81 Implemented --toc-level in LaTeX writer. 2013-01-05 11:49:42 -08:00
John MacFarlane
0f9e2c2320 Added css to preserve spaces in <code> tags.
Thanks to Dirk Laurie.
2013-01-04 23:02:22 -08:00
John MacFarlane
2f984b6074 Moved all data files and templates to data/. 2012-12-29 18:14:29 -08:00
fiddlosopher
56217f1004 Added --mathml option; removed Text.Pandoc.LaTeXMathML.
* Added data/MathMLinHTML.js, which is included when no URL is provided
  for --mathml.  This allows MathML to be displayed in better browsers,
  as text/html.
* The module was no longer necessary; its functionality (two lines)
  was incorporated into pandoc.hs.
* Consolidated the two LaTeXMathML.js files into one.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1909 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-03-18 06:45:56 +00:00
fiddlosopher
2ae3b9239e Moved data/ui -> s5. Added note on this in README.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1763 788f1e2b-df1e-0410-8736-df70ead52e1b
2010-01-01 01:25:24 +00:00
fiddlosopher
ed1535de10 Added --reference-odt option.
This allows the user to customized the styles used in pandoc-generated
ODTs.  The user may also put a default reference.odt in the ~/.pandoc
directory.

We have removed the old data/odt directory and replaced it with a
reference.odt.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1760 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 22:40:59 +00:00
fiddlosopher
07fe1aedd0 Removed old data/templates directory.
Templates are now in templates/.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1758 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 21:18:26 +00:00
fiddlosopher
bf42fa1f54 Indented and line-broke styles.xml so it can be modified more easily.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1732 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:17:18 +00:00
fiddlosopher
275a740624 Added newline at end of LaTeXMathML script.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1710 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:14:17 +00:00
fiddlosopher
b80de325b7 Moved odt-styles -> odt. Changed ODT module to look at user data first.
So if the user has an odt-styles directory in ~/.pandoc, it
will be used instead of the default.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1694 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:11:49 +00:00
fiddlosopher
4b0e39fd02 Add legacy-header to LaTeX template.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1680 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:09:43 +00:00
fiddlosopher
ca97f1482d Renamed headers -> templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1677 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:09:20 +00:00
fiddlosopher
ca712fe7f8 LaTeX header: fixes for xetex and header-includes.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1676 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:09:02 +00:00
fiddlosopher
2033da8e47 Revised LaTeX writer to use templates.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1675 788f1e2b-df1e-0410-8736-df70ead52e1b
2009-12-31 01:08:56 +00:00
fiddlosopher
0170f5e636 LaTeX header: Use fixed-width font for Haskell code.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1512 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:43:56 +00:00
fiddlosopher
22741eb8e8 Add definition of code environment to LaTeX header.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1505 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-12-02 22:43:02 +00:00
fiddlosopher
a24d107e6f Support horizontal rules in OpenDocument and ODT writers.
Added style for Horizontal_20_Rule to odt-styles/styles.xml.
Add support for horizontal rules in OpenDocument writer.
Resolves Issue #95.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1479 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-01 22:44:53 +00:00
fiddlosopher
aecca4959d Corrected mispelling (Defnition) in odt styles.xml.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1478 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-11-01 22:44:40 +00:00
fiddlosopher
3b58456673 Moved odt-styles/ to data/. Removed unneeded variable in Makefile.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1458 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-09-23 15:55:30 +00:00
fiddlosopher
f53fb554fe Support for display math; changed ASCIIMathML -> LaTeXMathML:
Resolves Issue #47.

+ Added a DisplayMath/InlineMath selector to Math inlines.
+ Markdown parser yields DisplayMath for $$...$$.
+ LaTeX parser yields DisplayMath when appropriate.  Removed
  mathBlock parsers, since the same effect is achieved by the math
  inline parsers, now that they handle display math.
+ Writers handle DisplayMath as appropriate for the format.
+ Changed -m option to use LaTeXMathML rather than ASCIIMathML.
  LaTeXMathML is closer to LaTeX in its display of math, and
  supports many non-math LaTeX environments.
+ Modified HTML writer to print raw TeX when LaTeXMathML is
  being used instead of suppressing it.
+ Removed ASCIIMathML files from data/ and added LaTeXMathML.
+ Replaced ASCIIMathML with LaTeXMathML in source files.
+ Modified README and pandoc man page source.
+ Modified web page.
+ Added --latexmathml option (kept --asciimathml as a synonym
  for backwards compatibility)
+ Modified tests accordingly; added new tests for display math.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1409 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-13 03:02:42 +00:00
fiddlosopher
ba32c2ec42 Simplified build process using template haskell.
+ Text/Pandoc/ASCIIMathML.hs, Text/Pandoc/DefaultHeaders.hs,
  and Text/Pandoc/Writers/S5.hs are no longer built in Setup.hs
  from templates in the templates/ directory.
+ Instead, they use template haskell to read data at compile
  time from the relevant files in data/.
+ Setup.hs is back to the default simple configuration.
+ Removed old templates and Extra-Tmp-Files field from
  pandoc.cabal.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1357 788f1e2b-df1e-0410-8736-df70ead52e1b
2008-08-01 06:35:42 +00:00
fiddlosopher
fe684764e6 Reverted back to state as of r1062. The template haskell changes
are more trouble than they're worth.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1064 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 23:27:58 +00:00
fiddlosopher
4a841bfc54 Use template haskell to avoid the need for templates:
+ Added library Text.Pandoc.Include, with a template haskell
  function $(includeStrFrom fname) to include a file as a string
  constant at compile time.
+ This removes the need for the 'templates' directory or Makefile
  target.  These have been removed.
+ The base source directory has been changed from src to .
+ A new 'data' directory has been added, containing the ASCIIMathML.js
  script, writer headers, and S5 files.
+ The src/wrappers directory has been moved to 'wrappers'.
+ The Text.Pandoc.ASCIIMathML library is no longer needed, since
  Text.Pandoc.Writers.HTML can use includeStrFrom to include the
  ASCIIMathML.js code directly.  It has been removed.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1063 788f1e2b-df1e-0410-8736-df70ead52e1b
2007-11-03 22:14:03 +00:00