diff options
author | Karl Berry <karl@freefriends.org> | 2019-09-26 21:49:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-09-26 21:49:06 +0000 |
commit | df42b39352bb8ffd623c43a39225b9d869e698e3 (patch) | |
tree | 81aff42fdc79011544fd341c272352981278d11c | |
parent | 8a294669f9624eae14a2acd6446a70745ce6452c (diff) |
tuda-ci (26sep19)
git-svn-id: svn://tug.org/texlive/trunk@52184 c570f23f-e606-0410-a88d-b1316a301751
32 files changed, 172 insertions, 93 deletions
diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf Binary files differindex fa33bcf2c49..43593adc738 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex index 3bf70cedd38..13a0dca9b48 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaBeamer.tex' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaBeamer.tex' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -78,6 +78,7 @@ \item Verwendung wie beamer \item keine besondere Syntax notwendig \item Klassenoption accentcolor wählt Akzentfarbe + \item Option serif=true für Serifenschrift \end{itemize} \end{frame} @@ -126,5 +127,19 @@ Ein Beispiel. \end{example} \end{frame} + +\begin{frame}[fragile]{Anpassungen der Mathematikschriftarten} + Es gibt keine fest Vorgabe zur Verwendung einer Mathematikschrift. + + In der Diskussion (\url{https://github.com/tudace/tuda_latex_templates/issues/30}) hat sich folgendes als hinreiche Lösung herausgestellt. Jedoch funktioniert diese Lösung nicht in pdflatex! + \begin{verbatim} + \usepackage{unicode-math} + \setmathfont{Fira Math} + \setmathfont[range=up]{Roboto} + \setmathfont[range=it]{Roboto-Italic} + \setmathfont[range=\int]{Fira Math} + \end{verbatim} + Allgemein kann jedoch die Mathematikschriftart wie auch sonst durch Pakete angepasst werden. +\end{frame} \end{document} diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib index 22bed7debf0..636a09f1c8c 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaBibliography.bib' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaBibliography.bib' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco index 4d00cb10eca..fdab6d79138 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaFromaddress.lco' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaFromaddress.lco' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf Binary files differindex 19a06df0fae..91b5ae3ea69 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex index daa26807820..90709bd5206 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaLetter.tex' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaLetter.tex' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf Binary files differindex 276d6f77781..0d2a7d2fd5a 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex index fbe3bab63fe..56ce9986621 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPhD.tex' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaPhD.tex' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf Binary files differindex 23eb5d40a97..6084d4e7e88 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex index 1b505ed0390..802f967b5f7 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPoster.tex' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaPoster.tex' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf Binary files differindex f0e30c50f9e..d9d69b28ec6 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex index 54f3968ab31..6784405762b 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPub.tex' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaPub.tex' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -234,7 +234,7 @@ Bei älteren \TeX-Distributionen kann es vorkommen, dass die Farbprofile nicht v \begin{verbatim} No color profile found to use for RGB screen colors \end{verbatim} -Um diesen Fehler zu beheben, können die notwendigen *.icc-Dateien unter \url{https://ctan.org/tex-archive/support/colorprofiles} heruntergeladen und entweder installiert oder im Projektordner mit abgelegt werden. Die einfachste Lösung bleibt jedoch, das eigene \TeX-System zu aktualisieren. +Um diesen Fehler zu beheben, können die notwendigen *.icc-Dateien unter \url{http://mirror.ctan.org/support/colorprofiles} heruntergeladen und entweder installiert oder im Projektordner mit abgelegt werden. Die einfachste Lösung bleibt jedoch, das eigene \TeX-System zu aktualisieren. Darüber hinaus werden bei \hologo{XeLaTeX} einige Features nicht unterstützt. In diesem Fall erzeugt \code{pdfa=false} ein kompilierbares Dokument, allerdings sollte für validierbare PDF/A-Dateien auf \hologo{LuaLaTeX} einer möglichst aktuellen Version umgestiegen werden. @@ -250,7 +250,7 @@ Im Stil der einzelnen Teilbereiche können so, über Aufruf von \end{verbatim} entsprechende Labels generiert werden. Sie haben den Namen \code{IMRAD:<Schlüssel>}. - +Der Prüfmechanismus ist auf Wunsch der Bibliothek standardmäßig aktiviert, kann jedoch durch die Option \code{IMRAD=false} deaktiviert werden. \section{Erweiterte Konfigurationsmöglichkeiten} @@ -268,6 +268,24 @@ Auf Wunsch wurden diese Makros auch bei \cls{scrartcl} und \cls{scrreprt} als Ba Somit ist es möglich, für den Vorspann auf römische Ziffern zu wechseln. Ab \verb+\mainmatter+ werden dann arabische Ziffern verwendet. +\subsection{Mathematikschriften} +Da es keine Compiler-unanbhängige, universelle Mathematikschrift gibt und die Corporate Design Richtlinien auch keinerlei Empfehlung berücksichtigen, wurden hierfür einige mögliche Varianten diskutiert. Die Voreinstallung entspricht immer dem Standard der Installation. Es werden keine spezifischen Einstellungen geladen. + +Die Diskussion hierzu findet sich unter \url{https://github.com/tudace/tuda_latex_templates/issues/19} + +Im Folgenden werden ein paar Beispielkonfigurationen gezeigt. Grundsätzlich ist die Mathematikschriftart jedoch -- abgesehen durch Einschränkungen des Compilers -- frei wählbar. + +Bei Auswahl und Verwendung ist häufig der \enquote{\TeX{} Font Catalogue hilfreich}: \url{https://tug.org/FontCatalogue/mathfonts.html} + +\subsection{\hologo{pdfLaTeX}} +Hier existiert eine Variante, die die Buchstaben der Basischriftart \enquote{Charter} mit Mathematiksymbolen aus unterschiedlichen Zeichensätzen möglichst passend kombiniert. + +\begin{verbatim} +\usepackage[charter]{mathdesign} +\end{verbatim} + +Es gibt ähnliche Ansätze für ein paar weitere Kombinationen. Einige Beispiele finden sich in der XCharter Dokumentation. \url{http://mirrors.ctan.org/fonts/xcharter/doc/xcharter-doc.pdf} + \section{Standard-KOMA-Script} \label{KOMA} diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf Binary files differindex 99cfe21847c..2cee61d2a3c 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex index 27dcda60ff1..ec299a74b80 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaSciPoster.tex' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaSciPoster.tex' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf Binary files differindex 9c02b725521..50cc0276b01 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex index 6a0d0c19545..cf26942f491 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaThesis.tex' version 1.10 (2019/09/09), +%% This is file `DEMO-TUDaThesis.tex' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/README.md b/Master/texmf-dist/doc/latex/tuda-ci/README.md index 64284dae462..8028e97a1c8 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/README.md +++ b/Master/texmf-dist/doc/latex/tuda-ci/README.md @@ -2,7 +2,7 @@ Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2019 - tuda-ci 2019/08/05 v1.10 + tuda-ci 2019/09/25 v1.11 *************************************************************************** @@ -120,4 +120,5 @@ letter | DEMO-TUDaLetter.tex, using DEMO-TUDaFromaddress.lco | tudaletter.cls a - Corrections and changes concerning the margin definitions - Fix compatibility issue with datetime package - Improved implementation of the headline option - - Add information on package dependencies
\ No newline at end of file + - Add information on package dependencies + * v1.11 (2019-09-25) bugfixes + smaller adjustments to simplify usage
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty index a3c33bb09da..c6481f6877c 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamercolorthemeTUDa.sty' version 1.10 (2019/09/09), +%% This is file `beamercolorthemeTUDa.sty' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamercolorthemeTUDa} [\filedate\space\fileversion] diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty index fbdf3382fa9..b1f54a81850 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerfontthemeTUDa.sty' version 1.10 (2019/09/09), +%% This is file `beamerfontthemeTUDa.sty' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,16 +26,36 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerfontthemeTUDa} [\filedate\space\fileversion] + +\RequirePackage{l3keys2e} + +\ExplSyntaxOn +\keys_define:nn {TUDa/beamer/fonts} { + serif .bool_gset:N = \g_TUDa_serif_bool, + serif .default:n = true, + serif .initial:n = false, + sans-serif .bool_gset_inverse:N = \g_TUDa_serif_bool, + sans-serif .default:n = true, +} + +\ProcessKeysOptions{TUDa/beamer/fonts} + +\ExplSyntaxOff + +\mode<presentation> \RequirePackage{tudafonts} -\renewcommand*{\familydefault}{\sfdefault} -\mode<presentation>{\beamer@suppressreplacementstrue} +\ExplSyntaxOn +\bool_if:NTF \g_TUDa_serif_bool + {\usefonttheme{serif}} + {\renewcommand*{\familydefault}{\sfdefault}} +\ExplSyntaxOff \setbeamerfont{title}{size=\large,series=\bfseries} \setbeamerfont{subtitle}{size=\normalsize,series=\bfseries} @@ -44,4 +64,6 @@ \setbeamerfont{frametitle}{size=\large,series=\bfseries} \setbeamerfont{author in head/foot}{size=\tiny} +\mode<all> + \endinput diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty index 356dfd89225..1838dfd3055 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerinnerthemeTUDa.sty' version 1.10 (2019/09/09), +%% This is file `beamerinnerthemeTUDa.sty' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerinnerthemeTUDa} [\filedate\space\fileversion] @@ -110,10 +110,8 @@ \let\width\l_TUDa_titlegraphic_wd_dim \nointerlineskip \begin{beamercolorbox}[wd=\width, - ht=\l_TUDa_titlegraphic_ht_dim, - dp=\z@, ]{titlegraphic} - \inserttitlegraphic + \raisebox{-\c_TUDa_largerule_dim}[\dim_eval:n {\height-\c_TUDa_largerule_dim}][0pt]{\inserttitlegraphic} \end{beamercolorbox} } diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty index e78cae9cb68..661c5c3ac57 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerouterthemeTUDa.sty' version 1.10 (2019/09/09), +%% This is file `beamerouterthemeTUDa.sty' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerouterthemeTUDa} [\filedate\space\fileversion] @@ -109,7 +109,7 @@ \defbeamertemplate*{footline}{TUDa theme} { - \begin{beamercolorbox}[leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep,wd=\TUDa@beamer@linewidth, + \begin{beamercolorbox}[leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep, ht=\csname c_TUDa_smallrule_dim\endcsname,dp=1mm]{footline} \TUDa@beamer@rule \end{beamercolorbox} @@ -144,7 +144,8 @@ \defbeamertemplate{headline}{TUDa theme.logo} {% % \vspace{.75\TUDa@beamer@sep} \begin{beamercolorbox}[ - leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep,wd=\TUDa@beamer@linewidth,ht=.75\TUDa@beamer@sep,dp=\box_dp:N \TUDa@beamer@headrule_box]{headline} + leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep,%wd=\TUDa@beamer@linewidth, + ht=.75\TUDa@beamer@sep,dp=\box_dp:N \TUDa@beamer@headrule_box]{headline} \TUDa@beamer@headrule \end{beamercolorbox} } @@ -154,7 +155,7 @@ \defbeamertemplate{frametitle}{TUDa theme.logo}{% \nointerlineskip% \begin{beamercolorbox}[ - sep=\TUDa@beamer@logosep,wd=\dimexpr\TUDa@beamer@linewidth\relax, + sep=\TUDa@beamer@logosep,%wd=\dimexpr\TUDa@beamer@linewidth\relax, rightskip=-\TUDa@beamer@logosep, % leftskip=-\TUDa@beamer@logosep ]{frametitle} @@ -179,17 +180,18 @@ {% \vspace{.75\TUDa@beamer@sep} \begin{beamercolorbox}[ - leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep,wd=\TUDa@beamer@linewidth]{headline} + leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep]{headline} \TUDa@beamer@headrule \end{beamercolorbox} } \defbeamertemplate*{frametitle}{TUDa theme.nologo}{% \nointerlineskip% \begin{beamercolorbox}[ - sep=\TUDa@beamer@logosep,wd=\dimexpr\TUDa@beamer@linewidth\relax, + sep=\TUDa@beamer@logosep, ]{frametitle} - \parbox[t]{\linewidth}{% - \usebeamerfont{frametitle}\insertframetitle + \parbox[t]{\dimexpr\TUDa@beamer@linewidth-2\TUDa@beamer@logosep}{% + \usebeamerfont{frametitle} + \insertframetitle \ifx\insertframesubtitle\@empty \else \par @@ -198,7 +200,7 @@ \insertframesubtitle \fi }% -% Rule vor voffset similar to logo +% Rule for voffset similar to logo \rule[\dimexpr-\ht\TUDa@logobox+\ht\strutbox\relax]{0pt}{\dimexpr\ht\TUDa@logobox+\dp\TUDa@logobox\relax} \end{beamercolorbox} \nointerlineskip diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty index f0a1cd3a8e3..10c021f9780 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerthemeTUDa.sty' version 1.10 (2019/09/09), +%% This is file `beamerthemeTUDa.sty' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthemeTUDa} [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt] @@ -41,11 +41,11 @@ \keys_define:nn {TUDa/beamer} { accentcolor .code:n = \PassOptionsToPackage{accentcolor=#1}{tudacolors}, - colortitle .code:n = \tl_show:n {true}\PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, + colortitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, colorbacktitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, colorframetitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, colorback .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, - logo .code:n = \tl_show:n {#1}\PassOptionsToPackage{logo=#1}{beamerouterthemeTUDa} + logo .code:n = \PassOptionsToPackage{logo=#1}{beamerouterthemeTUDa} } \ProcessKeysOptions{TUDa/beamer} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls index 09d6c0bde9e..2e30b5f986e 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls @@ -1,4 +1,4 @@ -%% This is file `tudabeamer.cls' version 1.10 (2019/09/09), +%% This is file `tudabeamer.cls' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{tudabeamer} [\filedate\space\fileversion\space] @@ -36,20 +36,25 @@ \RequirePackage{URspecialopts} \Define@specialopt@Module[TUDa/beamer] +\PassOptionsToClass{10pt}{beamer} \Module@DefineSpecialPassKey[TUDa/beamer]{color}<tudacolors> \ExplSyntaxOn \keys_define:nn {TUDa/beamer} { accentcolor .code:n = \PassOptionsToPackage{accentcolor=#1}{tudacolors}, - colortitle .code:n = \tl_show:n {true}\PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, + colortitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, colorbacktitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, colorframetitle .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, colorback .code:n = \PassOptionsToPackage{accentcolor=#1}{beamercolorthemeTUDa}, - logo .code:n = \tl_show:n {#1}\PassOptionsToPackage{logo=#1}{beamerouterthemeTUDa}, + logo .code:n = \PassOptionsToPackage{logo=#1}{beamerouterthemeTUDa}, pdfa .bool_gset:N = \g_TUDa@pdfa_bool, pdfa .initial:n = false, logofile .code:n = \PassOptionsToPackage{logofile=#1}{beamerouterthemeTUDa}, + serif .code:n = \PassOptionsToPackage{serif=#1}{beamerfontthemeTUDa}, + serif .default:n = true, + sans-serif .code:n = \PassOptionsToPackage{sans-serif=#1}{beamerfontthemeTUDa}, + sans-serif .default:n = true, } @@ -84,7 +89,6 @@ \ExplSyntaxOff % Load the latex-beamer class -\PassOptionsToClass{10pt}{beamer} \LoadClass{beamer} \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def index ec0cb53a4c2..ac9aa26af3c 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def @@ -1,4 +1,4 @@ -%% This is file `tudacolors.def' version 1.10 (2019/09/09), +%% This is file `tudacolors.def' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \ProvidesFile{tudacolors.def} [\filedate\space\fileversion\space Color definitions for tuda-ci] diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty index fd546e094d7..7bf135eae7a 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty @@ -1,4 +1,4 @@ -%% This is file `tudacolors.sty' version 1.10 (2019/09/09), +%% This is file `tudacolors.sty' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty index b935d95705c..09d47f5c82f 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty @@ -1,4 +1,4 @@ -%% This is file `tudafonts.sty' version 1.10 (2019/09/09), +%% This is file `tudafonts.sty' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tudafonts} [\filedate\space\fileversion\space diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls index 1cc25ffd167..9dd30d37c61 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls @@ -1,4 +1,4 @@ -%% This is file `tudaletter.cls' version 1.10 (2019/09/09), +%% This is file `tudaletter.cls' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaletter} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls index 13213823027..d79e9169ebd 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls @@ -1,4 +1,4 @@ -%% This is file `tudaposter.cls' version 1.10 (2019/09/09), +%% This is file `tudaposter.cls' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt} @@ -189,8 +189,10 @@ voffset=\paperheight-\g_TUDa_margin_dim, mode=picture, contents={% + \tl_if_empty:NF \g_TUDa_poster_qrcode_tl { \raisebox{\depth}{\qrcode[height=\dim_eval:n {\g_TUDa_qrcode_dim-2\fboxsep}]{\g_TUDa_poster_qrcode_tl}} - } + } + } ]{TUDa.poster.qrcode} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls index 2cbc051fe51..6fe60939034 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls @@ -1,4 +1,4 @@ -%% This is file `tudapub.cls' version 1.10 (2019/09/09), +%% This is file `tudapub.cls' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} @@ -329,23 +329,26 @@ \usepackage[draft=false]{scrlayer-scrpage} \bool_if:NTF \g_TUDa_geometry_bool { - \RequirePackage[top=\g_TUDa_topMargin_dim, inner=\g_TUDa_innerMargin_dim, outer=\dim_eval:n {\g_TUDa_outerMargin_dim}, bottom=\g_TUDa_bottomMargin_dim, columnsep= \g_TUDa_columnSep_dim, includehead, includefoot,includemp, nomarginpar, headheight=\g_TUDa_headheight_dim - ]{geometry} - - + \RequirePackage{geometry} + \geometry{ + top=\g_TUDa_topMargin_dim, + inner=\g_TUDa_innerMargin_dim, + outer=\dim_eval:n {\g_TUDa_outerMargin_dim}, + bottom=\g_TUDa_bottomMargin_dim, + columnsep= \g_TUDa_columnSep_dim, + includehead, + includefoot, + includemp, + nomarginpar, + headheight=\g_TUDa_headheight_dim + } \savegeometry{TUDa@nomarginpar} \geometry{includemp, marginpar=\g_TUDa_marginpar_dim, marginparsep=\g_TUDa_columnSep_dim} \KOMAoptions{mpinclude} \savegeometry{TUDa@marginpar} - \bool_if:NTF \g_TUDa_marginpar_bool { - \loadgeometry{TUDa@marginpar} - } { - \loadgeometry{TUDa@nomarginpar} - } - \bool_if:NTF \g_TUDa_custommargins_bool { - \AtBeginDocument{\savegeometry{TUDa@default}} + \AtBeginDocument{\savegeometry{TUDa@default}} \tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@default} }{ \bool_if:NTF \g_TUDa_marginpar_bool { @@ -353,6 +356,7 @@ } { \tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@nomarginpar} } + \AtBeginDocument{\loadgeometry{\c_TUDa_default_geometry_tl}} } \dim_gset:Nn \g_TUDa_headwidth_dim {\paperwidth-\g_TUDa_innerMargin_dim-\g_TUDa_outerMargin_dim-\Gm@bindingoffset} @@ -421,7 +425,21 @@ %Adjust headheight \AtBeginDocument{ \KOMAoptions{headlines=1.5} -\recalctypearea +\bool_if:NTF \g_TUDa_marginpar_bool + { + \KOMAoptions { + headwidth=textwithmarginpar, + footwidth=textwithmarginpar + } + }{ + \KOMAoptions { + headwidth=text, + footwidth=text + } + } +\box_if_exist:NF \TUDa@headline_box { + \TUDa@makeheadrule[color=identbarcolor, width=\sls@headwidth]{TUDa@headline} +} } \newpairofpagestyles[scrheadings]{TUDa.headings}{ @@ -448,9 +466,8 @@ } \setkomafont{pagehead}{\Large\bfseries} -\box_if_exist:NF \TUDa@headline_box { - \TUDa@makeheadrule[color=identbarcolor, width=\sls@headwidth]{TUDa@headline} -} + + \if@twocolumn \edef\sls@evenheadshift{\dim_eval:n {-\marginparwidth-\marginparsep\relax}} \let\sls@oddheadshift\sls@evenheadshift diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty index b1c0971024f..2304752f24b 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty @@ -1,4 +1,4 @@ -%% This is file `tudarules.sty' version 1.10 (2019/09/09), +%% This is file `tudarules.sty' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls index 96895ebafbe..b4d813c5dfd 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls @@ -1,4 +1,4 @@ -%% This is file `tudasciposter.cls' version 1.10 (2019/09/09), +%% This is file `tudasciposter.cls' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg index ad6d337fa38..4dd6d13762e 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg @@ -1,4 +1,4 @@ -%% This is file `tudathesis.cfg' version 1.10 (2019/09/09), +%% This is file `tudathesis.cfg' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Coporate Design (tuda-ci)} @@ -522,7 +522,7 @@ Die Arbeit hat bisher noch nicht zu Prüfungszwecken gedient. \bigskip }{ \section*{Erklärung zur Abschlussarbeit\\gemäß \S{}22~Abs.~7 und \S{}23~Abs.~7~APB der TU~Darmstadt} -Hiermit versichere ich, #1, die vorliegende \TUDa@thesisType{} ohne Hilfe Dritter und nur mit den angegebenen Quellen und Hilfsmitteln angefertigt zu haben. Alle Stellen, die Quellen entnommen wurden, sind als solche kenntlich gemacht worden. Diese Arbeit hat in gleicher oder ähnlicher Form noch keiner Prüfungsbehörde vorgelegen. +Hiermit versichere ich, \@author, die vorliegende \TUDa@thesisType{} ohne Hilfe Dritter und nur mit den angegebenen Quellen und Hilfsmitteln angefertigt zu haben. Alle Stellen, die Quellen entnommen wurden, sind als solche kenntlich gemacht worden. Diese Arbeit hat in gleicher oder ähnlicher Form noch keiner Prüfungsbehörde vorgelegen. \par Mir ist bekannt, dass im Fall eines Plagiats (\S{}38~Abs.~2~APB) ein Täuschungsversuch vorliegt, der dazu führt, dass die Arbeit mit 5,0 bewertet und damit ein Prüfungsversuch verbraucht wird. Abschlussarbeiten dürfen nur einmal wiederholt werden. \par |