Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / templates / print / marei / kivitendo.sty

diff --git a/templates/print/marei/kivitendo.sty b/templates/print/marei/kivitendo.sty
index 32d2e22..4e6ed0b 100644 (file)
--- a/templates/print/marei/kivitendo.sty
+++ b/templates/print/marei/kivitendo.sty
@@ -4,7 +4,12 @@
 \usepackage{german}
 \usepackage{graphicx}
 \usepackage{ifthen}
-\usepackage[utf8]{inputenc}
+\usepackage{iftex}
+%Compilerunabhängigkeit
+\ifPDFTeX
+  \usepackage[utf8]{inputenc}
+  \usepackage[T1]{fontenc}
+\fi
 \usepackage{latexsym}
 \usepackage{longtable}
 \usepackage{textcomp}
@@ -42,9 +47,13 @@
   \setlength{\footskip}{0.9cm}
 }
 
-%% Standardschrift
-\newcommand{\defaultfont}{\fontfamily{cmss}\fontsize{10pt}{12pt}\fontseries{m}\selectfont}
-\renewcommand{\familydefault}{cmss}
+%% Standardschrift Compilerunabhängig
+\newcommand*{\defaultfont}{\normalfont}
+\renewcommand*{\familydefault}{\sfdefault}
+\ifPDFTeX
+\else
+  \usepackage{fontspec}
+\fi
 
 %% Checkboxen
 \newsavebox{\checkedbox}
@@ -134,17 +143,17 @@
 % Abschnitte mit Kasten hinterlegt
 
 \newcommand{\reqspecsectionstyle}{%
-\renewcommand{\thesection}{\alph{section}}
-\makeatletter
-\def\section{\@ifstar\unnumberedsection\numberedsection}
-\makeatother
+  \renewcommand{\thesection}{\alph{section}}
+  \makeatletter
+  \def\section{\@ifstar\unnumberedsection\numberedsection}
+  \makeatother
 }
 
 \makeatletter
 \def\numberedsection{\@ifnextchar[%]
-  \numberedsectionwithtwoarguments\numberedsectionwithoneargument}
+\numberedsectionwithtwoarguments\numberedsectionwithoneargument}
 \def\unnumberedsection{\@ifnextchar[%]
-  \unnumberedsectionwithtwoarguments\unnumberedsectionwithoneargument}
+\unnumberedsectionwithtwoarguments\unnumberedsectionwithoneargument}
 \def\numberedsectionwithoneargument#1{\numberedsectionwithtwoarguments[#1]{#1}}
 \def\unnumberedsectionwithoneargument#1{\unnumberedsectionwithtwoarguments[#1]{#1}}
 \def\numberedsectionwithtwoarguments[#1]#2{%
@@ -165,7 +174,7 @@
   \endgroup
   \vskip 2ex\nobreak
   \addcontentsline{toc}{section}{\protect\numberline{\thesection{}.}#1}%
-  }
+}
 \def\unnumberedsectionwithtwoarguments[#1]#2{%
   \ifhmode\par\fi
   \removelastskip