texlive[43649] Master/texmf-dist: tudscr (30mar17)
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 30 23:33:00 CEST 2017
Revision: 43649
http://tug.org/svn/texlive?view=revision&revision=43649
Author: karl
Date: 2017-03-30 23:33:00 +0200 (Thu, 30 Mar 2017)
Log Message:
-----------
tudscr (30mar17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/tudscr/README.md
trunk/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
trunk/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf
trunk/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf
trunk/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf
trunk/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf
trunk/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/dissertation.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/document.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/evaluation.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/mathswap-example.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/mathtype-example.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/notice.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/poster.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/task.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/thesis.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/treatise-example.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-hints.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-introduction.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-packages.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-preface.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathswap.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex
trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/treatise.tex
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-color.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-locale.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-mathswap.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-texindy.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-twocolfix.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
trunk/Master/texmf-dist/source/latex/tudscr/tudscrsource.tex
trunk/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
trunk/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
trunk/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
trunk/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
Modified: trunk/Master/texmf-dist/doc/latex/tudscr/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/tudscr/README.md 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/doc/latex/tudscr/README.md 2017-03-30 21:33:00 UTC (rev 43649)
@@ -4,7 +4,7 @@
Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
- tudscr 2017/03/27 v2.05k
+ tudscr 2017/03/29 v2.05l
----------------------------------------------------------------------------
@@ -60,11 +60,14 @@
Versionen
---------
+**v2.05l** (2017/03/29)
++ Bugfix für Paket **fontspec** bei Option `cdfont=false`
++ Bugfix für Paket **fontspec** bei Schriftnamen
+
**v2.05k** (2017/03/27)
+ Bugfix für Gliederungsbefehle `\addpart`, `\addchap` und `\addsec`
+ kleinere Anpassungen für Dokumentationsklassen
-
**v2.05i** (2017/03/12)
+ Befehl `\Describe<Element>s` für mehrere Elemente in Klasse **tudscrdoc**
+ Umgebung `DescribeParameterParent` in Klasse **tudscrdoc**
@@ -71,45 +74,35 @@
+ Bugfix für `\mu` bei Mathematikschriften
+ Bugfix in Klasse **tudscrmanual** für neue Version von **xparse**
-
**v2.05h** (2017/02/04)
+ Quelltextdokumentationsklasse **tudscrdoc** an neue Version von **dox**
angepasst
+ Glyphen (`lessequal` und `greaterequal`) in Schriftfamilien korrigiert
-
**v2.05g** (2017/01/26)
+ Erweiterung der Quelltextdokumentationsklasse **tudscrdoc**
+ kleinere Fehler im TUD-Script-Bundle behoben
-
**v2.05f** (2016/10/12)
+ Probleme mit dem Paket **bm** behoben
-
**v2.05e** (2016/10/10)
+ Bugfix für Verwendung von `\author` nach `\maketitle`
-
**v2.05d** (2016/09/22)
+ Bezeichnung in TUD-Script-Bundle geändert
+ Probleme mit dem Paket **flexisym** behoben
-
**v2.05c** (2016/09/15)
+ Bugfix bei Verwendung von KOMA-Script v3.19 und früher
-
**v2.05b** (2016/09/09)
+ Bugfix für **fix-tudscrfonts**
-
**v2.05a** (2016/08/24)
+ Bugfix für Überprüfung der installierten Schriften
-
**v2.05** (2016/07/26)
-
+ Klasse **tudscrposter**
+ Schnittmarken mit Paketen **crop** und **geometry** möglich
+ neue Einstellungsmöglichkeiten für den Satzspiegel
@@ -119,34 +112,22 @@
**tudposter**
+ Paket **fix-tudscrfonts**
-
**v2.04e** (2016/06/17)
-
+ Bugfix für Teile mit KOMA-Script v3.21
-
**v2.04d** (2016/03/26)
-
+ Bugfix für Titelseite bei **tudscrartcl**
-
**v2.04c** (2015/11/29)
-
+ Bugfix für fehlenden Schriften bei Verwendung von Paket **fontspec**
-
**v2.04b** (2015/10/06)
-
+ Bugfix für KOMA-Script v3.19
-
**v2.04a** (2015/07/24)
-
+ Bugfix für Option `ddc`
-
**v2.04** (2015/07/02)
-
+ Anpassungen an KOMA-Script v3.18
+ Einfachere Verwendung von Paket **fontspec**
+ verbesserte Installationsroutine der Schriften für portable Distributionen
@@ -153,15 +134,11 @@
+ alleinstehender farbiger Querbalken im Kopfbereich
+ freier Inhalt im Fußbereich möglich
-
**v2.03a** (2015/06/11)
-
+ Anpassungen an KOMA-Script v3.17
+ Fehlerkorrektur für Auswahl der Mathematikschriften
-
**v2.03** (2015/02/15)
-
+ Anpassungen an KOMA-Script v3.15
+ Verbesserung des Satzspiegels für das Corporate Design
+ Kopf und Fuß können farbig dargestellt werden
@@ -168,9 +145,7 @@
+ Logos in der Fußzeile für Titel und dergleichen möglich
+ kleinere Fehlerkorrekturen
-
**v2.02** (2014/12/17)
-
+ Paket **tudscrfonts**
+ Probleme mit der Klasse **standalone** behoben
+ Laden der Schriften des Corporate Designs im OpenType-Format mit Paket
@@ -186,25 +161,17 @@
+ einige Befehle wurden für Kompatibilität zu anderen Paketen umbenannt
+ Funktionalität des Paketes **mathswap** im Dokument umschaltbar
-
**v2.01b** (2014/06/04)
-
+ Bug bei Aufgabenstellung behoben (tudscrsupervisor)
-
**v2.01a** (2014/06/03)
-
+ Bug bei der Verwendung des Untertitels behoben
-
**v2.01** (2014/04/24)
-
+ Fehlerkorrekturen beim Kerning der Ziffern und bei der Schriftstärke auf der
Titelseite
-
**v2.00** (2014/04/22)
-
+ Das TUD-Script-Bundle wurde von Grund auf überarbeitet und mittels Paket
**docstrip** erzeugt. Viele Fehler wurden entfernt und die Robustheit der
Befehle und Optionen wurde erhöht. Die Verwendung der Schriften, insbesondere
@@ -212,12 +179,9 @@
das Handbuch des Bundles eine komplette Überarbeitung, wurde erweitert und um
mehrere Indexe ergänzt.
-
**v1.0** (2012/10/31)
-
+ erste Version des TUD-Script-Bundles
-
-------------------------------------------------------------------------------
Summary
@@ -264,11 +228,14 @@
Versions
--------
+**v2.05l** (2017/03/29)
++ bug fix for package **fontspec** with option `cdfont=false`
++ bug fix for package **fontspec** with font names
+
**v2.05k** (2017/03/27)
+ bug fix for sectioning commands `\addpart`, `\addchap` und `\addsec`
+ small adaptions for documentation classes
-
**v2.05i** (2017/03/12)
+ command `\Describe<Element>s` for mutliple elements in class **tudscrdoc**
+ environment `DescribeParameterParent` in class **tudscrdoc**
@@ -279,39 +246,30 @@
+ adaption to source code documentation class **tudscrdoc** for updated **dox**
+ glyphs (`lessequal` und `greaterequal`) in font families corrected
-
**v2.05g** (2017/01/26)
+ enhancement of the source code documentation class **tudscrdoc**
+ minor errors fixed within the TUD-Script bundle
-
**v2.05f** (2016/10/12)
+ solved problems with package **bm**
-
**v2.05e** (2016/10/10)
+ bug fix for usage of `\author` after `\maketitle`
-
**v2.05d** (2016/09/22)
+ notation changed to TUD-Script bundle
+ solved problems with package **flexisym**
-
**v2.05c** (2016/09/15)
+ bug fix for usage of KOMA-Script v3.19 and earlier
-
**v2.05b** (2016/09/09)
+ bug fix for **fix-tudscrfonts**
-
**v2.05a** (2016/08/24)
+ bug fix for verification of installed fonts
-
**v2.05** (2016/07/26)
-
+ class **tudscrposter**
+ crop marks with packages **crop** and **geometry** possible
+ new possible settings for type area
@@ -321,34 +279,22 @@
**tudposter**
+ package **fix-tudscrfonts**
-
**v2.04e** (2016/06/17)
-
+ bug fix for parts with KOMA-Script v3.21
-
**v2.04d** (2016/03/26)
-
+ bug fix for titlepage with **tudscrartcl**
-
**v2.04c** (2015/11/29)
-
+ bug fix for missing fonts when using package **fontspec**
-
**v2.04b** (2015/10/06)
-
+ bug fix for KOMA-Script v3.19
-
**v2.04a** (2015/07/24)
-
+ bug fix for option `ddc`
-
**v2.04** (2015/07/02)
-
+ adjustments to KOMA-Script v3.18
+ simpler usage of package **fontspec**
+ improved installation routine for portable distributions
@@ -355,15 +301,11 @@
+ solitary colored head bar
+ customisable content in the foot possible
-
**v2.03a** (2015/06/11)
-
+ adjustments to KOMA-Script v3.17
+ bug fix for math font selecting
-
**v2.03** (2015/02/15)
-
+ adjustments to KOMA-Script v3.15
+ improvement of the corporate design type area
+ colored head and foot possible
@@ -370,9 +312,7 @@
+ including logos in the foot for the title etc.
+ a few little bug fixes
-
**v2.02** (2014/12/17)
-
+ package **tudscrfonts**
+ fixed bug with class **standalone**
+ loading the corporate design fonts in OpenType format with package
@@ -388,24 +328,16 @@
+ some commands have been renamed for compatibility with other packages
+ functionality of the package **mathswap** can be switched within the document
-
**v2.01b** (2014/06/04)
-
+ fixed bug when using task (tudscrsupervisor)
-
**v2.01a** (2014/06/03)
-
+ fixed bug when using the subtitle
-
**v2.01** (2014/04/24)
-
+ fixes the kerning of the digits and the font weight at the title page
-
**v2.00** (2014/04/22)
-
+ The TUD-Script bundle has been redesigned from the ground up and is
generated by using **docstrip**. Many bugs have been removed and the
robustness of the commands and options has been increased. The use of the
@@ -413,7 +345,5 @@
manual of the bundle underwent a complete overhaul, has been extended and
supplemented by several indexes.
-
**v1.0** (2012/10/31)
-
+ first version of the TUD-Script bundle
Modified: trunk/Master/texmf-dist/doc/latex/tudscr/tudscr.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tudscr/tudscr_print.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tudscr/tudscrsource.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tudscr/tutorials/mathswap.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tudscr/tutorials/mathtype.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/tudscr/tutorials/treatise.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/dissertation.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/dissertation.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/dissertation.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,BCOR=6mm,cdgeometry=no,DIV=13]{tudscrreprt}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{isodate}
\usepackage{blindtext}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/document.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/document.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/document.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman]{tudscrreprt}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{blindtext}
\begin{document}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/evaluation.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/evaluation.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/evaluation.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman]{tudscrreprt}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{isodate}
\usepackage{tudscrsupervisor}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/mathswap-example.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/mathswap-example.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/mathswap-example.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrartcl}% andere Klassen sind möglich
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{microtype}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/mathtype-example.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/mathtype-example.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/mathtype-example.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman]{tudscrartcl}% andere Klassen sind möglich
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{microtype}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/notice.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/notice.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/notice.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman]{tudscrreprt}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{isodate}
\usepackage{tudscrsupervisor}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/poster.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/poster.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/poster.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,8 +1,8 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\RequirePackage{fix-cm}
\documentclass[ngerman,paper=A1,fontsize=22pt,cdfoot=5ex,ddcfoot]{tudscrposter}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{blindtext}
\usepackage{multicol}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/task.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/task.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/task.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman]{tudscrreprt}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{isodate}
\usepackage{tudscrsupervisor}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/thesis.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/thesis.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/thesis.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman,BCOR=4mm]{tudscrreprt}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{isodate}
\begin{document}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/treatise-example.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/treatise-example.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/examples/treatise-example.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,8 +1,8 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrreprt}
\usepackage{babel}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{scrhack}
\usepackage{tudscrsupervisor}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-hints.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-hints.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-hints.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -94,8 +94,8 @@
\begin{Code}[escapechar=§]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman,§\PName{Klassenoptionen}§]§\Parameter{Dokumentklasse}§
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
§\dots§
\end{Code}
@@ -520,9 +520,8 @@
paper=a1,
fontsize=36pt
]{tudscrposter}
-\usepackage{selinput}
-\SelectInputMappings{adieresis={ä},germandbls={ß}}
\usepackage[T1]{fontenc}
+\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
§\dots§
\usepackage{graphicx}
\usepackage[b1,center,cam]{crop}
@@ -551,9 +550,8 @@
paper=a1,
fontsize=36pt
]{tudscrposter}
-\usepackage{selinput}
-\SelectInputMappings{adieresis={ä},germandbls={ß}}
\usepackage[T1]{fontenc}
+\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
§\dots§
\geometry{paper=b1,layout=a1,layoutoffset=1in,showcrop}
\begin{document}
@@ -587,9 +585,8 @@
\Option*{paper=A3}(\Package{typearea})'none' geändert werden kann.
\begin{Code}
\documentclass[paper=a4,pagesize]{tudscrreprt}
-\usepackage{selinput}
-\SelectInputMappings{adieresis={ä},germandbls={ß}}
\usepackage[T1]{fontenc}
+\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
\usepackage[ngerman]{babel}
\usepackage{blindtext}
@@ -696,8 +693,8 @@
\begin{Code}[escapechar=§]
\RequirePackage{fix-cm}
\documentclass§\OParameter{Klassenoptionen}\Parameter{Klasse}§
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
§\dots§
\begin{document}
§\dots§
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-introduction.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-introduction.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-introduction.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -249,7 +249,7 @@
\tudhyperdef*{sec:install:win}%
%
Zur Installation der Schriften des \CDs für das \TUDScript-Bundle ist das Archiv
-\hrfn{\Download{fonts/TUD-Script-fonts-Windows.zip}}{\File*{TUD-Script\_fonts\_Windows.zip}}
+\hrfn{\Download{fonts/TUD-Script_fonts_Windows.zip}}{\File*{TUD-Script\_fonts\_Windows.zip}}
vorgesehen. Dieses ist sowohl für \Distribution{\hologo{TeX}~Live}|?| als auch
\Distribution{\hologo{MiKTeX}}|?| nutzbar und enthält~-- bis auf die jeweiligen
Schriftarchive selbst~-- alle benötigten Dateien. Diese sollten nach dem
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-packages.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-packages.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-packages.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -168,7 +168,8 @@
Problemstellungen in einem Forum bereitgestellt werden. Alternativ dazu lässt
sich mit dem Paket \Package{inputenc}
(\Macro*{usepackage}[\OParameter{Eingabekodierung}\PParameter{inputenc}])
- die Eingabekodierung manuell einstellen.
+ die Eingabekodierung manuell einstellen. Das Paket \Package{fontenc} sollte
+ in jedem Fall \emph{zuvor} geladen werden.
\item[babel,polyglossia]
\index{Sprachunterstützung}%
\index{Bezeichner}%
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-preface.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-preface.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr-preface.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,4 +1,4 @@
-\addchap*{\prefacename}
+\addchap[tocentry={}]{\prefacename}
Die im Folgenden beschriebenen Klassen und Pakete wurden für das Erstellen von
\hologo{LaTeX}"=Dokumenten im \TUDCD entwickelt.%
\footnote{%
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/tudscr.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,7 +1,7 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrmanual}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\lstset{%
inputencoding=utf8,extendedchars=true,
literate=%
@@ -12,6 +12,7 @@
\usepackage{bookmark}
\TUDoption{ToDo}{true}
+\KOMAoptions{headings=optiontoheadandtoc}
%\tracinglabels[all]
%\tracingmarkup
@@ -25,7 +26,7 @@
\endgroup%
}
\faculty{\protect\cdurl}
-\date{27.03.2017}
+\date{29.03.2017}
\author{Falk Hanisch\thanks{\noexpand\mailto{\tudscrmail}}}
\subject{\TUDScript \vTUDScript{} basierend auf \KOMAScript}
\title{%
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathswap.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathswap.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathswap.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,8 +1,8 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrartcl}
\usepackage{tudscrtutorial}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\lstset{%
inputencoding=utf8,extendedchars=true,
literate=%
@@ -61,8 +61,8 @@
\begin{Preamble}
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrartcl}% andere Klassen sind möglich
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{microtype}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/mathtype.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,8 +1,8 @@
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrartcl}
\usepackage{tudscrtutorial}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\lstset{%
inputencoding=utf8,extendedchars=true,
literate=%
@@ -50,8 +50,8 @@
\begin{Preamble}
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman]{tudscrartcl}% andere Klassen sind möglich
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{microtype}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/treatise.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/treatise.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/doc/tutorials/treatise.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -4,8 +4,8 @@
cdgeometry=no,DIV=12,automark,%
]{tudscrartcl}
\usepackage{tudscrtutorial}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\lstset{%
inputencoding=utf8,extendedchars=true,
literate=%
@@ -155,7 +155,7 @@
\begin{document}
-\date{07.11.2016}
+\date{29.03.2017}
\author{Falk Hanisch\thanks{\noexpand\scriptsize\noexpand\mailto{\tudscrmail}}}
\title{%
Ein Anwenderleitfaden für das Erstellen einer wissenschaftlichen Abhandlung%
@@ -261,15 +261,18 @@
%
Bei der Verwendung von \Engine{pdfLaTeX} sollte zum einen die Eingabekodierung
des erstellten Datei spezifiziert werden. Das Paket \Package{selinput} erkennt
-automatisch, welche Kodierung der genutzte Editor verwendet. Zum anderen werden
-die Schriften in der Ausgabe ebenfalls kodiert. Mit dem Paket \Package{fontenc}
-lässt sich die verwendete Schriftkodierung für das Dokument spezifizieren,
-wobei im Normalfall mit der Option~\Option{T1}(\Package{fontenc}) die
-europäischen Zeichen aktiviert werden sollten.
+automatisch, welche Kodierung der genutzte Editor verwendet. Alternativ lässt
+sich die Eingabekodierung mit dem Paket \Package{inputenc} auch manuell
+festgelegen. Zum anderen werden die Schriften in der Ausgabe ebenfalls kodiert.
+Mit dem Paket \Package{fontenc} lässt sich die verwendete Schriftkodierung für
+das Dokument spezifizieren, wobei im Normalfall die europäischen Zeichen mit
+der Option~\Option{T1}(\Package{fontenc}) aktiviert werden sollten. Es wird
+empfohlen, das Paket \Package{fontenc} \emph{vor} \Package{selinput} respektive
+\Package{inputenc} zu laden.
%
\begin{Preamble}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\end{Preamble}
%
Für die \KOMAScript-Klassen wird außerdem das Paket \Package{scrhack}
@@ -294,21 +297,21 @@
machen, um bei der Finalisierung des Dokumentes keine böse Überraschung bei
Seitenumbrüchen oder der Position von Gleitobjekten zu erleben.
-Zuallererst gilt zu entscheiden, ob das Dokument einseitig oder beidseitig
+Zuerst gilt es zu entscheiden, ob das Dokument einseitig oder beidseitig
gesetzt werden soll. Ist Letzteres der Fall, so sollte die \KOMAScript-Option
\Option{twoside}(\Package{typearea}) als Klassenoption angegeben werden. Im
nächsten Schritt ist der zu verwendende Satzspiegel festzulegen. Hierfür kann
die \TUDScript-Option \Option{cdgeometry}'manual' verwendet werden, welche im
-\TUDScript-Handbuch beschrieben wird. Normalerweise wird das Dokument im
+\TUDScript-Handbuch beschrieben ist. Normalerweise wird das Dokument im
asymmetrischen Layout des \CDs gesetzt.
+%
+Dieses Verhalten wird mit \Option*{cdgeometry=false}'manual' deaktiviert und
+der Satzspiegel durch das Paket \Package{typearea} nach typografischen
+Gesichtspunkten konstruiert. Dabei ist für dessen Aufteilung maßgeblich die
+\KOMAScript-Option \Option{DIV}(\Package{typearea}) verantwortlich, mit der
+\KOMAScript"=Option \Option{BCOR}(\Package{typearea}) wird die Bindekorrektur
+angegeben. Diese wird in \autoref{sec:bcor} erläutert.
-Dieses Verhalten kann mit \Option*{cdgeometry=false}'manual' deaktiviert werden
-und der Satzspiegel wird durch das Paket \Package{typearea} nach typografischen
-Gesichtspunkten konstruiert. Dabei ist für die Aufteilung des Satzspiegels
-maßgeblich die \KOMAScript-Option \Option{DIV}(\Package{typearea})
-verantwortlich. Mit der \KOMAScript"=Option \Option{BCOR}(\Package{typearea})
-wird die Bindekorrektur angegeben. Diese wird in \autoref{sec:bcor} erläutert.
-
\subsection{Änderung des Zeilenabstandes (Durchschuss)}
Auf die Änderung des standardmäßigen Zeilenabstandes sollte aus typografischer
Sicht bei der Verwendung einer Standardschrift im Normalfall verzichtet werden.
@@ -2632,8 +2635,8 @@
\begin{Hint}
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[ngerman,§\PName{Klassenoptionen}§]§\Parameter{Dokumentklasse}§
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
§\dots§
\end{Hint}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-area.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-area.dtx}[%
- 2017/03/27 v2.05k TUD-Script (type or page area)%
+ 2017/03/29 v2.05l TUD-Script (type or page area)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-base.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-base.dtx}[%
- 2017/03/27 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
%</driver>
%<package&base>\ProvidesPackage{tudscrbase}[%
%<*driver|package&base>
@@ -63,8 +63,8 @@
%<*driver>
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-color.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-color.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-color.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-color.dtx}[%
- 2017/03/14 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
%</driver>
%<package>\ProvidesPackage{tudscrcolor}[%
%<*driver|package>
@@ -63,8 +63,8 @@
%<*driver>
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-comp.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,4 +1,4 @@
-% \CheckSum{1492}
+% \CheckSum{1494}
% \iffalse meta-comment
%
% TUD-Script -- Corporate Design of Technische Universität Dresden
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-comp.dtx}[%
- 2017/03/27 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
%</driver>
%<package&identify&comp&base>\ProvidesPackage{tudscrcomp}[%
%<package&identify&comp&book>\ProvidesPackage{tudscrcomp-book}[%
@@ -67,8 +67,8 @@
%<*driver>
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
@@ -265,7 +265,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD at Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -273,7 +273,7 @@
KOMA-Script v\TUD at Version@KOMA is required%
}{%
\TUD at Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD at Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD at Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
%</class>
@@ -332,6 +332,8 @@
% \changes{v2.05i}{2017/02/17}{neu}^^A
% \begin{macro}{\tud at v@2.05k}
% \changes{v2.05k}{2017/03/27}{neu}^^A
+% \begin{macro}{\tud at v@2.05l}
+% \changes{v2.05l}{2017/03/29}{neu}^^A
% \begin{macro}{\tud at v@last}
% \changes{v2.02}{2014/08/22}{neu}^^A
% \changes{v2.03}{2015/01/13}{angepasst}^^A
@@ -365,9 +367,11 @@
\csdef{tud at v@2.05h}{3}
\csdef{tud at v@2.05i}{3}
\csdef{tud at v@2.05k}{3}
+\csdef{tud at v@2.05l}{3}
\csdef{tud at v@last}{3}
% \end{macrocode}
% \end{macro}^^A \tud at v@last
+% \end{macro}^^A \tud at v@2.05l
% \end{macro}^^A \tud at v@2.05k
% \end{macro}^^A \tud at v@2.05i
% \end{macro}^^A \tud at v@2.05h
@@ -429,7 +433,13 @@
\fi%
}{%
\def\tud at reserved{%
- \ClassWarningNoLine{\TUD at Class@Name}{%PackageWarning!
+%<*class>
+ \ClassWarningNoLine{\TUD at Class@Name}%
+%</class>
+%<*package&fonts>
+ \PackageWarningNoLine{tudscrfonts}%
+%</package&fonts>
+ {%
Erroneous usage of `\string\tud at if@v at lower'.\MessageBreak%
There's no defined macro `\string\tud at v@\@tempa'%
}%
@@ -451,10 +461,10 @@
% \begin{macrocode}
\TUD at key{fontspec}[true]{%
%<*class>
- \ClassWarning{\TUD at Class@Name}%
+ \ClassWarningNoLine{\TUD at Class@Name}%
%</class>
%<*package&fonts>
- \PackageWarning{tudscrfonts}%
+ \PackageWarningNoLine{tudscrfonts}%
%</package&fonts>
{%
The option key `fontspec' is deprecated\MessageBreak%
@@ -495,7 +505,7 @@
\FamilyKeyStateProcessed%
}%
\if at tud@x at fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
% \end{macrocode}
@@ -875,9 +885,9 @@
%<*class>
\AtEndOfClass%
%</class>
-%<*package>
+%<*package&fonts>
\AtEndOfPackage%
-%</package>
+%</package&fonts>
{%
\tud at if@v at lower{2.04}{\TUDoptions{relspacing=false}}{}%
}
@@ -1733,8 +1743,8 @@
\ifx\usepackage\RequirePackage
\newcommand*\tud at fontsfix@maybe at err{%
\PackageError{fix-tudscrfonts}{Package too late}{%
- You must load `fix-tudscrfonts' before\MessageBreak%
- any document class with `\string\RequirePackage'%
+ You must load `fix-tudscrfonts' with\MessageBreak%
+ `\string\RequirePackage' before any document class.%
}%
}%
% \end{macrocode}
@@ -1749,7 +1759,7 @@
`tudbeamer', `tudfax', `tudform', `tudhaus',\MessageBreak%
and `tudletter' as well as `tudposter'\MessageBreak%
and `tudmathposter'. Otherwise it's adequate\MessageBreak%
- to use package `tudscrfonts' as usual%
+ to use package `tudscrfonts' as usual.%
}%
}%
\fi
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-doc.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,13 +51,13 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-doc.dtx}[%
- 2017/03/27 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
(source code documentation based on scrartcl/scrdoc)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-fields.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-fields.dtx}[%
- 2017/03/27 v2.05k TUD-Script (input fields)%
+ 2017/03/29 v2.05l TUD-Script (input fields)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-fonts.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -1,4 +1,4 @@
-% \CheckSum{1297}
+% \CheckSum{1307}
% \iffalse meta-comment
%
% TUD-Script -- Corporate Design of Technische Universität Dresden
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-fonts.dtx}[%
- 2017/03/27 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
%</driver>
%<package&identify>\ProvidesPackage{tudscrfonts}[%
%<*driver|package&identify>
@@ -63,8 +63,8 @@
%<*driver>
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
@@ -197,7 +197,25 @@
% bereits vor der Abarbeitung der Optionen definiert werden.
% \begin{macrocode}
\newif\if at tud@x at fontspec@enabled
-\AfterPackage*{fontspec}{\@tud at x@fontspec at enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud at x@fontspec at enabledtrue%
+ }{%
+ \@tud at x@fontspec at enabledfalse%
+%<*class>
+ \ClassWarningNoLine{\TUD at Class@Name}%
+%</class>
+%<*package>
+ \PackageWarningNoLine{tudscrfonts}%
+%</package>
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver at fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
% \end{macrocode}
% \end{macro}^^A \if at tud@x at fontspec@enabled
%
@@ -237,52 +255,26 @@
% \end{macro}^^A \tud at univers
% \begin{macro}{\tud at font@check}
% \changes{v2.04}{2015/03/10}{neu}^^A
+% \begin{macro}{\tud at font@missing at wrn}
+% \changes{v2.05l}{2017/03/29}{neu}^^A
+% \begin{macro}{\tud at font@math at missing@wrn}
+% \changes{v2.05l}{2017/03/29}{neu}^^A
% \begin{macro}{\tud at x@fontspec at noerror}
% \changes{v2.05}{2015/12/14}{neu}^^A
+% \changes{v2.05l}{2017/03/28}{unnötig seit \pkg{fontspec} `2017/01/24'}^^A
% Mit \cs{tud at font@check} wird überprüft, ob die benötigten Schriften \Univers
% und \DIN im PostScript- bzw. OTF-Format installiert sind und die passenden
-% Schalter gesetzt. Beim Nichtvorhandensein der Schriften wird im eine Warnung
-% ausgegeben und eine Rückfallebene definiert.
-%
-% Da das Paket \pkg{fontspec} keinen Befehl zum Prüfen auf das Vorhandensein
-% einer bestimmten Schrift bereitstellt, muss hier etwas getrickst werden. Bei
-% der Wahl einer nicht installierten Schrift wird normalerweise ein Fehler
-% ausgegeben. Mit \cs{tud at x@fontspec at noerror} wird dies verhindert, indem die
-% erzeugte Fehlermeldung mit \cs{msg\_redirect\_name:nnn} unterdrückt wird.
+% Schalter gesetzt. Beim Nichtvorhandensein der Schriften wird eine Warnung
+% ausgegeben und eine Rückfallebene definiert. Dies geschieht für OTF-Schriften
+% mit dem Befehl \cs{IfFontExistsTF}. Für die Mathematikschriften ist es
+% unerheblich, ob das Paket \pkg{fontspec} genutzt wird, da hier immer die
+% PostScript-Schriften zum Einsatz kommen.
% \begin{macrocode}
-\newcommand*\tud at x@fontspec at noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if at tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud at x@fontspec at noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
-% \end{macrocode}
-% Jetzt kann es mit dem eigentlichen Überprüfen der Schriften losgehen. Für das
-% Prüfen der Mathematikschriften ist es unerheblich, ob \pkg{fontspec} genutzt
-% wird, da hier immer die PostScript-Schriften zum Einsatz kommen.
-% \begin{macrocode}
\newcommand*\tud at font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
-%<*class>
- \ClassWarningNoLine{\TUD at Class@Name}%
-%</class>
-%<*package>
- \PackageWarningNoLine{tudscrfonts}%
-%</package>
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if at tud@cdmath%
+ \tud at font@math at missing@wrn{##1}%
\fi%
}%
% \end{macrocode}
@@ -291,7 +283,12 @@
% sollen.
% \begin{macrocode}
\@tempa{OT1}{\tud at univers}{\@tud at universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if at tud@cdmath%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
+ \fi%
% \end{macrocode}
% Für jede der OTF-Schriften wird eine Warnung ausgegeben, falls diese nicht
% installiert ist. Um sicher zu gehen, dass das Layout komplett genutzt werden
@@ -300,38 +297,24 @@
% \begin{macrocode}
\if at tud@x at fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
-%<*class>
- \ClassWarningNoLine{\TUD at Class@Name}%
-%</class>
-%<*package>
- \PackageWarningNoLine{tudscrfonts}%
-%</package>
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud at x@fontspec at noerror%
- \global\@tud at universtrue%
- \@tempc{Univers Light}{\global\@tud at universfalse}%
- \@tempc{Univers}{\global\@tud at universfalse}%
- \@tempc{Univers Bold}{\global\@tud at universfalse}%
- \@tempc{Univers Black}{\global\@tud at universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud at universfalse}%
- \global\@tud at dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud at dinboldfalse}%
- \endgroup%
+ \@tud at universtrue%
+ \@tempc{Univers Light}{\@tud at universfalse}%
+ \@tempc{Univers}{\@tud at universfalse}%
+ \@tempc{Univers Bold}{\@tud at universfalse}%
+ \@tempc{Univers Black}{\@tud at universfalse}%
+ \@tempc{Univers LightOblique}{\@tud at universfalse}%
+ \@tempc{Univers Oblique}{\@tud at universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud at universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud at universfalse}%
+ \@tud at dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud at dinboldfalse}%
\else%
% \end{macrocode}
% Ist \pkg{fontspec} nicht aktiv, wird auf die Schriften für den Fließtext im
@@ -339,36 +322,80 @@
% \begin{macrocode}
\def\@tempc##1{%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
-%<*class>
- \ClassWarningNoLine{\TUD at Class@Name}%
-%</class>
-%<*package>
- \PackageWarningNoLine{tudscrfonts}%
-%</package>
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if at tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud at univers}{\@tud at universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\undef\tud at font@check%
}
+\newcommand*\tud at font@missing at wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if at tud@x at fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if at tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+%<*class>
+ \ClassWarning{\TUD at Class@Name}{\@tempa}%
+%</class>
+%<*package>
+ \PackageWarning{tudscrfonts}{\@tempa}%
+%</package>
+ \endgroup%
+}
+\newcommand*\tud at font@math at missing@wrn[1]{%
+%<*class>
+ \ClassWarning{\TUD at Class@Name}%
+%</class>
+%<*package>
+ \PackageWarning{tudscrfonts}%
+%</package>
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
% \end{macrocode}
% \end{macro}^^A \tud at x@fontspec at noerror
+% \end{macro}^^A \tud at font@missing at wrn
+% \end{macro}^^A \tud at font@math at missing@wrn
% \end{macro}^^A \tud at font@check
%
% \subsection{Kompatibilität der Schriften mit verschiedenen Pakete}
@@ -460,6 +487,7 @@
% \changes{v2.02}{2014/07/08}{Schlüsselwerte für \opt{cdhead}}^^A
% \changes{v2.02}{2014/08/29}{Schlüsselwerte für \opt{fontspec}}^^A
% \changes{v2.05}{2016/04/04}{Schlüsselwerte für \val{ultrabold}}^^A
+% \changes{v2.05l}{2017/03/29}{Standardeinstellungen für \opt{cdmath}}^^A
% \begin{macro}{\tud at cdfont@num}
% \begin{macro}{\if at tud@cdfont at din}
% \begin{macro}{\if at tud@cdfont at ultrabold}
@@ -530,12 +558,15 @@
% \begin{macrocode}
\ifcase\@tempa\relax% false
\renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% heavy
\renewcommand*\tud at cdfont@num{2}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
% \end{macrocode}
% Für die Definition der fetten Schriftstärke kommt je nach Einstellung ein
@@ -546,6 +577,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% ultrabold
\@tud at cdfont@ultraboldtrue%
@@ -552,6 +584,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
% \end{macrocode}
% Hier wird die Verwendung von \DIN für die Überschirften festgelegt.
@@ -617,6 +650,7 @@
\csname @tud at fontsize@settrue\endcsname%
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -717,23 +751,18 @@
\if at atdocument%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
\if at tud@univers\else%
-%<*class>
- \ClassWarning{\TUD at Class@Name}%
-%</class>
-%<*package>
- \PackageWarning{tudscrfonts}%
-%</package>
- {`Univers' fonts not found}%
+ \tud at font@missing at wrn{Univers}%
\fi%
\if at tud@dinbold\else%
-%<*class>
- \ClassWarning{\TUD at Class@Name}%
-%</class>
-%<*package>
- \PackageWarning{tudscrfonts}%
-%</package>
- {`DIN Bold' fonts not found}%
+ \tud at font@missing at wrn{DIN-Bold}%
\fi%
+% \end{macrocode}
+% Sind die Schriften des \CDs nicht vorhanden, wird die Option zurückgesetzt.
+% \begin{macrocode}
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
% \end{macrocode}
@@ -759,10 +788,6 @@
\tud at cmd@restore{mdseries at tt}%
\fi%
% \end{macrocode}
-% Die Mathematikschriften werden auf ihr Standardverhalten zurückgesetzt.
-% \begin{macrocode}
- \bool at std@lock{@tud at cdmath}{false}%
-% \end{macrocode}
% Innerhalb der Klassen wird auch die Schrift im Querbalken zurückgsetzt, wenn
% kein Layout im \CD genutzt wird.
% \begin{macrocode}
@@ -797,11 +822,6 @@
\tud at cmd@store{mdseries at tt}%
\fi%
% \end{macrocode}
-% Die Mathematikschriften werden bei der Verwendung der Schriften des \CDs~--
-% falls nicht anders durch den Anwender definiert~-- auf Serifenlose gesetzt.
-% \begin{macrocode}
- \bool at std@lock{@tud at cdmath}{true}%
-% \end{macrocode}
% Die Schrift im Querbalken wird bei den Klassen angepasst.
% \begin{macrocode}
%<*class>
@@ -813,31 +833,23 @@
% \begin{macrocode}
\if at tud@univers%
\if at tud@x at fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud at univers%
- ]%
+ \setsansfont{Univers}[\tud at x@fontspec at set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud at univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud at univers t%
]%
% \end{macrocode}
% \dots nach dem NFSS.
@@ -984,9 +996,17 @@
% \end{macro}^^A \tud at font@skip at set
% \begin{macro}{\tud at font@init}
% \changes{v2.04}{2015/03/10}{neu}^^A
+% \begin{macro}{\tud at x@fontspec at fam@univ}
+% \changes{v2.05l}{2017/03/28}{neu}^^A
+% \begin{macro}{\tud at x@fontspec at set@univ}
+% \changes{v2.05l}{2017/03/28}{neu}^^A
+% \begin{macro}{\tud at x@fontspec at fam@din}
+% \changes{v2.05l}{2017/03/28}{neu}^^A
+% \begin{macro}{\tud at x@fontspec at set@din}
+% \changes{v2.05l}{2017/03/28}{neu}^^A
% \begin{macro}{\tud at font@fallback}
% \changes{v2.05}{2015/12/14}{neu}^^A
-% \begin{macro}{\tud at font@wrn}
+% \begin{macro}{\tud at font@fallback at wrn}
% \changes{v2.05}{2015/12/14}{neu}^^A
% \begin{macro}{\univln}
% \begin{macro}{\univrn}
@@ -1010,10 +1030,58 @@
% Das Makro \cs{tud at font@init} wird für die Defintion aller Befehle zur Auswahl
% der Schriften des \CDs verwendet.
% \begin{macrocode}
-\newcommand*\tud at dinbn{}
-\let\tud at dinbn\relax
\newcommand*\tud at font@init{%
% \end{macrocode}
+% Wurden alle notwendigen OTF"~Schriften gefunden, werden die zwei Makros
+% definiert, in welchen die notwendigen Einstellungen gespeichert werden.
+% Anschließend werden zwei Schriftfamilien erzeugt, damit später auf diese
+% zugegriffen werden kann bzw. die Schriften geladen werden.
+% \begin{macrocode}
+ \if at tud@x at fontspec@enabled%
+ \if at tud@univers%
+ \newcommand*\tud at x@fontspec at set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@univ{Univers}[%
+ \tud at x@fontspec at set@univ,NFSSFamily=\tud at univers%
+ ]%
+ \fi%
+ \if at tud@dinbold%
+ \newcommand*\tud at x@fontspec at set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@din{DIN-Bold}[%
+ \tud at x@fontspec at set@din,NFSSFamily=\tud at dinbold%
+ ]%
+ \fi%
+ \fi%
+% \end{macrocode}
% Es werden mehrere Schalter zur expliziten Auswahl für die Schriftschnitte
% \textuln{Univers~45~Light}, \texturn{Univers~55~Regular},
% \textubn{Univers~65~Bold}, \textuxn{Univers~75~Black},
@@ -1041,32 +1109,16 @@
\newrobustcmd*\univrn{\tud at font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud at font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud at font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud at font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud at font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud at font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud at font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud at font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud at font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud at font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
% \end{macrocode}
% Nach der \Univers-Schriftfamilie wird für \DIN äquivalent verfahren.
% \begin{macrocode}
\if at tud@dinbold%
- \if at tud@x at fontspec@enabled%
- \newfontface\tud at dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud at dinbold%
- ]%
- \else%
- \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
\if at tud@dinboldmath%
\appto\tud at dinbn{\mathversion{dinbold}}%
\fi%
@@ -1078,7 +1130,7 @@
% \begin{macrocode}
\else%
\newrobustcmd*\tud at dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud at font@wrn{DIN Bold}\tud at dinbn}%
+ \newrobustcmd*\dinbn{\tud at font@fallback at wrn{DIN-Bold}\tud at dinbn}%
\fi%
% \end{macrocode}
% Außerdem werden für die Schriften noch die entsprechenden Textauswahlbefehle
@@ -1113,10 +1165,10 @@
% Warnung definiert.
% \begin{macrocode}
\newcommand*\tud at font@fallback[3]{%
- \tud at font@wrn{#1}%
+ \tud at font@fallback at wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud at font@wrn[1]{%
+\newcommand*\tud at font@fallback at wrn[1]{%
%<*class>
\ClassWarning{\TUD at Class@Name}%
%</class>
@@ -1148,8 +1200,12 @@
% \end{macro}^^A \univbn
% \end{macro}^^A \univrn
% \end{macro}^^A \univln
-% \end{macro}^^A \tud at font@wrn
+% \end{macro}^^A \tud at font@fallback at wrn
% \end{macro}^^A \tud at font@fallback
+% \end{macro}^^A \tud at x@fontspec at set@din
+% \end{macro}^^A \tud at x@fontspec at fam@din
+% \end{macro}^^A \tud at x@fontspec at set@univ
+% \end{macro}^^A \tud at x@fontspec at fam@univ
% \end{macro}^^A \tud at font@init
% \begin{macro}{\cdfont}
% \changes{v2.04}{2015/03/04}{neu}^^A
@@ -1268,6 +1324,7 @@
% für das gesamte Dokument umgestellt werden.
% \begin{macrocode}
\bool at lock{@tud at cdmath}
+\bool at std@lock{@tud at cdmath}{true}%
\TUD at key{cdmath}[true]{%
\TUD at set@numkey{cdmath}{@tempa}{%
\TUD at bool@numkey,%
@@ -1697,27 +1754,20 @@
% Warnung erzeugt.
% \begin{macrocode}
\if at atdocument%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \if at tud@universmath\else%
-%<*class>
- \ClassWarning{\TUD at Class@Name}%
-%</class>
-%<*package>
- \PackageWarning{tudscrfonts}%
-%</package>
- {`Univers' math fonts not found}%
- \fi%
- \if at tud@dinboldmath\else%
-%<*class>
- \ClassWarning{\TUD at Class@Name}%
-%</class>
-%<*package>
- \PackageWarning{tudscrfonts}%
-%</package>
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if at tud@cdmath%
+ \if at tud@universmath\else%
+ \tud at font@math at missing@wrn{Univers}%
\fi%
+ \if at tud@dinboldmath\else%
+ \tud at font@math at missing@wrn{DIN-Bold}%
+ \fi%
+% \end{macrocode}
+% Sind die Mathematikschriften im \CD nicht vorhanden, wird die entsprechende
+% Option zurückgesetzt.
+% \begin{macrocode}
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\if at tud@universmath%
@@ -1804,6 +1854,11 @@
% \begin{macrocode}
%<package> \ifdef{\sectfont}{}{\let\sectfont\relax}%
% \end{macrocode}
+% Nachdem auf die Schriften geprüft wurde, werden noch die Schriftschalter und
+% die dazugehörigen Befehle definiert.
+% \begin{macrocode}
+ \tud at font@init%
+% \end{macrocode}
% Damit die Schrift im Dokument später noch umgestellt werden kann, werden
% sämtliche Einstellungen erst am Ende der Präambel gesichert. Deshalb wird
% der dafür verantwortliche Befehl \cs{tud at font@set} hier zum ersten Mal
@@ -1813,12 +1868,6 @@
% \begin{macrocode}
\tud at font@set%
% \end{macrocode}
-% Nachdem auf die Schriften geprüft wurde, werden noch die Schriftschalter und
-% die dazugehörigen Befehle definiert. Außerdem wird eine Warnung ausgegeben,
-% sobald mindestens eine der notwendigen OpenType-Schriften fehlt.
-% \begin{macrocode}
- \tud at font@init%
-% \end{macrocode}
% Die Einstellungen für den Mathematiksatz erfolgen erst zu Dokumentbeginn, um
% insbesondere auf Einstellungen von \pkg{fontspec} reagieren zu können. Da es
% so gut wie keine freien OpenType"=Schriften für den mathmatischen Formelsatz
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-frontmatter.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-frontmatter.dtx}[%
- 2017/03/27 v2.05k TUD-Script (frontmatter)%
+ 2017/03/29 v2.05l TUD-Script (frontmatter)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-layout.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-layout.dtx}[%
- 2017/03/27 v2.05k TUD-Script (layout)%
+ 2017/03/29 v2.05l TUD-Script (layout)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
@@ -1881,6 +1881,7 @@
% Besser suchbare Makronamen (z.B. \cs{tud at sec@chapter}) implementieren%
% }[v2.06]
% \ToDo{Reimplementierung mit \cs{DeclareSectionCommand}}[v2.06]
+% \ToDo{headings=optiontoheadandtoc in allen Kombinationen beachten!}[v2.06]
% \ToDo{\cs{ifcsdef\{scr at v@3.18\}} raus, \KOMAScript~v3.22 obligatorisch}[v2.06]
% \ToDo{Alle Elemente für vertikalen Freiraum vor Änderungen schützen}[v2.06]
% \ToDo{\cs{...pagecolor} (part/chapter/title)}[v2.06]
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-locale.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-locale.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-locale.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-locale.dtx}[%
- 2017/03/27 v2.05k TUD-Script (localization)%
+ 2017/03/29 v2.05l TUD-Script (localization)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-manual.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-manual.dtx}[%
- 2017/03/27 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
%</driver>
%<package&identify>\ProvidesPackage{tudscrtutorial}[%
%<*driver|package&identify>
@@ -63,8 +63,8 @@
%<*driver>
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
@@ -160,7 +160,7 @@
\@ifpackagelater{geometry}{2010/09/13}{%
\ClassWarning{\TUD at Class@Name}{%
Package `geometry' was updated so some patches\MessageBreak%
- are maybe outdated
+ are maybe outdated%
}%
}{}%
%</!doc>
@@ -755,7 +755,7 @@
{%
It is strongly recommended to load package `hyperref'.\MessageBreak%
Nevertheless, essential commands are rudimentarily\MessageBreak%
- defined. At least the package `url' is loaded.%
+ defined. At least the package `url' is loaded%
}%
%</!doc>
% \end{macrocode}
@@ -2753,7 +2753,7 @@
\ClassWarning{tudscrmanual}{%
%<*class>
Label #1\MessageBreak%
- is missing, no cross-reference created.%
+ is missing, no cross-reference created%
%</class>
%<*package>
You've used the unknown cross-reference\MessageBreak%
@@ -5447,8 +5447,8 @@
\begin{filecontents*}{\tud at tut@temp-standalone.tex}
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrreprt}
+\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrsupervisor}
\usepackage{isodate}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-mathswap.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-mathswap.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-mathswap.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-mathswap.dtx}[%
- 2017/03/14 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
%</driver>
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{mathswap}[%
@@ -64,8 +64,8 @@
%<*driver>
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-misc.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-misc.dtx}[%
- 2017/03/27 v2.05k TUD-Script (miscellaneous)%
+ 2017/03/29 v2.05l TUD-Script (miscellaneous)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
@@ -321,7 +321,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-pagestyle.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-pagestyle.dtx}[%
- 2017/03/27 v2.05k TUD-Script (pagestyle)%
+ 2017/03/29 v2.05l TUD-Script (pagestyle)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
@@ -859,7 +859,7 @@
\newcommand*\tud at head@fontsize{}
\newcommand*\tud at head@font at light{}
\newcommand*\tud at head@font at bold{}
-\newcommand*\tud at head@font@@bold{}
+%<class&poster>\newcommand*\tud at head@font@@bold{}
\newcommand*\tud at head@font at set{%
% \end{macrocode}
% Die Option \opt{cdhead} wird ausgewertet. Sollte diese inkompatibel gesetzt
@@ -886,9 +886,11 @@
{\sfdefault}{\mddefault}{\updefault}{\tud at head@fontsize}%
\DeclareFixedFont{\tud at head@font at bold}{\encodingdefault}%
{\sfdefault}{\bfdefault}{\updefault}{\tud at head@fontsize}%
+%<*class&poster>
\protected\gdef\tud at head@font@@bold{%
\usefont{\encodingdefault}{\sfdefault}{\bfdefault}{\updefault}%
}%
+%</class&poster>
% \end{macrocode}
% Und jetzt die eigentlichen Schriften im \CD.
% \begin{macrocode}
@@ -903,9 +905,11 @@
\fi%
\DeclareFixedFont{\tud at head@font at bold}{\encodingdefault}%
{\tud at univers}{b}{n}{\tud at head@fontsize}%
+%<*class&poster>
\protected\gdef\tud at head@font@@bold{%
\usefont{\encodingdefault}{\tud at univers}{b}{n}%
}%
+%</class&poster>
\fi%
\fi%
\global\@tud at head@font at setfalse%
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-supervisor.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-supervisor.dtx}[%
- 2017/03/14 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
%</driver>
%<package>\ProvidesPackage{tudscrsupervisor}[%
%<*driver|package>
@@ -63,8 +63,8 @@
%<*driver>
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-texindy.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-texindy.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-texindy.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-texindy.dtx}[%
- 2017/03/27 v2.05k TUD-Script (texindy style files)%
+ 2017/03/29 v2.05l TUD-Script (texindy style files)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-title.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,12 +51,12 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-title.dtx}[%
- 2017/03/27 v2.05k TUD-Script (title)%
+ 2017/03/29 v2.05l TUD-Script (title)%
]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
@@ -1411,7 +1411,7 @@
}{%
\ifstr{#1}{custom}{\bool at set@lock{@tud at cdgeometry@cover}{false}}{%
\ifstr{#1}{user}{\bool at set@lock{@tud at cdgeometry@cover}{false}}{%
- \TUD at parameter@error{cdgeometry}{true,false}%
+ \TUD at parameter@error{cdgeometry}{true, false}%
}%
}%
}%
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-twocolfix.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-twocolfix.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-twocolfix.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -51,7 +51,7 @@
%<*driver>
\ifx\ProvidesFile\@undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-twocolfix.dtx}[%
- 2017/03/14 v2.05k TUD-Script\space%
+ 2017/03/29 v2.05l TUD-Script\space%
%</driver>
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{twocolfix}[%
@@ -64,8 +64,8 @@
%<*driver>
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscr-version.dtx 2017-03-30 21:33:00 UTC (rev 43649)
@@ -131,7 +131,7 @@
% \end{macrocode}
% \ToDo{Version eintragen}[Release]
% \begin{macrocode}
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
% \end{macrocode}
% \end{macro}^^A \TUDScriptVersionNumber
@@ -147,8 +147,8 @@
% \iffalse
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/source/latex/tudscr/tudscrsource.tex
===================================================================
--- trunk/Master/texmf-dist/source/latex/tudscr/tudscrsource.tex 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/source/latex/tudscr/tudscrsource.tex 2017-03-30 21:33:00 UTC (rev 43649)
@@ -6,8 +6,8 @@
\ProvidesFile{tudscrsource.tex}[\TUDScriptVersion (sourcedoc)]
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman,xindy]{tudscrdoc}
+\usepackage[T1]{fontenc}
\usepackage{selinput}\SelectInputMappings{adieresis={ä},germandbls={ß}}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrfonts} % only load this package, if the fonts are installed
\KOMAoptions{parskip=half-}
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/fix-tudscrfonts.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -12,7 +12,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -55,7 +55,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -68,7 +68,7 @@
}{}
%%% From File: tudscr-comp.dtx
\ProvidesPackage{fix-tudscrfonts}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package for font fixes
(compatibility for old tud(scr) classes)%
]
@@ -105,8 +105,8 @@
\ifx\usepackage\RequirePackage
\newcommand*\tud at fontsfix@maybe at err{%
\PackageError{fix-tudscrfonts}{Package too late}{%
- You must load `fix-tudscrfonts' before\MessageBreak%
- any document class with `\string\RequirePackage'%
+ You must load `fix-tudscrfonts' with\MessageBreak%
+ `\string\RequirePackage' before any document class.%
}%
}%
\else
@@ -117,7 +117,7 @@
`tudbeamer', `tudfax', `tudform', `tudhaus',\MessageBreak%
and `tudletter' as well as `tudposter'\MessageBreak%
and `tudmathposter'. Otherwise it's adequate\MessageBreak%
- to use package `tudscrfonts' as usual%
+ to use package `tudscrfonts' as usual.%
}%
}%
\fi
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/mathswap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/mathswap.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/mathswap.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -8,7 +8,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -29,7 +29,7 @@
%%% From File: tudscr-mathswap.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mathswap}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(swap mathematical separators)%
]
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrartcl.cls 2017-03-30 21:33:00 UTC (rev 43649)
@@ -29,7 +29,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -72,13 +72,13 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
\newcommand*\TUD at ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD at Class@KOMA{#2}%
@@ -118,7 +118,20 @@
}%
]{tudscrfonts}
\newif\if at tud@x at fontspec@enabled
-\AfterPackage*{fontspec}{\@tud at x@fontspec at enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud at x@fontspec at enabledtrue%
+ }{%
+ \@tud at x@fontspec at enabledfalse%
+ \ClassWarningNoLine{\TUD at Class@Name}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver at fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if at tud@cdfont at din
\newif\if at tud@cdfont at ultrabold
\@tud at cdfont@dintrue
@@ -172,12 +185,15 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% heavy
\renewcommand*\tud at cdfont@num{2}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% normalbold
\@tud at cdfont@ultraboldfalse%
@@ -184,6 +200,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% ultrabold
\@tud at cdfont@ultraboldtrue%
@@ -190,6 +207,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% nodin
\@tud at cdfont@dinfalse%
@@ -221,6 +239,7 @@
\csname @tud at fontsize@settrue\endcsname%
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -250,6 +269,7 @@
\FamilyKeyStateProcessed%
}
\bool at lock{@tud at cdmath}
+\bool at std@lock{@tud at cdmath}{true}%
\TUD at key{cdmath}[true]{%
\TUD at set@numkey{cdmath}{@tempa}{%
\TUD at bool@numkey,%
@@ -946,7 +966,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD at Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -954,7 +974,7 @@
KOMA-Script v\TUD at Version@KOMA is required%
}{%
\TUD at Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD at Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD at Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
}
@@ -984,6 +1004,7 @@
\csdef{tud at v@2.05h}{3}
\csdef{tud at v@2.05i}{3}
\csdef{tud at v@2.05k}{3}
+\csdef{tud at v@2.05l}{3}
\csdef{tud at v@last}{3}
\newcommand*\tud at v@get[2]{%
\begingroup%
@@ -1007,7 +1028,8 @@
\fi%
}{%
\def\tud at reserved{%
- \ClassWarningNoLine{\TUD at Class@Name}{%PackageWarning!
+ \ClassWarningNoLine{\TUD at Class@Name}%
+ {%
Erroneous usage of `\string\tud at if@v at lower'.\MessageBreak%
There's no defined macro `\string\tud at v@\@tempa'%
}%
@@ -1017,7 +1039,7 @@
\tud at reserved%
}
\TUD at key{fontspec}[true]{%
- \ClassWarning{\TUD at Class@Name}%
+ \ClassWarningNoLine{\TUD at Class@Name}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -1037,7 +1059,7 @@
\FamilyKeyStateProcessed%
}%
\if at tud@x at fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD at key{cdfonts}[true]{%
@@ -1236,7 +1258,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
@@ -1316,88 +1338,103 @@
\newcommand*\tud at dinbold{0m6}
\newif\if at tud@dinbold
\newif\if at tud@dinboldmath
-\newcommand*\tud at x@fontspec at noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if at tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud at x@fontspec at noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud at font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if at tud@cdmath%
+ \tud at font@math at missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud at univers}{\@tud at universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if at tud@cdmath%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
+ \fi%
\if at tud@x at fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud at x@fontspec at noerror%
- \global\@tud at universtrue%
- \@tempc{Univers Light}{\global\@tud at universfalse}%
- \@tempc{Univers}{\global\@tud at universfalse}%
- \@tempc{Univers Bold}{\global\@tud at universfalse}%
- \@tempc{Univers Black}{\global\@tud at universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud at universfalse}%
- \global\@tud at dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud at dinboldfalse}%
- \endgroup%
+ \@tud at universtrue%
+ \@tempc{Univers Light}{\@tud at universfalse}%
+ \@tempc{Univers}{\@tud at universfalse}%
+ \@tempc{Univers Bold}{\@tud at universfalse}%
+ \@tempc{Univers Black}{\@tud at universfalse}%
+ \@tempc{Univers LightOblique}{\@tud at universfalse}%
+ \@tempc{Univers Oblique}{\@tud at universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud at universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud at universfalse}%
+ \@tud at dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud at dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if at tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud at univers}{\@tud at universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\undef\tud at font@check%
}
+\newcommand*\tud at font@missing at wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if at tud@x at fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if at tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \ClassWarning{\TUD at Class@Name}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud at font@math at missing@wrn[1]{%
+ \ClassWarning{\TUD at Class@Name}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud at raggedright{\raggedright}
\newcommand*\tud at RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -1418,13 +1455,15 @@
\if at atdocument%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
\if at tud@univers\else%
- \ClassWarning{\TUD at Class@Name}%
- {`Univers' fonts not found}%
+ \tud at font@missing at wrn{Univers}%
\fi%
\if at tud@dinbold\else%
- \ClassWarning{\TUD at Class@Name}%
- {`DIN Bold' fonts not found}%
+ \tud at font@missing at wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud at cdfont@num\relax% false
@@ -1445,7 +1484,6 @@
\tud at cmd@restore{mdseries at sf}%
\tud at cmd@restore{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{false}%
\ifcase\tud at cd@num\relax% false
\cs at std@lock{tud at head@font at num}{0}%
\else% !false
@@ -1469,35 +1507,26 @@
\tud at cmd@store{mdseries at sf}%
\tud at cmd@store{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{true}%
\cs at std@lock{tud at head@font at num}{\tud at cdfont@num}%
\if at tud@univers%
\if at tud@x at fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud at univers%
- ]%
+ \setsansfont{Univers}[\tud at x@fontspec at set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud at univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud at univers t%
]%
\else%
\renewcommand*\sfdefault{\tud at univers}%
@@ -1583,9 +1612,51 @@
\tud at skip@set{belowcaptionskip}{\z@}%
\tud at skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud at dinbn{}
-\let\tud at dinbn\relax
\newcommand*\tud at font@init{%
+ \if at tud@x at fontspec@enabled%
+ \if at tud@univers%
+ \newcommand*\tud at x@fontspec at set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@univ{Univers}[%
+ \tud at x@fontspec at set@univ,NFSSFamily=\tud at univers%
+ ]%
+ \fi%
+ \if at tud@dinbold%
+ \newcommand*\tud at x@fontspec at set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@din{DIN-Bold}[%
+ \tud at x@fontspec at set@din,NFSSFamily=\tud at dinbold%
+ ]%
+ \fi%
+ \fi%
\if at tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud at univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud at univers}{m}{n}}%
@@ -1600,29 +1671,13 @@
\newrobustcmd*\univrn{\tud at font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud at font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud at font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud at font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud at font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud at font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud at font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud at font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud at font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud at font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if at tud@dinbold%
- \if at tud@x at fontspec@enabled%
- \newfontface\tud at dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud at dinbold%
- ]%
- \else%
- \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
\if at tud@dinboldmath%
\appto\tud at dinbn{\mathversion{dinbold}}%
\fi%
@@ -1629,7 +1684,7 @@
\newrobustcmd*\dinbn{\tud at dinbn}%
\else%
\newrobustcmd*\tud at dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud at font@wrn{DIN Bold}\tud at dinbn}%
+ \newrobustcmd*\dinbn{\tud at font@fallback at wrn{DIN-Bold}\tud at dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -1652,10 +1707,10 @@
\undef\tud at font@init%
}
\newcommand*\tud at font@fallback[3]{%
- \tud at font@wrn{#1}%
+ \tud at font@fallback at wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud at font@wrn[1]{%
+\newcommand*\tud at font@fallback at wrn[1]{%
\ClassWarning{\TUD at Class@Name}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -1856,17 +1911,16 @@
}
\newcommand*\tud at font@math at set{%
\if at atdocument%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \if at tud@universmath\else%
- \ClassWarning{\TUD at Class@Name}%
- {`Univers' math fonts not found}%
- \fi%
- \if at tud@dinboldmath\else%
- \ClassWarning{\TUD at Class@Name}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if at tud@cdmath%
+ \if at tud@universmath\else%
+ \tud at font@math at missing@wrn{Univers}%
\fi%
+ \if at tud@dinboldmath\else%
+ \tud at font@math at missing@wrn{DIN-Bold}%
+ \fi%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\if at tud@universmath%
@@ -1914,8 +1968,8 @@
\ifundef{\mdseries at tt}{\edef\mdseries at tt{\mddefault}}{}%
\fi%
\tud at font@check%
+ \tud at font@init%
\tud at font@set%
- \tud at font@init%
\if at tud@x at bm@requested%
\tud at font@math at init%
\UnPreventPackageFromLoading{bm}%
@@ -4064,7 +4118,6 @@
\newcommand*\tud at head@fontsize{}
\newcommand*\tud at head@font at light{}
\newcommand*\tud at head@font at bold{}
-\newcommand*\tud at head@font@@bold{}
\newcommand*\tud at head@font at set{%
\ifcase\tud at head@font at num\relax% false
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
@@ -4082,9 +4135,6 @@
{\sfdefault}{\mddefault}{\updefault}{\tud at head@fontsize}%
\DeclareFixedFont{\tud at head@font at bold}{\encodingdefault}%
{\sfdefault}{\bfdefault}{\updefault}{\tud at head@fontsize}%
- \protected\gdef\tud at head@font@@bold{%
- \usefont{\encodingdefault}{\sfdefault}{\bfdefault}{\updefault}%
- }%
\ifcase\tud at head@font at num\relax\else% true/heavy
\if at tud@univers%
\ifcase\tud at head@font at num\relax\or% true
@@ -4096,9 +4146,6 @@
\fi%
\DeclareFixedFont{\tud at head@font at bold}{\encodingdefault}%
{\tud at univers}{b}{n}{\tud at head@fontsize}%
- \protected\gdef\tud at head@font@@bold{%
- \usefont{\encodingdefault}{\tud at univers}{b}{n}%
- }%
\fi%
\fi%
\global\@tud at head@font at setfalse%
@@ -5569,7 +5616,7 @@
}{%
\ifstr{#1}{custom}{\bool at set@lock{@tud at cdgeometry@cover}{false}}{%
\ifstr{#1}{user}{\bool at set@lock{@tud at cdgeometry@cover}{false}}{%
- \TUD at parameter@error{cdgeometry}{true,false}%
+ \TUD at parameter@error{cdgeometry}{true, false}%
}%
}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrbase.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -9,7 +9,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -52,7 +52,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -65,7 +65,7 @@
}{}
%%% From File: tudscr-base.dtx
\ProvidesPackage{tudscrbase}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(basics for the bundle)%
]
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrbook.cls 2017-03-30 21:33:00 UTC (rev 43649)
@@ -29,7 +29,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -72,13 +72,13 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
\newcommand*\TUD at ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD at Class@KOMA{#2}%
@@ -118,7 +118,20 @@
}%
]{tudscrfonts}
\newif\if at tud@x at fontspec@enabled
-\AfterPackage*{fontspec}{\@tud at x@fontspec at enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud at x@fontspec at enabledtrue%
+ }{%
+ \@tud at x@fontspec at enabledfalse%
+ \ClassWarningNoLine{\TUD at Class@Name}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver at fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if at tud@cdfont at din
\newif\if at tud@cdfont at ultrabold
\@tud at cdfont@dintrue
@@ -172,12 +185,15 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% heavy
\renewcommand*\tud at cdfont@num{2}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% normalbold
\@tud at cdfont@ultraboldfalse%
@@ -184,6 +200,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% ultrabold
\@tud at cdfont@ultraboldtrue%
@@ -190,6 +207,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% nodin
\@tud at cdfont@dinfalse%
@@ -221,6 +239,7 @@
\csname @tud at fontsize@settrue\endcsname%
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -250,6 +269,7 @@
\FamilyKeyStateProcessed%
}
\bool at lock{@tud at cdmath}
+\bool at std@lock{@tud at cdmath}{true}%
\TUD at key{cdmath}[true]{%
\TUD at set@numkey{cdmath}{@tempa}{%
\TUD at bool@numkey,%
@@ -1061,7 +1081,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD at Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -1069,7 +1089,7 @@
KOMA-Script v\TUD at Version@KOMA is required%
}{%
\TUD at Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD at Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD at Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
}
@@ -1099,6 +1119,7 @@
\csdef{tud at v@2.05h}{3}
\csdef{tud at v@2.05i}{3}
\csdef{tud at v@2.05k}{3}
+\csdef{tud at v@2.05l}{3}
\csdef{tud at v@last}{3}
\newcommand*\tud at v@get[2]{%
\begingroup%
@@ -1122,7 +1143,8 @@
\fi%
}{%
\def\tud at reserved{%
- \ClassWarningNoLine{\TUD at Class@Name}{%PackageWarning!
+ \ClassWarningNoLine{\TUD at Class@Name}%
+ {%
Erroneous usage of `\string\tud at if@v at lower'.\MessageBreak%
There's no defined macro `\string\tud at v@\@tempa'%
}%
@@ -1132,7 +1154,7 @@
\tud at reserved%
}
\TUD at key{fontspec}[true]{%
- \ClassWarning{\TUD at Class@Name}%
+ \ClassWarningNoLine{\TUD at Class@Name}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -1152,7 +1174,7 @@
\FamilyKeyStateProcessed%
}%
\if at tud@x at fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD at key{cdfonts}[true]{%
@@ -1351,7 +1373,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
@@ -1431,88 +1453,103 @@
\newcommand*\tud at dinbold{0m6}
\newif\if at tud@dinbold
\newif\if at tud@dinboldmath
-\newcommand*\tud at x@fontspec at noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if at tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud at x@fontspec at noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud at font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if at tud@cdmath%
+ \tud at font@math at missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud at univers}{\@tud at universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if at tud@cdmath%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
+ \fi%
\if at tud@x at fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud at x@fontspec at noerror%
- \global\@tud at universtrue%
- \@tempc{Univers Light}{\global\@tud at universfalse}%
- \@tempc{Univers}{\global\@tud at universfalse}%
- \@tempc{Univers Bold}{\global\@tud at universfalse}%
- \@tempc{Univers Black}{\global\@tud at universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud at universfalse}%
- \global\@tud at dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud at dinboldfalse}%
- \endgroup%
+ \@tud at universtrue%
+ \@tempc{Univers Light}{\@tud at universfalse}%
+ \@tempc{Univers}{\@tud at universfalse}%
+ \@tempc{Univers Bold}{\@tud at universfalse}%
+ \@tempc{Univers Black}{\@tud at universfalse}%
+ \@tempc{Univers LightOblique}{\@tud at universfalse}%
+ \@tempc{Univers Oblique}{\@tud at universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud at universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud at universfalse}%
+ \@tud at dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud at dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if at tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud at univers}{\@tud at universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\undef\tud at font@check%
}
+\newcommand*\tud at font@missing at wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if at tud@x at fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if at tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \ClassWarning{\TUD at Class@Name}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud at font@math at missing@wrn[1]{%
+ \ClassWarning{\TUD at Class@Name}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud at raggedright{\raggedright}
\newcommand*\tud at RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -1533,13 +1570,15 @@
\if at atdocument%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
\if at tud@univers\else%
- \ClassWarning{\TUD at Class@Name}%
- {`Univers' fonts not found}%
+ \tud at font@missing at wrn{Univers}%
\fi%
\if at tud@dinbold\else%
- \ClassWarning{\TUD at Class@Name}%
- {`DIN Bold' fonts not found}%
+ \tud at font@missing at wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud at cdfont@num\relax% false
@@ -1560,7 +1599,6 @@
\tud at cmd@restore{mdseries at sf}%
\tud at cmd@restore{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{false}%
\ifcase\tud at cd@num\relax% false
\cs at std@lock{tud at head@font at num}{0}%
\else% !false
@@ -1584,35 +1622,26 @@
\tud at cmd@store{mdseries at sf}%
\tud at cmd@store{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{true}%
\cs at std@lock{tud at head@font at num}{\tud at cdfont@num}%
\if at tud@univers%
\if at tud@x at fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud at univers%
- ]%
+ \setsansfont{Univers}[\tud at x@fontspec at set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud at univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud at univers t%
]%
\else%
\renewcommand*\sfdefault{\tud at univers}%
@@ -1698,9 +1727,51 @@
\tud at skip@set{belowcaptionskip}{\z@}%
\tud at skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud at dinbn{}
-\let\tud at dinbn\relax
\newcommand*\tud at font@init{%
+ \if at tud@x at fontspec@enabled%
+ \if at tud@univers%
+ \newcommand*\tud at x@fontspec at set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@univ{Univers}[%
+ \tud at x@fontspec at set@univ,NFSSFamily=\tud at univers%
+ ]%
+ \fi%
+ \if at tud@dinbold%
+ \newcommand*\tud at x@fontspec at set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@din{DIN-Bold}[%
+ \tud at x@fontspec at set@din,NFSSFamily=\tud at dinbold%
+ ]%
+ \fi%
+ \fi%
\if at tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud at univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud at univers}{m}{n}}%
@@ -1715,29 +1786,13 @@
\newrobustcmd*\univrn{\tud at font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud at font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud at font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud at font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud at font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud at font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud at font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud at font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud at font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud at font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if at tud@dinbold%
- \if at tud@x at fontspec@enabled%
- \newfontface\tud at dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud at dinbold%
- ]%
- \else%
- \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
\if at tud@dinboldmath%
\appto\tud at dinbn{\mathversion{dinbold}}%
\fi%
@@ -1744,7 +1799,7 @@
\newrobustcmd*\dinbn{\tud at dinbn}%
\else%
\newrobustcmd*\tud at dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud at font@wrn{DIN Bold}\tud at dinbn}%
+ \newrobustcmd*\dinbn{\tud at font@fallback at wrn{DIN-Bold}\tud at dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -1767,10 +1822,10 @@
\undef\tud at font@init%
}
\newcommand*\tud at font@fallback[3]{%
- \tud at font@wrn{#1}%
+ \tud at font@fallback at wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud at font@wrn[1]{%
+\newcommand*\tud at font@fallback at wrn[1]{%
\ClassWarning{\TUD at Class@Name}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -1971,17 +2026,16 @@
}
\newcommand*\tud at font@math at set{%
\if at atdocument%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \if at tud@universmath\else%
- \ClassWarning{\TUD at Class@Name}%
- {`Univers' math fonts not found}%
- \fi%
- \if at tud@dinboldmath\else%
- \ClassWarning{\TUD at Class@Name}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if at tud@cdmath%
+ \if at tud@universmath\else%
+ \tud at font@math at missing@wrn{Univers}%
\fi%
+ \if at tud@dinboldmath\else%
+ \tud at font@math at missing@wrn{DIN-Bold}%
+ \fi%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\if at tud@universmath%
@@ -2029,8 +2083,8 @@
\ifundef{\mdseries at tt}{\edef\mdseries at tt{\mddefault}}{}%
\fi%
\tud at font@check%
+ \tud at font@init%
\tud at font@set%
- \tud at font@init%
\if at tud@x at bm@requested%
\tud at font@math at init%
\UnPreventPackageFromLoading{bm}%
@@ -4183,7 +4237,6 @@
\newcommand*\tud at head@fontsize{}
\newcommand*\tud at head@font at light{}
\newcommand*\tud at head@font at bold{}
-\newcommand*\tud at head@font@@bold{}
\newcommand*\tud at head@font at set{%
\ifcase\tud at head@font at num\relax% false
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
@@ -4201,9 +4254,6 @@
{\sfdefault}{\mddefault}{\updefault}{\tud at head@fontsize}%
\DeclareFixedFont{\tud at head@font at bold}{\encodingdefault}%
{\sfdefault}{\bfdefault}{\updefault}{\tud at head@fontsize}%
- \protected\gdef\tud at head@font@@bold{%
- \usefont{\encodingdefault}{\sfdefault}{\bfdefault}{\updefault}%
- }%
\ifcase\tud at head@font at num\relax\else% true/heavy
\if at tud@univers%
\ifcase\tud at head@font at num\relax\or% true
@@ -4215,9 +4265,6 @@
\fi%
\DeclareFixedFont{\tud at head@font at bold}{\encodingdefault}%
{\tud at univers}{b}{n}{\tud at head@fontsize}%
- \protected\gdef\tud at head@font@@bold{%
- \usefont{\encodingdefault}{\tud at univers}{b}{n}%
- }%
\fi%
\fi%
\global\@tud at head@font at setfalse%
@@ -6072,7 +6119,7 @@
}{%
\ifstr{#1}{custom}{\bool at set@lock{@tud at cdgeometry@cover}{false}}{%
\ifstr{#1}{user}{\bool at set@lock{@tud at cdgeometry@cover}{false}}{%
- \TUD at parameter@error{cdgeometry}{true,false}%
+ \TUD at parameter@error{cdgeometry}{true, false}%
}%
}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcolor.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -9,7 +9,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -52,7 +52,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -65,7 +65,7 @@
}{}
%%% From File: tudscr-color.dtx
\ProvidesPackage{tudscrcolor}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(corporate design colors)%
]
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-book.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -12,7 +12,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -55,7 +55,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -77,7 +77,7 @@
}{}
%%% From File: tudscr-comp.dtx
\ProvidesPackage{tudscrcomp-book}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(compatibility for old tud(scr) classes)%
]
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp-poster.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -12,7 +12,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -55,7 +55,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -77,7 +77,7 @@
}{}
%%% From File: tudscr-comp.dtx
\ProvidesPackage{tudscrcomp-poster}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(compatibility for old tud(scr) classes)%
]
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrcomp.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -9,7 +9,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -52,7 +52,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -74,7 +74,7 @@
}{}
%%% From File: tudscr-comp.dtx
\ProvidesPackage{tudscrcomp}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(compatibility for old tud(scr) classes)%
]
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrdoc.cls 2017-03-30 21:33:00 UTC (rev 43649)
@@ -14,7 +14,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -57,13 +57,13 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
\newcommand*\TUD at ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD at Class@KOMA{#2}%
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrfonts.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -16,7 +16,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -59,7 +59,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -72,7 +72,7 @@
}{}
%%% From File: tudscr-fonts.dtx
\ProvidesPackage{tudscrfonts}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(corporate design fonts)%
]
@@ -100,7 +100,20 @@
\RequirePackage{tudscrbase}[\TUD at Version]
%%% From File: tudscr-fonts.dtx
\newif\if at tud@x at fontspec@enabled
-\AfterPackage*{fontspec}{\@tud at x@fontspec at enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud at x@fontspec at enabledtrue%
+ }{%
+ \@tud at x@fontspec at enabledfalse%
+ \PackageWarningNoLine{tudscrfonts}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver at fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if at tud@cdfont at din
\newif\if at tud@cdfont at ultrabold
\@tud at cdfont@dintrue
@@ -126,12 +139,15 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% heavy
\renewcommand*\tud at cdfont@num{2}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% normalbold
\@tud at cdfont@ultraboldfalse%
@@ -138,6 +154,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% ultrabold
\@tud at cdfont@ultraboldtrue%
@@ -144,6 +161,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% nodin
\@tud at cdfont@dinfalse%
@@ -175,6 +193,7 @@
\csname @tud at fontsize@settrue\endcsname%
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -204,6 +223,7 @@
\FamilyKeyStateProcessed%
}
\bool at lock{@tud at cdmath}
+\bool at std@lock{@tud at cdmath}{true}%
\TUD at key{cdmath}[true]{%
\TUD at set@numkey{cdmath}{@tempa}{%
\TUD at bool@numkey,%
@@ -303,6 +323,7 @@
\csdef{tud at v@2.05h}{3}
\csdef{tud at v@2.05i}{3}
\csdef{tud at v@2.05k}{3}
+\csdef{tud at v@2.05l}{3}
\csdef{tud at v@last}{3}
\newcommand*\tud at v@get[2]{%
\begingroup%
@@ -326,7 +347,8 @@
\fi%
}{%
\def\tud at reserved{%
- \ClassWarningNoLine{\TUD at Class@Name}{%PackageWarning!
+ \PackageWarningNoLine{tudscrfonts}%
+ {%
Erroneous usage of `\string\tud at if@v at lower'.\MessageBreak%
There's no defined macro `\string\tud at v@\@tempa'%
}%
@@ -336,7 +358,7 @@
\tud at reserved%
}
\TUD at key{fontspec}[true]{%
- \PackageWarning{tudscrfonts}%
+ \PackageWarningNoLine{tudscrfonts}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -356,7 +378,7 @@
\FamilyKeyStateProcessed%
}%
\if at tud@x at fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD at key{cdfonts}[true]{%
@@ -450,88 +472,103 @@
\newcommand*\tud at dinbold{0m6}
\newif\if at tud@dinbold
\newif\if at tud@dinboldmath
-\newcommand*\tud at x@fontspec at noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if at tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud at x@fontspec at noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud at font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \PackageWarningNoLine{tudscrfonts}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if at tud@cdmath%
+ \tud at font@math at missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud at univers}{\@tud at universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if at tud@cdmath%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
+ \fi%
\if at tud@x at fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \PackageWarningNoLine{tudscrfonts}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud at x@fontspec at noerror%
- \global\@tud at universtrue%
- \@tempc{Univers Light}{\global\@tud at universfalse}%
- \@tempc{Univers}{\global\@tud at universfalse}%
- \@tempc{Univers Bold}{\global\@tud at universfalse}%
- \@tempc{Univers Black}{\global\@tud at universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud at universfalse}%
- \global\@tud at dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud at dinboldfalse}%
- \endgroup%
+ \@tud at universtrue%
+ \@tempc{Univers Light}{\@tud at universfalse}%
+ \@tempc{Univers}{\@tud at universfalse}%
+ \@tempc{Univers Bold}{\@tud at universfalse}%
+ \@tempc{Univers Black}{\@tud at universfalse}%
+ \@tempc{Univers LightOblique}{\@tud at universfalse}%
+ \@tempc{Univers Oblique}{\@tud at universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud at universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud at universfalse}%
+ \@tud at dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud at dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \PackageWarningNoLine{tudscrfonts}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if at tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud at univers}{\@tud at universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\undef\tud at font@check%
}
+\newcommand*\tud at font@missing at wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if at tud@x at fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if at tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \PackageWarning{tudscrfonts}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud at font@math at missing@wrn[1]{%
+ \PackageWarning{tudscrfonts}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud at raggedright{\raggedright}
\newcommand*\tud at RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -560,13 +597,15 @@
\if at atdocument%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
\if at tud@univers\else%
- \PackageWarning{tudscrfonts}%
- {`Univers' fonts not found}%
+ \tud at font@missing at wrn{Univers}%
\fi%
\if at tud@dinbold\else%
- \PackageWarning{tudscrfonts}%
- {`DIN Bold' fonts not found}%
+ \tud at font@missing at wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud at cdfont@num\relax% false
@@ -587,7 +626,6 @@
\tud at cmd@restore{mdseries at sf}%
\tud at cmd@restore{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{false}%
\else% true/heavy
\tud at cmd@store{rmdefault}%
\tud at cmd@store{sfdefault}%
@@ -606,34 +644,25 @@
\tud at cmd@store{mdseries at sf}%
\tud at cmd@store{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{true}%
\if at tud@univers%
\if at tud@x at fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud at univers%
- ]%
+ \setsansfont{Univers}[\tud at x@fontspec at set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud at univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud at univers t%
]%
\else%
\renewcommand*\sfdefault{\tud at univers}%
@@ -717,9 +746,51 @@
\tud at skip@set{belowcaptionskip}{\z@}%
\tud at skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud at dinbn{}
-\let\tud at dinbn\relax
\newcommand*\tud at font@init{%
+ \if at tud@x at fontspec@enabled%
+ \if at tud@univers%
+ \newcommand*\tud at x@fontspec at set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@univ{Univers}[%
+ \tud at x@fontspec at set@univ,NFSSFamily=\tud at univers%
+ ]%
+ \fi%
+ \if at tud@dinbold%
+ \newcommand*\tud at x@fontspec at set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@din{DIN-Bold}[%
+ \tud at x@fontspec at set@din,NFSSFamily=\tud at dinbold%
+ ]%
+ \fi%
+ \fi%
\if at tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud at univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud at univers}{m}{n}}%
@@ -734,29 +805,13 @@
\newrobustcmd*\univrn{\tud at font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud at font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud at font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud at font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud at font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud at font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud at font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud at font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud at font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud at font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if at tud@dinbold%
- \if at tud@x at fontspec@enabled%
- \newfontface\tud at dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud at dinbold%
- ]%
- \else%
- \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
\if at tud@dinboldmath%
\appto\tud at dinbn{\mathversion{dinbold}}%
\fi%
@@ -763,7 +818,7 @@
\newrobustcmd*\dinbn{\tud at dinbn}%
\else%
\newrobustcmd*\tud at dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud at font@wrn{DIN Bold}\tud at dinbn}%
+ \newrobustcmd*\dinbn{\tud at font@fallback at wrn{DIN-Bold}\tud at dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -786,10 +841,10 @@
\undef\tud at font@init%
}
\newcommand*\tud at font@fallback[3]{%
- \tud at font@wrn{#1}%
+ \tud at font@fallback at wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud at font@wrn[1]{%
+\newcommand*\tud at font@fallback at wrn[1]{%
\PackageWarning{tudscrfonts}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -990,17 +1045,16 @@
}
\newcommand*\tud at font@math at set{%
\if at atdocument%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \if at tud@universmath\else%
- \PackageWarning{tudscrfonts}%
- {`Univers' math fonts not found}%
- \fi%
- \if at tud@dinboldmath\else%
- \PackageWarning{tudscrfonts}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if at tud@cdmath%
+ \if at tud@universmath\else%
+ \tud at font@math at missing@wrn{Univers}%
\fi%
+ \if at tud@dinboldmath\else%
+ \tud at font@math at missing@wrn{DIN-Bold}%
+ \fi%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\if at tud@universmath%
@@ -1049,8 +1103,8 @@
\fi%
\tud at font@check%
\ifdef{\sectfont}{}{\let\sectfont\relax}%
+ \tud at font@init%
\tud at font@set%
- \tud at font@init%
\if at tud@x at bm@requested%
\tud at font@math at init%
\UnPreventPackageFromLoading{bm}%
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrmanual.cls 2017-03-30 21:33:00 UTC (rev 43649)
@@ -16,7 +16,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -59,13 +59,13 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
\newcommand*\TUD at ProvidesWrapperClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD at Class@Parent{#2}%
@@ -183,7 +183,7 @@
\@ifpackagelater{geometry}{2010/09/13}{%
\ClassWarning{\TUD at Class@Name}{%
Package `geometry' was updated so some patches\MessageBreak%
- are maybe outdated
+ are maybe outdated%
}%
}{}%
\newcommand*\vTUDScript{v\TUDScriptVersionNumber}
@@ -367,7 +367,7 @@
{%
It is strongly recommended to load package `hyperref'.\MessageBreak%
Nevertheless, essential commands are rudimentarily\MessageBreak%
- defined. At least the package `url' is loaded.%
+ defined. At least the package `url' is loaded%
}%
\providecommand*\hypersetup[1]{}%
\providecommand*\href[3][]{#3}%
@@ -1130,7 +1130,7 @@
\def\@tempb{%
\ClassWarning{tudscrmanual}{%
Label #1\MessageBreak%
- is missing, no cross-reference created.%
+ is missing, no cross-reference created%
}%
}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrposter.cls 2017-03-30 21:33:00 UTC (rev 43649)
@@ -29,7 +29,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -72,13 +72,13 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
\newcommand*\TUD at ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD at Class@KOMA{#2}%
@@ -118,7 +118,20 @@
}%
]{tudscrfonts}
\newif\if at tud@x at fontspec@enabled
-\AfterPackage*{fontspec}{\@tud at x@fontspec at enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud at x@fontspec at enabledtrue%
+ }{%
+ \@tud at x@fontspec at enabledfalse%
+ \ClassWarningNoLine{\TUD at Class@Name}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver at fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if at tud@cdfont at din
\newif\if at tud@cdfont at ultrabold
\@tud at cdfont@dintrue
@@ -172,12 +185,15 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% heavy
\renewcommand*\tud at cdfont@num{2}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% normalbold
\@tud at cdfont@ultraboldfalse%
@@ -184,6 +200,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% ultrabold
\@tud at cdfont@ultraboldtrue%
@@ -190,6 +207,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% nodin
\@tud at cdfont@dinfalse%
@@ -221,6 +239,7 @@
\csname @tud at fontsize@settrue\endcsname%
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -250,6 +269,7 @@
\FamilyKeyStateProcessed%
}
\bool at lock{@tud at cdmath}
+\bool at std@lock{@tud at cdmath}{true}%
\TUD at key{cdmath}[true]{%
\TUD at set@numkey{cdmath}{@tempa}{%
\TUD at bool@numkey,%
@@ -837,7 +857,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD at Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -845,7 +865,7 @@
KOMA-Script v\TUD at Version@KOMA is required%
}{%
\TUD at Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD at Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD at Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
}
@@ -875,6 +895,7 @@
\csdef{tud at v@2.05h}{3}
\csdef{tud at v@2.05i}{3}
\csdef{tud at v@2.05k}{3}
+\csdef{tud at v@2.05l}{3}
\csdef{tud at v@last}{3}
\newcommand*\tud at v@get[2]{%
\begingroup%
@@ -898,7 +919,8 @@
\fi%
}{%
\def\tud at reserved{%
- \ClassWarningNoLine{\TUD at Class@Name}{%PackageWarning!
+ \ClassWarningNoLine{\TUD at Class@Name}%
+ {%
Erroneous usage of `\string\tud at if@v at lower'.\MessageBreak%
There's no defined macro `\string\tud at v@\@tempa'%
}%
@@ -908,7 +930,7 @@
\tud at reserved%
}
\TUD at key{fontspec}[true]{%
- \ClassWarning{\TUD at Class@Name}%
+ \ClassWarningNoLine{\TUD at Class@Name}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -928,7 +950,7 @@
\FamilyKeyStateProcessed%
}%
\if at tud@x at fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD at key{cdfonts}[true]{%
@@ -1127,7 +1149,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
@@ -1207,88 +1229,103 @@
\newcommand*\tud at dinbold{0m6}
\newif\if at tud@dinbold
\newif\if at tud@dinboldmath
-\newcommand*\tud at x@fontspec at noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if at tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud at x@fontspec at noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud at font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if at tud@cdmath%
+ \tud at font@math at missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud at univers}{\@tud at universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if at tud@cdmath%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
+ \fi%
\if at tud@x at fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud at x@fontspec at noerror%
- \global\@tud at universtrue%
- \@tempc{Univers Light}{\global\@tud at universfalse}%
- \@tempc{Univers}{\global\@tud at universfalse}%
- \@tempc{Univers Bold}{\global\@tud at universfalse}%
- \@tempc{Univers Black}{\global\@tud at universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud at universfalse}%
- \global\@tud at dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud at dinboldfalse}%
- \endgroup%
+ \@tud at universtrue%
+ \@tempc{Univers Light}{\@tud at universfalse}%
+ \@tempc{Univers}{\@tud at universfalse}%
+ \@tempc{Univers Bold}{\@tud at universfalse}%
+ \@tempc{Univers Black}{\@tud at universfalse}%
+ \@tempc{Univers LightOblique}{\@tud at universfalse}%
+ \@tempc{Univers Oblique}{\@tud at universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud at universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud at universfalse}%
+ \@tud at dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud at dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if at tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud at univers}{\@tud at universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\undef\tud at font@check%
}
+\newcommand*\tud at font@missing at wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if at tud@x at fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if at tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \ClassWarning{\TUD at Class@Name}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud at font@math at missing@wrn[1]{%
+ \ClassWarning{\TUD at Class@Name}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud at raggedright{\raggedright}
\newcommand*\tud at RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -1309,13 +1346,15 @@
\if at atdocument%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
\if at tud@univers\else%
- \ClassWarning{\TUD at Class@Name}%
- {`Univers' fonts not found}%
+ \tud at font@missing at wrn{Univers}%
\fi%
\if at tud@dinbold\else%
- \ClassWarning{\TUD at Class@Name}%
- {`DIN Bold' fonts not found}%
+ \tud at font@missing at wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud at cdfont@num\relax% false
@@ -1336,7 +1375,6 @@
\tud at cmd@restore{mdseries at sf}%
\tud at cmd@restore{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{false}%
\ifcase\tud at cd@num\relax% false
\cs at std@lock{tud at head@font at num}{0}%
\else% !false
@@ -1360,35 +1398,26 @@
\tud at cmd@store{mdseries at sf}%
\tud at cmd@store{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{true}%
\cs at std@lock{tud at head@font at num}{\tud at cdfont@num}%
\if at tud@univers%
\if at tud@x at fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud at univers%
- ]%
+ \setsansfont{Univers}[\tud at x@fontspec at set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud at univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud at univers t%
]%
\else%
\renewcommand*\sfdefault{\tud at univers}%
@@ -1474,9 +1503,51 @@
\tud at skip@set{belowcaptionskip}{\z@}%
\tud at skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud at dinbn{}
-\let\tud at dinbn\relax
\newcommand*\tud at font@init{%
+ \if at tud@x at fontspec@enabled%
+ \if at tud@univers%
+ \newcommand*\tud at x@fontspec at set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@univ{Univers}[%
+ \tud at x@fontspec at set@univ,NFSSFamily=\tud at univers%
+ ]%
+ \fi%
+ \if at tud@dinbold%
+ \newcommand*\tud at x@fontspec at set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@din{DIN-Bold}[%
+ \tud at x@fontspec at set@din,NFSSFamily=\tud at dinbold%
+ ]%
+ \fi%
+ \fi%
\if at tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud at univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud at univers}{m}{n}}%
@@ -1491,29 +1562,13 @@
\newrobustcmd*\univrn{\tud at font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud at font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud at font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud at font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud at font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud at font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud at font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud at font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud at font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud at font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if at tud@dinbold%
- \if at tud@x at fontspec@enabled%
- \newfontface\tud at dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud at dinbold%
- ]%
- \else%
- \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
\if at tud@dinboldmath%
\appto\tud at dinbn{\mathversion{dinbold}}%
\fi%
@@ -1520,7 +1575,7 @@
\newrobustcmd*\dinbn{\tud at dinbn}%
\else%
\newrobustcmd*\tud at dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud at font@wrn{DIN Bold}\tud at dinbn}%
+ \newrobustcmd*\dinbn{\tud at font@fallback at wrn{DIN-Bold}\tud at dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -1543,10 +1598,10 @@
\undef\tud at font@init%
}
\newcommand*\tud at font@fallback[3]{%
- \tud at font@wrn{#1}%
+ \tud at font@fallback at wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud at font@wrn[1]{%
+\newcommand*\tud at font@fallback at wrn[1]{%
\ClassWarning{\TUD at Class@Name}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -1747,17 +1802,16 @@
}
\newcommand*\tud at font@math at set{%
\if at atdocument%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \if at tud@universmath\else%
- \ClassWarning{\TUD at Class@Name}%
- {`Univers' math fonts not found}%
- \fi%
- \if at tud@dinboldmath\else%
- \ClassWarning{\TUD at Class@Name}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if at tud@cdmath%
+ \if at tud@universmath\else%
+ \tud at font@math at missing@wrn{Univers}%
\fi%
+ \if at tud@dinboldmath\else%
+ \tud at font@math at missing@wrn{DIN-Bold}%
+ \fi%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\if at tud@universmath%
@@ -1805,8 +1859,8 @@
\ifundef{\mdseries at tt}{\edef\mdseries at tt{\mddefault}}{}%
\fi%
\tud at font@check%
+ \tud at font@init%
\tud at font@set%
- \tud at font@init%
\if at tud@x at bm@requested%
\tud at font@math at init%
\UnPreventPackageFromLoading{bm}%
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrreprt.cls 2017-03-30 21:33:00 UTC (rev 43649)
@@ -29,7 +29,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -72,13 +72,13 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
\newcommand*\TUD at ProvidesClass[3]{%
\ProvidesClass{#1}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
^^J#3 (#2)%
]%
\newcommand*\TUD at Class@KOMA{#2}%
@@ -118,7 +118,20 @@
}%
]{tudscrfonts}
\newif\if at tud@x at fontspec@enabled
-\AfterPackage*{fontspec}{\@tud at x@fontspec at enabledtrue}
+\AfterPackage*{fontspec}{%
+ \@ifpackagelater{fontspec}{2017/01/24}{%
+ \@tud at x@fontspec at enabledtrue%
+ }{%
+ \@tud at x@fontspec at enabledfalse%
+ \ClassWarningNoLine{\TUD at Class@Name}%
+ {%
+ Version `2017/01/24' of package `fontspec' is needed,\MessageBreak
+ but only version\MessageBreak
+ `\csname ver at fontspec.sty\endcsname'\MessageBreak
+ is available, so a fallback layout is used%
+ }%
+ }%
+}
\newif\if at tud@cdfont at din
\newif\if at tud@cdfont at ultrabold
\@tud at cdfont@dintrue
@@ -172,12 +185,15 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed%
\ifcase\@tempa\relax% false
\renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% heavy
\renewcommand*\tud at cdfont@num{2}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% normalbold
\@tud at cdfont@ultraboldfalse%
@@ -184,6 +200,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% ultrabold
\@tud at cdfont@ultraboldtrue%
@@ -190,6 +207,7 @@
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
\fi%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\or% nodin
\@tud at cdfont@dinfalse%
@@ -221,6 +239,7 @@
\csname @tud at fontsize@settrue\endcsname%
\ifcase\tud at cdfont@num\relax% false to true
\renewcommand*\tud at cdfont@num{1}%
+ \bool at std@lock{@tud at cdmath}{true}%
\TUD at SpecialOptionAtDocument{tud at font@set}%
\fi%
\FamilyKeyStateProcessed%
@@ -250,6 +269,7 @@
\FamilyKeyStateProcessed%
}
\bool at lock{@tud at cdmath}
+\bool at std@lock{@tud at cdmath}{true}%
\TUD at key{cdmath}[true]{%
\TUD at set@numkey{cdmath}{@tempa}{%
\TUD at bool@numkey,%
@@ -1065,7 +1085,7 @@
KOMA-Script compatibility level too low%
}{%
\TUD at Version\space must be used at least with\MessageBreak%
- KOMA-Script compatibility option `version=3.12'.%
+ `version=3.12' KOMA-Script compatibility option.%
}%
\fi%
}{%
@@ -1073,7 +1093,7 @@
KOMA-Script v\TUD at Version@KOMA is required%
}{%
\TUD at Version\space must at least be used with\MessageBreak%
- KOMA-Script v\TUD at Version@KOMA. You're using \KOMAScriptVersion%
+ KOMA-Script v\TUD at Version@KOMA, but \KOMAScriptVersion is used.%
}%
}%
}
@@ -1103,6 +1123,7 @@
\csdef{tud at v@2.05h}{3}
\csdef{tud at v@2.05i}{3}
\csdef{tud at v@2.05k}{3}
+\csdef{tud at v@2.05l}{3}
\csdef{tud at v@last}{3}
\newcommand*\tud at v@get[2]{%
\begingroup%
@@ -1126,7 +1147,8 @@
\fi%
}{%
\def\tud at reserved{%
- \ClassWarningNoLine{\TUD at Class@Name}{%PackageWarning!
+ \ClassWarningNoLine{\TUD at Class@Name}%
+ {%
Erroneous usage of `\string\tud at if@v at lower'.\MessageBreak%
There's no defined macro `\string\tud at v@\@tempa'%
}%
@@ -1136,7 +1158,7 @@
\tud at reserved%
}
\TUD at key{fontspec}[true]{%
- \ClassWarning{\TUD at Class@Name}%
+ \ClassWarningNoLine{\TUD at Class@Name}%
{%
The option key `fontspec' is deprecated\MessageBreak%
You should load the package `fontspec' manually%
@@ -1156,7 +1178,7 @@
\FamilyKeyStateProcessed%
}%
\if at tud@x at fontspec@enabled%
- \RequirePackage{fontspec}[2014/06/21]%
+ \RequirePackage{fontspec}[2017/01/24]%
\fi%
}
\TUD at key{cdfonts}[true]{%
@@ -1355,7 +1377,7 @@
You've set a paper size, which is different from\MessageBreak%
default (paper=a4, paper=portrait). Therefore you\MessageBreak%
should additionally specify an explicit font size.\MessageBreak%
- See the manual for further information.%
+ See the manual for further information%
}%
\fi%
}{}%
@@ -1435,88 +1457,103 @@
\newcommand*\tud at dinbold{0m6}
\newif\if at tud@dinbold
\newif\if at tud@dinboldmath
-\newcommand*\tud at x@fontspec at noerror{}
-\IfFileExists{expl3.sty}{\@tempswatrue}{\@tempswafalse}
-\if at tempswa
- \RequirePackage{expl3}[2016/05/18]
- \ExplSyntaxOn
- \renewcommand*\tud at x@fontspec at noerror{%
- \__fontspec_font_suppress_not_found_error:
- \msg_redirect_name:nnn {fontspec}{font-not-found}{none}
- }%
- \ExplSyntaxOff
-\fi
\newcommand*\tud at font@check{%
\edef\@tempa##1##2{\lowercase{\noexpand\IfFileExists{##1##2.fd}}}%
\def\@tempb##1{%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts for math typesetting not found\MessageBreak%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual%
- }%
- \fi%
+ \if at tud@cdmath%
+ \tud at font@math at missing@wrn{##1}%
\fi%
}%
\@tempa{OT1}{\tud at univers}{\@tud at universmathtrue}{\@tempb{Univers}}%
- \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN Bold}}%
+ \@tempa{OT1}{\tud at dinbold}{\@tud at dinboldmathtrue}{\@tempb{DIN-Bold}}%
+ \if at tud@cdmath%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
+ \fi%
\if at tud@x at fontspec@enabled%
\def\@tempc##1##2{%
- \fontspec{##1}%
- \expandafter\ifx\the\font\nullfont%
+ \IfFontExistsTF{##1}{}{%
##2%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- It seems, you haven't installed the required\MessageBreak%
- OTF-font on your system. A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
- \fi%
+ }%
}%
- \begingroup%
- \tud at x@fontspec at noerror%
- \global\@tud at universtrue%
- \@tempc{Univers Light}{\global\@tud at universfalse}%
- \@tempc{Univers}{\global\@tud at universfalse}%
- \@tempc{Univers Bold}{\global\@tud at universfalse}%
- \@tempc{Univers Black}{\global\@tud at universfalse}%
- \@tempc{Univers Light Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Bold Oblique}{\global\@tud at universfalse}%
- \@tempc{Univers Black Oblique}{\global\@tud at universfalse}%
- \global\@tud at dinboldtrue%
- \@tempc{DIN Bold}{\global\@tud at dinboldfalse}%
- \endgroup%
+ \@tud at universtrue%
+ \@tempc{Univers Light}{\@tud at universfalse}%
+ \@tempc{Univers}{\@tud at universfalse}%
+ \@tempc{Univers Bold}{\@tud at universfalse}%
+ \@tempc{Univers Black}{\@tud at universfalse}%
+ \@tempc{Univers LightOblique}{\@tud at universfalse}%
+ \@tempc{Univers Oblique}{\@tud at universfalse}%
+ \@tempc{Univers BoldOblique}{\@tud at universfalse}%
+ \@tempc{Univers BlackOblique}{\@tud at universfalse}%
+ \@tud at dinboldtrue%
+ \@tempc{DIN-Bold}{\@tud at dinboldfalse}%
\else%
\def\@tempc##1{%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \@tempswafalse%
- \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
- \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
- \ClassWarningNoLine{\TUD at Class@Name}%
- {%
- `##1' fonts not found for encoding `\encodingdefault'\MessageBreak%
- \if at tempswa%
- Please use one of the installation scripts for the\MessageBreak%
- tudscr-bundle mentioned in the manual.\MessageBreak%
- \else%
- Please choose a possible encoding (`OT1' or `T1').\MessageBreak%
- \fi%
- A fallback layout is used%
- }%
+ \tud at font@missing at wrn{##1}%
\fi%
}%
\expandafter\@tempa\expandafter{\encodingdefault}%
{\tud at univers}{\@tud at universtrue}{\@tempc{Univers}}%
\expandafter\@tempa\expandafter{\encodingdefault}%
- {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN Bold}}%
+ {\tud at dinbold}{\@tud at dinboldtrue}{\@tempc{DIN-Bold}}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\undef\tud at font@check%
}
+\newcommand*\tud at font@missing at wrn[1]{%
+ \begingroup%
+ \def\@tempa{%
+ `#1' font not found for `\encodingdefault' encoding.\MessageBreak%
+ }%
+ \if at tud@x at fontspec@enabled%
+ \appto\@tempa{%
+ It seems, you haven't installed the required\MessageBreak%
+ OTF-font on your system%
+ }%
+ \else%
+ \ifstr{TU}{\encodingdefault}{%
+ \appto\@tempa{%
+ You should load package `fontspec'\MessageBreak%
+ or %
+ }%
+ }{%
+ \appto\@tempa{Please }%
+ }%
+ \@tempswafalse%
+ \ifstr{OT1}{\encodingdefault}{\@tempswatrue}{}%
+ \ifstr{T1}{\encodingdefault}{\@tempswatrue}{}%
+ \if at tempswa%
+ \appto\@tempa{%
+ use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+ \else%
+ \appto\@tempa{%
+ choose a possible encoding with\MessageBreak%
+ package `fontenc' (`OT1' or `T1')%
+ }%
+ \fi%
+ \fi%
+ \appto\@tempa{.\MessageBreak A fallback layout is used}%
+ \ClassWarning{\TUD at Class@Name}{\@tempa}%
+ \endgroup%
+}
+\newcommand*\tud at font@math at missing@wrn[1]{%
+ \ClassWarning{\TUD at Class@Name}%
+ {%
+ `#1' fonts for math typesetting not found.\MessageBreak%
+ Please use one of the installation scripts listed\MessageBreak%
+ in the TUD-Script manual%
+ }%
+}
\newcommand*\tud at raggedright{\raggedright}
\newcommand*\tud at RaggedRight{\raggedright}
\AfterPackage*{ragged2e}{%
@@ -1537,13 +1574,15 @@
\if at atdocument%
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
\if at tud@univers\else%
- \ClassWarning{\TUD at Class@Name}%
- {`Univers' fonts not found}%
+ \tud at font@missing at wrn{Univers}%
\fi%
\if at tud@dinbold\else%
- \ClassWarning{\TUD at Class@Name}%
- {`DIN Bold' fonts not found}%
+ \tud at font@missing at wrn{DIN-Bold}%
\fi%
+ \ifboolexpr{bool {@tud at univers} and bool {@tud at dinbold}}{}{%
+ \renewcommand*\tud at cdfont@num{0}%
+ \bool at std@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\ifcase\tud at cdfont@num\relax% false
@@ -1564,7 +1603,6 @@
\tud at cmd@restore{mdseries at sf}%
\tud at cmd@restore{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{false}%
\ifcase\tud at cd@num\relax% false
\cs at std@lock{tud at head@font at num}{0}%
\else% !false
@@ -1588,35 +1626,26 @@
\tud at cmd@store{mdseries at sf}%
\tud at cmd@store{mdseries at tt}%
\fi%
- \bool at std@lock{@tud at cdmath}{true}%
\cs at std@lock{tud at head@font at num}{\tud at cdfont@num}%
\if at tud@univers%
\if at tud@x at fontspec@enabled%
- \setsansfont{Univers}[%
- FontFace = {l}{\updefault}{Univers Light},%
- FontFace = {m}{\updefault}{Univers},%
- FontFace = {b}{\updefault}{Univers Bold},%
- FontFace = {bx}{\updefault}{Univers Bold},%
- FontFace = {eb}{\updefault}{Univers Black},%
- FontFace = {l}{\sldefault}{Univers Light Oblique},%
- FontFace = {m}{\sldefault}{Univers Oblique},%
- FontFace = {b}{\sldefault}{Univers Bold Oblique},%
- FontFace = {bx}{\sldefault}{Univers Bold Oblique},%
- FontFace = {eb}{\sldefault}{Univers Black Oblique},%
- NFSSFamily = \tud at univers%
- ]%
+ \setsansfont{Univers}[\tud at x@fontspec at set@univ]%
\setmonofont{LMMono10-Regular}[%
- FontFace = {l}{\updefault}{LMMonoLt10-Regular},%
- FontFace = {m}{\updefault}{LMMono10-Regular},%
- FontFace = {b}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {bx}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {eb}{\updefault}{LMMonoLt10-Bold},%
- FontFace = {l}{\sldefault}{LMMonoLt10-Oblique},%
- FontFace = {m}{\sldefault}{LMMonoSlant10-Regular},%
- FontFace = {b}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {bx}{\sldefault}{LMMonoLt10-BoldOblique},%
- FontFace = {eb}{\sldefault}{LMMonoLt10-BoldOblique},%
- NFSSFamily = \tud at univers t%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{LMMonoLt10-Regular},%
+ FontFace={m}{\updefault}{LMMono10-Regular},%
+ FontFace={b}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={bx}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={eb}{\updefault}{LMMonoLt10-Bold},%
+ FontFace={l}{\sldefault}{LMMonoLt10-Oblique},%
+ FontFace={m}{\sldefault}{LMMonoSlant10-Regular},%
+ FontFace={b}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={bx}{\sldefault}{LMMonoLt10-BoldOblique},%
+ FontFace={eb}{\sldefault}{LMMonoLt10-BoldOblique},%
+ NFSSFamily=\tud at univers t%
]%
\else%
\renewcommand*\sfdefault{\tud at univers}%
@@ -1702,9 +1731,51 @@
\tud at skip@set{belowcaptionskip}{\z@}%
\tud at skip@set{columnsep}{1.1\baselineskip}%
}
-\newcommand*\tud at dinbn{}
-\let\tud at dinbn\relax
\newcommand*\tud at font@init{%
+ \if at tud@x at fontspec@enabled%
+ \if at tud@univers%
+ \newcommand*\tud at x@fontspec at set@univ{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{Univers Light},%
+ FontFace={m}{\updefault}{Univers},%
+ FontFace={b}{\updefault}{Univers Bold},%
+ FontFace={bx}{\updefault}{Univers Bold},%
+ FontFace={eb}{\updefault}{Univers Black},%
+ FontFace={l}{\sldefault}{Univers LightOblique},%
+ FontFace={m}{\sldefault}{Univers Oblique},%
+ FontFace={b}{\sldefault}{Univers BoldOblique},%
+ FontFace={bx}{\sldefault}{Univers BoldOblique},%
+ FontFace={eb}{\sldefault}{Univers BlackOblique}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@univ{Univers}[%
+ \tud at x@fontspec at set@univ,NFSSFamily=\tud at univers%
+ ]%
+ \fi%
+ \if at tud@dinbold%
+ \newcommand*\tud at x@fontspec at set@din{%
+ BoldFont={},%
+ ItalicFont={},%
+ BoldItalicFont={},%
+ SmallCapsFont={},%
+ FontFace={l}{\updefault}{DIN-Bold},%
+ FontFace={m}{\updefault}{DIN-Bold},%
+ FontFace={b}{\updefault}{DIN-Bold},%
+ FontFace={bx}{\updefault}{DIN-Bold},%
+ FontFace={eb}{\updefault}{DIN-Bold},%
+ FontFace={l}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={m}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={b}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={bx}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15},%
+ FontFace={eb}{\sldefault}{Font=DIN-Bold,FakeSlant=0.15}%
+ }%
+ \newfontfamily\tud at x@fontspec at fam@din{DIN-Bold}[%
+ \tud at x@fontspec at set@din,NFSSFamily=\tud at dinbold%
+ ]%
+ \fi%
+ \fi%
\if at tud@univers%
\newrobustcmd*\univln{\usefont{\encodingdefault}{\tud at univers}{l}{n}}%
\newrobustcmd*\univrn{\usefont{\encodingdefault}{\tud at univers}{m}{n}}%
@@ -1719,29 +1790,13 @@
\newrobustcmd*\univrn{\tud at font@fallback{Univers}{md}{up}}%
\newrobustcmd*\univbn{\tud at font@fallback{Univers Bold}{bf}{up}}%
\newrobustcmd*\univxn{\tud at font@fallback{Univers Black}{bf}{up}}%
- \newrobustcmd*\univls{\tud at font@fallback{Univers Light Oblique}{md}{sl}}%
+ \newrobustcmd*\univls{\tud at font@fallback{Univers LightOblique}{md}{sl}}%
\newrobustcmd*\univrs{\tud at font@fallback{Univers Oblique}{md}{sl}}%
- \newrobustcmd*\univbs{\tud at font@fallback{Univers Bold Oblique}{bf}{sl}}%
- \newrobustcmd*\univxs{\tud at font@fallback{Univers Black Oblique}{bf}{sl}}%
+ \newrobustcmd*\univbs{\tud at font@fallback{Univers BoldOblique}{bf}{sl}}%
+ \newrobustcmd*\univxs{\tud at font@fallback{Univers BlackOblique}{bf}{sl}}%
\fi%
\if at tud@dinbold%
- \if at tud@x at fontspec@enabled%
- \newfontface\tud at dinbn{DIN Bold}[%
- FontFace = {l}{\updefault}{DIN Bold},%
- FontFace = {m}{\updefault}{DIN Bold},%
- FontFace = {b}{\updefault}{DIN Bold},%
- FontFace = {bx}{\updefault}{DIN Bold},%
- FontFace = {eb}{\updefault}{DIN Bold},%
- FontFace = {l}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {m}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {b}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {bx}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- FontFace = {eb}{\sldefault}{Font=DIN Bold,FakeSlant=0.15},%
- NFSSFamily = \tud at dinbold%
- ]%
- \else%
- \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
- \fi%
+ \newrobustcmd*\tud at dinbn{\usefont{\encodingdefault}{\tud at dinbold}{b}{n}}%
\if at tud@dinboldmath%
\appto\tud at dinbn{\mathversion{dinbold}}%
\fi%
@@ -1748,7 +1803,7 @@
\newrobustcmd*\dinbn{\tud at dinbn}%
\else%
\newrobustcmd*\tud at dinbn{\sectfont}%
- \newrobustcmd*\dinbn{\tud at font@wrn{DIN Bold}\tud at dinbn}%
+ \newrobustcmd*\dinbn{\tud at font@fallback at wrn{DIN-Bold}\tud at dinbn}%
\fi%
\newcommand*\textuln{}%
\newcommand*\texturn{}%
@@ -1771,10 +1826,10 @@
\undef\tud at font@init%
}
\newcommand*\tud at font@fallback[3]{%
- \tud at font@wrn{#1}%
+ \tud at font@fallback at wrn{#1}%
\sffamily\csuse{#2series}\csuse{#3shape}%
}
-\newcommand*\tud at font@wrn[1]{%
+\newcommand*\tud at font@fallback at wrn[1]{%
\ClassWarning{\TUD at Class@Name}%
{%
The requested font `#1' is not available, so\MessageBreak%
@@ -1975,17 +2030,16 @@
}
\newcommand*\tud at font@math at set{%
\if at atdocument%
- \ifnum\tud at cdfont@num>\z@\relax% true/heavy
- \if at tud@cdmath%
- \if at tud@universmath\else%
- \ClassWarning{\TUD at Class@Name}%
- {`Univers' math fonts not found}%
- \fi%
- \if at tud@dinboldmath\else%
- \ClassWarning{\TUD at Class@Name}%
- {`DIN Bold' math fonts not found}%
- \fi%
+ \if at tud@cdmath%
+ \if at tud@universmath\else%
+ \tud at font@math at missing@wrn{Univers}%
\fi%
+ \if at tud@dinboldmath\else%
+ \tud at font@math at missing@wrn{DIN-Bold}%
+ \fi%
+ \ifboolexpr{bool {@tud at universmath} and bool {@tud at dinboldmath}}{}{%
+ \bool at set@lock{@tud at cdmath}{false}%
+ }%
\fi%
\fi%
\if at tud@universmath%
@@ -2033,8 +2087,8 @@
\ifundef{\mdseries at tt}{\edef\mdseries at tt{\mddefault}}{}%
\fi%
\tud at font@check%
+ \tud at font@init%
\tud at font@set%
- \tud at font@init%
\if at tud@x at bm@requested%
\tud at font@math at init%
\UnPreventPackageFromLoading{bm}%
@@ -4184,7 +4238,6 @@
\newcommand*\tud at head@fontsize{}
\newcommand*\tud at head@font at light{}
\newcommand*\tud at head@font at bold{}
-\newcommand*\tud at head@font@@bold{}
\newcommand*\tud at head@font at set{%
\ifcase\tud at head@font at num\relax% false
\ifnum\tud at cdfont@num>\z@\relax% true/heavy
@@ -4202,9 +4255,6 @@
{\sfdefault}{\mddefault}{\updefault}{\tud at head@fontsize}%
\DeclareFixedFont{\tud at head@font at bold}{\encodingdefault}%
{\sfdefault}{\bfdefault}{\updefault}{\tud at head@fontsize}%
- \protected\gdef\tud at head@font@@bold{%
- \usefont{\encodingdefault}{\sfdefault}{\bfdefault}{\updefault}%
- }%
\ifcase\tud at head@font at num\relax\else% true/heavy
\if at tud@univers%
\ifcase\tud at head@font at num\relax\or% true
@@ -4216,9 +4266,6 @@
\fi%
\DeclareFixedFont{\tud at head@font at bold}{\encodingdefault}%
{\tud at univers}{b}{n}{\tud at head@fontsize}%
- \protected\gdef\tud at head@font@@bold{%
- \usefont{\encodingdefault}{\tud at univers}{b}{n}%
- }%
\fi%
\fi%
\global\@tud at head@font at setfalse%
@@ -6073,7 +6120,7 @@
}{%
\ifstr{#1}{custom}{\bool at set@lock{@tud at cdgeometry@cover}{false}}{%
\ifstr{#1}{user}{\bool at set@lock{@tud at cdgeometry@cover}{false}}{%
- \TUD at parameter@error{cdgeometry}{true,false}%
+ \TUD at parameter@error{cdgeometry}{true, false}%
}%
}%
}%
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrsupervisor.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -11,7 +11,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -54,7 +54,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -76,7 +76,7 @@
}{}
%%% From File: tudscr-supervisor.dtx
\ProvidesPackage{tudscrsupervisor}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(commands for supervisors)%
]
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/tudscrtutorial.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -14,7 +14,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -57,7 +57,7 @@
\fi%
}
\fi
- \TUD at Version@Check{2017/03/27 v2.05k TUD-Script}
+ \TUD at Version@Check{2017/03/29 v2.05l TUD-Script}
\endgroup
\NeedsTeXFormat{LaTeX2e}
\providecommand*\tudscrmail{hanisch.latex at outlook.com}
@@ -79,7 +79,7 @@
}{}
%%% From File: tudscr-manual.dtx
\ProvidesPackage{tudscrtutorial}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(internal tutorials)%
]
@@ -163,7 +163,7 @@
\@ifpackagelater{geometry}{2010/09/13}{%
\ClassWarning{\TUD at Class@Name}{%
Package `geometry' was updated so some patches\MessageBreak%
- are maybe outdated
+ are maybe outdated%
}%
}{}%
\newcommand*\vTUDScript{v\TUDScriptVersionNumber}
@@ -268,7 +268,7 @@
{%
It is strongly recommended to load package `hyperref'.\MessageBreak%
Nevertheless, essential commands are rudimentarily\MessageBreak%
- defined. At least the package `url' is loaded.%
+ defined. At least the package `url' is loaded%
}%
\providecommand*\hypersetup[1]{}%
\providecommand*\href[3][]{#3}%
@@ -1223,8 +1223,8 @@
\begin{filecontents*}{\tud at tut@temp-standalone.tex}
\RequirePackage[ngerman=ngerman-x-latest]{hyphsubst}
\documentclass[english,ngerman]{tudscrreprt}
+\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
\usepackage{babel}
\usepackage{tudscrsupervisor}
\usepackage{isodate}
Modified: trunk/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty 2017-03-30 21:32:38 UTC (rev 43648)
+++ trunk/Master/texmf-dist/tex/latex/tudscr/twocolfix.sty 2017-03-30 21:33:00 UTC (rev 43649)
@@ -8,7 +8,7 @@
%%
%% TUD-Script -- Corporate Design of Technische Universitaet Dresden
%%
-%% 2017/03/27 v2.05k TUD-Script
+%% 2017/03/29 v2.05l TUD-Script
%%
%% Copyright (C) Falk Hanisch <hanisch.latex at outlook.com>, 2012-2017
%%
@@ -29,7 +29,7 @@
%%% From File: tudscr-twocolfix.dtx
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{twocolfix}[%
- 2017/03/27 v2.05k TUD-Script
+ 2017/03/29 v2.05l TUD-Script
package
(twocolumn layout bugfix)%
]
More information about the tex-live-commits
mailing list