diff options
| -rw-r--r-- | README | 19 | ||||
| m--------- | data/templates | 13 | ||||
| -rw-r--r-- | pandoc.cabal | 2 | ||||
| -rw-r--r-- | tests/writer.latex | 2 |
4 files changed, 20 insertions, 16 deletions
@@ -127,7 +127,8 @@ Production of a PDF requires that a LaTeX engine be installed (see `--latex-engine`, below), and assumes that the following LaTeX packages are available: `amssymb`, `amsmath`, `ifxetex`, `ifluatex`, `listings` (if the `--listings` option is used), `fancyvrb`, `longtable`, `booktabs`, `url`, -`graphicx`, `hyperref`, `ulem`, `babel` (if the `lang` variable is set), +`graphicx` and `grffile` (if the document contains images), + `hyperref`, `ulem`, `babel` (if the `lang` variable is set), `fontspec` (if `xelatex` or `lualatex` is used as the LaTeX engine), `xltxtra` and `xunicode` (if `xelatex` is used). @@ -2666,20 +2667,24 @@ The bibliography may have any of these formats: Format File extension ------------ -------------- - MODS .mods BibLaTeX .bib BibTeX .bibtex - RIS .ris + Copac .copac + CSL JSON .json + CSL YAML .yaml EndNote .enl EndNote XML .xml ISI .wos MEDLINE .medline - Copac .copac - CSL JSON .json + MODS .mods + RIS .ris Note that `.bib` can generally be used with both BibTeX and BibLaTeX files, but you can use `.bibtex` to force BibTeX. +Note that `pandoc-citeproc --bib2json` and `pandoc-citeproc --bib2yaml` +can produce `.json` and `.yaml` files from any of the supported formats. + As an alternative to specifying a bibliography file, you can include the citation data directly in the `references` field of the document's YAML metadata. The field should contain an array of @@ -2699,8 +2704,8 @@ YAML-encoded references, for example: - - 1953 - 4 - 25 - title: 'Molecular structure of nucleic acids: a structure for deoxyribose nucleic - acid' + title: 'Molecular structure of nucleic acids: a structure for deoxyribose + nucleic acid' title-short: Molecular structure of nucleic acids container-title: Nature volume: 171 diff --git a/data/templates b/data/templates -Subproject 09767991b2a8945f5739d47c44d171e37e65e0d +Subproject 12ba81ec9697e238c861ca6b7f8dc08f4e876e7 diff --git a/pandoc.cabal b/pandoc.cabal index 9b1001ace..f52fdd73c 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -254,7 +254,7 @@ Library text >= 0.11 && < 1.3, zip-archive >= 0.2.3.4 && < 0.3, HTTP >= 4000.0.5 && < 4000.3, - texmath >= 0.8.0.2 && < 0.9, + texmath >= 0.8.1 && < 0.9, xml >= 1.3.12 && < 1.4, random >= 1 && < 1.2, extensible-exceptions >= 0.1 && < 0.2, diff --git a/tests/writer.latex b/tests/writer.latex index f7123be98..94e8f779e 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -25,7 +25,7 @@ }{} \usepackage{fancyvrb} \VerbatimFootnotes -\usepackage{graphicx} +\usepackage{graphicx,grffile} \makeatletter \def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi} \def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi} |