Commit graph

171 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