template:latex: make @ letter before using it (#5145)

This fixes the previous commit for parskip and KOMA classes.
jgm · Dec 11, 2018 · dc8caf1 · dc8caf1
1 parent fe9c6eb
commit dc8caf1
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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},