diff options
author | Karl Berry <karl@freefriends.org> | 2018-11-20 22:02:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-11-20 22:02:39 +0000 |
commit | b6f9a8150be60baacc19b5035f1e344d14d1582c (patch) | |
tree | 02b435f7462e170e5f491c222bb7523c377a6629 /Master/texmf-dist/source/latex/l3experimental/l3cctab | |
parent | 2b465ca87794c05f1793552a8608392027a2e100 (diff) |
l3 (20nov18)
git-svn-id: svn://tug.org/texlive/trunk@49205 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3experimental/l3cctab')
-rw-r--r-- | Master/texmf-dist/source/latex/l3experimental/l3cctab/l3cctab.dtx | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/l3experimental/l3cctab/l3cctab.dtx b/Master/texmf-dist/source/latex/l3experimental/l3cctab/l3cctab.dtx index 5c1db2f6aaa..7e0820f8b7b 100644 --- a/Master/texmf-dist/source/latex/l3experimental/l3cctab/l3cctab.dtx +++ b/Master/texmf-dist/source/latex/l3experimental/l3cctab/l3cctab.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2018-10-31} +% \date{Released 2018-11-19} % % \maketitle % @@ -148,7 +148,7 @@ % % \begin{macrocode} %<*package> -\ProvidesExplPackage{l3cctab}{2018-10-31}{} +\ProvidesExplPackage{l3cctab}{2018-11-19}{} {L3 Experimental category code tables} %</package> % \end{macrocode} @@ -160,10 +160,8 @@ % tables need to be followed. There is also a sequence stack for the % dynamic tables themselves. % \begin{macrocode} -%<*initex> \int_new:N \g_@@_allocate_int \int_gset:Nn \g_@@_allocate_int { -1 } -%</initex> \int_new:N \g_@@_stack_int \seq_new:N \g_@@_stack_seq % \end{macrocode} @@ -219,7 +217,6 @@ %</initex> %<*package> \newcatcodetable #1 - \tex_initcatcodetable:D #1 %</package> } % \end{macrocode} @@ -268,21 +265,29 @@ % \begin{macrocode} { \cs_new_protected:Npn \@@_gstore:Nnn #1#2#3 - { \intarray_gset:Nnn #1 { #2 + 1 } {#3} } + { + \intarray_gset:cnn + { g_@@_ \int_use:N #1 _cctab } { #2 + 1 } {#3} + } % \end{macrocode} % Following the \LuaTeX{} pattern, a new table starts with \IniTeX{} codes. % \begin{macrocode} \cs_new_protected:Npn \cctab_new:N #1 { - \intarray_new:Nn #1 { 256 } + \int_gadd:Nn \g_@@_allocate_int { 1 } + \int_const:Nn #1 { \g_@@_allocate_int } + \intarray_new:cn { g_@@_ \int_use:N #1 _cctab } { 256 } \int_step_inline:nn { 256 } - { \intarray_gset:Nnn #1 {##1} { 12 } } + { + \intarray_gset:cnn + { g_@@_ \int_use:N #1 _cctab } {##1} { 12 } + } \@@_gstore:Nnn #1 { 0 } { 9 } \@@_gstore:Nnn #1 { 13 } { 5 } \@@_gstore:Nnn #1 { 32 } { 10 } \@@_gstore:Nnn #1 { 37 } { 14 } - \int_step_inline:nnn { 65 } { 90 } - { \intarray_gset:Nnn #1 {##1} { 11 } } + \int_step_inline:nnn { 64 } { 89 } + { \@@_gstore:Nnn #1 {##1} { 11 } } \@@_gstore:Nnn #1 { 92 } { 0 } \int_step_inline:nnn { 97 } { 122 } { \@@_gstore:Nnn #1 {##1} { 11 } } @@ -309,7 +314,10 @@ \int_step_inline:nn { 256 } { \char_set_catcode:nn { ##1 - 1 } - { \intarray_item:Nn #1 {##1} } + { + \intarray_item:cn + { g_@@_ \int_use:N #1 _cctab } {##1} + } } } \cs_generate_variant:Nn \intarray_new:Nn { c } @@ -334,7 +342,7 @@ #2 \int_step_inline:nn { 256 } { - \intarray_gset:Nnn #1 {##1} + \intarray_gset:cnn { g_@@_ \int_use:N #1 _cctab } {##1} { \char_value_catcode:n { ##1 - 1 } } } \group_end: @@ -346,27 +354,19 @@ % \end{macro} % \end{macro} % -% \begin{variable}{\g_@@_tmp_cctab} -% Scratch space. -% \begin{macrocode} -\cctab_new:N \g_@@_tmp_cctab -% \end{macrocode} -% \end{variable} -% % \begin{macro}{\cctab_const:Nn} -% Creating constant tables is a bit tricky: we do it in a two part -% fashion via a temporary one. % \begin{macrocode} \cs_new_protected:Npn \cctab_const:Nn #1#2 { - \cctab_gset:Nn \g_@@_tmp_cctab {#2} - \cs_new_eq:NN #1 \g_@@_tmp_cctab + \cctab_new:N #1 + \cctab_gset:Nn #1 {#2} } % \end{macrocode} % \end{macro} % % \begin{variable} % { +% \c_initex_cctab , % \c_code_cctab , % \c_document_cctab , % \c_initex_cctab , |