diff options
Diffstat (limited to 'macros/latex')
52 files changed, 267 insertions, 278 deletions
diff --git a/macros/latex/contrib/l3build/CHANGELOG.md b/macros/latex/contrib/l3build/CHANGELOG.md index 50d5d5cc9d..09a8b1a94b 100644 --- a/macros/latex/contrib/l3build/CHANGELOG.md +++ b/macros/latex/contrib/l3build/CHANGELOG.md @@ -7,6 +7,16 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2019-09-25] + +### Added + +- New `texmfdir` variable for more complex local additions + +### Fixed + +- Clean out all configuration test dirs (see #98) + ## [2019-09-18] ### Added @@ -327,7 +337,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2019-09-18...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2019-09-25...HEAD +[2019-09-25]: https://github.com/latex3/l3build/compare/2019-09-18...2019-09-25 [2019-09-18]: https://github.com/latex3/l3build/compare/2019-09-14...2019-09-18 [2019-09-14]: https://github.com/latex3/l3build/compare/2019-08-24...2019-09-14 [2019-08-24]: https://github.com/latex3/l3build/compare/2019-07-31...2019-08-24 diff --git a/macros/latex/contrib/l3build/README.md b/macros/latex/contrib/l3build/README.md index 39787b7856..432fd5583c 100644 --- a/macros/latex/contrib/l3build/README.md +++ b/macros/latex/contrib/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX3 ================================================= -Release 2019-09-18 +Release 2019-09-25 Overview -------- diff --git a/macros/latex/contrib/l3build/l3build-check.lua b/macros/latex/contrib/l3build/l3build-check.lua index 8d1d58aee3..731d4282ea 100644 --- a/macros/latex/contrib/l3build/l3build-check.lua +++ b/macros/latex/contrib/l3build/l3build-check.lua @@ -721,14 +721,21 @@ function runtest(name, engine, hide, ext, pdfmode, breakout) -- Ensure there is no stray .log file rm(testdir,name .. logext) local errlevels = {} + local localtexmf = "" + if texmfdir and texmfdir ~= "" then + localtexmf = os_pathsep .. abspath(texmfdir) .. "//" + end + local texmfdir = abspath(texmfdir) .. "//" for i = 1, checkruns do errlevels[i] = run( testdir, -- No use of localdir here as the files get copied to testdir: -- avoids any paths in the logs - os_setenv .. " TEXINPUTS=." .. (checksearch and os_pathsep or "") + os_setenv .. " TEXINPUTS=." .. localtexmf + .. (checksearch and os_pathsep or "") .. os_concat .. - os_setenv .. " LUAINPUTS=." .. (checksearch and os_pathsep or "") + os_setenv .. " LUAINPUTS=." .. localtexmf + .. (checksearch and os_pathsep or "") .. os_concat .. -- Avoid spurious output from (u)pTeX os_setenv .. " GUESS_INPUT_KANJI_ENCODING=0" diff --git a/macros/latex/contrib/l3build/l3build-typesetting.lua b/macros/latex/contrib/l3build/l3build-typesetting.lua index eb2974cdf2..8e5b17bfc4 100644 --- a/macros/latex/contrib/l3build/l3build-typesetting.lua +++ b/macros/latex/contrib/l3build/l3build-typesetting.lua @@ -63,7 +63,12 @@ function runcmd(cmd,dir,vars) local vars = vars or {} -- Allow for local texmf files local env = os_setenv .. " TEXMFCNF=." .. os_pathsep + local localtexmf = "" + if texmfdir and texmfdir ~= "" then + localtexmf = os_pathsep .. abspath(texmfdir) .. "//" + end local envpaths = "." .. os_pathsep + .. localtexmf .. abspath(localdir) .. os_pathsep .. dir .. (typesetsearch and os_pathsep or "") -- Deal with spaces in paths diff --git a/macros/latex/contrib/l3build/l3build-variables.lua b/macros/latex/contrib/l3build/l3build-variables.lua index 6eb0f37858..11186c0e3f 100644 --- a/macros/latex/contrib/l3build/l3build-variables.lua +++ b/macros/latex/contrib/l3build/l3build-variables.lua @@ -46,6 +46,7 @@ sourcefiledir = sourcefiledir or currentdir supportdir = supportdir or maindir .. "/support" testfiledir = testfiledir or currentdir .. "/testfiles" testsuppdir = testsuppdir or testfiledir .. "/support" +texmfdir = texmfdir or maindir .. "/texmf" -- Structure within a development area builddir = builddir or maindir .. "/build" diff --git a/macros/latex/contrib/l3build/l3build.1 b/macros/latex/contrib/l3build/l3build.1 index bf724455ec..4959f4b0e9 100644 --- a/macros/latex/contrib/l3build/l3build.1 +++ b/macros/latex/contrib/l3build/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2019-09-18" +.TH l3build 1 "2019-09-25" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/macros/latex/contrib/l3build/l3build.dtx b/macros/latex/contrib/l3build/l3build.dtx index a7e04a1a6f..0597933557 100644 --- a/macros/latex/contrib/l3build/l3build.dtx +++ b/macros/latex/contrib/l3build/l3build.dtx @@ -63,6 +63,7 @@ \luavarset{supportdir} {maindir .. "/support"} {Directory containing general support files} \luavarset{testfiledir}{"./testfiles"} {Directory containing test files} \luavarset{testsuppdir}{testfiledir .. "/support"}{Directory containing test-specific support files} +\luavarset{texmfdir}{maindir .. "/texmf"}{Directory containing support files in tree form} \luavarseparator \luavarset{builddir} {maindir .. "/build"} {Directory for building and testing} \luavarset{distribdir}{builddir .. "/distrib"}{Directory for generating distribution structure} @@ -229,7 +230,7 @@ % }^^A % } % -% \date{Released 2019-09-18} +% \date{Released 2019-09-25} % % \maketitle % \tableofcontents @@ -387,6 +388,8 @@ % \item any files in the directory \var{testsuppdir}; % \item any files that match \var{checksuppfiles} in the \var{supportdir}. % \end{itemize} +% The \var{texmfdir} is also made available to the tests (if defined and +% non-empty). % This range of possibilities allow sensible defaults but significant flexibility for defining your own test setups. % % Checking can be performed with any or all of the `engines' \texttt{pdftex}, \texttt{xetex}, and \texttt{luatex}. diff --git a/macros/latex/contrib/l3build/l3build.lua b/macros/latex/contrib/l3build/l3build.lua index c0eea6b33a..e9b47f8357 100644 --- a/macros/latex/contrib/l3build/l3build.lua +++ b/macros/latex/contrib/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2019-09-18" +release_date = "2019-09-25" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") @@ -174,7 +174,7 @@ if options["target"] == "check" then end if #checkconfigs == 1 and checkconfigs[1] ~= "build" and - (options["target"] == "check" or options["target"] == "save") then + (options["target"] == "check" or options["target"] == "save" or options["target"] == "clean") then local config = "./" .. gsub(checkconfigs[1],".lua$","") .. ".lua" if fileexists(config) then dofile(config) diff --git a/macros/latex/contrib/l3build/l3build.pdf b/macros/latex/contrib/l3build/l3build.pdf Binary files differindex 3efe981d03..c579041252 100644 --- a/macros/latex/contrib/l3build/l3build.pdf +++ b/macros/latex/contrib/l3build/l3build.pdf diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md index 64284dae46..8028e97a1c 100644 --- a/macros/latex/contrib/tuda-ci/README.md +++ b/macros/latex/contrib/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/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf Binary files differindex fa33bcf2c4..43593adc73 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf Binary files differindex 19a06df0fa..91b5ae3ea6 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf Binary files differindex 276d6f7778..0d2a7d2fd5 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf Binary files differindex 23eb5d40a9..6084d4e7e8 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf Binary files differindex f0e30c50f9..d9d69b28ec 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf Binary files differindex 99cfe21847..2cee61d2a3 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf Binary files differindex 9c02b72552..50cc0276b0 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex index 3bf70cedd3..13a0dca9b4 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib index 22bed7debf..636a09f1c8 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco index 4d00cb10ec..fdab6d7913 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex index daa2680782..90709bd520 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex index fbe3bab63f..56ce998662 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex index 1b505ed039..802f967b5f 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex index 54f3968ab3..6784405762 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex index 27dcda60ff..ec299a74b8 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex index 6a0d0c1954..cf26942f49 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex +++ b/macros/latex/contrib/tuda-ci/example/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/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty index a3c33bb09d..c6481f6877 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty index fbdf3382fa..b1f54a8185 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty index 356dfd8922..1838dfd305 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty index e78cae9cb6..661c5c3ac5 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty index f0a1cd3a8e..10c021f978 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls index 09d6c0bde9..2e30b5f986 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def index ec0cb53a4c..ac9aa26af3 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudacolors.def +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudacolors.sty b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty index fd546e094d..7bf135eae7 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty index b935d95705..09d47f5c82 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls index 1cc25ffd16..9dd30d37c6 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls index 1321382302..d79e9169eb 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls index 2cbc051fe5..6fe6093903 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudapub.cls +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty index b1c0971024..2304752f24 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudarules.sty +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls index 96895ebafb..b4d813c5df 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls +++ b/macros/latex/contrib/tuda-ci/tex/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/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg index ad6d337fa3..4dd6d13762 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg +++ b/macros/latex/contrib/tuda-ci/tex/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 diff --git a/macros/latex/contrib/unicode-math/CHANGES.md b/macros/latex/contrib/unicode-math/CHANGES.md index ffe61e18a8..01dcd8a462 100644 --- a/macros/latex/contrib/unicode-math/CHANGES.md +++ b/macros/latex/contrib/unicode-math/CHANGES.md @@ -1,6 +1,15 @@ CHANGE HISTORY ============== +## v0.8p (2019/09/26) + + * Remove dependency on `filehook` package. Just to simplify. + * Remove patch code for the `colonequals` package; now if you use that package + you will simply receive its standard ‘constructed’ symbols. + * Load `amsmath` automatically. This is not intended to save time for the user, + but to simplify the code logic. Users should continue to load `amsmath` explicitly IMO. + + ## v0.8o (2019/03/04) * Avoid `'Dimension too large' error` for some (unpredictable) combinations of font diff --git a/macros/latex/contrib/unicode-math/README.md b/macros/latex/contrib/unicode-math/README.md index 7208d66799..12e0d1157a 100644 --- a/macros/latex/contrib/unicode-math/README.md +++ b/macros/latex/contrib/unicode-math/README.md @@ -76,7 +76,7 @@ REQUIREMENTS ------------ As well as running XeTeX or LuaTeX, this package requires recent versions of the -`lm-math`, `fontspec`, `expl3`, `xpackages`, `filehook`, and `lualatex-math` packages. +`lm-math`, `fontspec`, `expl3`, `xpackages`, and `lualatex-math` packages. THANKS diff --git a/macros/latex/contrib/unicode-math/um-code-amsmath.dtx b/macros/latex/contrib/unicode-math/um-code-amsmath.dtx index bc782ba88c..ee1f0642bc 100644 --- a/macros/latex/contrib/unicode-math/um-code-amsmath.dtx +++ b/macros/latex/contrib/unicode-math/um-code-amsmath.dtx @@ -9,8 +9,6 @@ % % Since the mathcode of |`\-| is greater than eight bits, this piece of |\AtBeginDocument| code from \pkg{amsmath} dies if we try and set the maths font in the preamble: % \begin{macrocode} -\AtEndOfPackageFile * {amsmath} - { \tl_remove_once:Nn \@begindocumenthook { \mathchardef\std@minus\mathcode`\-\relax @@ -38,24 +36,7 @@ % \end{macrocode} % The |subarray| environment uses inappropriate font dimensions. % \begin{macrocode} - \@@_check_and_fix:NNnnn \subarray \cs_set:Npn { #1 } - { - \vcenter - \bgroup - \Let@ - \restore@math@cr - \default@tag - \baselineskip \fontdimen 10~ \scriptfont \tw@ - \advance \baselineskip \fontdimen 12~ \scriptfont \tw@ - \lineskip \thr@@@@ \fontdimen 8~ \scriptfont \thr@@@@ - \lineskiplimit \lineskip - \ialign - \bgroup - \ifx c #1 \hfil \fi - $ \m@th \scriptstyle ## $ - \hfil - \crcr - } + \cs_set:Npn \subarray #1 { \vcenter \c_group_begin_token @@ -64,15 +45,9 @@ \default@tag \skip_set:Nn \baselineskip { -% \end{macrocode} -% Here we use stack top shift + stack bottom shift, which sounds reasonable. -% \begin{macrocode} \@@_stack_num_up:N \scriptstyle + \@@_stack_denom_down:N \scriptstyle } -% \end{macrocode} -% Here we use the minimum stack gap. -% \begin{macrocode} \lineskip \@@_stack_vgap:N \scriptstyle \lineskiplimit \lineskip \ialign @@ -91,19 +66,7 @@ % The roots need a complete rework. % \begin{macrocode} %<*LU> - \@@_check_and_fix:NNnnn \plainroot@ \cs_set_nopar:Npn { #1 \of #2 } - { - \setbox \rootbox \hbox - { - $ \m@th \scriptscriptstyle { #1 } $ - } - \mathchoice - { \r@@@@t \displaystyle { #2 } } - { \r@@@@t \textstyle { #2 } }~ - { \r@@@@t \scriptstyle { #2 } } - { \r@@@@t \scriptscriptstyle { #2 } } - \egroup - } + \cs_set_nopar:Npn \plainroot@ #1 \of #2 { \bool_if:nTF { @@ -131,20 +94,7 @@ % \end{macrocode} % % \begin{macrocode} - \@@_check_and_fix:NNnnn \r@@@@t \cs_set_nopar:Npn { #1 #2 } - { - \setboxz@h { $ \m@th #1 \sqrtsign { #2 } $ } - \dimen@ \ht\z@ - \advance \dimen@ -\dp\z@ - \setbox\@ne \hbox { $ \m@th #1 \mskip \uproot@ mu $ } - \advance \dimen@ by 1.667 \wd\@ne - \mkern -\leftroot@ mu - \mkern 5mu - \raise .6\dimen@ \copy\rootbox - \mkern -10mu - \mkern \leftroot@ mu - \boxz@ - } + \cs_set_nopar:Npn \r@@@@t #1 #2 %<*LU> { \hbox_set:Nn \l_tmpa_box @@ -197,7 +147,6 @@ \box_use_drop:N \l_tmpa_box } %</XE> - } % \end{macrocode} % % \begin{macrocode} diff --git a/macros/latex/contrib/unicode-math/um-code-compat.dtx b/macros/latex/contrib/unicode-math/um-code-compat.dtx index a5f05c81b3..72ce5186da 100644 --- a/macros/latex/contrib/unicode-math/um-code-compat.dtx +++ b/macros/latex/contrib/unicode-math/um-code-compat.dtx @@ -7,47 +7,6 @@ %<*package> % \end{macrocode} % -% \begin{macro}{\@@_check_and_fix:NNnnn} -% \darg{command} -% \darg{factory command} -% \darg{parameter text} -% \darg{expected replacement text} -% \darg{new replacement text} -% Tries to patch \meta{command}. -% If \meta{command} is undefined, do nothing. -% Otherwise it must be a macro with the given \meta{parameter text} and \meta{expected replacement text}, created by the given \meta{factory command} or equivalent. -% In this case it will be overwritten using the \meta{parameter text} and the \meta{new replacement text for \LuaTeX} or the \meta{new replacement text for \XeTeX}, depending on the engine. -% Otherwise issue a warning and don’t overwrite. -% \begin{macrocode} -\cs_new_protected_nopar:Nn \@@_check_and_fix:NNnnn - { - \cs_if_exist:NT #1 - { - \token_if_macro:NTF #1 - { - \group_begin: - #2 \@@_tmpa:w #3 { #4 } - \cs_if_eq:NNTF #1 \@@_tmpa:w - { - \msg_info:nnx { unicode-math } { patch-macro } { \token_to_str:N #1 } - \group_end: - #2 #1 #3 { #5 } - } - { - \msg_warning:nnxxx { unicode-math } { wrong-meaning } - { \token_to_str:N #1 } { \token_to_meaning:N #1 } - { \token_to_meaning:N \@@_tmpa:w } - \group_end: - } - } - { - \msg_warning:nnx { unicode-math } { macro-expected } - { \token_to_str:N #1 } - } - } - } -% \end{macrocode} -% \end{macro} % % \section{Patching/augmenting 3rd-party packages} % @@ -60,7 +19,7 @@ % but activates automatically so documents that might change the \cs{url} % font through the standard interface still work correctly. % \begin{macrocode} -\AtEndOfPackageFile * {url} +\@@_after_package:nNn {url} \@@_patch_url: { \tl_put_left:Nn \Url@FormatString { \@@_switch_to:n {literal} } \tl_put_right:Nn \UrlSpecials @@ -84,43 +43,21 @@ % upsetting effect on legacy math alphabets. % \begin{macrocode} %<*XE> -\AtEndOfPackageFile * { mathtools } +\@@_after_package:nNn { mathtools } \@@_patch_mathtools_A: { - \@@_check_and_fix:NNnnn \MT_cramped_internal:Nn \cs_set_nopar:Npn { #1 #2 } - { - \sbox \z@ { $ \m@th #1 \nulldelimiterspace = \z@ \radical \z@ { #2 } $ } - \ifx #1 \displaystyle - \dimen@ = \fontdimen 8 \textfont 3 - \advance \dimen@ .25 \fontdimen 5 \textfont 2 - \else - \dimen@ = 1.25 \fontdimen 8 - \ifx #1 \textstyle - \textfont - \else - \ifx #1 \scriptstyle - \scriptfont - \else - \scriptscriptfont - \fi - \fi - 3 - \fi - \advance \dimen@ -\ht\z@ - \ht\z@ = -\dimen@ - \box\z@ - } + \cs_set_nopar:Npn \MT_cramped_internal:Nn ##1 ##2 { \hbox_set:Nn \l_tmpa_box { \color@setgroup \c_math_toggle_token \m@th - #1 + ##1 \dim_zero:N \nulldelimiterspace - \XeTeXradical 255 ~ 0 ~ { #2 } + \XeTeXradical 255 ~ 0 ~ { ##2 } \c_math_toggle_token \color@endgroup } \box_set_ht:Nn \l_tmpa_box { - \box_ht:N \l_tmpa_box - \@@_radical_vgap:N #1 + \box_ht:N \l_tmpa_box - \@@_radical_vgap:N ##1 } \box_use_drop:N \l_tmpa_box } @@ -138,7 +75,7 @@ % with Unicode fonts, so we are hard coding the $5/18$ex suggested by % \pkg{mathtools}’s documentation. % \begin{macrocode} -\AtEndOfPackageFile * { mathtools } +\@@_after_package:nNn { mathtools } \@@_patch_mathtools_B: { \cs_set_eq:NN \MToverbracket \overbracket \cs_set_eq:NN \MTunderbracket \underbracket @@ -147,20 +84,20 @@ { \msg_warning:nn { unicode-math } { mathtools-overbracket } - \cs_set:Npn \downbracketfill #1 #2 + \cs_set:Npn \downbracketfill ##1 ##2 { \tl_set:Nn \l_MT_bracketheight_fdim {.27ex} - \downbracketend {#1} {#2} - \leaders \vrule \@height #1 \@depth \z@ \hfill - \downbracketend {#1} {#2} + \downbracketend {##1} {##2} + \leaders \vrule \@height ##1 \@depth \z@ \hfill + \downbracketend {##1} {##2} } - \cs_set:Npn \upbracketfill #1 #2 + \cs_set:Npn \upbracketfill ##1 ##2 { \tl_set:Nn \l_MT_bracketheight_fdim {.27ex} - \upbracketend {#1} {#2} - \leaders \vrule \@height \z@ \@depth #1 \hfill - \upbracketend {#1} {#2} + \upbracketend {##1} {##2} + \leaders \vrule \@height \z@ \@depth ##1 \hfill + \upbracketend {##1} {##2} } \cs_set_eq:NN \Uoverbracket \overbracket @@ -179,53 +116,22 @@ % \begin{macro}{\eqqcolon} % \pkg{mathtools} defines several commands as combinations of colons and % other characters, but with meanings incompatible to \pkg{unicode-math}. -% Thus we issue a warning. Because \pkg{mathtools} uses -% \cmd{\providecommand} \cmd{\AtBeginDocument}, we can just define the -% offending commands here. +% Thus we issue a warning. Note \pkg{mathtools} uses +% \cmd{\providecommand} \cmd{\AtBeginDocument}. % \begin{macrocode} -\AtEndOfPackageFile * { mathtools } +\@@_after_package:nNn { mathtools } \@@_patch_mathtools_C: { \msg_warning:nn { unicode-math } { mathtools-colon } - \NewDocumentCommand \dblcolon { } { \Colon } - \NewDocumentCommand \coloneqq { } { \coloneq } - \NewDocumentCommand \Coloneqq { } { \Coloneq } - \NewDocumentCommand \eqqcolon { } { \eqcolon } - } -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% -% \subsection{\pkg{colonequals}} -% -% \begin{macro}{\ratio} -% \begin{macro}{\coloncolon} -% \begin{macro}{\minuscolon} -% \begin{macro}{\colonequals} -% \begin{macro}{\equalscolon} -% \begin{macro}{\coloncolonequals} -% Similarly to \pkg{mathtools}, the \pkg{colonequals} defines several colon -% combinations. Fortunately there are no name clashes, so we can just -% overwrite their definitions. -% \begin{macrocode} -\AtEndOfPackageFile * { colonequals } - { - \msg_warning:nn { unicode-math } { colonequals } - \RenewDocumentCommand \ratio { } { \mathratio } - \RenewDocumentCommand \coloncolon { } { \Colon } - \RenewDocumentCommand \minuscolon { } { \dashcolon } - \RenewDocumentCommand \colonequals { } { \coloneq } - \RenewDocumentCommand \equalscolon { } { \eqcolon } - \RenewDocumentCommand \coloncolonequals { } { \Coloneq } + \DeclareDocumentCommand \dblcolon { } { \Colon } + \DeclareDocumentCommand \coloneqq { } { \coloneq } + \DeclareDocumentCommand \Coloneqq { } { \Coloneq } + \DeclareDocumentCommand \eqqcolon { } { \eqcolon } } % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} % \end{macro} -% \end{macro} -% \end{macro} % % \begin{macrocode} %</package> diff --git a/macros/latex/contrib/unicode-math/um-code-opening.dtx b/macros/latex/contrib/unicode-math/um-code-opening.dtx index b739fa6dea..16e3213998 100644 --- a/macros/latex/contrib/unicode-math/um-code-opening.dtx +++ b/macros/latex/contrib/unicode-math/um-code-opening.dtx @@ -17,7 +17,22 @@ % \begin{macrocode} \RequirePackage{xparse,l3keys2e} \RequirePackage{fontspec} -\RequirePackage{filehook} +\RequirePackage{fix-cm} +\RequirePackage{amsmath} +%<LU>\RequirePackage{lualatex-math} +% \end{macrocode} +% +% \begin{macrocode} +\cs_set_protected:Npn \@@_after_package:nNn #1 #2 #3 + { + \AtBeginDocument + { + \cs_new_protected:Npn #2 {#3} + \@ifpackageloaded {#1} {#2} {} + } + } +\RequirePackage{xparse,l3keys2e} +\RequirePackage{fontspec} \RequirePackage{fix-cm} %<LU>\RequirePackage{lualatex-math} % \end{macrocode} diff --git a/macros/latex/contrib/unicode-math/um-doc-main.tex b/macros/latex/contrib/unicode-math/um-doc-main.tex index 8ecc8357e7..5c0bc22ed1 100644 --- a/macros/latex/contrib/unicode-math/um-doc-main.tex +++ b/macros/latex/contrib/unicode-math/um-doc-main.tex @@ -69,7 +69,7 @@ Load \pkg{unicode-math} as a regular \LaTeX\ package. It should be loaded after any other maths or font-related package in case it needs to overwrite their definitions. Here's an example using the filename syntax to load the \TeX\ Gyre Pagella Math font: (this works for both \XeLaTeX\ and \LuaLaTeX) \begin{Verbatim} -\usepackage{amsmath} % if desired +\usepackage{amsmath} \usepackage{unicode-math} \setmathfont{texgyrepagella-math.otf} \end{Verbatim} @@ -78,6 +78,10 @@ Once the package is loaded, traditional TFM-based maths fonts are no longer supp you can only switch to a different OpenType maths font using the \cs{setmathfont} command. If you do not load an OpenType maths font before |\begin{document}|, Latin Modern Math will be loaded automatically. +Note that \pkg{amsmath} should be loaded before \pkg{unicode-math} to avoid conflicts, and +it will be loaded automatically if not requested earlier in the preamble. + + \subsection{New commands} \LaTeX, since the first version of \LaTeXe, changed the math group selection from, say, |{\bf x}| to |\mathbf{x}|. It introduced commands @@ -111,7 +115,7 @@ the two meanings with a command like |\mathbf| for the boldface text font in math and a command like |\symbf| (for the bold math font). The five new symbol font commands that behave in this way are: \cs{symup}, -\cs{symit}, \cs{symbf}, \cs{symsf}, and \cs{symit}. +\cs{symit}, \cs{symbf}, \cs{symsf}, and \cs{symtt}. These commands switch to single-letter mathematical symbols (generally within the same OpenType font). diff --git a/macros/latex/contrib/unicode-math/unicode-math-code.pdf b/macros/latex/contrib/unicode-math/unicode-math-code.pdf Binary files differindex bf0ca20ed5..c251d66a18 100644 --- a/macros/latex/contrib/unicode-math/unicode-math-code.pdf +++ b/macros/latex/contrib/unicode-math/unicode-math-code.pdf diff --git a/macros/latex/contrib/unicode-math/unicode-math.dtx b/macros/latex/contrib/unicode-math/unicode-math.dtx index 59cf98b188..3aee6d530b 100644 --- a/macros/latex/contrib/unicode-math/unicode-math.dtx +++ b/macros/latex/contrib/unicode-math/unicode-math.dtx @@ -60,15 +60,15 @@ %<base>\ProvidesExplPackage{unicode-math} %<package&XE>\ProvidesExplPackage{unicode-math-xetex} %<package&LU>\ProvidesExplPackage{unicode-math-luatex} -%<base|package> {2019/03/04} {0.8o} {Unicode maths in XeLaTeX and LuaLaTeX} +%<base|package> {2019/09/26} {0.8p} {Unicode maths in XeLaTeX and LuaLaTeX} % \end{macrocode} % % Here the version and date are setup for typesetting the documentation. % \begin{macrocode} %<*dtx> \date{ - \def\filedate{2019/03/04} - \def\fileversion{0.8o} + \def\filedate{2019/09/26} + \def\fileversion{0.8p} \filedate \qquad \fileversion } %</dtx> diff --git a/macros/latex/contrib/unicode-math/unicode-math.pdf b/macros/latex/contrib/unicode-math/unicode-math.pdf Binary files differindex 05d2817a78..41da2850e6 100644 --- a/macros/latex/contrib/unicode-math/unicode-math.pdf +++ b/macros/latex/contrib/unicode-math/unicode-math.pdf diff --git a/macros/latex/contrib/unicode-math/unimath-example.pdf b/macros/latex/contrib/unicode-math/unimath-example.pdf Binary files differindex 82fdbee8f9..315e19f268 100644 --- a/macros/latex/contrib/unicode-math/unimath-example.pdf +++ b/macros/latex/contrib/unicode-math/unimath-example.pdf diff --git a/macros/latex/contrib/unicode-math/unimath-symbols.pdf b/macros/latex/contrib/unicode-math/unimath-symbols.pdf Binary files differindex dcb99c16db..bd55866e6b 100644 --- a/macros/latex/contrib/unicode-math/unimath-symbols.pdf +++ b/macros/latex/contrib/unicode-math/unimath-symbols.pdf |