From 7447e931820114aa459e66b1a7937cdc9aebb0f4 Mon Sep 17 00:00:00 2001 From: Joseph Wright Date: Wed, 26 Oct 2022 19:32:45 +0100 Subject: [PATCH] Add optional arg. to case commands and keyval BCP47 interface (#936) --- base/changes.txt | 7 ++ base/doc/ltnews36.tex | 24 ++++- base/doc/usrguide.tex | 7 ++ base/ltfinal.dtx | 60 ++++++++++-- base/testfiles-lthooks/ltcmdhooks-001.tlg | 2 +- base/testfiles-ltmarks/xmarks-001.tlg | 92 +++++++++---------- base/testfiles-ltmarks/xmarks-002.tlg | 46 +++++----- base/testfiles-ltmarks/xmarks-003.tlg | 72 +++++++-------- base/testfiles-ltmarks/xmarks-004.tlg | 36 ++++---- base/testfiles-ltmarks/xmarks-005.tlg | 12 +-- base/testfiles-ltmarks/xmarks-006.tlg | 4 +- base/testfiles/github-robust-0123.luatex.tlg | 4 +- base/testfiles/github-robust-0123.tlg | 4 +- base/testfiles/github-robust-0123.xetex.tlg | 4 +- base/testfiles/sx172785.tlg | 16 ++-- base/testfiles/sx172785.xetex.tlg | 16 ++-- base/testfiles/tlb-rollback-005.luatex.tlg | 4 +- base/testfiles/tlb-rollback-005.tlg | 4 +- base/testfiles/tlb-rollback-005.xetex.tlg | 4 +- base/testfiles/tlb1135.tlg | 8 +- base/testfiles/tlb1519.tlg | 4 +- base/testfiles/vlatex02.luatex.tlg | 28 +++--- base/testfiles/vlatex02.tlg | 28 +++--- base/testfiles/vlatex06-2015.luatex.tlg | 30 +++--- base/testfiles/vlatex06-2015.tlg | 30 +++--- base/testfiles/vlatex06.luatex.tlg | 30 +++--- base/testfiles/vlatex06.tlg | 30 +++--- base/testfiles/vtl2e02.luatex.tlg | 28 +++--- base/testfiles/vtl2e02.tlg | 28 +++--- base/testfiles/vtl2e06.luatex.tlg | 30 +++--- base/testfiles/vtl2e06.tlg | 30 +++--- .../latex-lab/testfiles-OR/github-001.tlg | 10 +- 32 files changed, 404 insertions(+), 328 deletions(-) diff --git a/base/changes.txt b/base/changes.txt index eb52d03e7..ebdf5aa4e 100644 --- a/base/changes.txt +++ b/base/changes.txt @@ -6,6 +6,13 @@ completeness or accuracy and it contains some references to files that are not part of the distribution. ================================================================================ +2022-10-26 Joseph Wright + + * ltfinal.dtx: + Introduce optional argument for case-changing commands + Make case changing commands language-aware + Auto-detect babel locale for case changing + 2022-10-22 David Carlisle * ltclass.dtx, ltdefns.dtx: Further \protect guards for gh/932 diff --git a/base/doc/ltnews36.tex b/base/doc/ltnews36.tex index bf06fdd42..3397972c4 100644 --- a/base/doc/ltnews36.tex +++ b/base/doc/ltnews36.tex @@ -221,10 +221,26 @@ \subsection{Encoding subsets for \texttt{TS1} encoded fonts} % \githubissue{905} - - -%\section{New or improved commands} - +\section{New or improved commands} + +\subsection{Better language handling for case-changing commands} + +The commands \cs{MakeUppercase}, \cs{MakeLowercase} and \cs{MakeTitlecase} now +automatically detect the locale currently in use when \pkg{babel} is loaded. +This allows automatic adjustment of letter mappings where appropriate. They +also accept a leading optional argument. This accepts a key--value list of +control settings. At present, there is one key available: \texttt{locale}, +which can also be accessed via the alias \texttt{lang}. This are intended to +allow local setting of the language, which can be done using a BCP-47 +descriptor. For example, this could be used to force Turkic case changing in +otherwise English input +\begin{verbatim} + \MakeUppercase[lang = tr]{Ragıp Hulûsi Özdem} +\end{verbatim} +yields +\begin{quotation} + \MakeUppercase[lang = tr]{Ragıp Hulûsi Özdem}. +\end{quotation} \section{Code improvements} diff --git a/base/doc/usrguide.tex b/base/doc/usrguide.tex index 371e22312..32e12a139 100644 --- a/base/doc/usrguide.tex +++ b/base/doc/usrguide.tex @@ -1166,6 +1166,13 @@ \section{Case changing} \end{tabular} \end{quotation} +The case-changing commands take an optional argument which can be used to +tailor the output. This optional argument accepts the key \texttt{locale}, +also available under the alias \texttt{lang}, +which can be used to give a language identifier in BCP-47 +format. This is then applied to select language-specific features during +case-changing. + The input given to these commands is `expanded' before case changing is applied. This means that any commands within the input that convert to pure text will be case changed. Mathematical content is automatically excluded, as diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx index 69ea7bc94..7f4bef3bc 100644 --- a/base/ltfinal.dtx +++ b/base/ltfinal.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltfinal.dtx} - [2022/08/29 v2.2w LaTeX Kernel (Final Settings)] + [2022/10/26 v2.2x LaTeX Kernel (Final Settings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltfinal.dtx} @@ -1085,6 +1085,9 @@ % \changes{v2.2t}{2022/04/21}{Support \cs{noexpand} in argument of \cs{@expl@text@uppercase@@n}} % \changes{v2.2v}{2022/06/30}{Just use \cs{text_lowercase:n} without \cs{protectd@edf} gh/881x}% % \changes{v2.2w}{2022/07/04}{Introduced \cs{CaseSwitch}, \cs{DeclareCaseChangeEquivalent} and \cs{MakeTitlecase} to support hooking into case changing gh/889}% +% \changes{v2.2x}{2022/10/26}{Introduce optional argument for case-changing commands} +% \changes{v2.2x}{2022/10/26}{Make case changing commands language-aware} +% \changes{v2.2x}{2022/10/26}{Auto-detect \pkg{babel} locale} % Wrappers around the L3 case changing functions. % |\protected| to make them mostly safe as replacements for |uppercase| % and |\lowercase|. @@ -1109,12 +1112,55 @@ % functions. % \begin{macrocode} \ExplSyntaxOn -\cs_new_protected_nopar:cpn{MakeUppercase~}{\text_uppercase:n} -\cs_set_nopar:Npx\MakeUppercase#1{\use:c{MakeUppercase~}{#1}} -\cs_new_protected_nopar:cpn{MakeLowercase~}{\text_lowercase:n} -\cs_set_nopar:Npx\MakeLowercase#1{\use:c{MakeLowercase~}{#1}} -\cs_new_protected_nopar:cpn{MakeTitlecase~}{\text_titlecase:n} -\cs_set_nopar:Npx\MakeTitlecase#1{\use:c{MakeTitlecase~}{#1}} +\keys_define:nn { __kernel } + { + lang .str_set:N = \reserved@a , + locale .str_set:N = \reserved@a + } +\cs_new_protected:Npn \@@text@case@aux #1#2#3 + { + \cs_set_nopar:Npn \reserved@a { } + \tl_if_blank:nTF {#2} + { \@@text@case@aux@ } + { \keys_set:nn { __kernel } {#2} } + \use:c { text_ #1 case:Vn } \reserved@a {#3} + } +\cs_new_protected:Npn \@@text@case@aux@ { } +\tl_gput_right:Nn \@kernel@after@begindocument + { + \@ifpackageloaded { babel } + { + \@ifpackagelater { babel } { 2020-01-15 } + { + \cs_gset_protected:Npn \@@text@case@aux@ + { + \str_set:Nx \reserved@a + { \localeinfo* { tag.bcp47 } } + } + } + { } + } + { } + } +\exp_args_generate:n { cnx } +% \end{macrocode} +% The odd use of \emph{three} spaces here is needed as \pkg{ltcmd} uses the +% name with one and two spaces to give a `friendly' error message for a runaway +% argument: that means we can't use it here. +% \begin{macrocode} +\cs_set_protected:Npn \reserved@a #1 + { + \cs_generate_variant:cn { text_ \str_lowercase:n {#1} case:nn } { V } + \cs_new_protected:cpx { Make#1case \c_space_tl \c_space_tl \c_space_tl } [##1] ##2 + { \exp_not:N \@@text@case@aux { \str_lowercase:n {#1} } {##1} {##2} } + \ExpandArgs { cnx } \NewExpandableDocumentCommand + { Make#1case } + { O{} +m } + { \exp_not:c { Make#1case \c_space_tl \c_space_tl \c_space_tl } [####1] {####2} } + } +\reserved@a { Upper } +\reserved@a { Lower } +\reserved@a { Title } % \end{macrocode} % % \changes{v2.2u}{2022/06/02}{Add \cs{NoCaseChange}} diff --git a/base/testfiles-lthooks/ltcmdhooks-001.tlg b/base/testfiles-lthooks/ltcmdhooks-001.tlg index 87429b256..0eefd9327 100644 --- a/base/testfiles-lthooks/ltcmdhooks-001.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-001.tlg @@ -58,7 +58,7 @@ l. ...\ShowHook{cmd/foo/after} #1#2->FOO #1 #2. l. ...\show\foo > \@kernel@after@begindocument=macro: -->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: . +->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: \@ifpackageloaded {babel}{\@ifpackagelater {babel}{....-..-..}{\cs_gset_protected:Npn \@@text@case@aux@ {\str_set:Nx \reserved@a {\localeinfo *{tag.bcp47}}}}{}}{}. l. ...\show\@kernel@after@begindocument Update code for hook 'para/before' on input line ...: Update code for hook 'para/after' on input line ...: diff --git a/base/testfiles-ltmarks/xmarks-001.tlg b/base/testfiles-ltmarks/xmarks-001.tlg index fb97b20af..8937933ba 100644 --- a/base/testfiles-ltmarks/xmarks-001.tlg +++ b/base/testfiles-ltmarks/xmarks-001.tlg @@ -7,8 +7,8 @@ Marks: new mark: bar on line ... Marks: new mark: baz on line ... \c__mark_class_baz_mark=\marks... Marks: set foo <- 'figure' on line ... -Marks: set 2e-right <- '\MakeUppercase {1\hskip 1em\relax A test}' on line ... -Marks: set 2e-right-nonempty <- '\MakeUppercase {1\hskip 1em\relax A test}' on line ... +Marks: set 2e-right <- '\MakeUppercase []{1\hskip 1em\relax A test}' on line ... +Marks: set 2e-right-nonempty <- '\MakeUppercase []{1\hskip 1em\relax A test}' on line ... Marks: set foo <- 'first foo' on line ... Marks: 2e-left in OR (oneside): page (current):|||| @@ -18,19 +18,19 @@ Marks: 2e-left in OR (oneside): column (first):|||| column (second):|||| Marks: 2e-right in OR (oneside): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| column (previous):|||| - column (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right-nonempty in OR (oneside): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| column (previous):|||| - column (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: foo in OR (oneside): page (current):||first foo|first foo| page (previous):|||| @@ -64,19 +64,19 @@ Marks: 2e-left in OR (oneside): column (first):|||| column (second):|||| Marks: 2e-right in OR (oneside): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right-nonempty in OR (oneside): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: foo in OR (oneside): page (current):|first foo|second foo|second foo| page (previous):||first foo|first foo| @@ -111,19 +111,19 @@ Marks: 2e-left in OR (oneside): column (first):|||| column (second):|||| Marks: 2e-right in OR (oneside): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right-nonempty in OR (oneside): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: foo in OR (oneside): page (current):|second foo|third foo|forth foo| page (previous):|first foo|second foo|second foo| @@ -179,19 +179,19 @@ Marks: 2e-left in OR (oneside): column (first):|||| column (second):|||| Marks: 2e-right in OR (oneside): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right-nonempty in OR (oneside): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: foo in OR (oneside): page (current):|forth foo|forth foo|forth foo| page (previous):|second foo|third foo|forth foo| diff --git a/base/testfiles-ltmarks/xmarks-002.tlg b/base/testfiles-ltmarks/xmarks-002.tlg index fb6258be3..4e0814d6e 100644 --- a/base/testfiles-ltmarks/xmarks-002.tlg +++ b/base/testfiles-ltmarks/xmarks-002.tlg @@ -7,16 +7,16 @@ Marks: new mark: bar on line ... Marks: new mark: baz on line ... \c__mark_class_baz_mark=\marks... Marks: set foo <- 'figure' on line ... -Marks: set 2e-left <- '\MakeUppercase {1\hskip 1em\relax A test}' on line ... +Marks: set 2e-left <- '\MakeUppercase []{1\hskip 1em\relax A test}' on line ... Marks: set 2e-right <- '' on line ... Marks: set foo <- 'first foo' on line ... Marks: 2e-left in OR (twoside-odd): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| column (previous):|||| - column (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right in OR (twoside-odd): page (current):||\prg_do_nothing: |\prg_do_nothing: | page (previous):|||| @@ -57,12 +57,12 @@ Marks: baz in OR (twoside-odd): Marks: set foo <- 'second foo' on line ... Marks: set bar <- 'first bar' on line ... Marks: 2e-left in OR (twoside-even): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right in OR (twoside-even): page (current):|\prg_do_nothing: |\prg_do_nothing: |\prg_do_nothing: | page (previous):||\prg_do_nothing: |\prg_do_nothing: | @@ -104,12 +104,12 @@ Marks: set bar <- 'second bar' on line ... Marks: set foo <- 'forth foo' on line ... Marks: set baz <- 'first baz' on line ... Marks: 2e-left in OR (twoside-odd): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right in OR (twoside-odd): page (current):|\prg_do_nothing: |\prg_do_nothing: |\prg_do_nothing: | page (previous):|\prg_do_nothing: |\prg_do_nothing: |\prg_do_nothing: | @@ -147,12 +147,12 @@ Marks: baz in OR (twoside-odd): column (second):||first baz|first baz| [3] Marks: 2e-left in OR (twoside-even): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right in OR (twoside-even): page (current):|\prg_do_nothing: |\prg_do_nothing: |\prg_do_nothing: | page (previous):|\prg_do_nothing: |\prg_do_nothing: |\prg_do_nothing: | diff --git a/base/testfiles-ltmarks/xmarks-003.tlg b/base/testfiles-ltmarks/xmarks-003.tlg index 04ea2a31b..5da83947c 100644 --- a/base/testfiles-ltmarks/xmarks-003.tlg +++ b/base/testfiles-ltmarks/xmarks-003.tlg @@ -7,8 +7,8 @@ Marks: new mark: bar on line ... Marks: new mark: baz on line ... \c__mark_class_baz_mark=\marks... Marks: set foo <- 'figure' on line ... -Marks: set 2e-right <- '\MakeUppercase {1\hskip 1em\relax A test}' on line ... -Marks: set 2e-right-nonempty <- '\MakeUppercase {1\hskip 1em\relax A test}' on line ... +Marks: set 2e-right <- '\MakeUppercase []{1\hskip 1em\relax A test}' on line ... +Marks: set 2e-right-nonempty <- '\MakeUppercase []{1\hskip 1em\relax A test}' on line ... Marks: set foo <- 'first foo' on line ... Marks: 2e-left in OR (oneside first column): page (current):|||| @@ -21,15 +21,15 @@ Marks: 2e-right in OR (oneside first column): page (current):|||| page (previous):|||| column (previous):|||| - column (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| column (second):|\__mark_error:n {last-column}|\__mark_error:n {last-column}|\__mark_error:n {last-column}| Marks: 2e-right-nonempty in OR (oneside first column): page (current):|||| page (previous):|||| column (previous):|||| - column (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| column (second):|\__mark_error:n {last-column}|\__mark_error:n {last-column}|\__mark_error:n {last-column}| Marks: foo in OR (oneside first column): page (current):|||| @@ -62,19 +62,19 @@ Marks: 2e-left in OR (oneside second column): column (first):|||| column (second):|||| Marks: 2e-right in OR (oneside second column): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| - column (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right-nonempty in OR (oneside second column): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| - column (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: foo in OR (oneside second column): page (current):||first foo|second foo| page (previous):|||| @@ -110,18 +110,18 @@ Marks: 2e-left in OR (oneside first column): column (first):|||| column (second):|\__mark_error:n {last-column}|\__mark_error:n {last-column}|\__mark_error:n {last-column}| Marks: 2e-right in OR (oneside first column): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| column (second):|\__mark_error:n {last-column}|\__mark_error:n {last-column}|\__mark_error:n {last-column}| Marks: 2e-right-nonempty in OR (oneside first column): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| column (second):|\__mark_error:n {last-column}|\__mark_error:n {last-column}|\__mark_error:n {last-column}| Marks: foo in OR (oneside first column): page (current):||first foo|second foo| @@ -152,19 +152,19 @@ Marks: 2e-left in OR (oneside second column): column (first):|||| column (second):|||| Marks: 2e-right in OR (oneside second column): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right-nonempty in OR (oneside second column): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: foo in OR (oneside second column): page (current):|second foo|third foo|forth foo| page (previous):||first foo|second foo| diff --git a/base/testfiles-ltmarks/xmarks-004.tlg b/base/testfiles-ltmarks/xmarks-004.tlg index 623e1f67e..6f5fe52bd 100644 --- a/base/testfiles-ltmarks/xmarks-004.tlg +++ b/base/testfiles-ltmarks/xmarks-004.tlg @@ -7,15 +7,15 @@ Marks: new mark: bar on line ... Marks: new mark: baz on line ... \c__mark_class_baz_mark=\marks... Marks: set foo <- 'figure' on line ... -Marks: set 2e-left <- '\MakeUppercase {1\hskip 1em\relax A test}' on line ... +Marks: set 2e-left <- '\MakeUppercase []{1\hskip 1em\relax A test}' on line ... Marks: set 2e-right <- '' on line ... Marks: set foo <- 'first foo' on line ... Marks: 2e-left in OR (twoside-odd first column): page (current):|||| page (previous):|||| column (previous):|||| - column (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| column (second):|\__mark_error:n {last-column}|\__mark_error:n {last-column}|\__mark_error:n {last-column}| Marks: 2e-right in OR (twoside-odd first column): page (current):|||| @@ -55,12 +55,12 @@ Marks: baz in OR (twoside-odd first column): Marks: set foo <- 'second foo' on line ... Marks: set bar <- 'first bar' on line ... Marks: 2e-left in OR (twoside-odd second column): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| - column (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right in OR (twoside-odd second column): page (current):||\prg_do_nothing: |\prg_do_nothing: | page (previous):|||| @@ -103,11 +103,11 @@ Marks: set bar <- 'second bar' on line ... Marks: set foo <- 'forth foo' on line ... Marks: set baz <- 'first baz' on line ... Marks: 2e-left in OR (twoside-even first column): - page (current):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| page (previous):|||| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| column (second):|\__mark_error:n {last-column}|\__mark_error:n {last-column}|\__mark_error:n {last-column}| Marks: 2e-right in OR (twoside-even first column): page (current):||\prg_do_nothing: |\prg_do_nothing: | @@ -166,12 +166,12 @@ equal equal not equal Marks: 2e-left in OR (twoside-even second column): - page (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - page (previous):||\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (previous):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (current):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (first):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| - column (second):|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}|\MakeUppercase {1\hskip 1em\relax A test}| + page (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + page (previous):||\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (previous):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (current):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (first):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| + column (second):|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}|\MakeUppercase []{1\hskip 1em\relax A test}| Marks: 2e-right in OR (twoside-even second column): page (current):|\prg_do_nothing: |\prg_do_nothing: |\prg_do_nothing: | page (previous):||\prg_do_nothing: |\prg_do_nothing: | diff --git a/base/testfiles-ltmarks/xmarks-005.tlg b/base/testfiles-ltmarks/xmarks-005.tlg index 216da2fed..c8e4486c3 100644 --- a/base/testfiles-ltmarks/xmarks-005.tlg +++ b/base/testfiles-ltmarks/xmarks-005.tlg @@ -1,6 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -Marks: set 2e-left <- '\MakeUppercase {1\hskip 1em\relax A}' on line ... +Marks: set 2e-left <- '\MakeUppercase []{1\hskip 1em\relax A}' on line ... Marks: set 2e-right <- '' on line ... Marks: set 2e-right <- '1.1\hskip 1em\relax S-1' on line ... Marks: set 2e-right-nonempty <- '1.1\hskip 1em\relax S-1' on line ... @@ -8,15 +8,15 @@ Marks: set 2e-right <- '1.2\hskip 1em\relax S-2' on line ... Marks: set 2e-right-nonempty <- '1.2\hskip 1em\relax S-2' on line ... Marks: set 2e-right <- '1.3\hskip 1em\relax S-3' on line ... Marks: set 2e-right-nonempty <- '1.3\hskip 1em\relax S-3' on line ... -Marks: set 2e-left <- '\MakeUppercase {2\hskip 1em\relax B}' on line ... +Marks: set 2e-left <- '\MakeUppercase []{2\hskip 1em\relax B}' on line ... Marks: set 2e-right <- '' on line ... Marks: 2e-left in OR (twoside-even): - page (current):||\MakeUppercase {1\hskip 1em\relax A}|\MakeUppercase {2\hskip 1em\relax B}| + page (current):||\MakeUppercase []{1\hskip 1em\relax A}|\MakeUppercase []{2\hskip 1em\relax B}| page (previous):|||| column (previous):|||| - column (current):||\MakeUppercase {1\hskip 1em\relax A}|\MakeUppercase {2\hskip 1em\relax B}| - column (first):||\MakeUppercase {1\hskip 1em\relax A}|\MakeUppercase {2\hskip 1em\relax B}| - column (second):||\MakeUppercase {1\hskip 1em\relax A}|\MakeUppercase {2\hskip 1em\relax B}| + column (current):||\MakeUppercase []{1\hskip 1em\relax A}|\MakeUppercase []{2\hskip 1em\relax B}| + column (first):||\MakeUppercase []{1\hskip 1em\relax A}|\MakeUppercase []{2\hskip 1em\relax B}| + column (second):||\MakeUppercase []{1\hskip 1em\relax A}|\MakeUppercase []{2\hskip 1em\relax B}| Marks: 2e-right in OR (twoside-even): page (current):||\prg_do_nothing: |\prg_do_nothing: | page (previous):|||| diff --git a/base/testfiles-ltmarks/xmarks-006.tlg b/base/testfiles-ltmarks/xmarks-006.tlg index 649c67524..c5d9bf45e 100644 --- a/base/testfiles-ltmarks/xmarks-006.tlg +++ b/base/testfiles-ltmarks/xmarks-006.tlg @@ -1,5 +1,5 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -==Even======|left=\MakeUppercase {1\hskip 1em\relax A test}|right=| +==Even======|left=\MakeUppercase []{1\hskip 1em\relax A test}|right=| [5] [6] -==Even======|left=\MakeUppercase {4\hskip 1em\relax C}|right=| +==Even======|left=\MakeUppercase []{4\hskip 1em\relax C}|right=| diff --git a/base/testfiles/github-robust-0123.luatex.tlg b/base/testfiles/github-robust-0123.luatex.tlg index 3aca080be..d59fe4815 100644 --- a/base/testfiles/github-robust-0123.luatex.tlg +++ b/base/testfiles/github-robust-0123.luatex.tlg @@ -387,9 +387,9 @@ and I'll forget about whatever was undefined. --------------------------------------- \L -> \L --------------------------------------- -\MakeLowercase{foo} -> \MakeLowercase {foo} +\MakeLowercase{foo} -> \MakeLowercase []{foo} --------------------------------------- -\MakeUppercase{foo} -> \MakeUppercase {foo} +\MakeUppercase{foo} -> \MakeUppercase []{foo} --------------------------------------- \MessageBreak -> \MessageBreak --------------------------------------- diff --git a/base/testfiles/github-robust-0123.tlg b/base/testfiles/github-robust-0123.tlg index 19c672d15..f632c750e 100644 --- a/base/testfiles/github-robust-0123.tlg +++ b/base/testfiles/github-robust-0123.tlg @@ -379,9 +379,9 @@ l. ...\mruntest{ccc} --------------------------------------- \L -> \L --------------------------------------- -\MakeLowercase{foo} -> \MakeLowercase {foo} +\MakeLowercase{foo} -> \MakeLowercase []{foo} --------------------------------------- -\MakeUppercase{foo} -> \MakeUppercase {foo} +\MakeUppercase{foo} -> \MakeUppercase []{foo} --------------------------------------- \MessageBreak -> \MessageBreak --------------------------------------- diff --git a/base/testfiles/github-robust-0123.xetex.tlg b/base/testfiles/github-robust-0123.xetex.tlg index a39a81832..58bf57ab3 100644 --- a/base/testfiles/github-robust-0123.xetex.tlg +++ b/base/testfiles/github-robust-0123.xetex.tlg @@ -387,9 +387,9 @@ and I'll forget about whatever was undefined. --------------------------------------- \L -> \L --------------------------------------- -\MakeLowercase{foo} -> \MakeLowercase {foo} +\MakeLowercase{foo} -> \MakeLowercase []{foo} --------------------------------------- -\MakeUppercase{foo} -> \MakeUppercase {foo} +\MakeUppercase{foo} -> \MakeUppercase []{foo} --------------------------------------- \MessageBreak -> \MessageBreak --------------------------------------- diff --git a/base/testfiles/sx172785.tlg b/base/testfiles/sx172785.tlg index 5c16aa836..b1bd1be25 100644 --- a/base/testfiles/sx172785.tlg +++ b/base/testfiles/sx172785.tlg @@ -42,10 +42,10 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 @@ -556,10 +556,10 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 diff --git a/base/testfiles/sx172785.xetex.tlg b/base/testfiles/sx172785.xetex.tlg index 576d6759f..6f3bfc287 100644 --- a/base/testfiles/sx172785.xetex.tlg +++ b/base/testfiles/sx172785.xetex.tlg @@ -42,10 +42,10 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 @@ -556,10 +556,10 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.0375 plus 1.0 diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg index 8101d4633..90ede40a7 100644 --- a/base/testfiles/tlb-rollback-005.luatex.tlg +++ b/base/testfiles/tlb-rollback-005.luatex.tlg @@ -1,7 +1,7 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. > \@kernel@after@begindocument=macro: -->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: . +->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: \@ifpackageloaded {babel}{\@ifpackagelater {babel}{....-..-..}{\cs_gset_protected:Npn \@@text@case@aux@ {\str_set:Nx \reserved@a {\localeinfo *{tag.bcp47}}}}{}}{}. l. ...\makeatletter\show\@kernel@after@begindocument \makeatother (latexrelease.sty @@ -746,7 +746,7 @@ Applying: [....-..-..] UTF-8 default on input line .... Already applied: [....-..-..] UTF-8 default on input line .... ) > \@kernel@after@begindocument=macro: -->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: . +->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: \@ifpackageloaded {babel}{\@ifpackagelater {babel}{....-..-..}{\cs_gset_protected:Npn \@@text@case@aux@ {\str_set:Nx \reserved@a {\localeinfo *{tag.bcp47}}}}{}}{}. l. ...\makeatletter\show\@kernel@after@begindocument \makeatother (minimal.cls diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg index bd576cc15..203c8a5be 100644 --- a/base/testfiles/tlb-rollback-005.tlg +++ b/base/testfiles/tlb-rollback-005.tlg @@ -1,7 +1,7 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. > \@kernel@after@begindocument=macro: -->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: . +->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: \@ifpackageloaded {babel}{\@ifpackagelater {babel}{....-..-..}{\cs_gset_protected:Npn \@@text@case@aux@ {\str_set:Nx \reserved@a {\localeinfo *{tag.bcp47}}}}{}}{}. l. ...\makeatletter\show\@kernel@after@begindocument \makeatother (latexrelease.sty @@ -1171,7 +1171,7 @@ Now handling font encoding U ... Already applied: [....-..-..] UTF-8 default on input line .... ) > \@kernel@after@begindocument=macro: -->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: . +->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: \@ifpackageloaded {babel}{\@ifpackagelater {babel}{....-..-..}{\cs_gset_protected:Npn \@@text@case@aux@ {\str_set:Nx \reserved@a {\localeinfo *{tag.bcp47}}}}{}}{}. l. ......eatletter\show\@kernel@after@begindocument \makeatother (minimal.cls diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg index 397f552d9..e565cdc9d 100644 --- a/base/testfiles/tlb-rollback-005.xetex.tlg +++ b/base/testfiles/tlb-rollback-005.xetex.tlg @@ -1,7 +1,7 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. > \@kernel@after@begindocument=macro: -->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: . +->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: \@ifpackageloaded {babel}{\@ifpackagelater {babel}{....-..-..}{\cs_gset_protected:Npn \@@text@case@aux@ {\str_set:Nx \reserved@a {\localeinfo *{tag.bcp47}}}}{}}{}. l. ...\makeatletter\show\@kernel@after@begindocument \makeatother (latexrelease.sty @@ -743,7 +743,7 @@ Applying: [....-..-..] UTF-8 default on input line .... Already applied: [....-..-..] UTF-8 default on input line .... ) > \@kernel@after@begindocument=macro: -->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: . +->\prop_map_inline:Nn \l_keys_usage_preamble_prop {\clist_map_inline:nn {##2}{\keys_define:nn {##1}{####1.code:n=\msg_error:nnn {keys}{preamble-only}{####1}}}}\__hook_cmd_begindocument_code: \bool_gset_true:N \g__pdf_init_bool \group_begin: \cs_set_protected:Npn \__text_tmp:w ##1{\tl_clear:N \l_text_expand_exclude_tl \tl_map_inline:nn {##1}{\bool_lazy_any:nF {{\token_if_protected_macro_p:N ####1}{\token_if_protected_long_macro_p:N ####1}{\str_if_eq_p:ee {\cs_replacement_spec:N ####1}{\exp_not:n {\protect ####1}\c_space_tl }}}{\tl_put_right:Nn \l_text_expand_exclude_tl {####1}}}}\exp_args:NV \__text_tmp:w \l_text_expand_exclude_tl \exp_args:NNNV \group_end: \tl_set:Nn \l_text_expand_exclude_tl \l_text_expand_exclude_tl \group_begin: \cs_set_protected:Npn \__text_change_case_setup:Nn ##1##2{\quark_if_recursion_tail_stop:N ##1\tl_if_single_token:nT {##2}{\cs_if_exist:cF {c__text_uppercase_\token_to_str:N ##1_tl}{\tl_const:cn {c__text_uppercase_\token_to_str:N ##1_tl}{##2}}\cs_if_exist:cF {c__text_lowercase_\token_to_str:N ##2_tl}{\tl_const:cn {c__text_lowercase_\token_to_str:N ##2_tl}{##1}}}\__text_change_case_setup:Nn }\exp_after:wN \__text_change_case_setup:Nn \@uclclist \q_recursion_tail ?\q_recursion_stop \group_end: \@ifpackageloaded {babel}{\@ifpackagelater {babel}{....-..-..}{\cs_gset_protected:Npn \@@text@case@aux@ {\str_set:Nx \reserved@a {\localeinfo *{tag.bcp47}}}}{}}{}. l. ......eatletter\show\@kernel@after@begindocument \makeatother (minimal.cls diff --git a/base/testfiles/tlb1135.tlg b/base/testfiles/tlb1135.tlg index 0ffaf0edc..382d17f4d 100644 --- a/base/testfiles/tlb1135.tlg +++ b/base/testfiles/tlb1135.tlg @@ -9,9 +9,9 @@ Underfull \vbox (badness 10000) has occurred while \output is active .\write-{} .\write-{} .\write-{} -.\marks1{\MakeUppercase {Chapter\ 1. \ Chaptertitle}} +.\marks1{\MakeUppercase []{Chapter\ 1. \ Chaptertitle}} .\marks2{\prg_do_nothing: } -.\mark{{\MakeUppercase {Chapter\ 1. \ Chaptertitle}}{}} +.\mark{{\MakeUppercase []{Chapter\ 1. \ Chaptertitle}}{}} .\write-{} .\write-{} .\glue 0.0 @@ -29,9 +29,9 @@ Completed box being shipped out [1] ...\write-{} ...\write-{} ...\write-{} -...\marks1{\MakeUppercase {Chapter\ 1. \ Chaptertitle}} +...\marks1{\MakeUppercase []{Chapter\ 1. \ Chaptertitle}} ...\marks2{\prg_do_nothing: } -...\mark{{\MakeUppercase {Chapter\ 1. \ Chaptertitle}}{}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ Chaptertitle}}{}} ...\write-{} ...\write-{} ...\glue 0.0 diff --git a/base/testfiles/tlb1519.tlg b/base/testfiles/tlb1519.tlg index 61aa3af01..73cdca652 100644 --- a/base/testfiles/tlb1519.tlg +++ b/base/testfiles/tlb1519.tlg @@ -46,7 +46,7 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 ...\marks2{1.2\hskip 1em\relax And another one} ...\marks3{1.2\hskip 1em\relax And another one} -...\mark{{\MakeUppercase {1\hskip 1em\relax One}}{1.2\hskip 1em\relax And another one}} +...\mark{{\MakeUppercase []{1\hskip 1em\relax One}}{1.2\hskip 1em\relax And another one}} ...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {1.2}And another one}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 6.45831 plus 0.86108 @@ -131,7 +131,7 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 ...\marks2{1.3\hskip 1em\relax And another one} ...\marks3{1.3\hskip 1em\relax And another one} -...\mark{{\MakeUppercase {1\hskip 1em\relax One}}{1.3\hskip 1em\relax And another one}} +...\mark{{\MakeUppercase []{1\hskip 1em\relax One}}{1.3\hskip 1em\relax And another one}} ...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {1.3}And another one}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 6.45831 plus 0.86108 diff --git a/base/testfiles/vlatex02.luatex.tlg b/base/testfiles/vlatex02.luatex.tlg index edbf5f65a..1d0b51ae9 100644 --- a/base/testfiles/vlatex02.luatex.tlg +++ b/base/testfiles/vlatex02.luatex.tlg @@ -536,9 +536,9 @@ Completed box being shipped out [2] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}} -...\marks3{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}} -...\mark{{}{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}}} +...\marks2{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}} +...\marks3{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}} +...\mark{{}{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}\protect \LaTeX {} and \protect \SLiTeX {} logos}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -882,9 +882,9 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} -...\marks3{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} -...\mark{{}{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}}} +...\marks2{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} +...\marks3{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} +...\mark{{}{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -912,10 +912,10 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 ...\glue -9.90276 plus -0.86108 @@ -1070,10 +1070,10 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 ...\penalty 10000 ...\glue 9.90276 plus 0.86108 -...\marks1{\MakeUppercase {List of Figures}} -...\marks2{\MakeUppercase {List of Figures}} -...\marks3{\MakeUppercase {List of Figures}} -...\mark{{\MakeUppercase {List of Figures}}{\MakeUppercase {List of Figures}}} +...\marks1{\MakeUppercase []{List of Figures}} +...\marks2{\MakeUppercase []{List of Figures}} +...\marks3{\MakeUppercase []{List of Figures}} +...\mark{{\MakeUppercase []{List of Figures}}{\MakeUppercase []{List of Figures}}} ...\penalty 10000 ...\glue 0.0 plus 0.2 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/base/testfiles/vlatex02.tlg b/base/testfiles/vlatex02.tlg index 192940f2a..2c5aad8e8 100644 --- a/base/testfiles/vlatex02.tlg +++ b/base/testfiles/vlatex02.tlg @@ -467,9 +467,9 @@ Completed box being shipped out [2] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}} -...\marks3{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}} -...\mark{{}{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}}} +...\marks2{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}} +...\marks3{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}} +...\mark{{}{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} and \protect \SLiTeX {} logos}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}\protect \LaTeX {} and \protect \SLiTeX {} logos}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -772,9 +772,9 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} -...\marks3{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} -...\mark{{}{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}}} +...\marks2{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} +...\marks3{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} +...\mark{{}{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -797,10 +797,10 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 ...\glue -9.90276 plus -0.86108 @@ -936,10 +936,10 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 ...\penalty 10000 ...\glue 9.90276 plus 0.86108 -...\marks1{\MakeUppercase {List of Figures}} -...\marks2{\MakeUppercase {List of Figures}} -...\marks3{\MakeUppercase {List of Figures}} -...\mark{{\MakeUppercase {List of Figures}}{\MakeUppercase {List of Figures}}} +...\marks1{\MakeUppercase []{List of Figures}} +...\marks2{\MakeUppercase []{List of Figures}} +...\marks3{\MakeUppercase []{List of Figures}} +...\mark{{\MakeUppercase []{List of Figures}}{\MakeUppercase []{List of Figures}}} ...\penalty 10000 ...\glue 0.0 plus 0.2 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/base/testfiles/vlatex06-2015.luatex.tlg b/base/testfiles/vlatex06-2015.luatex.tlg index 94c694f41..c8efa9932 100644 --- a/base/testfiles/vlatex06-2015.luatex.tlg +++ b/base/testfiles/vlatex06-2015.luatex.tlg @@ -38,9 +38,9 @@ Completed box being shipped out [1] ...\write-{} ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1}First chapter}{\thepage }{}\protected@file@percent }} -...\marks1{\MakeUppercase {Chapter\ 1. \ First chapter}} +...\marks1{\MakeUppercase []{Chapter\ 1. \ First chapter}} ...\marks2{\prg_do_nothing: } -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{}} ...\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}} ...\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}} ...\glue(\topskip) 10.0 @@ -162,9 +162,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.1. \ First section}} -...\marks3{\MakeUppercase {1.1. \ First section}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.1. \ First section}}} +...\marks2{\MakeUppercase []{1.1. \ First section}} +...\marks3{\MakeUppercase []{1.1. \ First section}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.1. \ First section}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.1}First section}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -425,9 +425,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\marks3{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} +...\marks2{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\marks3{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.2}Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -3311,9 +3311,9 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\marks3{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} +...\marks2{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\marks3{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.5}Are `\{' and `\}' fragile?}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -4043,10 +4043,10 @@ Completed box being shipped out [7] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 diff --git a/base/testfiles/vlatex06-2015.tlg b/base/testfiles/vlatex06-2015.tlg index 636e0d1eb..4e4149a7a 100644 --- a/base/testfiles/vlatex06-2015.tlg +++ b/base/testfiles/vlatex06-2015.tlg @@ -38,9 +38,9 @@ Completed box being shipped out [1] ...\write-{} ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1}First chapter}{\thepage }{}\protected@file@percent }} -...\marks1{\MakeUppercase {Chapter\ 1. \ First chapter}} +...\marks1{\MakeUppercase []{Chapter\ 1. \ First chapter}} ...\marks2{\prg_do_nothing: } -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{}} ...\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}} ...\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}} ...\glue(\topskip) 10.0 @@ -136,9 +136,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.1. \ First section}} -...\marks3{\MakeUppercase {1.1. \ First section}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.1. \ First section}}} +...\marks2{\MakeUppercase []{1.1. \ First section}} +...\marks3{\MakeUppercase []{1.1. \ First section}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.1. \ First section}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.1}First section}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -362,9 +362,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\marks3{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} +...\marks2{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\marks3{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.2}Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -2907,9 +2907,9 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\marks3{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} +...\marks2{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\marks3{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.5}Are `\{' and `\}' fragile?}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -3567,10 +3567,10 @@ Completed box being shipped out [7] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 diff --git a/base/testfiles/vlatex06.luatex.tlg b/base/testfiles/vlatex06.luatex.tlg index 2e2db7a14..30e9aaf26 100644 --- a/base/testfiles/vlatex06.luatex.tlg +++ b/base/testfiles/vlatex06.luatex.tlg @@ -40,9 +40,9 @@ Completed box being shipped out [1] ...\write-{} ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1}First chapter}{\thepage }}} -...\marks1{\MakeUppercase {Chapter\ 1. \ First chapter}} +...\marks1{\MakeUppercase []{Chapter\ 1. \ First chapter}} ...\marks2{\prg_do_nothing: } -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{}} ...\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}} ...\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}} ...\glue(\topskip) 10.0 @@ -160,9 +160,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.1. \ First section}} -...\marks3{\MakeUppercase {1.1. \ First section}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.1. \ First section}}} +...\marks2{\MakeUppercase []{1.1. \ First section}} +...\marks3{\MakeUppercase []{1.1. \ First section}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.1. \ First section}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.1}First section}{\thepage }}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -416,9 +416,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\marks3{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} +...\marks2{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\marks3{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.2}Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}{\thepage }}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -3256,9 +3256,9 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\marks3{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} +...\marks2{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\marks3{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.5}Are `\{' and `\}' fragile?}{\thepage }}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -3972,10 +3972,10 @@ Completed box being shipped out [7] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 diff --git a/base/testfiles/vlatex06.tlg b/base/testfiles/vlatex06.tlg index cb8f404dd..2bc2f1b42 100644 --- a/base/testfiles/vlatex06.tlg +++ b/base/testfiles/vlatex06.tlg @@ -40,9 +40,9 @@ Completed box being shipped out [1] ...\write-{} ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1}First chapter}{\thepage }}} -...\marks1{\MakeUppercase {Chapter\ 1. \ First chapter}} +...\marks1{\MakeUppercase []{Chapter\ 1. \ First chapter}} ...\marks2{\prg_do_nothing: } -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{}} ...\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}} ...\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}} ...\glue(\topskip) 10.0 @@ -134,9 +134,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.1. \ First section}} -...\marks3{\MakeUppercase {1.1. \ First section}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.1. \ First section}}} +...\marks2{\MakeUppercase []{1.1. \ First section}} +...\marks3{\MakeUppercase []{1.1. \ First section}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.1. \ First section}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.1}First section}{\thepage }}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -353,9 +353,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\marks3{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} +...\marks2{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\marks3{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.2}Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}{\thepage }}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -2852,9 +2852,9 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\marks3{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} +...\marks2{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\marks3{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.5}Are `\{' and `\}' fragile?}{\thepage }}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -3496,10 +3496,10 @@ Completed box being shipped out [7] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 diff --git a/base/testfiles/vtl2e02.luatex.tlg b/base/testfiles/vtl2e02.luatex.tlg index 94028b734..68ffcfae9 100644 --- a/base/testfiles/vtl2e02.luatex.tlg +++ b/base/testfiles/vtl2e02.luatex.tlg @@ -474,9 +474,9 @@ Completed box being shipped out [2] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} logo}} -...\marks3{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} logo}} -...\mark{{}{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} logo}}} +...\marks2{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} logo}} +...\marks3{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} logo}} +...\mark{{}{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} logo}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}\protect \LaTeX {} logo}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -816,9 +816,9 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} -...\marks3{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} -...\mark{{}{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}}} +...\marks2{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} +...\marks3{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} +...\mark{{}{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -846,10 +846,10 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 ...\glue -9.90276 plus -0.86108 @@ -984,10 +984,10 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 ...\penalty 10000 ...\glue 9.90276 plus 0.86108 -...\marks1{\MakeUppercase {List of Figures}} -...\marks2{\MakeUppercase {List of Figures}} -...\marks3{\MakeUppercase {List of Figures}} -...\mark{{\MakeUppercase {List of Figures}}{\MakeUppercase {List of Figures}}} +...\marks1{\MakeUppercase []{List of Figures}} +...\marks2{\MakeUppercase []{List of Figures}} +...\marks3{\MakeUppercase []{List of Figures}} +...\mark{{\MakeUppercase []{List of Figures}}{\MakeUppercase []{List of Figures}}} ...\penalty 10000 ...\glue 0.0 plus 0.2 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/base/testfiles/vtl2e02.tlg b/base/testfiles/vtl2e02.tlg index 87fd524b7..23658c801 100644 --- a/base/testfiles/vtl2e02.tlg +++ b/base/testfiles/vtl2e02.tlg @@ -410,9 +410,9 @@ Completed box being shipped out [2] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} logo}} -...\marks3{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} logo}} -...\mark{{}{\MakeUppercase {1\hskip 1em\relax \protect \LaTeX {} logo}}} +...\marks2{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} logo}} +...\marks3{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} logo}} +...\mark{{}{\MakeUppercase []{1\hskip 1em\relax \protect \LaTeX {} logo}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}\protect \LaTeX {} logo}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -711,9 +711,9 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} -...\marks3{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} -...\mark{{}{\MakeUppercase {2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}}} +...\marks2{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} +...\marks3{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}} +...\mark{{}{\MakeUppercase []{2\hskip 1em\relax Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}Line\protect \nobreakspace {}1\protect \\line\protect \nobreakspace {}2}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -736,10 +736,10 @@ Completed box being shipped out [3] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 ...\glue -9.90276 plus -0.86108 @@ -857,10 +857,10 @@ Completed box being shipped out [3] ....\glue(\rightskip) 0.0 ...\penalty 10000 ...\glue 9.90276 plus 0.86108 -...\marks1{\MakeUppercase {List of Figures}} -...\marks2{\MakeUppercase {List of Figures}} -...\marks3{\MakeUppercase {List of Figures}} -...\mark{{\MakeUppercase {List of Figures}}{\MakeUppercase {List of Figures}}} +...\marks1{\MakeUppercase []{List of Figures}} +...\marks2{\MakeUppercase []{List of Figures}} +...\marks3{\MakeUppercase []{List of Figures}} +...\mark{{\MakeUppercase []{List of Figures}}{\MakeUppercase []{List of Figures}}} ...\penalty 10000 ...\glue 0.0 plus 0.2 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/base/testfiles/vtl2e06.luatex.tlg b/base/testfiles/vtl2e06.luatex.tlg index 46827ff8a..71efc5ba4 100644 --- a/base/testfiles/vtl2e06.luatex.tlg +++ b/base/testfiles/vtl2e06.luatex.tlg @@ -36,9 +36,9 @@ Completed box being shipped out [1] ...\write-{} ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1}First chapter}{\thepage }{}\protected@file@percent }} -...\marks1{\MakeUppercase {Chapter\ 1. \ First chapter}} +...\marks1{\MakeUppercase []{Chapter\ 1. \ First chapter}} ...\marks2{\prg_do_nothing: } -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{}} ...\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}} ...\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}} ...\glue(\topskip) 10.0 @@ -160,9 +160,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.1. \ First section}} -...\marks3{\MakeUppercase {1.1. \ First section}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.1. \ First section}}} +...\marks2{\MakeUppercase []{1.1. \ First section}} +...\marks3{\MakeUppercase []{1.1. \ First section}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.1. \ First section}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.1}First section}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -423,9 +423,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\marks3{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} +...\marks2{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\marks3{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.2}Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -3307,9 +3307,9 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\marks3{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} +...\marks2{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\marks3{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.5}Are `\{' and `\}' fragile?}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -3997,10 +3997,10 @@ Completed box being shipped out [7] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 diff --git a/base/testfiles/vtl2e06.tlg b/base/testfiles/vtl2e06.tlg index db2909379..473fa54ab 100644 --- a/base/testfiles/vtl2e06.tlg +++ b/base/testfiles/vtl2e06.tlg @@ -36,9 +36,9 @@ Completed box being shipped out [1] ...\write-{} ...\write-{} ...\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1}First chapter}{\thepage }{}\protected@file@percent }} -...\marks1{\MakeUppercase {Chapter\ 1. \ First chapter}} +...\marks1{\MakeUppercase []{Chapter\ 1. \ First chapter}} ...\marks2{\prg_do_nothing: } -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{}} ...\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}} ...\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}} ...\glue(\topskip) 10.0 @@ -134,9 +134,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.1. \ First section}} -...\marks3{\MakeUppercase {1.1. \ First section}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.1. \ First section}}} +...\marks2{\MakeUppercase []{1.1. \ First section}} +...\marks3{\MakeUppercase []{1.1. \ First section}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.1. \ First section}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.1}First section}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -360,9 +360,9 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\marks3{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} -...\mark{{\MakeUppercase {Chapter\ 1. \ First chapter}}{\MakeUppercase {1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} +...\marks2{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\marks3{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}} +...\mark{{\MakeUppercase []{Chapter\ 1. \ First chapter}}{\MakeUppercase []{1.2. \ Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.2}Do $\protect \longrightarrow $ and $\protect \longleftarrow $ or $\protect \longleftrightarrow $ need protect'ing?}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -2903,9 +2903,9 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\marks2{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\marks3{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} -...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase {1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} +...\marks2{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\marks3{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}} +...\mark{{{\protect \bf section\ 1.3}\hfil MY HEADINGS}{\MakeUppercase []{1.5. \ Are `\{' and `\}' fragile?\label {last:section}}}} ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.5}Are `\{' and `\}' fragile?}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 @@ -3531,10 +3531,10 @@ Completed box being shipped out [7] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 plus 1.0fil -...\marks1{\MakeUppercase {Contents}} -...\marks2{\MakeUppercase {Contents}} -...\marks3{\MakeUppercase {Contents}} -...\mark{{\MakeUppercase {Contents}}{\MakeUppercase {Contents}}} +...\marks1{\MakeUppercase []{Contents}} +...\marks2{\MakeUppercase []{Contents}} +...\marks3{\MakeUppercase []{Contents}} +...\mark{{\MakeUppercase []{Contents}}{\MakeUppercase []{Contents}}} ...\penalty 10000 ...\glue 40.0 ...\glue 10.00002 plus 1.0 diff --git a/required/latex-lab/testfiles-OR/github-001.tlg b/required/latex-lab/testfiles-OR/github-001.tlg index 732daa285..5aa6153da 100644 --- a/required/latex-lab/testfiles-OR/github-001.tlg +++ b/required/latex-lab/testfiles-OR/github-001.tlg @@ -1549,9 +1549,9 @@ Completed box being shipped out [1] ......\write-{} ......\write-{} ......\write1{\@writefile{toc}{\protect \contentsline {chapter}{\protect \numberline {1}Hello}{\thepage }{}\protected@file@percent }} -......\marks1{\MakeUppercase {Chapter\ 1. \ Hello}} +......\marks1{\MakeUppercase []{Chapter\ 1. \ Hello}} ......\marks2{\prg_do_nothing: } -......\mark{{\MakeUppercase {Chapter\ 1. \ Hello}}{}} +......\mark{{\MakeUppercase []{Chapter\ 1. \ Hello}}{}} ......\write1{\@writefile{lof}{\protect \addvspace {10\p@ }}} ......\write1{\@writefile{lot}{\protect \addvspace {10\p@ }}} ......\glue(\topskip) 0.144 @@ -1572,9 +1572,9 @@ Completed box being shipped out [1] .......\penalty 10000 .......\glue(\parfillskip) 0.0 plus 1.0fil .......\glue(\rightskip) 0.0 -......\marks2{\MakeUppercase {1.1. \ Test 1}} -......\marks3{\MakeUppercase {1.1. \ Test 1}} -......\mark{{\MakeUppercase {Chapter\ 1. \ Hello}}{\MakeUppercase {1.1. \ Test 1}}} +......\marks2{\MakeUppercase []{1.1. \ Test 1}} +......\marks3{\MakeUppercase []{1.1. \ Test 1}} +......\mark{{\MakeUppercase []{Chapter\ 1. \ Hello}}{\MakeUppercase []{1.1. \ Test 1}}} ......\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1.1}Test 1}{\thepage }{}\protected@file@percent }} ......\penalty 10000 ......\glue 11.88335 plus 1.03331