Do not change case of jachar

h20y6m · Dec 24, 2022 · 557d84a · 557d84a
1 parent 51ecfb0
commit 557d84a
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 9 deletions.
diff --git a/plexpl3.dtx b/plexpl3.dtx
@@ -307,6 +307,44 @@
   }
 %    \end{macrocode}
 %
+% \subsubsection{Fix for the case-change funcrtions}
+%
+% Do not change case of jachar.
+%    \begin{macrocode}
+\bool_lazy_or:nnT
+  { \sys_if_engine_ptex_p: }
+  { \sys_if_engine_uptex_p: }
+  {
+    \cs_new_eq:NN \@@_change_case_codepoint_lower_non_jachar:nnn
+      \@@_change_case_codepoint_lower:nnn
+    \cs_new_eq:NN \@@_change_case_codepoint_upper_non_jachar:nnn
+      \@@_change_case_codepoint_upper:nnn
+    \cs_new_eq:NN \@@_change_case_codepoint_title_non_jachar:nnn
+      \@@_change_case_codepoint_title:nnn
+    \cs_new_eq:NN \@@_change_case_codepoint_titleonly_non_jachar:nnn
+      \@@_change_case_codepoint_titleonly:nnn
+    \cs_gset:Npn \@@_change_case_codepoint_lower:nnn #1#2#3
+      { \@@_change_case_codepoint_jachar:nnnn {#1} {#1} {#2} {#3} }
+    \cs_gset:Npn \@@_change_case_codepoint_upper:nnn #1#2#3
+      { \@@_change_case_codepoint_jachar:nnnn {#1} {#1} {#2} {#3} }
+    \cs_gset:Npn \@@_change_case_codepoint_title:nnn #1#2#3
+      { \@@_change_case_codepoint_jachar:nnnn {#1} { lower } {#2} {#3} }
+    \cs_gset:Npn \@@_change_case_codepoint_titleonly:nnn #1#2#3
+      { \@@_change_case_codepoint_jachar:nnnn {#1} { end } {#2} {#3} }
+    \cs_new:Npn \@@_change_case_codepoint_jachar:nnnn #1#2#3#4
+      {
+        \bool_lazy_and:nnTF
+          { \tl_if_single_p:n {#4} }
+          { \token_if_jachar_p:N #4 }
+          {
+            \@@_change_case_store:n {#4}
+            \use:c { @@_change_case_next_ #2 :nn } {#2} {#3}
+          }
+          { \use:c { @@_change_case_codepoint_ #1 _non_jachar:nnn } {#1} {#3} {#4} }
+      }
+  }
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %<@@=>
 %    \end{macrocode}

diff --git a/testfiles/pl3text001.tlg b/testfiles/pl3text001.tlg
@@ -20,8 +20,8 @@ ABCXYZ+?
 2×^^c3^^98^^c3^^99^^c3^^9d^^c3^^9eSS
 ^^c3^^83^^c3^^86^^c3^^87^^c3^^89^^c3^^8c^^c3^^90^^c3^^94÷^^c3^^98^^c3^^9b^^c3^^9e^^c5^^b8
 ^^c4^^82^^c4^^98^^c5^^81^^c5^^8a^^c5^^90^^c4^^84^^c4^^9a^^c4^^9e^^c5^^8a^^c5^^9e^^c5^^ae^^c5^^bb
-\cGrek {ΑΒΓΩ^^ce^^91^^ce^^92^^ce^^93^^ce^^a9}
-\cCyrl {АБВ^^d0^^89^^d0^^87Я^^d0^^90^^d0^^91^^d0^^92^^d2^^90^^d0^^8f^^d0^^af}
+\cGrek {ΑΒΓΩαβγω}
+\cCyrl {АБВ^^d0^^89^^d0^^87Яабв^^d2^^90^^d0^^8fя}
 ‰
 ============================================================
 ============================================================
@@ -32,8 +32,7 @@ abcxyz+?
 2×^^c3^^b8^^c3^^b9^^c3^^bd^^c3^^be^^c3^^9f
 ^^c3^^a3^^c3^^a6^^c3^^a7^^c3^^a9^^c3^^ac^^c3^^b0^^c3^^b4÷^^c3^^b8^^c3^^bb^^c3^^be^^c3^^bf
 ^^c4^^83^^c4^^99^^c5^^82^^c5^^8b^^c5^^91^^c4^^85^^c4^^9b^^c4^^9f^^c5^^8b^^c5^^9f^^c5^^af^^c5^^bc
-\cGrek {^^ce^^b1^^ce^^b2^^ce^^b3^^cf^^89αβγω}
-\cCyrl {^^d0^^b0^^d0^^b1^^d0^^b2^^d1^^99^^d1^^97^^d1^^8fабв^^d2^^91^^d1^^9f
-я}
+\cGrek {ΑΒΓΩαβγω}
+\cCyrl {АБВ^^d1^^99^^d1^^97Яабв^^d2^^91^^d1^^9fя}
 ‰
 ============================================================
diff --git a/testfiles/pl3text001.uptex.tlg b/testfiles/pl3text001.uptex.tlg
@@ -18,8 +18,8 @@ ABCXYZ+?
 £§±¶½^^c3^^85^^c3^^86^^c3^^87^^c3^^8a^^c3^^8f^^c3^^90^^c3^^91^^c3^^92×^^c3^^98^^c3^^99^^c3^^9d^^c3^^9eSS
 ^^c3^^83^^c3^^86^^c3^^87^^c3^^89^^c3^^8c^^c3^^90^^c3^^94÷^^c3^^98^^c3^^9b^^c3^^9e^^c5^^b8
 ^^c4^^82^^c4^^98^^c5^^81^^c5^^8a^^c5^^90^^c4^^84^^c4^^9a^^c4^^9e^^c5^^8a^^c5^^9e^^c5^^ae^^c5^^bb
-\cGrek {ΑΒΓΩ^^ce^^91^^ce^^92^^ce^^93^^ce^^a9}
-\cCyrl {АБВЉЇЯ^^d0^^90^^d0^^91^^d0^^92^^d2^^90^^d0^^8f^^d0^^af}
+\cGrek {ΑΒΓΩαβγω}
+\cCyrl {АБВЉЇЯабвґџя}
 ‰
 ============================================================
 ============================================================
@@ -29,7 +29,7 @@ abcxyz+?
 £§±¶½^^c3^^a5^^c3^^a6^^c3^^a7^^c3^^aa^^c3^^af^^c3^^b0^^c3^^b1^^c3^^b2×^^c3^^b8^^c3^^b9^^c3^^bd^^c3^^be^^c3^^9f
 ^^c3^^a3^^c3^^a6^^c3^^a7^^c3^^a9^^c3^^ac^^c3^^b0^^c3^^b4÷^^c3^^b8^^c3^^bb^^c3^^be^^c3^^bf
 ^^c4^^83^^c4^^99^^c5^^82^^c5^^8b^^c5^^91^^c4^^85^^c4^^9b^^c4^^9f^^c5^^8b^^c5^^9f^^c5^^af^^c5^^bc
-\cGrek {^^ce^^b1^^ce^^b2^^ce^^b3^^cf^^89αβγω}
-\cCyrl {^^d0^^b0^^d0^^b1^^d0^^b2^^d1^^99^^d1^^97^^d1^^8fабвґџя}
+\cGrek {ΑΒΓΩαβγω}
+\cCyrl {АБВЉЇЯабвґџя}
 ‰
 ============================================================