From ef0a9dc859ee8fee1fb1f380cffe44f618ef6f0a Mon Sep 17 00:00:00 2001
From: "Marei (peiTeX)" <marei@peitex.de>
Date: Wed, 21 Oct 2020 15:52:53 +0200
Subject: [PATCH] marei: fix eurosym/pdflatex issue

---
 templates/print/marei/kiviletter.sty | 19 ++++++++++---------
 templates/print/marei/kivitendo.sty  |  7 ++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/templates/print/marei/kiviletter.sty b/templates/print/marei/kiviletter.sty
index 139350a4f..abbc1a101 100644
--- a/templates/print/marei/kiviletter.sty
+++ b/templates/print/marei/kiviletter.sty
@@ -16,25 +16,26 @@
 
 
 \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:
diff --git a/templates/print/marei/kivitendo.sty b/templates/print/marei/kivitendo.sty
index 79204681a..6e91e74fb 100644
--- a/templates/print/marei/kivitendo.sty
+++ b/templates/print/marei/kivitendo.sty
@@ -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}
-- 
2.20.1