marei: fix eurosym/pdflatex issue
authorMarei (peiTeX) <marei@peitex.de>
Wed, 21 Oct 2020 13:52:53 +0000 (15:52 +0200)
committerJan Büren <jan@kivitendo.de>
Wed, 21 Oct 2020 14:11:20 +0000 (16:11 +0200)
templates/print/marei/kiviletter.sty
templates/print/marei/kivitendo.sty

index 139350a..abbc1a1 100644 (file)
 
 
 \RequirePackage{expl3}
+\RequirePackage{xparse}
 \RequirePackage{iftex}
 \KOMAoptions{fontsize=12pt}
 % Schriftart, Eingabelayout der Tastatur
 \ifPDFTeX
-\RequirePackage[utf8]{inputenc}% Nur notwendig, wenn Basis älter als TL2018
-\RequirePackage[T1]{fontenc}
-\RequirePackage{lmodern}
+       \RequirePackage[utf8]{inputenc}% Nur notwendig, wenn Basis älter als TL2018
+       \RequirePackage[T1]{fontenc}
+       \RequirePackage{lmodern}
+
+       \RequirePackage{eurosym}
+       \DeclareUnicodeCharacter{20AC}{\euro}
 \else
-\RequirePackage{fontspec}
+       \RequirePackage{fontspec}
 \fi
 
 \RequirePackage{xltabular}
 \RequirePackage{booktabs}
 \RequirePackage{graphicx}
 
-\ifPDFTeX
-\RequirePackage{eurosym}
-\DeclareUnicodeCharacter{20AC}{\euro}
-\fi
+
 
 \RequirePackage[fromlogo,fromalign=right,
   firstfoot=false,%Für einheitliche Randeinstellungen
@@ -302,7 +303,7 @@ contents={\usebox\shippingAddressBox}
        @{}
 }
 
-\cs_new:Nn \__kivi_tab_column_currency: {\,\currency}
+\cs_new_protected:Nn \__kivi_tab_column_currency: {\,\currency}
 \def\tabcurrency{\__kivi_tab_column_currency:}
 \cs_set:Nn \__kivi_tab_column_header_currency: {}
 \cs_set_eq:NN \__kivi_tab_column_body_currency:  \__kivi_tab_column_currency:
index 7920468..6e91e74 100644 (file)
@@ -5,6 +5,7 @@
 \usepackage{graphicx}
 \usepackage{ifthen}
 \usepackage{iftex}
+%Compilerunabhängigkeit
 \ifPDFTeX
        \usepackage[utf8]{inputenc}
        \usepackage[T1]{fontenc}
@@ -46,9 +47,9 @@
   \setlength{\footskip}{0.9cm}
 }
 
-%% Standardschrift
-\newcommand{\defaultfont}{\normalfont}
-\renewcommand{\familydefault}{\sfdefault}
+%% Standardschrift Compilerunabhängig
+\newcommand*{\defaultfont}{\normalfont}
+\renewcommand*{\familydefault}{\sfdefault}
 \ifPDFTeX
 \else
 \usepackage{fontspec}