diff options
| author | Enno <Konfekt@users.noreply.github.com> | 2018-12-11 18:21:45 -0300 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2018-12-11 16:21:45 -0500 |
| commit | dc8caf10df9ba65169ba050ea37cca2d45fcc4d4 (patch) | |
| tree | 05728091ac632192a263e37be4f4586c13b1378c | |
| parent | fe9c6eb86b162560c502675619b72d866df15601 (diff) | |
| download | pandoc-dc8caf10df9ba65169ba050ea37cca2d45fcc4d4.tar.gz | |
template:latex: make @ letter before using it (#5145)
This fixes the previous commit for parskip and KOMA classes.
| -rw-r--r-- | data/templates/default.latex | 11 | ||||
| -rw-r--r-- | test/lhs-test.latex | 11 | ||||
| -rw-r--r-- | test/lhs-test.latex+lhs | 11 | ||||
| -rw-r--r-- | test/writer.latex | 11 | ||||
| -rw-r--r-- | test/writers-lang-and-dir.latex | 11 |
5 files changed, 35 insertions, 20 deletions
diff --git a/data/templates/default.latex b/data/templates/default.latex index 1861bde45..6e8fda613 100644 --- a/data/templates/default.latex +++ b/data/templates/default.latex @@ -159,13 +159,16 @@ $endif$ }{} $if(indent)$ $else$ +\makeatletter \@ifundefined{KOMAClassName}{% \IfFileExists{parskip.sty}{% - \usepackage{parskip} + \usepackage{parskip} }{% else - \setlength{\parindent}{0pt} - \setlength{\parskip}{6pt plus 2pt minus 1pt} - }}{\KOMAoptions{parskip=half}} + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% else + \KOMAoptions{parskip=half}} +\makeatother $endif$ $if(verbatim-in-note)$ \usepackage{fancyvrb} diff --git a/test/lhs-test.latex b/test/lhs-test.latex index 88758c51c..015a55255 100644 --- a/test/lhs-test.latex +++ b/test/lhs-test.latex @@ -21,13 +21,16 @@ \usepackage[]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} +\makeatletter \@ifundefined{KOMAClassName}{% \IfFileExists{parskip.sty}{% - \usepackage{parskip} + \usepackage{parskip} }{% else - \setlength{\parindent}{0pt} - \setlength{\parskip}{6pt plus 2pt minus 1pt} - }}{\KOMAoptions{parskip=half}} + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% else + \KOMAoptions{parskip=half}} +\makeatother \usepackage{hyperref} \hypersetup{ pdfborder={0 0 0}, diff --git a/test/lhs-test.latex+lhs b/test/lhs-test.latex+lhs index 53b684192..fc16ff95a 100644 --- a/test/lhs-test.latex+lhs +++ b/test/lhs-test.latex+lhs @@ -21,13 +21,16 @@ \usepackage[]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} +\makeatletter \@ifundefined{KOMAClassName}{% \IfFileExists{parskip.sty}{% - \usepackage{parskip} + \usepackage{parskip} }{% else - \setlength{\parindent}{0pt} - \setlength{\parskip}{6pt plus 2pt minus 1pt} - }}{\KOMAoptions{parskip=half}} + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% else + \KOMAoptions{parskip=half}} +\makeatother \usepackage{hyperref} \hypersetup{ pdfborder={0 0 0}, diff --git a/test/writer.latex b/test/writer.latex index 0a9cf96f8..46e9b7a38 100644 --- a/test/writer.latex +++ b/test/writer.latex @@ -21,13 +21,16 @@ \usepackage[]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} +\makeatletter \@ifundefined{KOMAClassName}{% \IfFileExists{parskip.sty}{% - \usepackage{parskip} + \usepackage{parskip} }{% else - \setlength{\parindent}{0pt} - \setlength{\parskip}{6pt plus 2pt minus 1pt} - }}{\KOMAoptions{parskip=half}} + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% else + \KOMAoptions{parskip=half}} +\makeatother \usepackage{fancyvrb} \usepackage{hyperref} \hypersetup{ diff --git a/test/writers-lang-and-dir.latex b/test/writers-lang-and-dir.latex index 66f1104c6..de382641d 100644 --- a/test/writers-lang-and-dir.latex +++ b/test/writers-lang-and-dir.latex @@ -21,13 +21,16 @@ \usepackage[]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} +\makeatletter \@ifundefined{KOMAClassName}{% \IfFileExists{parskip.sty}{% - \usepackage{parskip} + \usepackage{parskip} }{% else - \setlength{\parindent}{0pt} - \setlength{\parskip}{6pt plus 2pt minus 1pt} - }}{\KOMAoptions{parskip=half}} + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% else + \KOMAoptions{parskip=half}} +\makeatother \usepackage{hyperref} \hypersetup{ pdfborder={0 0 0}, |