diff options
author | Karl Berry <karl@freefriends.org> | 2023-07-04 19:54:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-07-04 19:54:36 +0000 |
commit | 05521ca120f1bb734f3c85b7a85f9b33b093459c (patch) | |
tree | ff0c7fc4ebead9e9d0685bb931f1de7e6aea4192 /Master | |
parent | 0da6a9ab743631e01ecd830eb9e43069d13f8b28 (diff) |
se2thesis (4jul23)
git-svn-id: svn://tug.org/texlive/trunk@67548 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
14 files changed, 67 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md b/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md index 96e937e109f..a7a887addf2 100644 --- a/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/se2thesis/CHANGELOG.md @@ -7,6 +7,19 @@ and this project adheres to ## [Unreleased] +## [v3.1.0] – 2023–07–04 + +### Changed + +- The `lua-widow-control` package causes build failures in different settings, + although the same TeX Live version is used. Until this can be resolved, we + deactivate the loading of this package from `se2packages` by default. It can + still be activated manually by adding the `widowcontrol=true` option to the + `se2packages` package. +- Set penalties for widows and orphans only if `lua-widow-control` package is + not loaded. +- Change the formatting of chapter headings. + ## [v3.0.0] – 2023–04–18 ### Added @@ -124,6 +137,7 @@ These changes might be breaking changes! ### Added - First official release +[v3.1.0]: https://github.com/se2p/se2thesis/compare/v3.1.0...v3.0.0 [v3.0.0]: https://github.com/se2p/se2thesis/compare/v3.0.0...v2.1.0 [v2.1.0]: https://github.com/se2p/se2thesis/compare/v2.1.0...v2.0.0 [v2.0.0]: https://github.com/se2p/se2thesis/compare/v2.0.0...v1.3.1 diff --git a/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf b/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf Binary files differindex df38c241267..8cb95d80c38 100644 --- a/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf +++ b/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.pdf diff --git a/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.tex b/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.tex index da47aaa56e6..106aa4b5416 100644 --- a/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.tex +++ b/Master/texmf-dist/doc/latex/se2thesis/se2thesis-master-thesis-example.tex @@ -1,5 +1,5 @@ \documentclass[% - chapterprefix=true,% + chapterprefix=false,% open=right,% twoside=true,% paper=a4,% diff --git a/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf b/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf Binary files differindex dd2d5278ec7..04e910061f3 100644 --- a/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf +++ b/Master/texmf-dist/doc/latex/se2thesis/se2thesis.pdf diff --git a/Master/texmf-dist/source/latex/se2thesis/se2colors.dtx b/Master/texmf-dist/source/latex/se2thesis/se2colors.dtx index bf2af3728f9..8b4f738c8c9 100644 --- a/Master/texmf-dist/source/latex/se2thesis/se2colors.dtx +++ b/Master/texmf-dist/source/latex/se2thesis/se2colors.dtx @@ -231,7 +231,7 @@ % % Identify the package and give the overall version information. % \begin{macrocode} -\ProvidesExplPackage {se2colors} {2023-04-18} {3.0.0} +\ProvidesExplPackage {se2colors} {2023-07-04} {3.1.0} {A colour support package for the se2thesis bundle} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx b/Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx index dccb8420b10..09e2351a94e 100644 --- a/Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx +++ b/Master/texmf-dist/source/latex/se2thesis/se2fonts.dtx @@ -159,7 +159,7 @@ % % Identify the package and give the overall version information. % \begin{macrocode} -\ProvidesExplPackage {se2fonts} {2023-04-18} {3.0.0} +\ProvidesExplPackage {se2fonts} {2023-07-04} {3.1.0} {A font-selection support package for the se2thesis bundle} % \end{macrocode} % diff --git a/Master/texmf-dist/source/latex/se2thesis/se2packages.dtx b/Master/texmf-dist/source/latex/se2thesis/se2packages.dtx index 319bbfeed18..1e987c35753 100644 --- a/Master/texmf-dist/source/latex/se2thesis/se2packages.dtx +++ b/Master/texmf-dist/source/latex/se2thesis/se2packages.dtx @@ -162,6 +162,11 @@ % The former implements a better control over ligatures, % the latter provides better control over orphans and widows. % +% For some reason we were not yet able to fix properly, +% \pkg{lua-widow-control} works on some machine but fails on others, +% although they are using the same version of \TeXLive. +% We therefore deactivate \pkg{lua-widow-control} by default. +% % \subsubsection{Use \pkg{microtype} for Microtypographic Optimisation} % % \pkg{microtype} is a game changer when writing documents. @@ -299,8 +304,8 @@ % |nowidowcontrol| % \end{syntax} % The argument to |widowcontrol| can be one of |true| or |false|. -% The latter does not load \pkg{lua-widow-control}, -% the former is the default value. +% The former loads \pkg{lua-widow-control}, +% the latter is the default value. % By using |nowidowcontrol| you can also avoid % that \pkg{lua-widow-control} is loaded. % \end{function} @@ -426,7 +431,7 @@ % % Identify the package and give the overall version information. % \begin{macrocode} -\ProvidesExplPackage {se2packages} {2023-04-18} {3.0.0} +\ProvidesExplPackage {se2packages} {2023-07-04} {3.1.0} {Supporting packages for the se2thesis bundle} % \end{macrocode} % @@ -541,7 +546,7 @@ noselnolig .meta:n = {selnolig=false}, widowcontrol .bool_gset:N = \l_@@_luawidowcontrol_bool, - widowcontrol .initial:n = true, + widowcontrol .initial:n = false, nowidowcontrol .meta:n = {widowcontrol=false}, microtype .bool_gset:N = \l_@@_microtype_bool, @@ -727,14 +732,20 @@ % \end{macrocode} % % Conditionally load and configure \pkg{microtype}. +% If a package option requires for the \pkg{lua-widow-control} package, +% we do not set penalties for widows and orphans +% but let that package control these penalties. % \begin{macrocode} \bool_if:NT \l_@@_microtype_bool { \msg_info:nnn { seiipackages } { load-package } { microtype } \RequirePackage{microtype} - \clubpenalty=10000 - \widowpenalty=10000 - \displaywidowpenalty=10000 + \bool_if:NF \l_@@_luawidowcontrol_bool + { + \clubpenalty=10000 + \widowpenalty=10000 + \displaywidowpenalty=10000 + } \SetExtraKerning{ encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2} }{ diff --git a/Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx b/Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx index 8826356f6c9..9e04544bab1 100644 --- a/Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx +++ b/Master/texmf-dist/source/latex/se2thesis/se2thesis.dtx @@ -589,7 +589,7 @@ % % Identify the class and give the overall version number. % \begin{macrocode} -\ProvidesExplClass {se2thesis} {2023-04-18} {3.0.0} +\ProvidesExplClass {se2thesis} {2023-07-04} {3.1.0} {A thesis class for the Chair of Software Engineering II} % \end{macrocode} % @@ -1349,11 +1349,16 @@ \addtokomafont{section}{\large\mdseries} \addtokomafont{subsection}{\normalsize\mdseries} \renewcommand*{\chapterformat}{% - \mbox{% - \scalebox{1.3}{\chapappifchapterprefix{\nobreakspace}}% - \scalebox{3.5}{\color{UPSE2-Gray}\thechapter\autodot}\enskip% + \enskip\mbox{% + \scalebox{3}{\color{UPSE2-DarkGray}\thechapter\autodot}% }% } +\renewcommand{\chapterlinesformat}[3]{% + \parbox[b]{\textwidth}{\hrulefill#2}\par% + #3\par\bigskip% + \hrule% +} +\RedeclareSectionCommand[afterskip=1.5\baselineskip]{chapter} \renewcommand*{\chapterlineswithprefixformat}[3]{% \Ifstr{#1}{chapter} {#2\textls*[75]{\MakeUppercase{#3}}}% change definition for chapter @@ -1610,7 +1615,7 @@ % We provide the following English translations. % % \begin{macrocode} -\ProvideDictionaryFor{English}{se2translations}[2023/04/18] +\ProvideDictionaryFor{English}{se2translations}[2023/07/04] \ProvideDictTranslation{abstract}{abstract} \ProvideDictTranslation{Abstract}{Abstract} \ProvideDictTranslation{acknowledgement}{acknowledgement} @@ -1661,7 +1666,7 @@ % We provide the following German translations. % % \begin{macrocode} -\ProvideDictionaryFor{German}{se2translations}[2023/04/18] +\ProvideDictionaryFor{German}{se2translations}[2023/07/04] \ProvideDictTranslation{abstract}{Zusammenfassung} \ProvideDictTranslation{Abstract}{Zusammenfassung} \ProvideDictTranslation{acknowledgement}{Danksagung} diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty index c63d49f623e..11cf5cffa16 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty +++ b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty @@ -48,7 +48,7 @@ \endinput }% \providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } -\ProvidesExplPackage {se2colors} {2023-04-18} {3.0.0} +\ProvidesExplPackage {se2colors} {2023-07-04} {3.1.0} {A colour support package for the se2thesis bundle} \keys_define:nn { seiicolors } { diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty b/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty index f0054c41faf..d5fdc4a305f 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty +++ b/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty @@ -48,7 +48,7 @@ \endinput }% \providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } -\ProvidesExplPackage {se2fonts} {2023-04-18} {3.0.0} +\ProvidesExplPackage {se2fonts} {2023-07-04} {3.1.0} {A font-selection support package for the se2thesis bundle} \tl_new:N \l__slcd_fonts_fontmode_tl \keys_define:nn { seiifonts } diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty b/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty index 6a304e88dd5..b8b47b39879 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty +++ b/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty @@ -48,7 +48,7 @@ \endinput }% \providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } -\ProvidesExplPackage {se2packages} {2023-04-18} {3.0.0} +\ProvidesExplPackage {se2packages} {2023-07-04} {3.1.0} {Supporting packages for the se2thesis bundle} \bool_new:N \l__slcd_packages_csquotes_bool \bool_new:N \l__slcd_packages_booktabs_bool @@ -88,7 +88,7 @@ noselnolig .meta:n = {selnolig=false}, widowcontrol .bool_gset:N = \l__slcd_packages_luawidowcontrol_bool, - widowcontrol .initial:n = true, + widowcontrol .initial:n = false, nowidowcontrol .meta:n = {widowcontrol=false}, microtype .bool_gset:N = \l__slcd_packages_microtype_bool, @@ -220,9 +220,12 @@ { \msg_info:nnn { seiipackages } { load-package } { microtype } \RequirePackage{microtype} - \clubpenalty=10000 - \widowpenalty=10000 - \displaywidowpenalty=10000 + \bool_if:NF \l__slcd_packages_luawidowcontrol_bool + { + \clubpenalty=10000 + \widowpenalty=10000 + \displaywidowpenalty=10000 + } \SetExtraKerning{ encoding = {OT1,T1,T2A,LY1,OT4,QX,T5,TS1,EU1,EU2} }{ diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls b/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls index ac3e0daa962..6dc09093ee3 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls +++ b/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls @@ -48,7 +48,7 @@ \endinput }% \providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } -\ProvidesExplClass {se2thesis} {2023-04-18} {3.0.0} +\ProvidesExplClass {se2thesis} {2023-07-04} {3.1.0} {A thesis class for the Chair of Software Engineering II} \prg_new_conditional:Nnn \slcd_package_if_loaded:n { p, T, F, TF } { @@ -524,11 +524,16 @@ \addtokomafont{section}{\large\mdseries} \addtokomafont{subsection}{\normalsize\mdseries} \renewcommand*{\chapterformat}{% - \mbox{% - \scalebox{1.3}{\chapappifchapterprefix{\nobreakspace}}% - \scalebox{3.5}{\color{UPSE2-Gray}\thechapter\autodot}\enskip% + \enskip\mbox{% + \scalebox{3}{\color{UPSE2-DarkGray}\thechapter\autodot}% }% } +\renewcommand{\chapterlinesformat}[3]{% + \parbox[b]{\textwidth}{\hrulefill#2}\par% + #3\par\bigskip% + \hrule% +} +\RedeclareSectionCommand[afterskip=1.5\baselineskip]{chapter} \renewcommand*{\chapterlineswithprefixformat}[3]{% \Ifstr{#1}{chapter} {#2\textls*[75]{\MakeUppercase{#3}}}% change definition for chapter diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl index a9fc8fece62..b1022433b85 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl +++ b/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl @@ -32,7 +32,7 @@ %% se2packages.sty, %% se2thesis-master-thesis-example.bib, and %% se2thesis-master-thesis-example.pdf -\ProvideDictionaryFor{English}{se2translations}[2023/04/18] +\ProvideDictionaryFor{English}{se2translations}[2023/07/04] \ProvideDictTranslation{abstract}{abstract} \ProvideDictTranslation{Abstract}{Abstract} \ProvideDictTranslation{acknowledgement}{acknowledgement} diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl index 088f23a93cf..42e00aa6ade 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl +++ b/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl @@ -32,7 +32,7 @@ %% se2packages.sty, %% se2thesis-master-thesis-example.bib, and %% se2thesis-master-thesis-example.pdf -\ProvideDictionaryFor{German}{se2translations}[2023/04/18] +\ProvideDictionaryFor{German}{se2translations}[2023/07/04] \ProvideDictTranslation{abstract}{Zusammenfassung} \ProvideDictTranslation{Abstract}{Zusammenfassung} \ProvideDictTranslation{acknowledgement}{Danksagung} |