[latex3-commits] [git/LaTeX3-latex3-latex2e] gh239: Add default encoding for copying (e819b80c)

PhelypeOleinik tex.phelype at gmail.com
Sun Aug 2 05:40:27 CEST 2020 

Repository : https://github.com/latex3/latex2e
On branch  : gh239
Link       : https://github.com/latex3/latex2e/commit/e819b80c21ce60aa329884817def7487f0441099

>---------------------------------------------------------------

commit e819b80c21ce60aa329884817def7487f0441099
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date:   Sun Aug 2 00:40:27 2020 -0300

    Add default encoding for copying


>---------------------------------------------------------------

e819b80c21ce60aa329884817def7487f0441099
 base/ltoutenc.dtx                      | 11 +++++------
 base/testfiles/github-0239d.luatex.tlg | 34 ++++++++++++++++++++++++++++++++--
 base/testfiles/github-0239d.lvt        |  7 +++++++
 base/testfiles/github-0239d.tlg        | 29 +++++++++++++++++++++++++++--
 base/testfiles/github-0239d.xetex.tlg  | 29 +++++++++++++++++++++++++++--
 5 files changed, 98 insertions(+), 12 deletions(-)

diff --git a/base/ltoutenc.dtx b/base/ltoutenc.dtx
index 21696402..84d0dc85 100644
--- a/base/ltoutenc.dtx
+++ b/base/ltoutenc.dtx
@@ -1349,10 +1349,10 @@
 %    \end{macrocode}
 %
 %   Finally, call \cs{@copy at declaretextcommand} in a loop to copy
-%   |\<enc>\#2| into |\<enc>\#1| for every \meta{enc} in
-%   \cs{@loaded at encoding@list}:
+%   |\<enc>\#2| into |\<enc>\#1| for the default (|?|) then for every
+%   \meta{enc} in \cs{@loaded at encoding@list}:
 %    \begin{macrocode}
