Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
6549 commits 2 branches 0 tags 65 MiB
Commit graph

212 commits

Author SHA1 Message Date
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