diff options
| author | Enno <Konfekt@users.noreply.github.com> | 2018-12-11 15:22:31 -0300 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2018-12-11 13:22:31 -0500 |
| commit | 84147eeff15afe29899578fb5a5cc4cb2af1fb7d (patch) | |
| tree | e80aa2dfdc72ef39093f07b328c347a7cd4d8c0f | |
| parent | 0f736d778f3a93d418c7fed8c9a4a64754aeb515 (diff) | |
| download | pandoc-84147eeff15afe29899578fb5a5cc4cb2af1fb7d.tar.gz | |
Let KOMA document class handle parskip when applicable (#5143)
This is just a change to the default latex template.
| -rw-r--r-- | data/templates/default.latex | 13 | ||||
| -rw-r--r-- | test/lhs-test.latex | 13 | ||||
| -rw-r--r-- | test/lhs-test.latex+lhs | 13 | ||||
| -rw-r--r-- | test/writer.latex | 13 | ||||
| -rw-r--r-- | test/writers-lang-and-dir.latex | 13 |
5 files changed, 35 insertions, 30 deletions
diff --git a/data/templates/default.latex b/data/templates/default.latex index 737ebaa44..1861bde45 100644 --- a/data/templates/default.latex +++ b/data/templates/default.latex @@ -159,12 +159,13 @@ $endif$ }{} $if(indent)$ $else$ -\IfFileExists{parskip.sty}{% -\usepackage{parskip} -}{% else -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} -} +\@ifundefined{KOMAClassName}{% + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt} + }}{\KOMAoptions{parskip=half}} $endif$ $if(verbatim-in-note)$ \usepackage{fancyvrb} diff --git a/test/lhs-test.latex b/test/lhs-test.latex index 8379864ec..88758c51c 100644 --- a/test/lhs-test.latex +++ b/test/lhs-test.latex @@ -21,12 +21,13 @@ \usepackage[]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} -\IfFileExists{parskip.sty}{% -\usepackage{parskip} -}{% else -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} -} +\@ifundefined{KOMAClassName}{% + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt} + }}{\KOMAoptions{parskip=half}} \usepackage{hyperref} \hypersetup{ pdfborder={0 0 0}, diff --git a/test/lhs-test.latex+lhs b/test/lhs-test.latex+lhs index 53ab4f713..53b684192 100644 --- a/test/lhs-test.latex+lhs +++ b/test/lhs-test.latex+lhs @@ -21,12 +21,13 @@ \usepackage[]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} -\IfFileExists{parskip.sty}{% -\usepackage{parskip} -}{% else -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} -} +\@ifundefined{KOMAClassName}{% + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt} + }}{\KOMAoptions{parskip=half}} \usepackage{hyperref} \hypersetup{ pdfborder={0 0 0}, diff --git a/test/writer.latex b/test/writer.latex index 9500c7cf9..0a9cf96f8 100644 --- a/test/writer.latex +++ b/test/writer.latex @@ -21,12 +21,13 @@ \usepackage[]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} -\IfFileExists{parskip.sty}{% -\usepackage{parskip} -}{% else -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} -} +\@ifundefined{KOMAClassName}{% + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt} + }}{\KOMAoptions{parskip=half}} \usepackage{fancyvrb} \usepackage{hyperref} \hypersetup{ diff --git a/test/writers-lang-and-dir.latex b/test/writers-lang-and-dir.latex index 9a31a7df8..66f1104c6 100644 --- a/test/writers-lang-and-dir.latex +++ b/test/writers-lang-and-dir.latex @@ -21,12 +21,13 @@ \usepackage[]{microtype} \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts }{} -\IfFileExists{parskip.sty}{% -\usepackage{parskip} -}{% else -\setlength{\parindent}{0pt} -\setlength{\parskip}{6pt plus 2pt minus 1pt} -} +\@ifundefined{KOMAClassName}{% + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt} + }}{\KOMAoptions{parskip=half}} \usepackage{hyperref} \hypersetup{ pdfborder={0 0 0}, |