-  \noexpand\@for\noexpand\@elt:=\@loaded at encoding@list\noexpand\do
+  \noexpand\@for\noexpand\@elt:=?,\@loaded at encoding@list\noexpand\do
     {\unexpanded{%
       \expandafter\@copy at declaretextcommand\expandafter{\@elt}#1#2}%
         {\@expl at cs@to at str@@N#1}{\@expl at cs@to at str@@N#2}%
@@ -1475,7 +1475,7 @@
 %    \begin{macrocode}
     \expandafter\ifx\csname @list@#3enc at composites\endcsname\relax
       \unexpanded{\@nnil\@nil
-        \@latex at error{List of composites undefined for encoding #3}\@ehc}
+        \@latex at error{List of composites undefined for encoding #3}\@ehc}%
     \else
       \unexpanded\expandafter\expandafter
         \expandafter{\csname @list@#3enc at composites\endcsname
@@ -1523,8 +1523,7 @@
   {A}{g}{\i}{i}}
 \@namedef{@list at T1enc@composites}{%
   {a}{c}{d}{e}{g}{\i}{i}{k}{l}{n}{o}{r}{s}{t}{u}{y}{z}
-  {A}{C}{D}{E}{G}    {I}{K}{L}{N}{O}{R}{S}{T}{U}{Y}{Z}%
-  }
+  {A}{C}{D}{E}{G}    {I}{K}{L}{N}{O}{R}{S}{T}{U}{Y}{Z}}
 %    \end{macrocode}
 %
 %   Here's the \cs{@copy at declaretextcommand@enc} auxiliary:
diff --git a/base/testfiles/github-0239d.luatex.tlg b/base/testfiles/github-0239d.luatex.tlg
index 2a757e90..feedce48 100644
--- a/base/testfiles/github-0239d.luatex.tlg
+++ b/base/testfiles/github-0239d.luatex.tlg
@@ -55,9 +55,39 @@ Completed box being shipped out [1]
 ...\hbox(0.0+0.0)x345.0, direction TLT
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 503.94617fil, direction TLT
+..\vbox(550.0+0.0)x345.0, glue set 491.94745fil, direction TLT
 ...\write-{}
-...\glue(\topskip) 3.02
+...\glue(\topskip) 3.1128
+...\hbox(6.8872+2.49939)x345.0, glue set 302.50424fil, direction TLT
+....\localpar
+.....\localinterlinepenalty=0
+.....\localbrokenpenalty=0
+.....\localleftbox=null
+.....\localrightbox=null
+....\hbox(0.0+0.0)x15.0, direction TLT
+....\OT1/cmr/m/n/10 1
+....\vbox(4.60689+2.49939)x11.1084, direction TLT
+.....\hbox(4.60689+0.0)x11.1084, direction TLT
+......\glue(\tabskip) 0.0
+......\hbox(4.60689+0.0)x11.1084, glue set 3.33199fil, direction TLT
+.......\glue 0.0 plus 1.0fil
+.......\hbox(4.30554+0.0)x4.44444, shifted -0.30135, direction TLT
+........\OT1/cmr/m/n/10 c
+.......\glue 0.0 plus 1.0fil
+......\glue(\tabskip) 0.0
+.....\glue(\baselineskip) -7.49817
+.....\hbox(7.49817+2.49939)x11.1084, direction TLT
+......\glue(\tabskip) 0.0
+......\hbox(7.49817+2.49939)x11.1084, direction TLT
+.......\TS1/cmr/m/n/10 O
+......\glue(\tabskip) 0.0
+....\OT1/cmr/m/n/10 2
+....\TS1/cmr/m/n/10 ^^a3
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 2.52061
 ...\hbox(6.98+0.11)x345.0, glue set 325.0fil, direction TLT
 ....\localpar
 .....\localinterlinepenalty=0
diff --git a/base/testfiles/github-0239d.lvt b/base/testfiles/github-0239d.lvt
index c2949766..86aed6c0 100644
--- a/base/testfiles/github-0239d.lvt
+++ b/base/testfiles/github-0239d.lvt
@@ -13,12 +13,19 @@
 
 \START
 
+\NewCommandCopy \mysterling \textsterling
+
+\DeclareTextCommandDefault{\textsterling}{\textcircled{c}}
+
 \let\undeclare\UndeclareTextCommand
 \let\declare\DeclareTextCompositeCommand
 \begin{document}
 \let\UndeclareTextCommand\undeclare
 \let\DeclareTextCompositeCommand\declare
 
+1\textsterling
+2\mysterling
+
 \ifx\Umathchar\UNDEFINED
 
 \test{T1}{\`a}
diff --git a/base/testfiles/github-0239d.tlg b/base/testfiles/github-0239d.tlg
index fb4be9cb..b4c8329b 100644
--- a/base/testfiles/github-0239d.tlg
+++ b/base/testfiles/github-0239d.tlg
@@ -58,9 +58,34 @@ Completed box being shipped out [1]
 ...\hbox(0.0+0.0)x345.0
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 503.94617fil
+..\vbox(550.0+0.0)x345.0, glue set 491.94745fil
 ...\write-{}
-...\glue(\topskip) 3.05556
+...\glue(\topskip) 3.1128
+...\hbox(6.8872+2.49939)x345.0, glue set 302.50424fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 1
+....\vbox(4.60689+2.49939)x11.1084
+.....\hbox(4.60689+0.0)x11.1084
+......\glue(\tabskip) 0.0
+......\hbox(4.60689+0.0)x11.1084, glue set 3.33199fil
+.......\glue 0.0 plus 1.0fil
+.......\hbox(4.30554+0.0)x4.44444, shifted -0.30135
+........\OT1/cmr/m/n/10 c
+.......\glue 0.0 plus 1.0fil
+......\glue(\tabskip) 0.0
+.....\glue(\baselineskip) -7.49817
+.....\hbox(7.49817+2.49939)x11.1084
+......\glue(\tabskip) 0.0
+......\hbox(7.49817+2.49939)x11.1084
+.......\TS1/cmr/m/n/10 O
+......\glue(\tabskip) 0.0
+....\OT1/cmr/m/n/10 2
+....\TS1/cmr/m/n/10 ^^a3
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 2.55617
 ...\hbox(6.94444+0.0)x345.0, glue set 316.66788fil
 ....\hbox(0.0+0.0)x15.0
 ....\T1/cmr/m/n/10 ^^e0
diff --git a/base/testfiles/github-0239d.xetex.tlg b/base/testfiles/github-0239d.xetex.tlg
index 1a5adf59..ebdb9e61 100644
--- a/base/testfiles/github-0239d.xetex.tlg
+++ b/base/testfiles/github-0239d.xetex.tlg
@@ -54,9 +54,34 @@ Completed box being shipped out [1]
 ...\hbox(0.0+0.0)x345.0
 ..\glue 25.0
 ..\glue(\lineskip) 0.0
-..\vbox(550.0+0.0)x345.0, glue set 503.94617fil
+..\vbox(550.0+0.0)x345.0, glue set 491.94745fil
 ...\write-{}
-...\glue(\topskip) 3.02
+...\glue(\topskip) 3.1128
+...\hbox(6.8872+2.49939)x345.0, glue set 302.50424fil
+....\hbox(0.0+0.0)x15.0
+....\OT1/cmr/m/n/10 1
+....\vbox(4.60689+2.49939)x11.1084
+.....\hbox(4.60689+0.0)x11.1084
+......\glue(\tabskip) 0.0
+......\hbox(4.60689+0.0)x11.1084, glue set 3.33199fil
+.......\glue 0.0 plus 1.0fil
+.......\hbox(4.30554+0.0)x4.44444, shifted -0.30135
+........\OT1/cmr/m/n/10 c
+.......\glue 0.0 plus 1.0fil
+......\glue(\tabskip) 0.0
+.....\glue(\baselineskip) -7.49817
+.....\hbox(7.49817+2.49939)x11.1084
+......\glue(\tabskip) 0.0
+......\hbox(7.49817+2.49939)x11.1084
+.......\TS1/cmr/m/n/10 O
+......\glue(\tabskip) 0.0
+....\OT1/cmr/m/n/10 2
+....\TS1/cmr/m/n/10 ^^a3
+....\penalty 10000
+....\glue(\parfillskip) 0.0 plus 1.0fil
+....\glue(\rightskip) 0.0
+...\glue(\parskip) 0.0 plus 1.0
+...\glue(\baselineskip) 2.52061
 ...\hbox(6.98+0.10999)x345.0, glue set 325.0fil
 ....\hbox(0.0+0.0)x15.0
 ....\TU/lmr/m/n/10 ^^e0

More information about the latex3-commits mailing list.