diff options
| author | Norbert Preining <norbert@preining.info> | 2022-04-21 03:01:37 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2022-04-21 03:01:37 +0000 |
| commit | 21fe0e070af2427bda486f49569e1a5cb3df486d (patch) | |
| tree | 55d1fb5f8488adb2047db2ce4d40aeb4fe0bfdcf /macros | |
| parent | b981b5402a493d6d8c0eb44c350072ff41deb068 (diff) | |
CTAN sync 202204210301
Diffstat (limited to 'macros')
194 files changed, 751 insertions, 600 deletions
diff --git a/macros/generic/witharrows/witharrows-french.pdf b/macros/generic/witharrows/witharrows-french.pdf Binary files differindex 19becad1d3..ebb65eab90 100644 --- a/macros/generic/witharrows/witharrows-french.pdf +++ b/macros/generic/witharrows/witharrows-french.pdf diff --git a/macros/generic/witharrows/witharrows-french.tex b/macros/generic/witharrows/witharrows-french.tex index 56d9e694d3..fd610eef08 100644 --- a/macros/generic/witharrows/witharrows-french.tex +++ b/macros/generic/witharrows/witharrows-french.tex @@ -80,13 +80,25 @@ le calcul mathématique présenté. \end{abstract} -\vspace{1cm} -Dans la suite, on décrira l'extension LaTeX \pkg{witharrows} (néanmoins \pkg{witharrows} peut aussi être utilisé en -plain-TeX : voir à ce sujet p.~\pageref{plain-TeX}). Cette extension peut être utilisée avec |xelatex|, |lualatex|, -|pdflatex| mais aussi avec le cheminement classique |latex|-|dvips|-|ps2pdf| (ou Adobe Distiller). L'extension -\pkg{witharrows} charge les extensions \pkg{l3keys2e}, \pkg{xparse}, \pkg{tikz}, \pkg{varwidth} ainsi que les -bibliothèques Tikz \pkg{arrows.meta} et \pkg{bending}. Les flèches sont tracées avec Tikz et donc plusieurs -compilations peuvent être nécessaires. +\vspace{1cm} +L'extension LaTeX \pkg{witharrows} est entièrement contenue dans le fichier |witharrows.sty|. Ce +fichier peut être placé dans le répertoire courant ou dans une arborescence |texmf|. Le mieux reste néanmoins +d'installer \pkg{witharrows} avec une distribution TeX comme MiKTeX, TeX~Live ou MacTeX. + +\medskip +En fait, \pkg{witharrows} est aussi une extension utilisable avec plain-TeX et dans ce cas, le seul fichier +nécessaire est le fichier |witharrows.tex| : voir à ce sujet p.~\pageref{plain-TeX}. Dans la suite, on décrira +l'extension LaTeX. + +\medskip +Cette extension peut être utilisée avec |xelatex|, |lualatex|, |pdflatex| mais aussi avec le cheminement classique +|latex|-|dvips|-|ps2pdf| (ou Adobe Distiller). L'extension \pkg{witharrows} charge les extensions \pkg{l3keys2e}, +\pkg{xparse}, \pkg{tikz}, \pkg{varwidth} ainsi que les bibliothèques Tikz \pkg{arrows.meta} et \pkg{bending}. L'utilisateur final n'a qu'à charger l'extension \pkg{nicematrix} avec +l'instruction habituelle : |\usepackage{witharrows}|. + +\medskip +Les flèches sont tracées avec Tikz et donc \textbf{plusieurs compilations peuvent être nécessaires}.\footnote{Si + vous utilisez Overleaf, Overleaf effectue automatiquement le nombre de compilations nécessaire.} \bigskip Cette extension fournit un environnement |{WithArrows}| pour construire des alignements d'équations @@ -243,9 +255,7 @@ En fait, il est possible de modifier de manière plus drastique la forme des flà \interitem Il est possible d'utiliser l'option «|text width|» pour contrôler la largeur du texte associé à la -flèche.\footnote{Il est possible d'éviter les coupures de mots dans ces étiquettes: -utiliser l'option Tikz «|align = flush left|» en LaTeX et «|align = {flushleft,nothyphenated}|» en -ConTeXt.} +flèche. \newcounter{fnnohyphen} \setcounter{fnnohyphen}{\thefootnote} % diff --git a/macros/generic/witharrows/witharrows.dtx b/macros/generic/witharrows/witharrows.dtx index 921c2ebc77..ca8955ce21 100644 --- a/macros/generic/witharrows/witharrows.dtx +++ b/macros/generic/witharrows/witharrows.dtx @@ -15,8 +15,8 @@ % % \fi % \iffalse -\def\myfileversion{2.6d} -\def\myfiledate{2022/01/01} +\def\myfileversion{2.7} +\def\myfiledate{2022/04/20} % % %<*batchfile> @@ -98,14 +98,28 @@ version 2005/12/01 or later. % \end{abstract} % % -% \vspace{1cm} In this document, we describe the LaTeX extension -% \pkg{witharrows} (however, \pkg{witharrows} can also be used with plain-TeX: -% see p.~\pageref{plain-TeX}). This package can be used with |xelatex|, -% |lualatex|, |pdflatex| but also by the classical workflow -% |latex|-|dvips|-|ps2pdf| (or Adobe Distiller). This package loads the packages -% \pkg{l3keys2e}, \pkg{varwidth}, \pkg{tikz} and the Tikz libraries -% \pkg{arrows.meta} and \pkg{bending}. The arrows are drawn with Tikz and that's -% why several compilations may be necessary. +% \vspace{1cm} +% The package \pkg{witharrows} is entirely contained in the file +% |witharrows.sty|. This file may be put in the current directory or in a +% |texmf| tree. However, the best is to install \pkg{witharrows} with a TeX +% distribution such as MiKTeX, TeX Live or MacTeX. +% +% \medskip +% In fact, \pkg{witharrows} may also be used with plain-TeX and, in that case, +% the only required file is |witharrows.tex|: see p.~\pageref{plain-TeX}. In what +% follows, we describe the LaTeX package. +% +% \medskip +% This package can be used with |xelatex|, |lualatex|, |pdflatex| but also by +% the classical workflow |latex|-|dvips|-|ps2pdf| (or Adobe Distiller). This +% package loads the packages \pkg{l3keys2e}, \pkg{varwidth}, \pkg{tikz} and the +% Tikz libraries \pkg{arrows.meta} and \pkg{bending}. The final user only has to +% load the package with the classical instruction: |\usepackage{witharrows}|. +% +% \medskip +% The arrows are drawn with Tikz and that's why \textbf{several compilations may +% be necessary}.\footnote{If you use Overleaf, Overleaf will do automatically +% the right number of compilations.} % % \bigskip % This package provides an environment |{WithArrows}| to construct alignments of @@ -267,9 +281,7 @@ version 2005/12/01 or later. % % \interitem % It's possible to use the Tikz option ``|text width|'' to control the width of -% the text associated to the arrow.\footnote{It's possible to avoid the -% hyphenations of the words: use the Tikz option ``|align = flush left|'' in -% LaTeX and ``|align = {flushleft,nothyphenated}|'' in ConTeXt.} +% the text associated to the arrow. % \newcounter{fnnohyphen} % \setcounter{fnnohyphen}{\thefootnote} % @@ -543,7 +555,6 @@ version 2005/12/01 or later. % \begin{Verbatim} % \begin{DispWithArrows*}[~emphase#format = cCcCc@, % wrap-lines, -% tikz = {align = flush left}, % interline=1mm] % k & \;\le\; & t & \;\le\; & k+1 \\ % \frac{1}{k+1} & \le & \frac{1}{t} & \le & \frac{1}{k} @@ -556,7 +567,6 @@ version 2005/12/01 or later. % \end{Verbatim} % \begin{DispWithArrows*}[format = cCcCc, % wrap-lines, -% tikz = {align = flush left}, % interline=1mm] % k & \;\le\; & t & \;\le\; & k+1 \\ % \frac{1}{k+1} & \le & \frac{1}{t} & \le & \frac{1}{k} @@ -2671,7 +2681,6 @@ version 2005/12/01 or later. % % % \medskip -% We use |\seq_set_map_x:NNn| which has been introduced the 2020/07/16. % \begin{macrocode} \msg_new:nnn { witharrows } { expl3~too~old } { @@ -2869,7 +2878,7 @@ version 2005/12/01 or later. % |\@ifpackageloaded| in the core of the functions because |\@ifpackageloaded| % is available only in the preamble.} % \begin{macrocode} -\AtBeginDocument +\AtBeginDocument { \clist_map_inline:nn { @@ -3031,11 +3040,10 @@ version 2005/12/01 or later. { WithArrows / arrow / .style = { - align = left , + align = flush~left , % \end{macrocode} % -% We have put the option |align = left| because we want to give the user the -% possibility of using |\\| in the labels. +% Before the version 2.7, it was |align = left|. % \begin{macrocode} auto = left , %<*LaTeX> @@ -3055,7 +3063,7 @@ version 2005/12/01 or later. % |\WithArrowsOptions| and |{DispWithArrows}|. % \begin{macrocode} %<*LaTeX> -\AtBeginDocument +\AtBeginDocument { \bool_if:NTF \c_@@_amsmath_loaded_bool { @@ -3073,8 +3081,9 @@ version 2005/12/01 or later. % % Nevertheless, we want the extension \pkg{witharrows} available without % \pkg{amsmath}. That's why we give a definition of |\spread@equation| if -% \pkg{amsmath} is not loaded (we put the code in a |\AtBeginDocument| because -% the flag |\c_@@_amsmath_loaded_bool| is itself set in a |\AtBeginDocument|). +% \pkg{amsmath} is not loaded (we put the code in the hook |begindocument| +% because the flag |\c_@@_amsmath_loaded_bool| is itself set in the hook +% |begindocument|). % \begin{macrocode} { %</LaTeX> @@ -6309,6 +6318,18 @@ version 2005/12/01 or later. node [ anchor = west ] { \begin { minipage } { \l_tmpa_dim } + \tikz@text@action + \pgfkeysgetvalue { / tikz / node~halign~header } \l_tmpa_tl + \tl_if_eq:NnTF \l_tmpa_tl { \tikz@align@left@header } + { \pgfutil@raggedright } + { + \tl_if_eq:NnTF \l_tmpa_tl { \tikz@align@right@header } + { \pgfutil@raggedleft } + { + \tl_if_eq:NnT \l_tmpa_tl { \tikz@align@center@header } + { \centering } + } + } #3 \end { minipage } } ; @@ -7951,6 +7972,11 @@ version 2005/12/01 or later. % % Version 2.6d: correction of a bug (cf. question 628461 on TeX StackExchange). % +% \subsection*{Changes between 2.6b and 2.7} +% +% Correction of a bug: when the key |wrap-lines| was in force, the content of +% the annotations was not ``flush left'' by default as it should be (but justified). +% % \PrintIndex % % \tableofcontents diff --git a/macros/generic/witharrows/witharrows.ins b/macros/generic/witharrows/witharrows.ins index fb1d7ae5ed..d101deff19 100644 --- a/macros/generic/witharrows/witharrows.ins +++ b/macros/generic/witharrows/witharrows.ins @@ -1,5 +1,5 @@ %% -%% Copyright (C) 2017-2021 by F. Pantigny +%% Copyright (C) 2017-2022 by F. Pantigny %% %% %% This file may be distributed and/or modified under the @@ -17,7 +17,7 @@ \usedir{tex/latex/witharrows} \preamble -Copyright (C) 2017-2021 by F. Pantigny +Copyright (C) 2017-2022 by F. Pantigny This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either diff --git a/macros/generic/witharrows/witharrows.pdf b/macros/generic/witharrows/witharrows.pdf Binary files differindex e5e271026a..a6570633ea 100644 --- a/macros/generic/witharrows/witharrows.pdf +++ b/macros/generic/witharrows/witharrows.pdf diff --git a/macros/latex/contrib/babel-contrib/french/README.md b/macros/latex/contrib/babel-contrib/french/README.md index 0e046586e0..08a1d95dd8 100644 --- a/macros/latex/contrib/babel-contrib/french/README.md +++ b/macros/latex/contrib/babel-contrib/french/README.md @@ -50,5 +50,5 @@ Changes See the included manual frenchb.pdf, section "Change History". --- -Copyright 1996--2021 Daniel Flipo +Copyright 1996--2022 Daniel Flipo E-mail: daniel (dot) flipo (at) free (dot) fr diff --git a/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf b/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf Binary files differindex bf4c8438e4..e531ee4cc4 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf +++ b/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf diff --git a/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex b/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex index 467181d9dc..c5100059d6 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex +++ b/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex @@ -6,7 +6,6 @@ \usepackage{iftex}[2019/10/24] \RequireLuaTeX -\usepackage{xspace} \usepackage{array,longtable} \usepackage{varioref} \renewcommand{\reftextpagerange}[2]{\pageref{#1}--\pageref{#2}} @@ -122,11 +121,11 @@ \title{Mode d’emploi du module \ext{babel-french}} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\latestversion}{3.5m} +\newcommand*{\latestversion}{3.5n} \date{Version {\latestversion} -- \today} \begin{document} -%\def\today{30 juillet 2020} +\def\today{18 avril 2022} \maketitle \thispagestyle{empty} @@ -147,7 +146,6 @@ La présente documentation en français est également disponible sur CTAN, il n’y a plus besoin de la récupérer sur mon site personnel {\expandafter\expandafter\expandafter\url{\urlperso/babel-french}}. - \end{abstract} \bgroup @@ -161,19 +159,6 @@ \vspace{-\baselineskip}\noindent \descindentFB=0pt \begin{description} - \item[8 juillet 2014] Ajout des sections~\ref{ssec:captions} - p.~\pageref{ssec:captions} (\textit{caption names}) et \ref{ssec:biblatex} - p.~\pageref{ssec:biblatex} (\biblatex). - \item[28 juillet 2014] Présentation des listes, - configuration d’\ext{enumitem} (section~\ref{ssec:lists}). - \item[16 sept. 2014] Ajout de l’option \fbo{SmallCapsFigTabCaptions}, - voir p.~\pageref{scfigtab}. - \item[9 avril 2015] Charger \ext{listings} après \ext{babel} - (section~\ref{sec:Incomp}). - \item[14 février 2016] Adaptation à la version 3.2a, voir - section~\ref{ssec:changes-3.2}. - \item[30 mars 2016] Charger \ext{subcaption} après \ext{babel} - (section~\ref{sec:Incomp}). \item[14 mai 2016] Mise à jour pour TeXLive~2016, voir section~\ref{ssec:changes-3.2}. L’historique des changements antérieurs à la version~3.0 a été supprimé. @@ -199,6 +184,8 @@ voir p.~\pageref{listspacing}. \item[14 mars 2019] Nouvelle commande |\NoEveryParQuote|, voir p.~\pageref{frquote}. + \item[18 avril 2022] Nouvelle commande |\bname{}|, variante sans petites + capitales de |\bsc{}| voir p.~\pageref{bname}. \end{description} \end{abstract} \egroup @@ -458,21 +445,20 @@ au comportement standard de LaTeX (typographie américaine). Des commandes ont été prévues pour faciliter la saisie : \begin{itemize} -\item Les guillemets peuvent être saisis grâce aux commandes |\og| et |\fg|% - \footnote{Si les caractères « et » sont accessibles au clavier, - ils peuvent être utilisés pour saisir les guillemets, voir - la fin de la section~\ref{sec:Perso}, p.~\pageref{og-fg}.}, - ce qui donne selon la langue de travail « guillemets français » ou - \begin{otherlanguage}{english}``english quotes’’\end{otherlanguage}. +\item Les guillemets français peuvent être saisis grâce à la commande + |\frquote{|\textit{texte}|}| qui affiche \frquote{\textit{texte}} + avec les espaces insécables adéquats. Il est également possible de coder + |\og texte\fg{}| (ancienne syntaxe toujours valide). + + Si les caractères « et » sont accessibles au clavier% + \footnote{grâce à une touche \texttt{Compose} par exemple…}, + ils peuvent être utilisés pour saisir les guillemets français, voir + la fin de la section~\ref{sec:Perso}, p.~\pageref{og-fg}. Notez que les guillemets français ne devraient \emph{jamais} être saisis avec |<<| et |>>| contrairement à ce qui se fait avec {e-French} (voir section~\ref{sec:CompatFP}). - Depuis la version~3.1, une alternative, |\frquote{|\textit{texte}|}|, est - proposée pour la saisie des guillemets français avec l’espace adéquat, - le résultat est \frquote{\textit{texte}}. - L’usage de |\frquote{}| est recommandé pour les citations longues (c.-à -d. s’étendant sur plus d’un paragraphe) et pour les citations imbriquées.\hlabel{frquote} @@ -584,12 +570,21 @@ vertical des lettres supérieures simulées par |\fup| (voir dans le code de \file{frenchb.dtx} les commandes |\FBsupS| et |\FBsupR|). -\item L’usage français veut que les noms propres soient imprimés en - petites capitales et ne soient pas coupés en bout de ligne, la commande - |\bsc| (\textit{boxed small caps}) en facilite la saisie : - on saisira par exemple |Leslie~\bsc{Lamport}| pour - obtenir Leslie~\bsc{Lamport} sans risque de coupure \textsc{Lam-port} - en bout de ligne. +\item Les commandes |\bname{}|\label{bname} (\textit{boxed name}) + et |\bsc{}| (\textit{boxed small caps}) facilitent la saisie des noms + propres : toutes deux empêchent la coupure de leur argument, sauf au niveau + du tiret pour les noms composés ; + la seconde imprime son argument en petites capitales, ce qui est d’usage par + exemple dans les bibliographies ou les signatures.\\ + Exemples : |\bname{Montesquieu}|, |Albert~\bsc{Camus}|.\\ + N.B. Ces commandes ne mettent pas leur argument dans une |\mbox{}|, leur + effet n’est pas aussi radical : un |\kern0pt| inhibe toute coupure du mot + suivant, ce qui marche bien pour les noms simples ou composés avec un tiret + et a l’avantage de préserver l’expansion éventuellement faite par + \pkg{microtype}. Les patronymes à particule peuvent poser problème : coder + |Jean~\bname{de La Fontaine}| n’aurait strictement aucun effet (les coupures + après `de’, après `La’ ou `Fon-taine’ restent possibles), en revanche + |Jean~de~La~\bname{Fontaine}| empêcherait toute coupure. \item les commandes |\primo|, |\secundo|, |\tertio| et |\quarto| peuvent @@ -598,8 +593,8 @@ vertical des lettres supérieures simulées par |\fup| Ensuite, |\FrenchEnumerate{6}| donne \FrenchEnumerate{6}. \item Les abréviations de «numéro», \No, \Nos, \no{} et \nos, sont obtenues - en tapant |\No|, |\Nos|, |\no| et |\nos| ; - l’espace qui suit est insécable : coder |\no1| ou |\no 1|. + en tapant |\No|, |\Nos|, |\no| et |\nos| ; elles incluent + une espace insécable finale : coder |\no1| ou |\no 1| suffit. \item Le caractère \degre{} (à ne pas confondre avec le petit «o» de \No) est saisi |\degre|, mais comme les espaces avant @@ -659,7 +654,10 @@ les commandes |\ieme|, |\iemes|, |\fg| et |\dots| sont respectés sans avoir à les forcer par des |{}| ou -des~\code{\boi\textvisiblespace}. +des~\code{\boi\textvisiblespace}. Noter cependant que l’auteur de \pkg{xspace} +ne recommande plus vraiment son utilisation, aussi peut-on préférer +\emph{ne pas charger} \pkg{xspace} et gérer les espaces soi-même : +« |les 1\ier, 2 et 3~mai| » ou « |le 1\ier~mai| » (espace insécable). \section{Personnalisation} \label{sec:Perso} @@ -982,13 +980,12 @@ La liste étant longue, les options sont regroupées par thèmes. \fbsetup{} sont optionnels.} ; \hlabel{og-fg} lorsqu’on dispose de guillemets français au clavier (grâce à une touche \textit{compose} par exemple), cette option permet - d’utiliser directement ces guillemets à la place des commandes |\og| et |\fg|% - \footnote{Toutefois, si des guillemets doivent être utilisés dans une - commande \cs{index}, ils \emph{doivent} être codés en \cs{og} et - \cs{fg}.}. - On peut ainsi saisir \code{«guillemets»} ou \code{« guillemets »} (avec ou - sans espaces à l’intérieur) pour obtenir «guillemets» avec espaces - insécables adéquates en français. En revanche, si on active cette option, + d’utiliser directement ces guillemets à la place des commandes |\frquote{}| + ou |\og| et |\fg|. + On peut ainsi saisir \code{«guillemets»} (sans espace) ou + \code{« guillemets »} (avec espaces à l’intérieur) pour obtenir «guillemets» + avec les espaces insécables adéquates en français. En revanche, si on active + cette option, \emph{il ne faut pas coder explicitement les espaces insécables} : \code{«}|~|\code{guillemets}|~|\code{»} produirait «~guillemets~» où l’espace qui suit le guillemet ouvrant est @@ -1551,6 +1548,10 @@ etc.) sont maintenant prises en compte correctement. |\textorpdfstring{}{}| (suggestion de l’équipe LaTeX3). \end{itemize} +La commande |\bname{}| (voir section~\pageref{bname}) a été ajoutée en +version~3.5n, la documentation concernant la commande |\bsc{}| a été revue +comme celle concernant la saisie des guillemets. + \subsection{Changements entre les versions 3.4d et 3.3d} \label{ssec:changes-3.4} @@ -1899,9 +1900,9 @@ cette liste. virgule par une espace fine. \item Dans une commande |\index{}|, les guillemets français doivent - obligatoirement être codés sous la forme |\og|, |\fg| : + obligatoirement être codés sous la forme |\frquote{}| (ou |\og|, |\fg|) : \hlabel{ch-doc4} - |\index{\og toto\fg}| donne le résultat attendu, tandis que + |\index{\frquote{toto}| donne le résultat attendu, tandis que |\index{«toto»}| provoque soit une erreur à la compilation (en LaTeX), soit un mauvais classement de l’entrée |«toto»| dans l’index (en XeLaTeX et LuaLaTeX). diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.dtx b/macros/latex/contrib/babel-contrib/french/frenchb.dtx index 4630c18ef4..fec387a0d4 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb.dtx +++ b/macros/latex/contrib/babel-contrib/french/frenchb.dtx @@ -1,4 +1,4 @@ -%\CheckSum{3732} +%\CheckSum{3741} % %\iffalse % Tell the LaTeX system who we are and write an entry on the @@ -13,12 +13,12 @@ %<frenchb>\ProvidesLanguage{frenchb} %<lua>--[[ %<lua> File `frenchb.lua’ generated from frenchb.dtx - [2021/07/20 v3.5m French support from the babel system] + [2022/04/18 v3.5n French support from the babel system] %<*internal> \iffalse %</internal> %<*lua> - Copyright © 2014-2021 Daniel Flipo + Copyright © 2014-2022 Daniel Flipo <daniel (dot) flipo (at) free (dot) fr> License LPPL: see french.ldf. --]] @@ -32,7 +32,7 @@ %<*dtx|french> %% %% Babel package for LaTeX version 2e -%% Copyright © 1996-2021 +%% Copyright © 1996-2022 %% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr> %% %</dtx|french> @@ -228,44 +228,36 @@ % Some commands are provided by \frenchb{} to make typesetting % easier: % \begin{enumerate} -% \item French quotation marks can be entered using the commands -% |\og| and |\fg| which work in LaTeX2e and PlainTeX, -% their appearance depending on what is available to draw -% them; even if you use LaTeX2e \emph{and} |T1|-encoding, -% you should refrain from entering them as -% |<<~French quotation~>>|: |\og| and |\fg| provide -% better horizontal spacing (controlled by |\FBguillspace|). -% If French quote characters are available on your keyboard, -% you can use them, to get proper spacing in LaTeX2e see -% option \fbo{og=«, fg=»} p.~\pageref{option-og-fg}. -% -% |\og| and |\fg| can be used outside French, they typeset -% then English quotes `` and ’’. -% -% A new command |\frquote{}| has been added in version~3.1 to -% enter French quotations. |\frquote{|\textit{texte}|}| is -% equivalent to |\og| \textit{texte} |\fg{}| for short -% quotations.\hlabel{frquote} -% For quotations spreading over more than one paragraph, -% |\frquote| will add at the beginning of every paragraph of -% the quotation either an opening French guillemet («), or -% a closing one (») or nothing depending on option -% \fbo{EveryParGuill=open} or \fbo{=close} or \fbo{=none}, -% see p.~\pageref{everyparguill}. -% Command |\NoEveryParQuote| is provided to locally suppress -% unwanted guillemets (typically when lists are embedded in -% |\frquote{}|), it is meant to be used inside an environment -% or a group. -% -% |\frquote| is recommended to enter embedded quotations ``à la -% française’’, several variants are provided through options. -% \begin{itemize} -% \item with all engines: the inner quotation -% is surrounded by double quotes (``\textit{texte}’’) -% unless option \fbo{InnerGuillSingle=true}, then -% a) the inner quotation is printed as +% \item French quotation marks can be entered using the command +% |\frquote{}|: |\frquote{some text}| will output +% «~some text~». Former commands |\og| and |\fg| are kept +% for backward compatibility: |\og some text\fg{}| is an +% alternative to |\frquote{some text}|.\hlabel{frquote} +% +% If French quote characters are available on your keyboard, +% you can use them, to get proper spacing in LaTeX2e see +% option \fbo{og=«, fg=»} p.~\pageref{option-og-fg}. +% +% For quotations spreading over more than one paragraph, +% |\frquote| will add at the beginning of every paragraph of +% the quotation either an opening French guillemet («), or +% a closing one (») or nothing depending on option +% \fbo{EveryParGuill=open} or \fbo{=close} or \fbo{=none}, +% see p.~\pageref{everyparguill}. +% Command |\NoEveryParQuote| is provided to locally suppress +% unwanted guillemets (typically when lists are embedded in +% |\frquote{}|), it is meant to be used inside an environment +% or a group. +% +% |\frquote| is recommended to enter embedded quotations ``à la +% française’’, several variants are provided through options. +% \begin{itemize} +% \item with all engines: the inner quotation +% is surrounded by double quotes (``\textit{texte}’’) +% unless option \fbo{InnerGuillSingle=true}, then +% a) the inner quotation is printed as % \guilsinglleft\FRguillspace\textit{texte}\FRguillspace -% \guilsinglright{} and b) if the inner quotation +% \guilsinglright{} and b) if the inner quotation % spreads over more than one paragraph, every paragraph % included in the inner quotation starts with % a \guilsinglleft{} or a \guilsinglright{} or nothing, @@ -280,12 +272,12 @@ % option \fbo{InnerGuillSingle}; % the default is \fbo{EveryLineGuill=none} so that % |\frquote{}| behaves as with non-LuaTeX engines. -% \end{itemize} -% A starred variant |\frquote*| is meant for inner quotations -% which end together with the outer one: using |\frquote*| for -% the inner quotation will print only one closing quote -% character (the outer one) as recommended by the French -% `Imprimerie Nationale’. +% \end{itemize} +% A starred variant |\frquote*| is meant for inner quotations +% which end together with the outer one: using |\frquote*| for +% the inner quotation will print only one closing quote +% character (the outer one) as recommended by the French +% `Imprimerie Nationale’. % % \item |\frenchdate|\marg{year}\marg{month}\marg{day} helps % typesetting dates in French: |\frenchdate{2001}{01}{01}| @@ -300,12 +292,12 @@ % All these commands take advantage of real superscript % letters when they are available in the current font. % -% \item Family names should be typeset in small capitals and never -% be hyphenated, the macro |\bsc| (boxed small caps) does -% this, e.g., |L.~\bsc{Lamport}| will print the same as -% |L.~\mbox{\textsc{Lamport}}|. Note that composed names -% (such as Dupont-Durant) may now be hyphenated on explicit -% hyphens, this differs from \frenchb~v.~1.x. +% \item Command |\bname{}| (boxed name) is provided to typeset +% family names: its argument will not be hyphenated except on +% explicit hyphens. |\bsc{}| (boxed small caps) is a variant +% that prints its argument in small capitals, it is meant for +% bibliographies, signatures, etc. +% Usage: |Albert~\bsc{Camus}|. % % \item Commands |\primo|, |\secundo|, |\tertio| and |\quarto| % print 1\up{o}, 2\up{o}, 3\up{o}, 4\up{o}. @@ -591,7 +583,7 @@ % % \item [og=«, fg=»]; when guillemets characters are available on % the keyboard (through a compose key for instance), it is nice -% to use them instead of typing |\og| and |\fg|. This option +% to use them instead of typing |\frquote{}|. This option % tells \frenchb{} which characters are opening and closing % French guillemets (they depend on the input encoding), then % you can type either \hlabel{option-og-fg} @@ -831,6 +823,9 @@ % |\textorpdfstring{}{}|. % \end{itemize} % +% Version 3.5n introduces a new command |\bname{}| (an alternative to +% |\bsc{}|). +% % \subsubsection*{What’s new in version 3.4?} % % Version 3.4a adds a new command |\frenchdate| (see @@ -3454,15 +3449,14 @@ return french_punctuation % \end{macro} % \end{macro} % +% \begin{macro}{\bname} % \begin{macro}{\bsc} -% As family names should be written in small capitals and never be -% hyphenated, we provide a command (its name comes from Boxed Small -% Caps) to input them easily. Note that this command has changed -% with version~2 of \frenchb: a |\kern0pt| is used instead of |\hbox| -% because |\hbox| would break microtype’s font expansion; as a -% (positive?) side effect, composed names (such as Dupont-Durand) -% can now be hyphenated on explicit hyphens. -% Usage: |Jean~\bsc{Duchemin}|. +% These commands are meant to easily enter family names (in small +% capitals for the latter) while avoidind hyphenation. +% A |\kern0pt| is used instead of |\mbox| because |\mbox| would break +% microtype’s font expansion; as a positive side effect, composed +% names (such as Dupont-Durand) can now be hyphenated on explicit +% hyphens. % % \changes{v2.0}{2006/11/06}{\cs{hbox} dropped, replaced by % \cs{kern0pt}.} @@ -3470,17 +3464,24 @@ return french_punctuation % \changes{v3.5k}{2020/07/18}{\cs{bsc} now relies on % \cs{texorpdfstring} to be safe in bookmarks.} % +% \changes{v3.5n}{2022/04/01}{Added command \cs{bname} (no small caps).} +% % \begin{macrocode} \ifLaTeXe + \DeclareRobustCommand*{\bname}[1]{% + \texorpdfstring{\leavevmode\begingroup\kern0pt #1\endgroup}{#1}% + } \DeclareRobustCommand*{\bsc}[1]{% \texorpdfstring{\leavevmode\begingroup\kern0pt \scshape #1\endgroup}% {\textsc{#1}}% } \else - \newcommand*{\bsc}[1]{\leavevmode\begingroup\kern0pt #1\endgroup} + \newcommand*{\bname}[1]{\leavevmode\begingroup\kern0pt #1\endgroup} + \let\bsc\bname \fi % \end{macrocode} % \end{macro} +% \end{macro} % % Some definitions for special characters. We won’t define |\tilde| % as a Text Symbol not to conflict with the macro |\tilde| for math @@ -4429,6 +4430,9 @@ return french_punctuation % section~\ref{ssec-loading-order}; a light customisation is % compatible with the \pkg{beamerarticle} package. % +% \changes{v3.5n}{2022/04/18}{\cs{FBGlobalLayoutFrench} no longer set to +% false when French is not the main language.} +% % \begin{macrocode} \def\FB@french{french} \def\FB@acadian{acadian} @@ -4461,8 +4465,6 @@ return french_punctuation \FBFrenchFootnotestrue \FBAutoSpaceFootnotestrue \FBCustomiseFigTabCaptionstrue - \else - \FBGlobalLayoutFrenchfalse \fi % \end{macrocode} % \frenchb{} being an option of \babel, it cannot load a package @@ -4482,7 +4484,7 @@ return french_punctuation \csname FBStandardLayout#1\endcsname \else \PackageWarning{french.ldf}% - {Option `StandardlLayout' skipped:\MessageBreak + {Option `StandardLayout' skipped:\MessageBreak French is *not* babel's last option.\MessageBreak Reported}% \fi @@ -4494,7 +4496,6 @@ return french_punctuation \FBIndentFirstfalse \FBFrenchFootnotesfalse \FBAutoSpaceFootnotesfalse - \FBGlobalLayoutFrenchfalse \else \FBStandardListSpacingfalse \FBStandardItemizeEnvfalse @@ -4517,7 +4518,7 @@ return french_punctuation % If this key is set to \fbo{true} when French is the main language, % nothing to do: all flags keep their default value. % If this key is set to \fbo{false}, nothing to do either: -% |\babel@save| will do the job. +% |\babel@save| will do the job at every language’s switch. % \begin{macrocode} \define@key{FB}{ReduceListSpacing}[true]% {\csname FBReduceListSpacing#1\endcsname @@ -4934,6 +4935,14 @@ return french_punctuation \def\FB@ufl{\update@frenchlists} \ifFB@mainlanguage@FR \update@frenchlists + \else + \ifFBStandardItemizeEnv + \else + \PackageWarning{french.ldf}% + {babel-french will not customize lists' layout\MessageBreak + when French is not the main language,\MessageBreak + reported}% + \fi \fi % \end{macrocode} % The layout of footnotes is handled at the |\begin{document}| @@ -5582,7 +5591,6 @@ return french_punctuation % \label{ssec-indent} % % \begin{macro}{\bbl@frenchindent} -% \begin{macro}{\bbl@nonfrenchindent} % In French the first paragraph of each section should be indented, % this is another difference with US-English. This is controlled % by the flag |\if@afterindent|. @@ -5592,30 +5600,23 @@ return french_punctuation % French which is correct for English but wrong for some languages % like Spanish. Pointed out by Juan José Torrens.} % +% \changes{v3.5n}{2022/04/18}{\cs{bbl@frenchindent} changed. +% \cs{bbl@nonfrenchindent} removed.} +% % We will need to save the value of the flag |\if@afterindent| % `AtBeginDocument’ before eventually changing its value. % % \begin{macrocode} \def\bbl@frenchindent{% - \ifFBGlobalLayoutFrench - \else - \babel@save\@afterindentfalse - \fi + \ifFBGlobalLayoutFrench\else\babel@save\@afterindentfalse\fi \ifFBIndentFirst + \ifFB@mainlanguage@FR\else\babel@save\@afterindentfalse\fi \let\@afterindentfalse\@afterindenttrue \@afterindenttrue \fi} -\def\bbl@nonfrenchindent{% - \ifFBGlobalLayoutFrench - \ifFBIndentFirst - \@afterindenttrue - \fi - \fi} \addto\extrasfrench{\bbl@frenchindent} -\addto\noextrasfrench{\bbl@nonfrenchindent} % \end{macrocode} % \end{macro} -% \end{macro} % % \subsection{Formatting footnotes} % \label{ssec-footnotes} diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.ins b/macros/latex/contrib/babel-contrib/french/frenchb.ins index a8bfed7524..10f64910fa 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb.ins +++ b/macros/latex/contrib/babel-contrib/french/frenchb.ins @@ -2,7 +2,7 @@ %% This file will generate fast loadable files and documentation driver %% files from the doc files in this package when run through LuaTeX. %% -%% Copyright 2001-2021 Daniel Flipo. All rights reserved. +%% Copyright 2001-2022 Daniel Flipo. All rights reserved. %% %% This is a generated file part of the the babel-french bundle %% to be used with the Babel system. @@ -14,7 +14,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2021/01/30} +\def\filedate{2022/04/18} \def\batchfile{frenchb.ins} \input docstrip.tex diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.pdf b/macros/latex/contrib/babel-contrib/french/frenchb.pdf Binary files differindex 2f202d918f..086582ceff 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb.pdf +++ b/macros/latex/contrib/babel-contrib/french/frenchb.pdf diff --git a/macros/latex/contrib/l3backend/CHANGELOG.md b/macros/latex/contrib/l3backend/CHANGELOG.md index e725149f03..48187b02ea 100644 --- a/macros/latex/contrib/l3backend/CHANGELOG.md +++ b/macros/latex/contrib/l3backend/CHANGELOG.md @@ -6,6 +6,13 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2022-04-20] + +### Changed +- Adjust `(x)dvipdfmx` backend approach to color following issues with + multiple color stacks in `xetex.def` +- Move some functions to `l3color` + ## [2022-04-14] ### Added @@ -238,7 +245,8 @@ this project uses date-based 'snapshot' version identifiers. - Include `l3backend` in file names - Moved backend code to internal for each 'parent' module -[Unreleased]: https://github.com/latex3/latex3/compare/2022-04-14...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2022-04-20...HEAD +[2022-04-20]: https://github.com/latex3/latex3/compare/2022-04-14...2022-04-20 [2022-04-14]: https://github.com/latex3/latex3/compare/2022-04-10...2022-04-14 [2022-04-10]: https://github.com/latex3/latex3/compare/2022-02-07...2022-04-10 [2022-02-07]: https://github.com/latex3/latex3/compare/2022-01-12...2022-02-07 diff --git a/macros/latex/contrib/l3backend/README.md b/macros/latex/contrib/l3backend/README.md index 824db1bdd3..20ec9a84fe 100644 --- a/macros/latex/contrib/l3backend/README.md +++ b/macros/latex/contrib/l3backend/README.md @@ -1,7 +1,7 @@ LaTeX3 Backend Drivers ====================== -Release 2022-04-14 +Release 2022-04-20 This package forms parts of `expl3`, and contains the code used to interface with backends (drivers) across the `expl3` codebase. The functions here are diff --git a/macros/latex/contrib/l3backend/l3backend-basics.dtx b/macros/latex/contrib/l3backend/l3backend-basics.dtx index adaf33ee44..1eb47c105e 100644 --- a/macros/latex/contrib/l3backend/l3backend-basics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-14} +% \date{Released 2022-04-20} % % \maketitle % @@ -70,27 +70,27 @@ % \begin{macrocode} \ProvidesExplFile %<*dvipdfmx> - {l3backend-dvipdfmx.def}{2022-04-14}{} + {l3backend-dvipdfmx.def}{2022-04-20}{} {L3 backend support: dvipdfmx} %</dvipdfmx> %<*dvips> - {l3backend-dvips.def}{2022-04-14}{} + {l3backend-dvips.def}{2022-04-20}{} {L3 backend support: dvips} %</dvips> %<*dvisvgm> - {l3backend-dvisvgm.def}{2022-04-14}{} + {l3backend-dvisvgm.def}{2022-04-20}{} {L3 backend support: dvisvgm} %</dvisvgm> %<*luatex> - {l3backend-luatex.def}{2022-04-14}{} + {l3backend-luatex.def}{2022-04-20}{} {L3 backend support: PDF output (LuaTeX)} %</luatex> %<*pdftex> - {l3backend-pdftex.def}{2022-04-14}{} + {l3backend-pdftex.def}{2022-04-20}{} {L3 backend support: PDF output (pdfTeX)} %</pdftex> %<*xetex> - {l3backend-xetex.def}{2022-04-14}{} + {l3backend-xetex.def}{2022-04-20}{} {L3 backend support: XeTeX} %</xetex> % \end{macrocode} diff --git a/macros/latex/contrib/l3backend/l3backend-box.dtx b/macros/latex/contrib/l3backend/l3backend-box.dtx index 4093f8b3a7..872e2dadcb 100644 --- a/macros/latex/contrib/l3backend/l3backend-box.dtx +++ b/macros/latex/contrib/l3backend/l3backend-box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-14} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-code.pdf b/macros/latex/contrib/l3backend/l3backend-code.pdf Binary files differindex a5c0020393..3d69a13b8e 100644 --- a/macros/latex/contrib/l3backend/l3backend-code.pdf +++ b/macros/latex/contrib/l3backend/l3backend-code.pdf diff --git a/macros/latex/contrib/l3backend/l3backend-color.dtx b/macros/latex/contrib/l3backend/l3backend-color.dtx index 7166fb693d..6f766bc88a 100644 --- a/macros/latex/contrib/l3backend/l3backend-color.dtx +++ b/macros/latex/contrib/l3backend/l3backend-color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-14} +% \date{Released 2022-04-20} % % \maketitle % @@ -60,9 +60,10 @@ %<@@=color> % \end{macrocode} % -% Color support is split into parts: collecting data from \LaTeXe{}, the color stack, general color, separations, and color for -% drawings. We have different approaches in each backend, and have some choices -% to make about \texttt{dvipdfmx}/\XeTeX{} in particular. Whilst it is in some ways +% Color support is split into parts: collecting data from \LaTeXe{}, the color +% stack, general color, separations, and color for drawings. We have different +% approaches in each backend, and have some choices to make about +% \texttt{dvipdfmx}/\XeTeX{} in particular. Whilst it is in some ways % convenient to use the same approach in multiple backends, the fact that % \texttt{dvipdfmx}/\XeTeX{} is PDF-based means it (largely) sticks closer to % direct PDF output. @@ -169,119 +170,29 @@ % \subsection{The color stack} % % For PDF-based engines, we have a color stack available inside the specials. -% This is used for concepts beyond color itself: it is needed to manage th graphics -% state generally. The exact form depends on the engine, and for -% \texttt{dvipdfmx}/\XeTeX{} the backend version. +% This is used for concepts beyond color itself: it is needed to manage the +% graphics state generally. Although \texttt{dvipdfmx}/\XeTeX{} have multiple +% color stacks in recent releases, the way these interact with the original +% single stack and with other graphic state operations means that currently it +% is not feasible to use the multiple stacks. % % \subsubsection{Common code} % % \begin{macrocode} -%<*dvipdfmx|luatex|pdftex|xetex> +%<*luatex|pdftex> % \end{macrocode} % % \begin{variable}{\l_@@_backend_stack_int} -% \pdfTeX{}, \LuaTeX{} and recent \texttt{(x)dvipdfmx} have multiple stacks -% available, and to track which one is in use a variable is required. +% For tracking which stack is in use where multiple stacks are used: +% currently just \pdfTeX{}/\LuaTeX{} but at some future stage may also cover +% \texttt{dvipdfmx}/\XeTeX{}. % \begin{macrocode} \int_new:N \l_@@_backend_stack_int % \end{macrocode} % \end{variable} % % \begin{macrocode} -%</dvipdfmx|luatex|pdftex|xetex> -% \end{macrocode} -% -% \subsubsection{\texttt{dvipdfmx}/\XeTeX{}} -% -% \begin{macrocode} -%<*dvipdfmx|xetex> -% \end{macrocode} -% -% \begin{macro}{\__kernel_color_backend_stack_init:Nnn} -% \begin{variable} -% {\g_@@_backend_stack_int, \c_@@_backend_main_stack_int} -% In \texttt{(x)dvipdfmx}, the base color stack is not set up, so we have to -% force that, as well as providing a mechanism more generally. -% \begin{macrocode} -\int_new:N \g_@@_backend_stack_int -\cs_new_protected:Npx \__kernel_color_backend_stack_init:Nnn #1#2#3 - { - \int_gincr:N \exp_not:N \g_@@_backend_stack_int - \int_const:Nn #1 { \exp_not:N \g_@@_backend_stack_int } - \use:x - { - \__kernel_backend_first_shipout:n - { - \__kernel_backend_literal:n - { - pdfcolorstackinit ~ - \exp_not:N \int_use:N \exp_not:N \g_@@_backend_stack_int - \c_space_tl - \exp_not:N \tl_if_blank:nF {#2} { #2 ~ } - (#3) - } - } - } - } -\cs_if_exist:cTF { main@pdfcolorstack } - { - \int_set:Nn \l_@@_backend_stack_int - { \int_use:c { main@pdfcolorstack } } - } - { - \__kernel_color_backend_stack_init:Nnn \c_@@_backend_main_stack_int - { page ~ direct } { 0 ~ g ~ 0 ~ G } - \int_set_eq:NN \l_@@_backend_stack_int - \c_@@_backend_main_stack_int - \int_const:cn { main@pdfcolorstack } { \c_@@_backend_main_stack_int } - } -% \end{macrocode} -% The backend automatically restores the stack color from the \enquote{classical} -% approach (\texttt{pdf:bcolor}) after a scope. That will be an issue for us, so -% we manually ensure that the one we are using is inserted. -% \begin{macrocode} -\cs_gset_protected:Npn \__kernel_backend_scope_end: - { - \__kernel_backend_literal:n { x:grestore } - \__kernel_backend_literal:x - { - pdfcolorstack ~ - \int_use:N \g_@@_backend_stack_int \c_space_tl current - } - } -% \end{macrocode} -% \end{variable} -% \end{macro} -% -% \begin{macro}{\__kernel_color_backend_stack_push:nn, \__kernel_color_backend_stack_push:nx} -% \begin{macro}{\__kernel_color_backend_stack_pop:n} -% Simple enough but needs a version check. -% \begin{macrocode} -\cs_new_protected:Npn \__kernel_color_backend_stack_push:nn #1#2 - { - \__kernel_backend_literal:x - { - pdfcolorstack ~ - \int_eval:n {#1} ~ - push ~ (#2) - } - } -\cs_generate_variant:Nn \__kernel_color_backend_stack_push:nn { nx } -\cs_new_protected:Npn \__kernel_color_backend_stack_pop:n #1 - { - \__kernel_backend_literal:x - { - pdfcolorstack ~ - \int_eval:n {#1} ~ - pop - } - } -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macrocode} -%</dvipdfmx|xetex> +%</luatex|pdftex> % \end{macrocode} % % \subsubsection{\LuaTeX and \pdfTeX{}} @@ -309,7 +220,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\__kernel_color_backend_stack_push:nn, \__kernel_color_backend_stack_push:nx} +% \begin{macro}{\__kernel_color_backend_stack_push:nn} % \begin{macro}{\__kernel_color_backend_stack_pop:n} % \begin{macrocode} \cs_new_protected:Npn \__kernel_color_backend_stack_push:nn #1#2 @@ -322,7 +233,6 @@ %</pdftex> \int_eval:n {#1} ~ push ~ {#2} } -\cs_generate_variant:Nn \__kernel_color_backend_stack_push:nn { nx } \cs_new_protected:Npn \__kernel_color_backend_stack_pop:n #1 { %<*luatex> @@ -392,7 +302,7 @@ % \subsubsection{\LuaTeX{} and \pdfTeX{}} % % \begin{macrocode} -%<*dvipdfmx|luatex|pdftex|xetex> +%<*luatex|pdftex> % \end{macrocode} % % \begin{variable}{\l_@@_backend_fill_tl, \l_@@_backend_stroke_tl} @@ -431,6 +341,45 @@ % \end{macro} % \end{macro} % +% \begin{macrocode} +%</luatex|pdftex> +% \end{macrocode} +% +% \subsubsection{\texttt{dvipmdfx}/\XeTeX{}} +% +% These backends have the most possible approaches: it recognises both +% \texttt{dvips}-based color specials and its own format, plus one can +% include PDF statements directly. Recent releases also have a color stack +% approach similar to \pdfTeX{}. Of the stack methods, the dedicated +% the most versatile is the latter as it can cover all of the use cases +% we have. However, at present this interacts problematically with any color +% on the original stack. We therefore stick to a single-stack approach here. +% +% \begin{macrocode} +%<*dvipdfmx|xetex> +% \end{macrocode} +% +% \begin{macro} +% { +% \@@_backend_select:n , +% \@@_backend_select_cmyk:n , +% \@@_backend_select_gray:n , +% \@@_backend_select_rgb:n +% } +% \begin{macro}{\@@_backend_reset:} +% Using the single stack is relatively easy as there is only one route. +% \begin{macrocode} +\cs_new_protected:Npn \@@_backend_select:n #1 + { \__kernel_backend_literal:n { pdf : bc ~ [ #1 ] } } +\cs_new_eq:NN \@@_backend_select_cmyk:n \@@_backend_select:n +\cs_new_eq:NN \@@_backend_select_gray:n \@@_backend_select:n +\cs_new_eq:NN \@@_backend_select_rgb:n \@@_backend_select:n +\cs_new_protected:Npn \@@_backend_reset: + { \__kernel_backend_literal:n { pdf : ec } } +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macro}{\@@_backend_select_named:n} % For classical named colors, the only value we should get is |Black|. % \begin{macrocode} @@ -446,19 +395,9 @@ % \end{macro} % % \begin{macrocode} -%</dvipdfmx|luatex|pdftex|xetex> +%</dvipdfmx|xetex> % \end{macrocode} % -% \subsubsection{\texttt{dvipmdfx}/\XeTeX{}} -% -% These backends have the most possible approaches: it recognises both -% \texttt{dvips}-based color specials and it's own format, plus one can -% include PDF statements directly. Recent releases also have a color stack -% approach similar to \pdfTeX{}. Of the stack methods, the dedicated -% the most versatile is the latter as it can cover all of the use cases -% we have. Thus it is used in preference to the \texttt{dvips}-style interface -% or the \enquote{native} color specials (which have only one stack). -% % \subsection{Separations} % % Here, life gets interesting and we need essentially one approach per @@ -867,24 +806,53 @@ % \@@_backend_select_devicen:nn , % \@@_backend_select_iccbased:nn % } -% Although \texttt{(x)dvipdfmx} has a built-in approach to color spaces, that -% can't be used with the generic color stacks. So we take an approach in which -% we share the same code as for \pdfTeX{}. % \begin{macrocode} +%<*dvipdfmx|xetex> +\cs_new_protected:Npn \@@_backend_select_separation:nn #1#2 + { \__kernel_backend_literal:x { pdf : bc ~ \pdf_object_ref:n {#1} ~ [ #2 ] } } +%</dvipdfmx|xetex> +%<*luatex|pdftex> \cs_new_protected:Npn \@@_backend_select_separation:nn #1#2 { \@@_backend_select:nn { /#1 ~ cs ~ #2 ~ scn } { /#1 ~ CS ~ #2 ~ SCN } } +%</luatex|pdftex> \cs_new_eq:NN \@@_backend_select_devicen:nn \@@_backend_select_separation:nn \cs_new_eq:NN \@@_backend_select_iccbased:nn \@@_backend_select_separation:nn % \end{macrocode} % \end{macro} % +% \begin{macro}{\@@_backend_init_resource:n} +% Resource initiation comes up a few times. For \texttt{dvipdfmx}/\XeTeX{}, +% we skip this as at present it's handled by the backend. +% \begin{macrocode} +\cs_new_protected:Npn \@@_backend_init_resource:n #1 + { +%<*luatex|pdftex> + \bool_lazy_and:nnT + { \cs_if_exist_p:N \pdfmanagement_if_active_p: } + { \pdfmanagement_if_active_p: } + { + \use:x + { + \pdfmanagement_add:nnn + { Page / Resources / ColorSpace } + { #1 } + { \pdf_object_ref_last: } + } + } +%</luatex|pdftex> + } +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@@_backend_separation_init:nnnnn} % \begin{macro}{\@@_backend_separation_init:nn} % \begin{macro}{\@@_backend_separation_init_CIELAB:nnn} % Initialising the PDF structures needs two parts: creating an object % containing the \enquote{real} name of the Separation, then adding a reference % to that to each page. We use a separate object for the tint transformation -% following the model in the PDF reference. +% following the model in the PDF reference. The object here for the color +% needs to be named as that way it's accessible to +% \texttt{dvipdfmx}/\XeTeX{}. % \begin{macrocode} \cs_new_protected:Npn \@@_backend_separation_init:nnnnn #1#2#3#4#5 { @@ -898,23 +866,16 @@ } \exp_args:Nx \@@_backend_separation_init:nn { \str_convert_pdfname:n {#1} } {#2} - \bool_lazy_and:nnT - { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p: } - { - \use:x - { - \pdfmanagement_add:nnn - { Page / Resources / ColorSpace } - { color \int_use:N \g_@@_model_int } - { \pdf_object_ref_last: } - } - } + \@@_backend_init_resource:n { color \int_use:N \g_@@_model_int } } \cs_new_protected:Npn \@@_backend_separation_init:nn #1#2 { - \pdf_object_unnamed_write:nx { array } - { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: } + \use:x + { + \pdf_object_new:nn { color \int_use:N \g_@@_model_int } { array } + \pdf_object_write:nn { color \int_use:N \g_@@_model_int } + { /Separation /#1 ~ #2 ~ \pdf_object_ref_last: } + } \prop_gput:Nnx \g_@@_backend_colorant_prop { /#1 } { \pdf_object_ref_last: } } @@ -978,26 +939,19 @@ } { {#3} } } - \pdf_object_unnamed_write:nx { array } - { - /DeviceN ~ - [ ~ #1 ~ ] ~ - #2 ~ - \pdf_object_ref_last: - \@@_backend_devicen_colorants:n {#1} - } - \bool_lazy_and:nnT - { \cs_if_exist_p:N \pdfmanagement_if_active_p: } - { \pdfmanagement_if_active_p: } + \use:x { - \use:x + \pdf_object_new:nn { color \int_use:N \g_@@_model_int } { array } + \pdf_object_write:nn { color \int_use:N \g_@@_model_int } { - \pdfmanagement_add:nnn - { Page / Resources / ColorSpace } - { color \int_use:N \g_@@_model_int } - { \pdf_object_ref_last: } + /DeviceN ~ + [ ~ #1 ~ ] ~ + #2 ~ + \pdf_object_ref_last: + \@@_backend_devicen_colorants:n {#1} } } + \@@_backend_init_resource:n { color \int_use:N \g_@@_model_int } } \cs_new:Npn \@@_backend_devicen_init:w #1 ~ #2 \s_@@_stop { @@ -1029,23 +983,14 @@ } \pdf_object_unnamed_write:nx { array } { /ICCBased ~ \pdf_object_ref:n { @@_icc_ #1 } } - \cs_if_exist:NT \pdfmanagement_add:nnn - { - \use:x - { - \pdfmanagement_add:nnn { Page / Resources / ColorSpace } - { color \int_use:N \g_@@_model_int } - { ~ \pdf_object_ref_last: } - } - } + \@@_backend_init_resource:n { color \int_use:N \g_@@_model_int } } % \end{macrocode} % \end{macro} - % % \begin{macro}{\@@_backend_iccbased_device:nnn} % This is very similar to setting up a color space: the only part we -% skip is adding it to the page resources. +% add to the page resources differently. % \begin{macrocode} \cs_new_protected:Npn \@@_backend_iccbased_device:nnn #1#2#3 { @@ -1060,16 +1005,7 @@ } \pdf_object_unnamed_write:nx { array } { /ICCBased ~ \pdf_object_ref:n { @@_icc_ #1 } } - \cs_if_exist:NT \pdfmanagement_add:nnn - { - \use:x - { - \pdfmanagement_add:nnn - { Page / Resources / ColorSpace } - { Default #2 } - { \pdf_object_ref_last: } - } - } + \@@_backend_init_resource:n { Default #2 } } % \end{macrocode} % \end{macro} @@ -1080,13 +1016,78 @@ % % \subsection{Fill and stroke color} % -% Here, \texttt{dvipdfmx}/\XeTeX{} follows \LuaTeX{} and \pdfTeX{}, -% while for \texttt{dvips} +% Here, \texttt{dvipdfmx}/\XeTeX{} we write direct PDF specials for the fill, +% and only use the stack for the stroke color (see above for comments on why +% we cannot use multiple stacks with these backends). \LuaTeX{} and \pdfTeX{} +% have mutiple stacks that can deal with fill and stroke. For \texttt{dvips} % we have to manage fill and stroke color ourselves. We also handle % \texttt{dvisvgm} independently, as there we can create SVG directly. % % \begin{macrocode} -%<*dvipdfmx|luatex|pdftex|xetex> +%<*dvipdfmx|xetex> +% \end{macrocode} +% +% \begin{macro} +% { +% \@@_backend_fill:n , +% \@@_backend_fill_cmyk:n , +% \@@_backend_fill_gray:n , +% \@@_backend_fill_rgb:n , +% \@@_backend_stroke:n , +% \@@_backend_stroke_cmyk:n , +% \@@_backend_stroke_gray:n , +% \@@_backend_stroke_rgb:n +% } +% \begin{macrocode} +\cs_new_protected:Npn \@@_backend_fill:n #1 + { \__kernel_backend_literal:n { pdf : bc ~ fill ~ [ #1 ] } } +\cs_new_eq:NN \@@_backend_fill_cmyk:n \@@_backend_fill:n +\cs_new_eq:NN \@@_backend_fill_gray:n \@@_backend_fill:n +\cs_new_eq:NN \@@_backend_fill_rgb:n \@@_backend_fill:n +\cs_new_protected:Npn \@@_backend_stroke:n #1 + { \__kernel_backend_literal:n { pdf : bc ~ stroke ~ [ #1 ] } } +\cs_new_eq:NN \@@_backend_stroke_cmyk:n \@@_backend_stroke:n +\cs_new_eq:NN \@@_backend_stroke_gray:n \@@_backend_stroke:n +\cs_new_eq:NN \@@_backend_stroke_rgb:n \@@_backend_stroke:n +% \end{macrocode} +% \end{macro} +% +% \begin{macro} +% { +% \@@_backend_fill_separation:nn, +% \@@_backend_stroke_separation:nn, +% \@@_backend_fill_devicen:nn, +% \@@_backend_stroke_devicen:nn +% } +% \begin{macrocode} +\cs_new_protected:Npn \@@_backend_fill_separation:nn #1#2 + { + \__kernel_backend_literal:x + { pdf : bc ~ fill ~ \pdf_object_ref:n {#1} ~ [ #2 ] } + } +\cs_new_protected:Npn \@@_backend_stroke_separation:nn #1#2 + { + \__kernel_backend_literal:x + { pdf : bc ~ stroke ~ \pdf_object_ref:n {#1} ~ [ #2 ] } + } +\cs_new_eq:NN \@@_backend_fill_devicen:nn \@@_backend_fill_separation:nn +\cs_new_eq:NN \@@_backend_stroke_devicen:nn \@@_backend_stroke_separation:nn +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@@_backend_fill_reset:, \@@_backend_stroke_reset:} +% \begin{macrocode} +\cs_new_eq:NN \@@_backend_fill_reset: \@@_backend_reset: +\cs_new_eq:NN \@@_backend_stroke_reset: \@@_backend_reset: +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +%</dvipdfmx|xetex> +% \end{macrocode} +% +% \begin{macrocode} +%<*luatex|pdftex> % \end{macrocode} % % \begin{macro} @@ -1117,7 +1118,6 @@ \tl_set:Nn \l_@@_backend_fill_tl {#1} \__kernel_color_backend_stack_push:nn \l_@@_backend_stack_int { #1 ~ \l_@@_backend_stroke_tl } - \group_insert_after:N \@@_backend_reset: } \cs_new_protected:Npn \@@_backend_stroke_cmyk:n #1 { \@@_backend_stroke:n { #1 ~ K } } @@ -1130,7 +1130,6 @@ \tl_set:Nn \l_@@_backend_stroke_tl {#1} \__kernel_color_backend_stack_push:nn \l_@@_backend_stack_int { \l_@@_backend_fill_tl \c_space_tl #1 } - \group_insert_after:N \@@_backend_reset: } % \end{macrocode} % \end{macro} @@ -1152,8 +1151,15 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\@@_backend_fill_reset:, \@@_backend_stroke_reset:} % \begin{macrocode} -%</dvipdfmx|luatex|pdftex|xetex> +\cs_new_eq:NN \@@_backend_fill_reset: \@@_backend_reset: +\cs_new_eq:NN \@@_backend_stroke_reset: \@@_backend_reset: +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +%</luatex|pdftex> % \end{macrocode} % % \begin{macrocode} @@ -1182,7 +1188,6 @@ \cs_new_protected:Npn \@@_backend_fill:n #1 { \__kernel_backend_literal:n { color~push~ #1 } - \group_insert_after:N \@@_backend_reset: } \cs_new_protected:Npn \@@_backend_stroke_cmyk:n #1 { \__kernel_backend_postscript:n { /color.sc { #1 ~ setcmykcolor } def } } @@ -1210,6 +1215,13 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\@@_backend_fill_reset:, \@@_backend_stroke_reset:} +% \begin{macrocode} +\cs_new_eq:NN \@@_backend_fill_reset: \@@_backend_reset: +\cs_new_protected:Npn \@@_backend_stroke_reset: { } +% \end{macrocode} +% \end{macro} +% % \begin{macrocode} %</dvips> % \end{macrocode} @@ -1237,7 +1249,6 @@ \cs_new_protected:Npn \@@_backend_fill:n #1 { \__kernel_backend_literal:n { color~push~ #1 } - \group_insert_after:N \@@_backend_reset: } % \end{macrocode} % \end{macro} @@ -1327,6 +1338,13 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\@@_backend_fill_reset:, \@@_backend_stroke_reset:} +% \begin{macrocode} +\cs_new_eq:NN \@@_backend_fill_reset: \@@_backend_reset: +\cs_new_protected:Npn \@@_backend_stroke_reset: { } +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@@_backend_devicen_init:nnn, \@@_backend_iccbased_init:nnn} % No support at present. % \begin{macrocode} diff --git a/macros/latex/contrib/l3backend/l3backend-draw.dtx b/macros/latex/contrib/l3backend/l3backend-draw.dtx index 4a0d779682..c8029dfca5 100644 --- a/macros/latex/contrib/l3backend/l3backend-draw.dtx +++ b/macros/latex/contrib/l3backend/l3backend-draw.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-14} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-graphics.dtx b/macros/latex/contrib/l3backend/l3backend-graphics.dtx index 08df3f16b5..9d5b31faa9 100644 --- a/macros/latex/contrib/l3backend/l3backend-graphics.dtx +++ b/macros/latex/contrib/l3backend/l3backend-graphics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-14} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-header.dtx b/macros/latex/contrib/l3backend/l3backend-header.dtx index 2298af2a4e..cad715a200 100644 --- a/macros/latex/contrib/l3backend/l3backend-header.dtx +++ b/macros/latex/contrib/l3backend/l3backend-header.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-14} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3backend/l3backend-opacity.dtx b/macros/latex/contrib/l3backend/l3backend-opacity.dtx index 9fd8426741..4c5de69fb4 100644 --- a/macros/latex/contrib/l3backend/l3backend-opacity.dtx +++ b/macros/latex/contrib/l3backend/l3backend-opacity.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-14} +% \date{Released 2022-04-20} % % \maketitle % @@ -139,14 +139,16 @@ % \end{macrocode} % % \begin{variable}{\c_@@_backend_stack_int} -% Set up a stack. +% Set up a stack, where that is applicable. % \begin{macrocode} \bool_lazy_and:nnT { \cs_if_exist_p:N \pdfmanagement_if_active_p: } { \pdfmanagement_if_active_p:} { +%<*luatex|pdftex> \__kernel_color_backend_stack_init:Nnn \c_@@_backend_stack_int { page ~ direct } { /opacity 1 ~ gs } +%</luatex|pdftex> \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity 1 } { << /ca ~ 1 /CA ~ 1 >> } } @@ -178,7 +180,12 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity #1 } { << /ca ~ #1 /CA ~ #1 >> } +%<*dvipdfmx|xetex> + \__kernel_backend_literal:n +%</dvipdfmx|xetex> +%<*luatex|pdftex> \__kernel_color_backend_stack_push:nn \c_@@_backend_stack_int +%</luatex|pdftex> { /opacity #1 ~ gs } \group_insert_after:N \@@_backend_reset: } @@ -189,7 +196,11 @@ \cs_gset_protected:Npn \@@_backend_select_aux:n #1 { } } \cs_new_protected:Npn \@@_backend_reset: - { \__kernel_color_backend_stack_pop:n \c_@@_backend_stack_int } + { +%<*luatex|pdftex> + \__kernel_color_backend_stack_pop:n \c_@@_backend_stack_int +%</luatex|pdftex> + } % \end{macrocode} % \end{macro} % \end{macro} @@ -224,7 +235,12 @@ \pdfmanagement_add:nnn { Page / Resources / ExtGState } { opacity.stroke #1 } { << /CA ~ #2 >> } - \__kernel_color_backend_stack_push:nn \c_@@_backend_stack_int +%<*dvipdfmx|xetex> + \__kernel_backend_literal:n +%</dvipdfmx|xetex> +%<*luatex|pdftex> + \__kernel_color_backend_stack_push:nn \c_@@_backend_stack_int +%</luatex|pdftex> { /opacity.fill #1 ~ gs /opacity.stroke #2 ~ gs } \group_insert_after:N \@@_backend_reset: } diff --git a/macros/latex/contrib/l3backend/l3backend-pdf.dtx b/macros/latex/contrib/l3backend/l3backend-pdf.dtx index 071b8805f5..f8cf011160 100644 --- a/macros/latex/contrib/l3backend/l3backend-pdf.dtx +++ b/macros/latex/contrib/l3backend/l3backend-pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-14} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/CHANGELOG.md b/macros/latex/contrib/l3experimental/CHANGELOG.md index eb5896536a..78831e5827 100644 --- a/macros/latex/contrib/l3experimental/CHANGELOG.md +++ b/macros/latex/contrib/l3experimental/CHANGELOG.md @@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2022-04-20] + +### Fixed +- Finding graphics files with multiple extensions + ## [2022-04-10] ### Added @@ -246,7 +251,8 @@ this project uses date-based 'snapshot' version identifiers. - New `l3color` module using `xcolor`-like expression syntax - New `l3draw` module, based on `pgf` layer of the TikZ system -[Unreleased]: https://github.com/latex3/latex3/compare/2022-04-10...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2022-04-20...HEAD +[2022-04-20]: https://github.com/latex3/latex3/compare/2022-04-10...2022-04-20 [2022-04-10]: https://github.com/latex3/latex3/compare/2022-02-05...2022-04-10 [2022-02-05]: https://github.com/latex3/latex3/compare/2021-11-12...2022-02-05 [2021-11-12]: https://github.com/latex3/latex3/compare/2021-08-27...2021-11-12 diff --git a/macros/latex/contrib/l3experimental/README.md b/macros/latex/contrib/l3experimental/README.md index 8d02dbf001..61893ee144 100644 --- a/macros/latex/contrib/l3experimental/README.md +++ b/macros/latex/contrib/l3experimental/README.md @@ -1,7 +1,7 @@ Experimental LaTeX3 Concepts ============================ -Release 2022-04-10 +Release 2022-04-20 Overview -------- diff --git a/macros/latex/contrib/l3experimental/l3benchmark.dtx b/macros/latex/contrib/l3experimental/l3benchmark.dtx index 0eb34e5c0c..a2cc6311a9 100644 --- a/macros/latex/contrib/l3experimental/l3benchmark.dtx +++ b/macros/latex/contrib/l3experimental/l3benchmark.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -122,7 +122,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3benchmark}{2022-04-10}{} +\ProvidesExplPackage{l3benchmark}{2022-04-20}{} {L3 Experimental benchmarking} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3benchmark.pdf b/macros/latex/contrib/l3experimental/l3benchmark.pdf Binary files differindex e5f7ea9bc1..cc2eafedb3 100644 --- a/macros/latex/contrib/l3experimental/l3benchmark.pdf +++ b/macros/latex/contrib/l3experimental/l3benchmark.pdf diff --git a/macros/latex/contrib/l3experimental/l3bitset.dtx b/macros/latex/contrib/l3experimental/l3bitset.dtx index 3443ca7d25..0038883adf 100644 --- a/macros/latex/contrib/l3experimental/l3bitset.dtx +++ b/macros/latex/contrib/l3experimental/l3bitset.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % \begin{documentation} @@ -264,7 +264,7 @@ %<@@=bitset> % \end{macrocode} % \begin{macrocode} -\ProvidesExplPackage{l3bitset}{2022-04-10}{} +\ProvidesExplPackage{l3bitset}{2022-04-20}{} {L3 Experimental bitset support} % \end{macrocode} % A bitset is a string variable. diff --git a/macros/latex/contrib/l3experimental/l3bitset.pdf b/macros/latex/contrib/l3experimental/l3bitset.pdf Binary files differindex 47e6e50d2b..6be2638c8b 100644 --- a/macros/latex/contrib/l3experimental/l3bitset.pdf +++ b/macros/latex/contrib/l3experimental/l3bitset.pdf diff --git a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx index 926ff3387e..4059deb74c 100644 --- a/macros/latex/contrib/l3experimental/l3draw-boxes.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-boxes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-code.pdf b/macros/latex/contrib/l3experimental/l3draw-code.pdf Binary files differindex 31b8834d68..a980d5775f 100644 --- a/macros/latex/contrib/l3experimental/l3draw-code.pdf +++ b/macros/latex/contrib/l3experimental/l3draw-code.pdf diff --git a/macros/latex/contrib/l3experimental/l3draw-layers.dtx b/macros/latex/contrib/l3experimental/l3draw-layers.dtx index e82e7a1e2a..bbdc422604 100644 --- a/macros/latex/contrib/l3experimental/l3draw-layers.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-layers.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-paths.dtx b/macros/latex/contrib/l3experimental/l3draw-paths.dtx index 024faef324..27252d36c4 100644 --- a/macros/latex/contrib/l3experimental/l3draw-paths.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-paths.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-points.dtx b/macros/latex/contrib/l3experimental/l3draw-points.dtx index fe3c28351e..d67f61cbcc 100644 --- a/macros/latex/contrib/l3experimental/l3draw-points.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-points.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx index 2fcc7e8ac0..2a4968ba78 100644 --- a/macros/latex/contrib/l3experimental/l3draw-scopes.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-scopes.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx index 53dfd48728..91f16e362d 100644 --- a/macros/latex/contrib/l3experimental/l3draw-softpath.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-softpath.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-state.dtx b/macros/latex/contrib/l3experimental/l3draw-state.dtx index b93f593a7e..b4cdd7b1f3 100644 --- a/macros/latex/contrib/l3experimental/l3draw-state.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-state.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx index bdc96e0c88..3461dd983c 100644 --- a/macros/latex/contrib/l3experimental/l3draw-transforms.dtx +++ b/macros/latex/contrib/l3experimental/l3draw-transforms.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3experimental/l3draw.dtx b/macros/latex/contrib/l3experimental/l3draw.dtx index 31ac35f042..9dcca5c6f8 100644 --- a/macros/latex/contrib/l3experimental/l3draw.dtx +++ b/macros/latex/contrib/l3experimental/l3draw.dtx @@ -110,7 +110,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -1173,7 +1173,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3draw}{2022-04-10}{} +\ProvidesExplPackage{l3draw}{2022-04-20}{} {L3 Experimental core drawing support} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3draw.pdf b/macros/latex/contrib/l3experimental/l3draw.pdf Binary files differindex d58318d5d3..36d736d883 100644 --- a/macros/latex/contrib/l3experimental/l3draw.pdf +++ b/macros/latex/contrib/l3experimental/l3draw.pdf diff --git a/macros/latex/contrib/l3experimental/l3galley.dtx b/macros/latex/contrib/l3experimental/l3galley.dtx index 5dd9d565eb..08bc173293 100644 --- a/macros/latex/contrib/l3experimental/l3galley.dtx +++ b/macros/latex/contrib/l3experimental/l3galley.dtx @@ -61,7 +61,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -686,7 +686,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3galley}{2022-04-10}{} +\ProvidesExplPackage{l3galley}{2022-04-20}{} {L3 Experimental galley code} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3galley.pdf b/macros/latex/contrib/l3experimental/l3galley.pdf Binary files differindex af4ba00c96..f191180826 100644 --- a/macros/latex/contrib/l3experimental/l3galley.pdf +++ b/macros/latex/contrib/l3experimental/l3galley.pdf diff --git a/macros/latex/contrib/l3experimental/l3graphics.dtx b/macros/latex/contrib/l3experimental/l3graphics.dtx index cf4a70983d..0a3556c5be 100644 --- a/macros/latex/contrib/l3experimental/l3graphics.dtx +++ b/macros/latex/contrib/l3experimental/l3graphics.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -185,13 +185,14 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3graphics}{2022-04-10}{} +\ProvidesExplPackage{l3graphics}{2022-04-20}{} {L3 Experimental graphics inclusion support} % \end{macrocode} % -% \begin{variable}{\l_@@_internal_ior, \l_@@_internal_tl} +% \begin{variable}{\l_@@_internal_dim, \l_@@_internal_ior, \l_@@_internal_tl} % Scratch space. % \begin{macrocode} +\dim_new:N \l_@@_internal_dim \ior_new:N \l_@@_internal_ior \tl_new:N \l_@@_internal_tl % \end{macrocode} @@ -631,7 +632,9 @@ % \begin{macro}{\graphics_get_full_name:nN} % \begin{macro}[TF]{\graphics_get_full_name:nN} % \begin{macro}{\@@_get_full_name:n} -% A simple search. +% As well as searching by path, etc., there is a need here to check that +% we do not trip over |foo.bar| if |.bar| is not a known extension for +% the current backend. % \begin{macrocode} \cs_new_protected:Npn \graphics_get_full_name:nN #1#2 { @@ -645,8 +648,18 @@ \seq_set_eq:NN \l_file_search_path_seq \l_graphics_search_path_seq \file_get_full_name:nNTF {#1} \l_@@_full_name_str { - \str_if_eq:eeT { \l_@@_full_name_str } { #1 .tex } + \str_if_eq:eeTF { \l_@@_full_name_str } { #1 .tex } { \@@_get_full_name:n {#1} } + { + \file_parse_full_name:VNNN \l_@@_full_name_str + \l_@@_dir_str \l_@@_name_str \l_@@_ext_str + \seq_map_inline:Nn \l_graphics_search_ext_seq + { + \str_if_eq:nVT {##1} \l_@@_ext_str + { \seq_map_break:n { \use_none:nn } } + } + \@@_get_full_name:n {#1} + } } { \@@_get_full_name:n {#1} } \exp_args:NNNV \group_end: diff --git a/macros/latex/contrib/l3experimental/l3graphics.pdf b/macros/latex/contrib/l3experimental/l3graphics.pdf Binary files differindex 3d5ce27457..cd16e12ff3 100644 --- a/macros/latex/contrib/l3experimental/l3graphics.pdf +++ b/macros/latex/contrib/l3experimental/l3graphics.pdf diff --git a/macros/latex/contrib/l3experimental/l3opacity.dtx b/macros/latex/contrib/l3experimental/l3opacity.dtx index 192f6b6818..0ad59425ff 100644 --- a/macros/latex/contrib/l3experimental/l3opacity.dtx +++ b/macros/latex/contrib/l3experimental/l3opacity.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -97,7 +97,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3opacity}{2022-04-10}{} +\ProvidesExplPackage{l3opacity}{2022-04-20}{} {L3 Experimental opacity support} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3opacity.pdf b/macros/latex/contrib/l3experimental/l3opacity.pdf Binary files differindex ffdc658846..46163501c3 100644 --- a/macros/latex/contrib/l3experimental/l3opacity.pdf +++ b/macros/latex/contrib/l3experimental/l3opacity.pdf diff --git a/macros/latex/contrib/l3experimental/l3str-format.dtx b/macros/latex/contrib/l3experimental/l3str-format.dtx index c84c77c608..6ca47a9693 100644 --- a/macros/latex/contrib/l3experimental/l3str-format.dtx +++ b/macros/latex/contrib/l3experimental/l3str-format.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -166,7 +166,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3str-format}{2022-04-10}{} +\ProvidesExplPackage{l3str-format}{2022-04-20}{} {L3 Experimental string formatting} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3str-format.pdf b/macros/latex/contrib/l3experimental/l3str-format.pdf Binary files differindex 74e1f21ef0..547cc3b557 100644 --- a/macros/latex/contrib/l3experimental/l3str-format.pdf +++ b/macros/latex/contrib/l3experimental/l3str-format.pdf diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.dtx b/macros/latex/contrib/l3experimental/l3sys-shell.dtx index db10bbbf60..3f8f711278 100644 --- a/macros/latex/contrib/l3experimental/l3sys-shell.dtx +++ b/macros/latex/contrib/l3experimental/l3sys-shell.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -151,7 +151,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{l3sys-shell}{2022-04-10}{} +\ProvidesExplPackage{l3sys-shell}{2022-04-20}{} {L3 Experimental system shell functions} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/l3sys-shell.pdf b/macros/latex/contrib/l3experimental/l3sys-shell.pdf Binary files differindex 8baa8395b8..2e673babe4 100644 --- a/macros/latex/contrib/l3experimental/l3sys-shell.pdf +++ b/macros/latex/contrib/l3experimental/l3sys-shell.pdf diff --git a/macros/latex/contrib/l3experimental/xcoffins.dtx b/macros/latex/contrib/l3experimental/xcoffins.dtx index e7773188c0..44a7913181 100644 --- a/macros/latex/contrib/l3experimental/xcoffins.dtx +++ b/macros/latex/contrib/l3experimental/xcoffins.dtx @@ -53,7 +53,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -672,7 +672,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xcoffins}{2022-04-10}{} +\ProvidesExplPackage{xcoffins}{2022-04-20}{} {L3 Experimental design level coffins} % \end{macrocode} % diff --git a/macros/latex/contrib/l3experimental/xcoffins.pdf b/macros/latex/contrib/l3experimental/xcoffins.pdf Binary files differindex 269b1c2ffa..1cf45fa2ec 100644 --- a/macros/latex/contrib/l3experimental/xcoffins.pdf +++ b/macros/latex/contrib/l3experimental/xcoffins.pdf diff --git a/macros/latex/contrib/l3experimental/xgalley.dtx b/macros/latex/contrib/l3experimental/xgalley.dtx index 2e541d6550..1d721dd590 100644 --- a/macros/latex/contrib/l3experimental/xgalley.dtx +++ b/macros/latex/contrib/l3experimental/xgalley.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -731,7 +731,7 @@ % \end{macrocode} % % \begin{macrocode} -\ProvidesExplPackage{xgalley}{2022-04-10}{} +\ProvidesExplPackage{xgalley}{2022-04-20}{} {L3 Experimental galley} \RequirePackage{xtemplate,l3galley} % \end{macrocode} diff --git a/macros/latex/contrib/l3experimental/xgalley.pdf b/macros/latex/contrib/l3experimental/xgalley.pdf Binary files differindex 7addf4afe8..d9e7678c0e 100644 --- a/macros/latex/contrib/l3experimental/xgalley.pdf +++ b/macros/latex/contrib/l3experimental/xgalley.pdf diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index 81af951ced..39130c2abf 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,11 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2022-04-20] + +### Changed +- Collect some common code from `l3backend-color` + ## [2022-04-10] ### Added @@ -1073,7 +1078,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2022-04-10...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2022-04-20...HEAD +[2022-04-20]: https://github.com/latex3/latex3/compare/2022-04-10...2022-04-20 [2022-04-10]: https://github.com/latex3/latex3/compare/2022-02-24...2022-04-10 [2022-02-24]: https://github.com/latex3/latex3/compare/2022-02-21...2022-02-24 [2022-02-21]: https://github.com/latex3/latex3/compare/2022-02-05...2022-02-21 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index c3054ed481..22712dc937 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2022-04-10 +Release 2022-04-20 Overview -------- diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index 34e12e7d55..4b64f6a13d 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> %</driver|generic|package|2ekernel> -\def\ExplFileDate{2022-04-10}% +\def\ExplFileDate{2022-04-20}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf Binary files differindex 17f1287430..29776ed923 100644 --- a/macros/latex/contrib/l3kernel/expl3.pdf +++ b/macros/latex/contrib/l3kernel/expl3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf Binary files differindex fa6f123061..229072c9ba 100644 --- a/macros/latex/contrib/l3kernel/interface3.pdf +++ b/macros/latex/contrib/l3kernel/interface3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index 9274fe46c3..fa53f4fe9f 100644 --- a/macros/latex/contrib/l3kernel/interface3.tex +++ b/macros/latex/contrib/l3kernel/interface3.tex @@ -54,7 +54,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2022-04-10} +\date{Released 2022-04-20} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index c945620ece..322813f163 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index 5b137477ca..42be007851 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index 7c19e49bfd..5376ce1713 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx index d8e01d0d0b..79a4b5a0a1 100644 --- a/macros/latex/contrib/l3kernel/l3candidates.dtx +++ b/macros/latex/contrib/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx index 69409085fe..2bb46eda42 100644 --- a/macros/latex/contrib/l3kernel/l3cctab.dtx +++ b/macros/latex/contrib/l3kernel/l3cctab.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index a2e5dd0ec0..8bce2d8d74 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index d00fe3918d..db9d753ee5 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx index 93f42374ef..1cb9c71bb6 100644 --- a/macros/latex/contrib/l3kernel/l3color.dtx +++ b/macros/latex/contrib/l3kernel/l3color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -1600,7 +1600,10 @@ \exp_after:wN \@@_draw:nnn \l_@@_current_tl { stroke } } \cs_new_protected:Npn \@@_draw:nnn #1#2#3 - { \use:c { @@_backend_ #3 _ #1 :n } {#2} } + { + \use:c { @@_backend_ #3 _ #1 :n } {#2} + \exp_args:Nc \group_insert_after:N { @@_backend_ #3 _ reset: } + } % \end{macrocode} % \end{macro} % \end{macro} diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index 65457cbdea..ce4c2b0279 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index 4d48f2a007..ed7222bf67 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -487,15 +487,14 @@ % % \subsection{Deprecated \pkg{l3sys} functions} % +% \begin{macrocode} +%<@@=sys> +% \end{macrocode} +% % \begin{macro}{\sys_load_deprecation:} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2021-01-11 } { (no~longer~required) } -\cs_gset_protected:Npn \sys_load_deprecation: - { - \bool_if:NF \g_@@_deprecation_bool - { \__kernel_sys_configuration_load:n { l3deprecation } } - \bool_gset_true:N \g_@@_deprecation_bool - } +\cs_gset_protected:Npn \sys_load_deprecation: { } % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index 0db227edf9..b948b6ef14 100644 --- a/macros/latex/contrib/l3kernel/l3doc.dtx +++ b/macros/latex/contrib/l3kernel/l3doc.dtx @@ -85,7 +85,7 @@ and all files in that bundle must be distributed together. % require you to do updates, if the class changes.}} % % \author{\Team} -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % \maketitle % \tableofcontents % diff --git a/macros/latex/contrib/l3kernel/l3doc.pdf b/macros/latex/contrib/l3kernel/l3doc.pdf Binary files differindex 1577ec2375..d7c60a5bc6 100644 --- a/macros/latex/contrib/l3kernel/l3doc.pdf +++ b/macros/latex/contrib/l3kernel/l3doc.pdf diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index 9319cd39e5..adaab46663 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf Binary files differindex c4ccf58249..e853d5aea9 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.pdf +++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index 614a73d29e..5f68d32791 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index adf73279bc..b3c86f0117 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index 22fae08ae6..a36e3e7f30 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index 38f6d3ff6a..ec8dcce639 100644 --- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index 9ae275ac22..169bfa4b4d 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index 8cd126989a..1c4abe1c82 100644 --- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index 6fc2681f56..62c44efe0a 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index fdaece8932..9ec52f8236 100644 --- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index d116ce9221..56b5bcab2b 100644 --- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index 7c24b0822c..909f20d9e7 100644 --- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index 307a848a08..cb2630f5da 100644 --- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index 8ad1b84880..c437ea1cb1 100644 --- a/macros/latex/contrib/l3kernel/l3fp-random.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index 8cb45a097b..fddead799a 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index 6cd2dd1b9b..45977704d6 100644 --- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index 993db8a0b6..b4e1b6bfb6 100644 --- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index c0f2daa482..1b692e111d 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index 2b279e18d7..1dcd88b349 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index e8dc857816..1def079f9c 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index 916cef5db2..ef7cedf8d9 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index bd62a0dbca..f5e3dd4c32 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index 81eb124edd..dcfa2a5c8b 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index 534d37be27..19e3a8c0ea 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index 04786d3c1f..1d54693b88 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index ef95cabf99..d315aff78e 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index 50512593c3..94a18e5ee5 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % @@ -794,6 +794,8 @@ \@@_primitive:NN \crampedscriptstyle \tex_crampedscriptstyle:D \@@_primitive:NN \crampedtextstyle \tex_crampedtextstyle:D \@@_primitive:NN \csstring \tex_csstring:D + \@@_primitive:NN \discretionaryligaturemode + \tex_discretionaryligaturemode:D \@@_primitive:NN \directlua \tex_directlua:D \@@_primitive:NN \dviextension \tex_dviextension:D \@@_primitive:NN \dvifeedback \tex_dvifeedback:D @@ -840,10 +842,12 @@ \@@_primitive:NN \luatexbanner \tex_luatexbanner:D \@@_primitive:NN \luatexrevision \tex_luatexrevision:D \@@_primitive:NN \luatexversion \tex_luatexversion:D + \@@_primitive:NN \mathdefaultsmode \tex_mathdefaultsmode:D \@@_primitive:NN \mathdelimitersmode \tex_mathdelimitersmode:D \@@_primitive:NN \mathdir \tex_mathdir:D \@@_primitive:NN \mathdirection \tex_mathdirection:D \@@_primitive:NN \mathdisplayskipmode \tex_mathdisplayskipmode:D + \@@_primitive:NN \matheqdirmode \tex_matheqdirmode:D \@@_primitive:NN \matheqnogapstep \tex_matheqnogapstep:D \@@_primitive:NN \mathnolimitsmode \tex_mathnolimitsmode:D \@@_primitive:NN \mathoption \tex_mathoption:D diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf Binary files differindex 9ca06a0a68..c4d0d407a8 100644 --- a/macros/latex/contrib/l3kernel/l3news.pdf +++ b/macros/latex/contrib/l3kernel/l3news.pdf diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf Binary files differindex 1976dbbfc5..be6541557d 100644 --- a/macros/latex/contrib/l3kernel/l3news01.pdf +++ b/macros/latex/contrib/l3kernel/l3news01.pdf diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf Binary files differindex 96c2a09157..453e2f405a 100644 --- a/macros/latex/contrib/l3kernel/l3news02.pdf +++ b/macros/latex/contrib/l3kernel/l3news02.pdf diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf Binary files differindex 68b424976f..bafa452ea8 100644 --- a/macros/latex/contrib/l3kernel/l3news03.pdf +++ b/macros/latex/contrib/l3kernel/l3news03.pdf diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf Binary files differindex 4337d21355..115e960a07 100644 --- a/macros/latex/contrib/l3kernel/l3news04.pdf +++ b/macros/latex/contrib/l3kernel/l3news04.pdf diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf Binary files differindex 6a23c7d8bb..025aea91cd 100644 --- a/macros/latex/contrib/l3kernel/l3news05.pdf +++ b/macros/latex/contrib/l3kernel/l3news05.pdf diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf Binary files differindex 07b0787506..0cf9c2f3fc 100644 --- a/macros/latex/contrib/l3kernel/l3news06.pdf +++ b/macros/latex/contrib/l3kernel/l3news06.pdf diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf Binary files differindex 221fdc815a..1861ba93d6 100644 --- a/macros/latex/contrib/l3kernel/l3news07.pdf +++ b/macros/latex/contrib/l3kernel/l3news07.pdf diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf Binary files differindex 88dce29221..e96b64b0f5 100644 --- a/macros/latex/contrib/l3kernel/l3news08.pdf +++ b/macros/latex/contrib/l3kernel/l3news08.pdf diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf Binary files differindex 0e81abd093..2a10b6e0b9 100644 --- a/macros/latex/contrib/l3kernel/l3news09.pdf +++ b/macros/latex/contrib/l3kernel/l3news09.pdf diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf Binary files differindex 96bbed2245..a56a5e4b3b 100644 --- a/macros/latex/contrib/l3kernel/l3news10.pdf +++ b/macros/latex/contrib/l3kernel/l3news10.pdf diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf Binary files differindex 39754d32c5..64c19e2087 100644 --- a/macros/latex/contrib/l3kernel/l3news11.pdf +++ b/macros/latex/contrib/l3kernel/l3news11.pdf diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf Binary files differindex 9035265fc7..6f43ea20a8 100644 --- a/macros/latex/contrib/l3kernel/l3news12.pdf +++ b/macros/latex/contrib/l3kernel/l3news12.pdf diff --git a/macros/latex/contrib/l3kernel/l3pdf.dtx b/macros/latex/contrib/l3kernel/l3pdf.dtx index b2ed19cb08..d94bd4f034 100644 --- a/macros/latex/contrib/l3kernel/l3pdf.dtx +++ b/macros/latex/contrib/l3kernel/l3pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf Binary files differindex 433569b9b2..12350c7ad7 100644 --- a/macros/latex/contrib/l3kernel/l3prefixes.pdf +++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index 98f6211187..da352b14fc 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index 1d0694fe6a..b86bb5f6dd 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index 53ea8dfc18..3088a12d35 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index e9c254bb02..192dd6ecc6 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index bf285df964..545321f959 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index 75e80b0c54..dac1117ef4 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index 11604bbf81..a677ae672e 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index 8646c378e5..52cbcc19a2 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index ddfdd10279..00b4e96dd2 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf Binary files differindex 21449e7b02..cdb2b804b8 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.pdf +++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index 6fd43ce801..f28431faa4 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.tex +++ b/macros/latex/contrib/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2022-04-10} +\date{Released 2022-04-20} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf Binary files differindex 587c0c8b36..c3e6f8dc4f 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index 722a90977a..86f0f57d12 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2022-04-10} +\date{Released 2022-04-20} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index a211af619b..ca862ca831 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf Binary files differindex d200cd3e0c..6e0af9c77a 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf +++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index 90b3a71af2..0239a0ee4b 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.tex +++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2022-04-10} +\date{Released 2022-04-20} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx index faa9960f79..9ffd8a140a 100644 --- a/macros/latex/contrib/l3kernel/l3text-case.dtx +++ b/macros/latex/contrib/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx index a055aec838..7b7b2957e7 100644 --- a/macros/latex/contrib/l3kernel/l3text-purify.dtx +++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx index 3cb5795a5d..caa3ba34a2 100644 --- a/macros/latex/contrib/l3kernel/l3text.dtx +++ b/macros/latex/contrib/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index 0db5f15d7a..bcce1944fd 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index 68d2cdaf8a..af83797cd1 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index 3d5858a37a..6b1b1759ff 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index db57bd0f38..19134440ae 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2022-04-10} +% \date{Released 2022-04-20} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf Binary files differindex c00c8648b5..4a9e965632 100644 --- a/macros/latex/contrib/l3kernel/source3.pdf +++ b/macros/latex/contrib/l3kernel/source3.pdf diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index 3defa4b47a..f889363f67 100644 --- a/macros/latex/contrib/l3kernel/source3.tex +++ b/macros/latex/contrib/l3kernel/source3.tex @@ -53,7 +53,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2022-04-10} +\date{Released 2022-04-20} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md index 22889ae11b..57a47ad4f3 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–2022 - tuda-ci 2022/03/21 v3.23 + tuda-ci 2022/04/20 v3.24 *************************************************************************** @@ -47,7 +47,10 @@ Falls Sie noch keine Distribution installiert haben, finden Sie die notwendigen - MacTeX http://tug.org/mactex/ #### Sonderfall: Paketverwaltung des Betriebssystems (Linux/BSD) -Für einige Linux/BSD-Varianten existieren texlive-Pakete die über die Paketverwaltung des Systems installierbar sind. Da TUDa-CI sehr speziell ist, ist es nur in der Paketen *texlive-full* enthalten. Falls Sie ein kleineres Setup wünschen, empfehlen wir die Installation über den TeX Live Manager https://tug.org/texlive/doc/texlive-en/texlive-en.html#installation. +Für einige Linux/BSD-Varianten existieren texlive-Pakete die über die Paketverwaltung des Systems installierbar sind. +Da TUDa-CI sehr speziell ist, ist es meistens nur in der Paketen *texlive-full* enthalten. +Allerdings sind die in den Paketverwaltungen enthalten TeX Live Versionen häufig stark veraltet und die Logo-Dateien müssen ohnehin zusätzlich installiert werden. +Wir empfehlen daher die Installation von TeX Live über den TeX Live Manager: https://tug.org/texlive/doc/texlive-en/texlive-en.html#installation. ### Nutzung von TUDa-CI über Overleaf @@ -152,7 +155,10 @@ In case you don't have any installed TeX system the following links might be use It's also possible to use the TUDa-CI-DEMO files as Overleaf-Templates on TUDa's own installation: https://sharelatex01.ca.hrz.tu-darmstadt.de/templates/all (requires TUDa Account) #### Remark on texlive packages provided by Linux/BSD package managers: -In case you already use a texlive package of your OS TUDa-CI might not be included. Since it's a personal corporate design package you might need to install *texlive-full* to use it without further adjustments. These packages also will miss the logo and – this depends on your OS – the provided package might be outdated. In this case we recomment the setup using tlmgr (as described in the upper links). +In case you already use a texlive package of your OS TUDa-CI might not be included. +Since it's a corporate design package you might need to install *texlive-full* to use it without further adjustments. +These packages also will lack the logo and – this depends on your OS – the provided package might be outdated. +In this case we recommend the setup using tlmgr (as described in the upper links). ### Logos The used Logos can not be published within this bundle. Members of TU Darmstadt can download these via intranet: @@ -307,3 +313,6 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls - fix bug in handling of `\Metadata` * 3.23 (2022-03-21) - fix font selection for reviewers in uppertitleback + * 3.24 (2022-04-20) + - Fix paper=landscape for TUDa-SciPoster. + - Improve internals for advanced department configuration in TUDa-SciPoster diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf Binary files differindex b19af47979..fdac8a614e 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf 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 8e020519a6..55d3cd1630 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-TUDaExercise.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf Binary files differindex 8614237505..1462ae8e3d 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf Binary files differnew file mode 100644 index 0000000000..d8b307bf6e --- /dev/null +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.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 8c68e18601..856b822011 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 e02be75c05..d73e3bc8bc 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 e9a2976734..ce1a1e65d5 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 6f649add82..7acf402ddc 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-TUDaReport.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf Binary files differindex 9aa05f3685..4a493aa297 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.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 2b59a3632f..1bdcef923e 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 02c9e32c3f..57a8b00154 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-TUDaAnnouncement.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex index 8431f03384..e6f0d58e62 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaAnnouncement.tex' version 3.23 (2022/03/21), +%% This is file `DEMO-TUDaAnnouncement.tex' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex index bdfe7034e2..f4fae126e5 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaBeamer.tex' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib index 321d21b3ad..54521adc8d 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaBibliography.bib' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex index 5ef68d1882..a9b20da8c0 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaExercise.tex' version 3.23 (2022/03/21), +%% This is file `DEMO-TUDaExercise.tex' version 3.24 (2022/04/20), %% 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 8942513a16..334851255a 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaFromaddress.lco' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex index c64a7414ae..4879c5a239 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaLeaflet.tex' version 3.23 (2022/03/21), +%% This is file `DEMO-TUDaLeaflet.tex' version 3.24 (2022/04/20), %% 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 cdac4bd86e..f8e053b268 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaLetter.tex' version 3.24 (2022/04/20), %% 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 32396f562a..117ca29f8a 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaPhD.tex' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -314,7 +314,7 @@ Falls eine Layoutanpassung der Titelseite notwendig ist, gelten die in der TUDaP \item[titleaddendum] Wie \code{\tbs{}titleintro} jedoch als letztes Element des Blocks. \end{description} -\section{Weitere Macros} +\section{Weitere Makros} Das Makro \verb+\affidavit+ erzeugt eine Selbstständigkeitserklärung mit Unterschriftenzeile. Hier wird der oben übergebene Name/Signatur eingefügt. In diesem Dokument findet sich das Affidavit direkt nach der Titelei. @@ -322,26 +322,41 @@ Ab Version 3.06 verfügt \verb+\affidavit+ zusätzlich über ein optionales Argu Es besteht die Unterscheidung zwischen \verb+digital+ und \verb+print+. Hier wird entsprechend der Vorgabe unter \url{https://www.tu-darmstadt.de/studieren/studierende_tu/studienorganisation_und_tucan/hilfe_und_faq/artikel_details_de_en_37824.de.jsp} der entsprechende Text automatisch ausgewählt. \begin{verbatim} -\affidavit[digital] + \affidavit[digital] \end{verbatim} -Da für Dissertationen bisher keine Option der rein digitalen Abgabe besteht, entfällt dort diese Unterscheidungsmöglichkeit. +Da für Dissertationen bisher keine Option der rein digitalen Abgabe besteht, entfällt dort diese Unterscheidungsmöglichkeit, hierfür wird intern der Schlüssel \verb+dr+ verwendet. + +Version 3.20 ermöglicht zusätzlich die Übergabe weiterer Optionen für den Signatur-Namen, ein Signatur-Bild oder die Ortsangabe. +Inwieweit diese Optionen verwendet werden dürfen ist jeweils vor der Verwendung durch die Nutzer:in abzuklären. +TUDa-CI kann hierfür keine gesicherte Aussage treffen. +In diesem Fall muss der Varianten-Option der Optionsschlüssel \verb+affidavit+ vorangestellt werden. + +\begin{verbatim} + \affidavit[affidavit=digital,signature=Signaturname,signature-image={\includegraphics[width=\width]{signaturbild}}] +\end{verbatim} +Eine vertikale Verschiebung des Signaturbildes ist nicht direkt implementiert, ist jedoch mit der Verwendung des \LaTeX-Makros \verb+\raisebox{<Verschiebung>}{<Inhalt>}+ problemlos möglich. Es besteht zusätzlich die Möglichkeit ein anderssprachiges Affidavit als Ergänzung mit abzudrucken. Um die Struktur und die ggf. notwendige Sprachumschaltung zu erledigen, existiert hierfür ab Version 2.03 eine Umgebung: \begin{verbatim} -\begin{affidavit*}[Babel-Sprachoption]{Überschrift} -Text -\end{affidavit*} + \begin{affidavit*}[Babel-Sprachoption]{Überschrift} + Text + \end{affidavit*} \end{verbatim} Diese Variante verfügt bewusst über keine Unterschriftenzeile, da diese Version laut Verständnis der Entwickler keine rechtliche Verbindlichkeit besitzt. Die Umgebung kann jedoch auch für besondere Formen der Erklärung genutzt werden. In diesem Fall kann eine zusätzliche Signaturzeile über \begin{verbatim} -\AffidavitSignature[Stadt] + \AffidavitSignature[Stadt] \end{verbatim} hinzugefügt werden. Die Vorbelegung für Stadt ist hierbei \enquote{Darmstadt}. +Ab Version 3.20 ist die Übergabe einer zusätzlichen Option für den Ort der Signatur auch als Option möglich. + +\begin{verbatim} + \affidavit[signature-location=Stadt] +\end{verbatim} \section{Layout-Optionen mit Verstoß gegen das Corporate Design} diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex index a42cd97def..fc15eb469d 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaPoster.tex' version 3.24 (2022/04/20), %% 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 d912b35dc4..6fcc2db571 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaPub.tex' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -135,7 +135,8 @@ Im folgenden werden die möglichen Optionen beschrieben. } \item[twocolumn] Aktiviert den zweispaltigen Modus global. In diesem Fall werden jedoch aufgrund ihrer Natur zwei Randnotizspalten erzeugt. Eine Nutzung in Kombination mit \code{marginpar=auto} ist daher in den meisten Fällen fragwürdig. Falls der zweispaltige Modus lediglich lokal aktiviert wird, entfällt dieses Verhalten, allerdings werden dann Randnotizen deaktiviert. \item[ruledheaders] Wählt den Stil der Überschriften aus. \code{ruledheaders=all} wählt den mit Linien eingerahmten Stil für alle bis zur \verb+\subsubsection+. Bei \code{chapter} beziehungsweise \code{section} ist dieser Stil entsprechend beschränkt. False lädt den Standardstil aus \KOMAScript. - \item[type] Als Typ stehen im Moment \code{publication} und \code{thesis} zur Verfügung. Die besonderen Möglichkeiten im Typ thesis sind in der Datei DEMO-TUDaThesis.tex/.pdf geschildert. Voreingestellt ist \code{publication}. + \item[title=default/small/large] Die relativ große Schriftgröße des Titels kann – insbesondere bei langen Titel für Abschlussarbeiten – zu Platzproblemen führen. Die Option \code{title} verhindert dies, indem die für das jeweils kleinere Papierformat eingestellten Schriftgrößen geladen werden. Die Voreinstellung ist \code{default} und entspricht dem Wert \code{large}. + \item[type] Als Typ stehen im Moment \code{publication} und \code{thesis} zur Verfügung. Die besonderen Möglichkeiten im Typ thesis sind in der Datei DEMO-TUDaThesis.tex/.pdf geschildert. Voreingestellt ist \code{publication}. Zusätzlich existiert ab Version 1.2 noch der Modus \code{intern}. Dieser wählt die Optionen \code{titlepage=false} für einen Titelkopf statt Titelseiten, sowie die TUDaPub-Optionen \code{pdfa=""false} und \code{IMRAD=false}. Dieser Modus ist für kurze, interne Berichte gedacht. \item[headline] Die Kopfzeile verfügt über die im Corporate Design beschriebenen Layoutmöglichkeiten über den Wert \code{automark}. Da diese Lösung typografisch nicht sonderlich sinnvoll ist, ist es auch möglich, diese abzuschalten. Voreingestellt ist ein Stil ohne Kolumnentitel. \item[logo] Option für die Titelseite, siehe \ref{sec:title} @@ -182,7 +183,7 @@ Um die Institutsboxen für Logos zu verwenden, liefert \cls{tudapub} das Makro \ \end{verbatim} \subsubsection{Sponsorenlogos} -Ab Version 3.0 steht in TUDaPub auch der Sponsorenmechanismus der TUDaLeaflet-Klasse zur verfügung. Damit ist es Möglich Sponsorenlogos unterhalb des Titelbildes zu platzieren. +Ab Version 3.0 steht in TUDaPub auch der Sponsorenmechanismus der TUDaLeaflet-Klasse zur Verfügung. Damit ist es Möglich Sponsorenlogos unterhalb des Titelbildes zu platzieren. Sponsorenlogos werden üblicherweise über \begin{verbatim} @@ -330,7 +331,7 @@ Die gilt insbesondere für die Optionen \code{includehead}, \code{includefoot} u \minisec{Hinweis zu den Kopf-/Fußzeilen} Wenn die Option \code{marginpar=true} gesetzt bleibt, ragen die Kopf- und Fußzeile über die Marginalspalte hinaus. Aus ästhetischen Gründen wird daher empfohlen in diesem Fall die Kopf- und Fußzeile mit \code{marginpar=false} auf den Textbereich zu beschränken. -Auch ist das Standard-Layout der Kolumnentitel wenig vorteilhaft, da die Kolumnentitel damit local größer sein können als die eigentliche Überschrift. (\code{headline=automark}) +Auch ist das Standard-Layout der Kolumnentitel wenig vorteilhaft, da die Kolumnentitel damit lokal größer sein können als die eigentliche Überschrift. (\code{headline=automark}) Deswegen kann über \begin{verbatim} \pagestyle{TUDa.headings} @@ -380,7 +381,7 @@ Darüber hinaus erfordern manche Stellen dieses Fachbereichs die Übergabe einer \SetPaperID{<Buchstabe>}{<tiefgestelle Nummer>}} \end{verbatim} eingeführt. -Dieser funktioniert auch ohne die Aktivierung des \code{mecheng}-Modus, allerdings ergänzt due Option einige zusätzliche Parameter für angepasste Abstände. +Dieser funktioniert auch ohne die Aktivierung des \code{mecheng}-Modus, allerdings ergänzt die Option einige zusätzliche Parameter für angepasste Abstände. Darüber hinaus aktiviert der Modus die Optionen: \code{colorback=false}, \code{ruledheaders=section}. @@ -438,7 +439,7 @@ $\dot{\hat{x}}$ \noindent Die zugehörige Diskussion findet sich im tuda-ci Repository (\url{https://github.com/tudace/tuda_latex_templates/issues/78}). Da sich diese Problematik nicht direkt aus tuda-ci sondern aus der Konstruktion der beiden Pakete untereinander ergibt, ist es leider nicht möglich pauschal eine Anpassung in tuda-ci zu implementieren. Unter dem angegebenen Link findet sich jedoch ein möglicher Workaround, sobald beide Varianten benötigt werden. \subsection{Möglicher Option Clash mit microtype} -Das Paket microtype wird im Falle der Nutzung von \hologo{pdfLaTeX} oder einer erzwungenden Nutzung von Type1 Schriftarten automatisch geladen, da in der verwendeten Schriftart die Ligaturen für Kapitälchen deaktiviert werden müssen, um Probleme zu vermeiden (vgl. \url{https://github.com/tudace/tuda_latex_templates/issues/144}). +Das Paket \pck{microtype} wird im Falle der Nutzung von \hologo{pdfLaTeX} oder einer erzwungenen Nutzung von Type1 Schriftarten automatisch geladen, da in der verwendeten Schriftart die Ligaturen für Kapitälchen deaktiviert werden müssen, um Probleme zu vermeiden (vgl. \url{https://github.com/tudace/tuda_latex_templates/issues/144}). Falls es zwingend Notwendig ist die Type 1 Schriftart zu verwenden, ist es möglich weitere Optionen vor dem Laden der Dokumentenklasse an \pck{microtype} zu übergeben. diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex index 61482496d0..8259da2a71 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaReport.tex' version 3.23 (2022/03/21), +%% This is file `DEMO-TUDaReport.tex' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex index 8822228bfd..02b390a449 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaSciPoster.tex' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -159,13 +159,14 @@ % Papierformat \begin{posterboxenv}[title=Papierformat]{name=paper,column=3,span=2,below=row5} Die Klasse \cls{tudasciposter} unterstützt die Papierformate A0, A1, A2 und A3. Der Wert wird über die Klassenoption \code{paper} ausgewählt: - -\begin{verbatim} -paper=a0 -\end{verbatim} + \begin{verbatim} + paper=a0 + \end{verbatim} Die Voreinstellung entspricht \code{a0}. Die Änderung des Papierformates ist keine Skalierung, da Schriftgrößen nicht direkt skalieren. + Zusätzlich kann die Option \code{paper} wie bei \KOMAScript{} üblich auch einen Wert für die Ausrichtung verarbeiten. Querformat erhält man somit über \code{paper=landscape}. + Um eine Skalierung eines größeren auf ein kleineres Design zu erreichen, empfiehlt es sich, das Ausgangsformat beim Druck zu skalieren (Drucken in eine Datei mit Skalierung) oder ggf. die PDF-Datei mit Paketen wie \pck{pdfpages} umzurechnen. \end{posterboxenv} diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex index 8ac908715f..aad0e14013 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 3.23 (2022/03/21), +%% This is file `DEMO-TUDaThesis.tex' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -331,7 +331,7 @@ hinzugefügt werden. Die Vorbelegung für Stadt ist hierbei \enquote{Darmstadt}. Ab Version 3.20 ist die Übergabe einer zusätzlichen Option für den Ort der Signatur auch als Option möglich. \begin{verbatim} -\affidavit[location=Stadt] +\affidavit[signature-location=Stadt] \end{verbatim} \section{Layout-Optionen mit Verstoß gegen das Corporate Design} diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty index 0955997a9f..aac4d1091a 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 3.23 (2022/03/21), +%% This is file `beamercolorthemeTUDa.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \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 8891e07422..87014da3de 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 3.23 (2022/03/21), +%% This is file `beamerfontthemeTUDa.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerfontthemeTUDa} [\filedate\space\fileversion] diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty index 6b2ee5998b..557789f2c6 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 3.23 (2022/03/21), +%% This is file `beamerinnerthemeTUDa.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \ProvidesExplPackage{beamerinnerthemeTUDa}{\filedate}{\fileversion}{Inner~beamer~theme~of~tuda-ci} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty index 7442ad0d8e..56ede7ff39 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 3.23 (2022/03/21), +%% This is file `beamerouterthemeTUDa.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \ProvidesExplPackage{beamerouterthemeTUDa}{\filedate}{\fileversion}{Outer~beamer~theme~of~tuda-ci} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty index a821a4a674..1378144db5 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty @@ -1,4 +1,4 @@ -%% This is file `beamerthemeTUDa-mecheng.sty' version 3.23 (2022/03/21), +%% This is file `beamerthemeTUDa-mecheng.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \RequirePackage{expl3} \ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty index acee328ae3..0399f5ad12 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 3.23 (2022/03/21), +%% This is file `beamerthemeTUDa.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthemeTUDa} [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt] diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo index ed56d10672..459e08ade7 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a0paper.clo' version 3.23 (2022/03/21), +%% This is file `tuda-a0paper.clo' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo index f3f7081f10..df8efa1223 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a1paper.clo' version 3.23 (2022/03/21), +%% This is file `tuda-a1paper.clo' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a1paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo index 7ab26bbcfd..2674e388e0 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a2paper.clo' version 3.23 (2022/03/21), +%% This is file `tuda-a2paper.clo' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo index 675da89209..2563e1bbd5 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a3paper.clo' version 3.23 (2022/03/21), +%% This is file `tuda-a3paper.clo' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a3paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo index 77e3699934..62aeab95bb 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a4paper.clo' version 3.23 (2022/03/21), +%% This is file `tuda-a4paper.clo' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a4paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo index 46289ed392..33f1e9e7ff 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a5paper.clo' version 3.23 (2022/03/21), +%% This is file `tuda-a5paper.clo' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a5paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty index b954d5b53e..49257cf899 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty +++ b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty @@ -1,4 +1,4 @@ -%% This is file `tuda-pgfplots.sty' version 3.23 (2022/03/21), +%% This is file `tuda-pgfplots.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} % Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt % The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme \ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes] diff --git a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls index 12c1d7def0..54a7f37f6a 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 3.23 (2022/03/21), +%% This is file `tudabeamer.cls' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{tudabeamer} [\filedate\space\fileversion\space] diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def index 393b44ccf8..9b2af62e64 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 3.23 (2022/03/21), +%% This is file `tudacolors.def' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \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 a73b166161..71e5dc0911 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 3.23 (2022/03/21), +%% This is file `tudacolors.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \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/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls index e2ca89b016..01c0a0f908 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls @@ -1,4 +1,4 @@ -%% This is file `tudaexercise.cls' version 3.23 (2022/03/21), +%% This is file `tudaexercise.cls' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaexercise} diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty index dd4c39d650..255637f835 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 3.23 (2022/03/21), +%% This is file `tudafonts.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tudafonts} [\filedate\space\fileversion\space diff --git a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls index 7c520dee40..77629e07ee 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls @@ -1,4 +1,4 @@ -%% This is file `tudaleaflet.cls' version 3.23 (2022/03/21), +%% This is file `tudaleaflet.cls' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaleaflet}{\filedate}{\fileversion}{Leaflets using the Corporate Design of TU Darmstadt} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls index 454112720b..4bcfef164c 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 3.23 (2022/03/21), +%% This is file `tudaletter.cls' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaletter} diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo index 8509583501..221c677efb 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo +++ b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo @@ -1,4 +1,4 @@ -%% This is file `tudalettersize10pt.clo' version 3.23 (2022/03/21), +%% This is file `tudalettersize10pt.clo' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg index 9803673f18..1bf9dc2ee9 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg +++ b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg @@ -1,4 +1,4 @@ -%% This is file `tudamecheng.cfg' version 3.23 (2022/03/21), +%% This is file `tudamecheng.cfg' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \RequirePackage{expl3} \ProvidesExplFile{tudamecheng.cfg} {\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls index ec08c2164a..23ce7e27bd 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 3.23 (2022/03/21), +%% This is file `tudaposter.cls' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt} diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls index 8d9ca5de98..7f2305e9d7 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 3.23 (2022/03/21), +%% This is file `tudapub.cls' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty index 722383b394..db42809f7b 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 3.23 (2022/03/21), +%% This is file `tudarules.sty' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \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 f4bfad84a2..e70cc21a76 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 3.23 (2022/03/21), +%% This is file `tudasciposter.cls' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt} @@ -65,6 +65,8 @@ \exp_args:Nx \PassOptionsToPackage{paper=\l_keys_choice_tl}{tudarules} \exp_args:Nx \PassOptionsToPackage{\l_keys_choice_tl paper}{geometry} }, + paper / landscape .code:n = \PassOptionsToPackage{landscape}{geometry}, + paper / portrait .code:n = \PassOptionsToPackage{portrait}{geometry}, paper .initial:n = a0, fontsize .tl_gset:N = \g_ptxcd_fontsize_tl, logofile .tl_gset:N = \g_ptxcd_logofile_tl, @@ -111,10 +113,9 @@ \prop_gput:NnV \g_ptxcd_clsopts_prop {fontsize} \g_ptxcd_fontsize_tl - \prop_map_inline:Nn \g_ptxcd_clsopts_prop { \tl_if_empty:nTF {#2} - {\exp_args:NnV\PassOptionsToClass{#1}\l_tmpa_tl} + {\PassOptionsToClass{#1}{scrartcl}} {\clist_map_inline:nn {#2} {\PassOptionsToClass{#1=##1}{scrartcl}}} } @@ -378,6 +379,12 @@ \setlength{\contentwidth}{\dimexpr\paperwidth-2\g_ptxcd_margin_dim\relax} \newlength{\contentheight} +\cs_new:Nn \__ptxcd_logo_code:n { + \node[anchor=north~east,inner~sep=0pt,minimum~width=2.5\c_ptxcd_logoheight_dim](#1) at ([xshift=.3\c_ptxcd_logoheight_dim,yshift=-.5\c_ptxcd_logoheight_dim]identbar.south~east){ + \includegraphics[height=\c_ptxcd_logoheight_dim]{\g_ptxcd_logofile_tl} + }; +} + \tcbposterset{ coverage = @@ -413,9 +420,7 @@ \fill \path [identbarcolor] (identbar.south~east)rectangle([yshift=-\g_ptxcd_titleblock_dim]identbar.south~west) coordinate(bottomlefttitleblock); - - \node[anchor=north~east,inner~sep=0pt,minimum~width=2.5\c_ptxcd_logoheight_dim](TUDalogo) at ([xshift=.3\c_ptxcd_logoheight_dim,yshift=-.5\c_ptxcd_logoheight_dim]identbar.south~east){ - \includegraphics[height=\c_ptxcd_logoheight_dim]{\g_ptxcd_logofile_tl}}; + \__ptxcd_logo_code:n {TUDalogo} \node[inner~sep=0pt,text~width=2.2\c_ptxcd_logoheight_dim,align=right,anchor=north~west,](titlegraphic) at ([yshift=-\c_ptxcd_rulesep_dim]TUDalogo.south~west){\box_use:N \g_ptxcd_titlegraphic_box}; diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo index ea428520cd..0cb0cd1d2c 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo +++ b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo @@ -1,4 +1,4 @@ -%% This is file `tudasize9pt.clo' version 3.23 (2022/03/21), +%% This is file `tudasize9pt.clo' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg index 7d62c46e5b..c635933f64 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 3.23 (2022/03/21), +%% This is file `tudathesis.cfg' version 3.24 (2022/04/20), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.23} -\def\filedate{2022/03/21} +\def\fileversion{3.24} +\def\filedate{2022/04/20} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)} diff --git a/macros/unicodetex/latex/polyglossia/README.md b/macros/unicodetex/latex/polyglossia/README.md index dbf1c5189d..28f8d5209d 100644 --- a/macros/unicodetex/latex/polyglossia/README.md +++ b/macros/unicodetex/latex/polyglossia/README.md @@ -1,4 +1,4 @@ -# THE POLYGLOSSIA PACKAGE v1.55a +# THE POLYGLOSSIA PACKAGE v1.56 ## Multilingual typesetting with XeLaTeX and LuaLaTeX This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX. diff --git a/macros/unicodetex/latex/polyglossia/polyglossia.dtx b/macros/unicodetex/latex/polyglossia/polyglossia.dtx index 5c72d9843f..8b53cdf70b 100644 --- a/macros/unicodetex/latex/polyglossia/polyglossia.dtx +++ b/macros/unicodetex/latex/polyglossia/polyglossia.dtx @@ -8,7 +8,7 @@ \iffalse %</internal> %<*README> -# THE POLYGLOSSIA PACKAGE v1.55a +# THE POLYGLOSSIA PACKAGE v1.56 ## Multilingual typesetting with XeLaTeX and LuaLaTeX This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX. @@ -2807,6 +2807,14 @@ to track the issues and follow progress. % \section{Revision history} % % \bgroup\footnotesize +% \subsection*{1.56 (20-04-2022)} +% +% \subsubsection*{Bug fixes} +% \begin{itemize} +% \item Fix English setup via aliases (\TXI{539}). +% \end{itemize} +% +% % \subsection*{1.55a (10-04-2022)} % % \subsubsection*{Bug fixes} @@ -3693,7 +3701,7 @@ to track the issues and follow progress. % \subsection{polyglossia.sty} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{polyglossia}[2022/04/10 v1.55a +\ProvidesPackage{polyglossia}[2022/04/20 v1.56 Modern multilingual typesetting with XeLaTeX and LuaLaTeX] \RequirePackage{etoolbox} \RequirePackage{makecmds} @@ -4804,7 +4812,7 @@ to track the issues and follow progress. %we call this macro when a gloss file is not found for a given language \def\xpg@nogloss#1{% - \xpg@warning{File~ gloss-#1.ldf~ does~ not~ exist!\MessageBreak + \xpg@warning{Neither~ file~ gloss-#1.ldf~ nor file~ gloss-#1.lde~ exists!\MessageBreak I~ will~ nevertheless~ try~ to~ use~ hyphenation~ patterns~ for~ #1.}% \PolyglossiaSetup{#1}{hyphenmins={2,3},hyphennames={#1},fontsetup=true}% % the above amounts to: @@ -13290,23 +13298,24 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages hyphenmins={2,3}, langtag=ENG, fontsetup=true, + babelname=english } % BCP-47 compliant aliases -\setlanguagealias*[bcp47=en]{english}{en} -\setlanguagealias*[variant=australian,babelname=autralian,bcp47=en-AU]{en}{en-AU} -\setlanguagealias*[variant=canadian,babelname=canadian,bcp47=en-CA]{en}{en-CA} -\setlanguagealias*[variant=british,babelname=british,bcp47=en-NZ]{en}{en-GB} -\setlanguagealias*[variant=newzealand,babelname=newzealand,bcp47=en-NZ]{en}{en-NZ} -\setlanguagealias*[variant=us,babelname=american,bcp47=en-US]{en}{en-US} +\setlanguagealias*{english}{en} +\setlanguagealias*[variant=australian]{english}{en-AU} +\setlanguagealias*[variant=canadian]{english}{en-CA} +\setlanguagealias*[variant=british]{english}{en-GB} +\setlanguagealias*[variant=newzealand]{english}{en-NZ} +\setlanguagealias*[variant=us]{english}{en-US} % Babel aliases -\setlanguagealias[variant=us]{en-US}{american} -\setlanguagealias[variant=australian]{en-AU}{australian} -\setlanguagealias[variant=british]{en-GB}{british} -\setlanguagealias[variant=canadian]{en-CA}{canadian} -\setlanguagealias[variant=newzealand]{en-NZ}{newzealand} +\setlanguagealias[variant=us]{english}{american} +\setlanguagealias[variant=australian]{english}{australian} +\setlanguagealias[variant=british]{english}{british} +\setlanguagealias[variant=canadian]{english}{canadian} +\setlanguagealias[variant=newzealand]{english}{newzealand} \providebool{british@hyphen} \providebool{english@ordinalmonthday} diff --git a/macros/unicodetex/latex/polyglossia/polyglossia.pdf b/macros/unicodetex/latex/polyglossia/polyglossia.pdf Binary files differindex 320e4aa224..9da4544c2b 100644 --- a/macros/unicodetex/latex/polyglossia/polyglossia.pdf +++ b/macros/unicodetex/latex/polyglossia/polyglossia.pdf |