diff options
| -rw-r--r-- | MANUAL.txt | 7 | ||||
| -rw-r--r-- | data/templates/default.latex | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/PDF.hs | 2 | ||||
| -rw-r--r-- | test/lhs-test.latex | 2 | ||||
| -rw-r--r-- | test/lhs-test.latex+lhs | 2 | ||||
| -rw-r--r-- | test/writer.latex | 2 | ||||
| -rw-r--r-- | test/writers-lang-and-dir.latex | 2 |
7 files changed, 9 insertions, 10 deletions
diff --git a/MANUAL.txt b/MANUAL.txt index af14f23c9..fcfbe2695 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -139,7 +139,7 @@ When using LaTeX, the following packages need to be available [`iftex`], [`listings`] (if the `--listings` option is used), [`fancyvrb`], [`longtable`], [`booktabs`], [`graphicx`] (if the document -contains images), [`hyperref`], [`xcolor`], +contains images), [`bookmark`], [`xcolor`], [`soul`], [`geometry`] (with the `geometry` variable set), [`setspace`] (with `linestretch`), and [`babel`] (with `lang`). If `CJKmainfont` is set, [`xeCJK`] @@ -157,9 +157,8 @@ output quality if present, but pandoc does not require them to be present: [`upquote`] (for straight quotes in verbatim environments), [`microtype`] (for better spacing adjustments), [`parskip`] (for better inter-paragraph spaces), [`xurl`] (for -better line breaks in URLs), [`bookmark`] (for better PDF -bookmarks), and [`footnotehyper`] or [`footnote`] (to allow -footnotes in tables). +better line breaks in URLs), and [`footnotehyper`] or +[`footnote`] (to allow footnotes in tables). [TeX Live]: https://www.tug.org/texlive/ [`amsfonts`]: https://ctan.org/pkg/amsfonts diff --git a/data/templates/default.latex b/data/templates/default.latex index 94aac2670..deac9871d 100644 --- a/data/templates/default.latex +++ b/data/templates/default.latex @@ -425,7 +425,7 @@ $endif$ $if(csquotes)$ \usepackage{csquotes} $endif$ -\IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}} +\usepackage{bookmark} \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available \urlstyle{$if(urlstyle)$$urlstyle$$else$same$endif$} $if(links-as-notes)$ diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs index bd6b928c7..def3697f6 100644 --- a/src/Text/Pandoc/PDF.hs +++ b/src/Text/Pandoc/PDF.hs @@ -267,7 +267,7 @@ tex2pdf :: (PandocMonad m, MonadIO m) tex2pdf program args tmpDir source = do let numruns | takeBaseName program == "latexmk" = 1 | "\\tableofcontents" `T.isInfixOf` source = 3 -- to get page numbers - | otherwise = 2 -- 1 run won't give you PDF bookmarks + | otherwise = 1 (exit, log', mbPdf) <- runTeXProgram program args numruns tmpDir source case (exit, mbPdf) of (ExitFailure _, _) -> do diff --git a/test/lhs-test.latex b/test/lhs-test.latex index 69acd9bd5..4fc183584 100644 --- a/test/lhs-test.latex +++ b/test/lhs-test.latex @@ -81,7 +81,7 @@ \ifLuaTeX \usepackage{selnolig} % disable illegal ligatures \fi -\IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}} +\usepackage{bookmark} \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available \urlstyle{same} \hypersetup{ diff --git a/test/lhs-test.latex+lhs b/test/lhs-test.latex+lhs index b4aeb7186..01aa20a81 100644 --- a/test/lhs-test.latex+lhs +++ b/test/lhs-test.latex+lhs @@ -48,7 +48,7 @@ \ifLuaTeX \usepackage{selnolig} % disable illegal ligatures \fi -\IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}} +\usepackage{bookmark} \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available \urlstyle{same} \hypersetup{ diff --git a/test/writer.latex b/test/writer.latex index 829ab16ab..b1d784f02 100644 --- a/test/writer.latex +++ b/test/writer.latex @@ -63,7 +63,7 @@ \ifLuaTeX \usepackage{selnolig} % disable illegal ligatures \fi -\IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}} +\usepackage{bookmark} \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available \urlstyle{same} \VerbatimFootnotes % allow verbatim text in footnotes diff --git a/test/writers-lang-and-dir.latex b/test/writers-lang-and-dir.latex index 915d2deed..7d3fcc86f 100644 --- a/test/writers-lang-and-dir.latex +++ b/test/writers-lang-and-dir.latex @@ -64,7 +64,7 @@ \newenvironment{RTL}{\beginR}{\endR} \newenvironment{LTR}{\beginL}{\endL} \fi -\IfFileExists{bookmark.sty}{\usepackage{bookmark}}{\usepackage{hyperref}} +\usepackage{bookmark} \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available \urlstyle{same} \hypersetup{ |