Skip to content

Commit

Permalink
Merge branch 'refactoring': manual backport from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mrpiggi committed Aug 9, 2022
2 parents ad380c3 + 2e6b8d6 commit 0047224
Show file tree
Hide file tree
Showing 35 changed files with 6,954 additions and 5,572 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
*.bat text eol=crlf
*.zip binary
*.pdf binary
* filter=copyright
*.dtx filter=filedate
7 changes: 7 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
## git config --local include.path ../.gitconfig

[filter "filedate"]
clean = export filename=$(basename "%f") && sed -b -r -z -e"s:\\\\\\\\ProvidesFile\\\\{$filename\\\\}[^\\\\n]*\\\\n::g" -e"s:%\\<\\\\*dtx\\>\\\\n:%\\<\\*dtx\\>\\\\n\\\\\\\\ProvidesFile{$filename}[$(date '+%Y/%m/%d')]\\\\n:" -e"s:\\(%/GitFileInfo[^\\\\n]*\\\\n\\)::g" -e"s:\\(%\\\\s*\\\\\\\\iffalse\\)\\([^\\\\n]*\\\\n\\)\\(%\\\\s*$filename[^\\\\n]*\\\\n\\)?:\\\\1\\ meta-comment\\\\n%/GitFileInfo=$filename\\\\n:" -e"s/\\(.*Copyright.*Hanisch.*,\\)\\\\s*\\([[:digit:]]{4}\\)\\(-[[:digit:]]{4}\\)?\\(.*\\)/\\\\1' '\\\\2-$(date '+%Y')\\\\4/g"

[filter "copyright"]
clean = sed -b -r "s/\\(.*Copyright.*Hanisch.*,\\)\\\\s*\\([[:digit:]]{4}\\)\\(-[[:digit:]]{4}\\)?\\(.*\\)/\\\\1' '\\\\2-$(date '+%Y')\\\\4/g"
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
TUD-Script &ndash; Corporate Design of Technische Universität Dresden
----------------------------------------------------------------------------

Copyright (C) Falk Hanisch <[email protected]>, 2012-2021
Copyright (C) Falk Hanisch <[email protected]>, 2012-2022

----------------------------------------------------------------------------

Expand All @@ -19,7 +19,7 @@

----------------------------------------------------------------------------

However, only members of the Technische Universität Dresden are permitted
However, only members of the Technische Universität Dresden are permitted
to publish documents in the corporate design, in particular with the use
of an official logo.

Expand Down
23 changes: 21 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
TUD-Script &ndash; Corporate Design of Technische Universität Dresden
----------------------------------------------------------------------------

Copyright (C) Falk Hanisch <[email protected]>, 2012-2021
Copyright (C) Falk Hanisch <[email protected]>, 2012-2022

tudscr 2021/07/15 v2.06n
tudscr 2022/08/09 v2.06o

This material is subject to the LaTeX Project Public License version 1.3c
or later.<br>
Expand Down Expand Up @@ -59,6 +59,16 @@ Das Bundle beinhaltet:
Versionen
---------

**v2.06o** (2022/08/09)
+ Schriftstärke im Mathematikmodus wird passend zu den Einstellungen für den
Fließtext (`cdfont=light/heavy/normalbold/ultrabold`) gewählt
+ Kombination `cd=true` und `cdfont=false` verwendet Open Sans in Überschriften
+ `relspacing=true` Schriftgröße hat stärkeren Einfluss, unsauberer Übergang zu
nicht vordefinierten Zwischengrößen behoben
+ **tudscrposter** Umgebungen `figurehere` und `tablehere`
+ Verwendung der Symbole `\textleftarrow`, `\textrightarrow`, `\textuparrow`,
`\textdownarrow` sowie `\textlangle` und `\textrangle` aus Paket **iwona**

**v2.06n** (2021/07/15)
+ Fix für **siunitx**

Expand Down Expand Up @@ -284,6 +294,15 @@ The bundle offers:
Versions
--------

**v2.06o** (2022/08/09)
+ font face in math mode matches text mode settings
(`cdfont=light/heavy/normalbold/ultrabold`)
+ combination `cd=true` and `cdfont=false` uses Open Sans in headings
+ `relspacing=true` depends on selected font size
+ **tudscrposter** environments `figurehere` und `tablehere`
+ symbols for `\textleftarrow`, `\textrightarrow`, `\textuparrow`,
`\textdownarrow` as well as `\textlangle` and `\textrangle` from **iwona**

