[latex3-commits] [l3svn] 06/06: Use (internal) \char_generate:nn for pdfTeX UTF-8 support

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit 0f0b22f2e0d47c651c7fd24661b45ab27f0e73cd
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Mar 25 21:09:37 2016 +0000

    Use (internal) \char_generate:nn for pdfTeX UTF-8 support
---
 l3kernel/l3candidates.dtx |   62 +++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/l3kernel/l3candidates.dtx b/l3kernel/l3candidates.dtx
index 8529322..065a252 100644
--- a/l3kernel/l3candidates.dtx
+++ b/l3kernel/l3candidates.dtx
@@ -3890,17 +3890,18 @@
         { \tl_const:Nx #1 { \utex_char:D "#2 ~ } }
     }
     {
-      \char_set_catcode_active:N .
-      \char_set_catcode_active:N !
       \cs_set_protected:Npn \@@_tmp:w #1#2
         {
           \group_begin:
             \cs_set_protected:Npn \@@_tmp:w ##1##2##3
               {
-                \char_set_lccode:nn { `\. } {##2}
-                \char_set_lccode:nn { `\! } {##3}
-                \tex_lowercase:D
-                  { \tl_const:Nn #1 { . ! } }
+                \tl_const:Nx #1
+                  {
+                    \exp_after:wN \exp_after:wN \exp_after:wN
+                      \exp_not:N \__char_generate:nn {##2} { 13 }
+                    \exp_after:wN \exp_after:wN \exp_after:wN
+                      \exp_not:N \__char_generate:nn {##3} { 13 }
+                  }
               }
             \tl_set:Nx \l_@@_internal_a_tl
               { \__unicode_codepoint_to_UTFviii:n {"#2} }
@@ -3923,10 +3924,6 @@
 % octets, so that is taken as read.
 %    \begin{macrocode}
 \group_begin:
-  \char_set_catcode_active:N .
-  \char_set_catcode_active:N !
-  \char_set_catcode_active:N ;
-  \char_set_catcode_active:N ,
   \bool_if:nT
     {
       \sys_if_engine_pdftex_p: || \sys_if_engine_uptex_p:
@@ -3945,16 +3942,31 @@
         }
       \cs_set_protected:Npn \@@_tmp:w #1#2#3#4#5#6
         {
-          \char_set_lccode:nn { `\. } {#2}
-          \char_set_lccode:nn { `\! } {#3}
-          \char_set_lccode:nn { `\; } {#5}
-          \char_set_lccode:nn { `\, } {#6}
-          \tex_lowercase:D
+          \tl_const:cx
+            {
+              c__unicode_lower_
+              \char_generate:nn {#2} { 12 }
+              \char_generate:nn {#3} { 12 }
+              _tl
+            }
+            {
+              \exp_after:wN \exp_after:wN \exp_after:wN
+                \exp_not:N \__char_generate:nn {#5} { 13 }
+              \exp_after:wN \exp_after:wN \exp_after:wN
+                \exp_not:N \__char_generate:nn {#6} { 13 }
+            }
+          \tl_const:cx
+            {
+              c__unicode_upper_
+              \char_generate:nn {#5} { 12 }
+              \char_generate:nn {#6} { 12 }
+              _tl
+            }
             {
-              \tl_const:cn { c__unicode_lower_ \tl_to_str:n { . ! } _tl }
-                { ; , }
-              \tl_const:cn { c__unicode_upper_ \tl_to_str:n { ; , } _tl }
-                { . ! }
+              \exp_after:wN \exp_after:wN \exp_after:wN
+                \exp_not:N \__char_generate:nn {#2} { 13 }
+              \exp_after:wN \exp_after:wN \exp_after:wN
+                \exp_not:N \__char_generate:nn {#3} { 13 }
             }
         }
       \@@_loop:nn
@@ -4064,14 +4076,14 @@
           \group_begin:
             \cs_set_protected:Npn \@@_tmp:w ##1##2##3
               {
-                \char_set_lccode:nn { `\. } {##2}
-                \char_set_lccode:nn { `\! } {##3}
-                \tex_lowercase:D
+                \tl_const:cx
                   {
-                    \tl_const:cn
-                      { c__unicode_ #3 _ \tl_to_str:n { . ! } _tl }
+                    c__unicode_ #3 _
+                    \char_generate:nn {##2} { 12 }
+                    \char_generate:nn {##3} { 12 }
+                    _tl
                   }
-                    { #2 }
+                    {#2}
               }
             \tl_set:Nx \l_@@_internal_a_tl
               { \__unicode_codepoint_to_UTFviii:n { "#1 } }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.