tuda-ci (8nov19)

git-svn-id: svn://tug.org/texlive/trunk@52697 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 23 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
index 09d47f5c82f..0f720d37e3a 100644
--- a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
+++ b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty
@@ -1,4 +1,4 @@
-%% This is file `tudafonts.sty' version 1.11 (2019/09/25),
+%% This is file `tudafonts.sty' version 2.0 (2019/11/07),
 %% it is part of
 %% TUDa-CI -- Corporate Design for TU Darmstadt
 %% ----------------------------------------------------------------------------
@@ -7,12 +7,12 @@
 %%
 %% ============================================================================
 %% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
 %%
 %% This work has the LPPL maintenance status `maintained'.
 %%
@@ -26,31 +26,42 @@
 %%
 %% ============================================================================
 %%
-\def\fileversion{1.11}
-\def\filedate{2019/09/25}
+\def\fileversion{2.0}
+\def\filedate{2019/11/07}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tudafonts}
  [\filedate\space\fileversion\space 
    font loading for TUDa-CI, TU Darmstadt's Corporate Design]
+
+\expandafter\newif\csname if@TUDa@T1\endcsname
    
+\DeclareOption{T1}{\csname @TUDa@T1true\endcsname}
+\ProcessOptions\relax
+
 \RequirePackage{iftex}
 \RequirePackage{anyfontsize}
 
 \ifPDFTeX
-	%Declare Euro Symbol
+        \csname @TUDa@T1true\endcsname
+        %Fallback for older versions
 	\expandafter\ifx\csname DeclareUnicodeCharacter\endcsname\relax
 	\RequirePackage[utf8]{inputenc}
+        \cs_if_exist:NF \texteuro {\RequirePackage{textcomp}}
+        \DeclareUnicodeCharacter{20AC}{\texteuro}
 	\fi
-	\RequirePackage{eurosym}
-	\DeclareUnicodeCharacter{20AC}{\euro}
-	\RequirePackage{XCharter}
 \else
 	\RequirePackage{fontspec}
+\fi
+
+\csname if@TUDa@T1\endcsname
+    \RequirePackage{XCharter}%activates T1
+    \PassOptionsToPackage{type1}{roboto}
+    \PassOptionsToPackage{type1}{roboto-mono}
+\else
 	\setmainfont{XCharter}
 \fi
 
 \RequirePackage{roboto}
-
 \IfFileExists{roboto-mono.sty}{
 	\RequirePackage{roboto-mono}
 }{
@@ -59,6 +70,7 @@
 	For correct font setup either install it manually or update you distribution}
 }
 
+
 \ifPDFTeX
 	\RequirePackage[T1]{fontenc}
 \fi