**v2.06n** (2021/07/15)
+ bug fix for **siunitx**

Expand Down
5 changes: 2 additions & 3 deletions release.bat
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ echo =========================================================================
set version=
setlocal enabledelayedexpansion
for /f "tokens=1,2,3* delims= " %%a in (
'findstr /r \TUD@Version@Check{[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] source\tudscr-version.dtx'
'findstr /r \TUD@@Version{[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] source\tudscr-version.dtx'
) do (
set version=%%c
if "!version:~0,10!"=="TUD-Script" (
Expand Down Expand Up @@ -125,10 +125,9 @@ copy development\tools\*.* release-%version%\temp\
copy temp\doc\latex\tudscr\tudscr.pdf release-%version%\temp\
copy temp\doc\latex\tudscr\tudscr_print.pdf release-%version%\temp\
move temp\install\*.* release-%version%\temp\
rmdir temp\install /s /q > nul
cd release-%version%\temp
7za a -tzip tudscr_%version%.zip .\..\..\temp\doc\ .\..\..\temp\source\ .\..\..\temp\tex\
for /f %%f in ('dir /b *.bat') do unix2dos -k %%f
7za a -tzip tudscr_%version%.zip .\..\..\temp\*
7za a -tzip tudscr_fonts_install.zip @7za_files_metrics.txt
REM call tudscr_fonts_convert.bat
REM 7za a -tzip tudscr_fonts_converted.zip @7za_files_fonts.txt
Expand Down
2 changes: 1 addition & 1 deletion source/doc/tudscr-mainclasses.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2118,8 +2118,8 @@ \subsection{Der Titel und die Umschlagseite}
\textbf{Wert} & \textbf{Bezeichner} & \textbf{Deutsch} & \textbf{Englisch}
\tabularnewline
\midrule
\typecast{habil}{habilitationname}
\typecast{diss}{dissertationname}
\typecast{doctoral}{dissertationname}
\typecast{phd}{dissertationname}
\typecast{diploma}{diplomathesisname}
\typecast{master}{masterthesisname}
Expand Down
36 changes: 17 additions & 19 deletions source/doc/tudscr.tex
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,20 @@
literate=%
{ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
{Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1
{~}{{\textasciitilde}}1 {ß}{{\ss}}1
{ß}{{\ss}}1 {~}{{\textasciitilde}}1
{»}{{\guillemetright}}1 {«}{{\guillemetleft}}1
}
\usepackage{bookmark}
\usepackage{babel}
\usepackage[babel]{microtype}

\TUDoption{ToDo}{true}
\usepackage{bookmark}
\KOMAoptions{headings=optiontoheadandtoc}

%\tracinglabels[all]
%\tracingmarkup
%\tracingbundle

\begin{document}
\newrobustcmd*\cdurl{%
\begingroup%
\hypersetup{hidelinks}%
\href{https://tu-dresden.de/cd/}{https://tu-dresden.de/cd}%
\href{https://tu-dresden.de/cd}{https://tu-dresden.de/cd}%
\endgroup%
}
\faculty{\cdurl}
Expand All @@ -36,7 +34,7 @@
}
\publishers{\GitHubRepo'[]}
\subject{\TUDScript \vTUDScript{} basierend auf \KOMAScript}
\title{Ein {LaTeX}-Bundle für Dokumente im \TUDCD}
\title{Ein \hologo{LaTeX}-Bundle für Dokumente im \TUDCD}
\ifdef{\tudprintflag}{%
\subtitle{Benutzerhandbuch\thanks{\href{tudscr}{Online-Version}}}%
}{%
Expand All @@ -51,9 +49,9 @@
\let\footnote\@gobble%
\let\emailaddress\@gobble%
\hypersetup{%
pdfauthor = {\@author},%
pdftitle = {\@title},%
pdfsubject = {Benutzerhandbuch für \TUDScript},%
pdfauthor = {\@author},%
pdftitle = {\@title},%
pdfsubject = {\@subtitle},%
pdfkeywords = {LaTeX, \TUDScript, Benutzerhandbuch},%
}%
\endgroup%
Expand Down Expand Up @@ -140,25 +138,25 @@ \part{Anhang}
davor (\Option*{open=right}) sowie danach (\Option*{open=left}). Setzen von
speziellen Inhalten auf diesen Seiten äquivalent zu \Macro*{setpartpreamble}
bzw. \Macro*{setchapterpreamble}; ggf. temporär umschalten bzw. Warnung bei
Konflikt.
\url{http://latex.wcms-file3.tu-dresden.de/phpBB3/viewtopic.php?f=11&t=396}
Konflikt. \Forum<396>
}[v2.07]

\ToDo[imp]{Alle Datumsangaben auf YYYY-MM-DD umstellen}[v2.07]

\ToDo[imp]{LyX: layout-Dateien in das Projekt integrieren lassen?}[v2.07]
\ToDo[imp]{\Package*{glossaries}: Paket für Stile aus Tutorial}[v2.07]
\ToDo[imp]{%
\Package*{glossaries}: Paket für Stile aus Tutorial, siehe auch \Forum<535>
}[v2.07]

\ToDo[imp]{TeXstudio: cwl-Dateien über docstrip, separate .ins-Datei}[v2.07]
\ToDo[rls]{TeXstudio: alle *.cwl erneuern, automatisch über *.dtx}

\ToDo[rls]{GitHub auf offene Issues prüfen}
\ToDo[rls]{\emph{alle} dtx-Dateien der vorherigen Version mit WinMerge sichten}
\ToDo[rls]{Datumsangaben \emph{aller} dtx-Dateien prüfen}%: ^((?!%).)*\d{4}(/|-)
\ToDo[rls]{Layout und Umbrüche kontrollieren}
\ToDo[rls]{Datum in tudscr-version.dtx, tudscr-comp.dtx, Handbuch \& README}
\ToDo[rls]{%
Release auf GitHub und CTAN, Tag für Homepage und im Forum ändern\\
{\small\url{http://latex.wcms-file3.tu-dresden.de/phpBB3/viewtopic.php?t=303}}%
}
\ToDo[rls]{Release auf GitHub und CTAN, Tag für Homepage und \Forum<303> ändern}

\ListOfToDo
\end{document}
13 changes: 8 additions & 5 deletions source/doc/tutorials/mathswap.tex
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,17 @@
\usepackage[T1]{fontenc}
\usepackage[ngerman=ngerman-x-latest]{hyphsubst}
\fi
\usepackage{babel}
\usepackage[babel]{microtype}

\usepackage{tudscrtutorial}
\usepackage{tudscrmanual}
\lstset{%
inputencoding=utf8,extendedchars=true,
literate=%
{ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
{Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1
{~}{{\textasciitilde}}1 {ß}{{\ss}}1
{ß}{{\ss}}1 {~}{{\textasciitilde}}1
{»}{{\guillemetright}}1 {«}{{\guillemetleft}}1
}

\usepackage{mathswap}
Expand All @@ -29,9 +32,9 @@
\let\thanks\@gobble%
\let\footnote\@gobble%
\hypersetup{%
pdfauthor = {\@author},%
pdftitle = {\@title},%
pdfsubject = {Mathematiksatz in LaTeX},%
pdfauthor = {\@author},%
pdftitle = {\@title},%
pdfsubject = {Mathematiksatz in LaTeX},%
pdfkeywords = {LaTeX, \TUDScript, Tutorial, Mathematiksatz},%
}%
\endgroup%
Expand Down
15 changes: 9 additions & 6 deletions source/doc/tutorials/mathtype.tex
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
\documentclass[english,ngerman]{tudscrartcl}
\documentclass[english,ngerman,cdfont=false]{tudscrartcl}
\iftutex
\usepackage{fontspec}
\else
\usepackage[T1]{fontenc}
\usepackage[ngerman=ngerman-x-latest]{hyphsubst}
\fi
\usepackage{babel}
\usepackage[babel]{microtype}

\usepackage{tudscrtutorial}
\usepackage{tudscrmanual}
\lstset{%
inputencoding=utf8,extendedchars=true,
literate=%
{ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
{Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1
{~}{{\textasciitilde}}1 {ß}{{\ss}}1
{ß}{{\ss}}1 {~}{{\textasciitilde}}1
{»}{{\guillemetright}}1 {«}{{\guillemetleft}}1
}

\usepackage{mathtools}
Expand All @@ -28,9 +31,9 @@
\let\thanks\@gobble%
\let\footnote\@gobble%
\hypersetup{%
pdfauthor = {\@author},%
pdftitle = {\@title},%
pdfsubject = {Mathematiksatz in LaTeX},%
pdfauthor = {\@author},%
pdftitle = {\@title},%
pdfsubject = {Mathematiksatz in LaTeX},%
pdfkeywords = {LaTeX, \TUDScript, Tutorial, Mathematiksatz},%
}%
\endgroup%
Expand Down
19 changes: 12 additions & 7 deletions source/doc/tutorials/treatise.tex
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
\RequirePackage{fix-cm}
\documentclass[%
english,ngerman,%
cdgeometry=no,DIV=12,automark%
cdgeometry=no,DIV=12,%
automark,%
listof=toc,%
]{tudscrartcl}
\iftutex
\usepackage{fontspec}
\else
\usepackage[T1]{fontenc}
\usepackage[ngerman=ngerman-x-latest]{hyphsubst}
\fi
\usepackage{babel}
\usepackage[babel]{microtype}

\usepackage{tudscrtutorial}
\usepackage{tudscrmanual}
\lstset{%
inputencoding=utf8,extendedchars=true,
literate=%
{ä}{{\"a}}1 {ö}{{\"o}}1 {ü}{{\"u}}1
{Ä}{{\"A}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1
{~}{{\textasciitilde}}1 {ß}{{\ss}}1
{ß}{{\ss}}1 {~}{{\textasciitilde}}1
{»}{{\guillemetright}}1 {«}{{\guillemetleft}}1
}
\lstset{escapechar=§}

\usepackage{lmodern}
\TUDoptions{cdfont=false}
\TUDoptions{cd=false,cdfont=false,cdtitle=true}
\KOMAoptions{headings=normal}

\usepackage{tudscrsupervisor}
Expand Down Expand Up @@ -171,9 +176,9 @@
\let\thanks\@gobble%
\let\footnote\@gobble%
\hypersetup{%
pdfauthor = {\@author},%
pdftitle = {\@title},%
pdfsubject = {Tutorial für LaTeX},%
pdfauthor = {\@author},%
pdftitle = {\@title},%
pdfsubject = {Tutorial für LaTeX},%
pdfkeywords = {LaTeX, \TUDScript, Tutorial, Anwenderleitfaden},%
}%
\endgroup%
Expand Down
22 changes: 6 additions & 16 deletions source/install/tudscr-metrics.dtx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
% \iffalse meta-comment
%/GitFileInfo=tudscr-metrics.dtx
%
% TUD-Script -- Corporate Design of Technische Universität Dresden
% ----------------------------------------------------------------------------
%
% Copyright (C) Falk Hanisch <[email protected]>, 2012-2021
% Copyright (C) Falk Hanisch <[email protected]>, 2012-2022
%
% ----------------------------------------------------------------------------
%
Expand Down Expand Up @@ -56,14 +57,8 @@
\endbatchfile
%</ins>
%<*dtx>
% \fi
%
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tudscr-metrics.dtx}[2022/07/28 v2.06 TUD-Script\space%
(font metrics)%
]
%
% \iffalse
\ProvidesFile{tudscr-metrics.dtx}[2022/08/09]
\RequirePackage{tudscr-gitinfo}
\documentclass[english,ngerman,xindy]{tudscrdoc}
\iftutex
\usepackage{fontspec}
Expand All @@ -75,14 +70,9 @@
\usepackage{tudscrfonts}
\usepackage[babel]{microtype}

\CodelineIndex
\RecordChanges
\GetFileInfo{tudscr-metrics.dtx}
\title{\file{\filename}}
\author{Falk Hanisch\qquad\expandafter\mailto\expandafter{\tudscrmail}}
\date{\fileversion\nobreakspace(\filedate)}

\GitHubBase{\TUDScriptRepository}
\begin{document}
\author{Falk Hanisch\TUDScriptContactTitle}
\maketitle
\tableofcontents
\DocInput{\filename}
Expand Down
Loading

0 comments on commit 0047224

Please sign in to comment.