From eeb0596588d5082d22a2106d7afbf0c4e9c5556f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 3 Feb 2023 22:05:21 +0000 Subject: l3kernel (3feb23) git-svn-id: svn://tug.org/texlive/trunk@65721 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 92 ++++++++++++++-------- .../tex/latex/l3kernel/expl3-generic.tex | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.ltx | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 +- 4 files changed, 62 insertions(+), 36 deletions(-) (limited to 'Master/texmf-dist/tex/latex/l3kernel') diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 6419c220d6b..d14778dad58 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -71,7 +71,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-02-01}% +\def\ExplFileDate{2023-02-02}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -33502,7 +33502,8 @@ Type H for immediate help}\def~{\errmessage{% { \__text_change_case_store:e { - \use:c { __text_change_case_upper_ #3 :n } {#4} + \codepoint_generate:nn { "0399 } + { \char_value_catcode:n { "0399 } } } \__text_change_case_loop:nnw {#2} {#3} } @@ -33511,13 +33512,6 @@ Type H for immediate help}\def~{\errmessage{% } \cs_new_eq:cN { __text_change_case_upper_el-x-iota:nnnn } \__text_change_case_upper_el:nnnn -\cs_new:Npn \__text_change_case_upper_el:n #1 - { - \codepoint_generate:nn { "0399 } - { \char_value_catcode:n { "0399 } } - } -\cs_new:cpn { __text_change_case_upper_el-x-iota:n } #1 - { \exp_not:n {#1} } \cs_new:Npn \__text_change_case_upper_el:nnn #1#2#3 { \__text_codepoint_process:nN @@ -33565,15 +33559,15 @@ Type H for immediate help}\def~{\errmessage{% \cs_new:Npn \__text_change_case_upper_el_ypogegrammeni:nnnnnN #1#2#3#4#5#6 { \token_if_cs:NTF #6 - { \__text_change_case_upper_el_aux:nnnN {#1} {#2} {#3} #4#5 #6 } + { \__text_change_case_upper_el_aux:nnnN {#1} {#2} {#3} #4#5 } { \__text_codepoint_process:nN { \__text_change_case_upper_el_ypogegrammeni:nnnnnn {#1} {#2} {#3} {#4} {#5} } - #6 } + #6 } \cs_new:Npn \__text_change_case_upper_el_ypogegrammeni:nnnnnn #1#2#3#4#5#6 { @@ -33603,23 +33597,23 @@ Type H for immediate help}\def~{\errmessage{% \__text_codepoint_compare:nNnTF {#4} = { "0308 } { \__text_change_case_upper_el_dialytika:nnn {#2} {#3} {#1} } { - \__text_change_case_if_greek_accent:nTF {#4} + \__text_change_case_if_greek_accent:nTF {#4} { \__text_change_case_upper_el_hiatus:nnnw {#2} {#3} {#1} } { \__text_change_case_if_greek_diacritic:nTF {#4} - { - \__text_change_case_store:e - { \__text_change_case_codepoint:nn { upper } {#1} } - \__text_change_case_loop:nnw {#2} {#3} - } + { \__text_change_case_upper_el:nnn {#1} {#2} {#3} } { \__text_codepoint_compare:nNnTF {#4} = { "0345 } - { \__text_change_case_store:e { [XXX] } } + { + \__text_change_case_store:e + { \use:c { __text_change_case_upper_ #3 _ypogegrammeni:n } {#1} } + \__text_change_case_loop:nnw {#2} {#3} + } { \__text_change_case_store:e { \__text_change_case_codepoint:nn { upper } {#1} } + \__text_change_case_loop:nnw {#2} {#3} #4 } - \__text_change_case_loop:nnw {#2} {#3} #4 } } } @@ -33653,32 +33647,62 @@ Type H for immediate help}\def~{\errmessage{% } \cs_new:Npn \__text_change_case_upper_el_hiatus:nnnw #1#2#3#4 \q__text_recursion_stop - { - \__text_change_case_store:e - { \__text_change_case_codepoint:nn { upper } {#3} } + { \tl_if_head_is_N_type:nTF {#4} - { \__text_change_case_upper_el_hiatus:nnN } - { \__text_change_case_loop:nnw } + { \__text_change_case_upper_el_hiatus:nnnN {#3} } + { + \__text_change_case_store:e + { \__text_change_case_codepoint:nn { upper } {#3} } + \__text_change_case_loop:nnw + } {#1} {#2} #4 \q__text_recursion_stop } -\cs_new:Npn \__text_change_case_upper_el_hiatus:nnN #1#2#3 +\cs_new:Npn \__text_change_case_upper_el_hiatus:nnnN #1#2#3#4 { - \token_if_cs:NTF #3 - { \__text_change_case_loop:nnw {#1} {#2} #3 } + \token_if_cs:NTF #4 + { + \__text_change_case_store:e + { \__text_change_case_codepoint:nn { upper } {#1} } + \__text_change_case_loop:nnw {#2} {#3} #4 + } { \__text_codepoint_process:nN - { \__text_change_case_upper_el_hiatus:nnn {#1} {#2} } #3 + { \__text_change_case_upper_el_hiatus:nnnn {#1} {#2} {#3} } #4 } } -\cs_new:Npn \__text_change_case_upper_el_hiatus:nnn #1#2#3 +\cs_new:Npn \__text_change_case_upper_el_hiatus:nnnn #1#2#3#4 { - \__text_change_case_if_takes_dialytika:nTF {#3} + \__text_change_case_if_takes_dialytika:nTF {#4} + { + \__text_change_case_store:e + { \__text_change_case_codepoint:nn { upper } {#1} } + \__text_change_case_upper_el_dialytika:n {#4} + \__text_change_case_upper_el_gobble:nnw {#2} {#3} + } + { \__text_change_case_upper_el:nnn {#1} {#2} {#3} #4 } + } +\cs_new:Npn \__text_change_case_upper_el_ypogegrammeni:n #1 + { + \__text_change_case_codepoint:nn { upper } {#1} + \codepoint_generate:nn { "0399 } + { \char_value_catcode:n { "0399 } } + } +\cs_new:cpn { __text_change_case_upper_el-x-iota_ypogegrammeni:n } #1 + { + \int_case:nnF + { \__text_codepoint_from_chars:Nw #1 } { - \__text_change_case_upper_el_dialytika:n {#3} - \__text_change_case_upper_el_gobble:nnw {#1} {#2} + { "0391 } { \__text_change_case_upper_el_ypogegrammeni_aux:n { "1FBC } } + { "03B1 } { \__text_change_case_upper_el_ypogegrammeni_aux:n { "1FBC } } + { "0397 } { \__text_change_case_upper_el_ypogegrammeni_aux:n { "1FCC } } + { "03B7 } { \__text_change_case_upper_el_ypogegrammeni_aux:n { "1FCC } } + { "03A9 } { \__text_change_case_upper_el_ypogegrammeni_aux:n { "1FFC } } + { "03C9 } { \__text_change_case_upper_el_ypogegrammeni_aux:n { "1FFC } } } - { \__text_change_case_loop:nnw {#1} {#2} #3 } + { \__text_change_case_upper_el_ypogegrammeni:n {#1} } } +\cs_new:Npn \__text_change_case_upper_el_ypogegrammeni_aux:n #1 + { \codepoint_generate:nn {#1} { \char_value_catcode:n {#1} } } \cs_new:Npn \__text_change_case_upper_el_gobble:nnw #1#2#3 \q__text_recursion_stop { @@ -33851,6 +33875,8 @@ Type H for immediate help}\def~{\errmessage{% { \__text_change_case_loop:nnw } {#2} {#3} #4 \q__text_recursion_stop } +\cs_new_eq:cN { __text_change_case_boundary_upper_el-x-iota:Nnnw } + \__text_change_case_boundary_upper_el:Nnnw \cs_new:Npn \__text_change_case_boundary_upper_el:nnN #1#2#3 { \token_if_cs:NTF #3 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 41bcbbe342f..4831717dd08 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-02-01}% +\def\ExplFileDate{2023-02-02}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index a1adcd5fad4..3e19ca6113b 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-02-01}% +\def\ExplFileDate{2023-02-02}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index 193c8bca10d..eba92f1b632 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2023-02-01}% +\def\ExplFileDate{2023-02-02}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% -- cgit v1.2.3