[latex3-commits] [git/LaTeX3-latex3-latex2e] textcomp: bit more cleanup (3162f651)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : textcomp
Link       : https://github.com/latex3/latex2e/commit/3162f65161142462755d945905d74ae7b5de4bc0

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

commit 3162f65161142462755d945905d74ae7b5de4bc0
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Tue Dec 24 12:06:45 2019 +0100

    bit more cleanup


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

3162f65161142462755d945905d74ae7b5de4bc0
 base/doc/source2e.tex              |  4 +++-
 base/lttextcomp.dtx                | 28 +++++++++++++++++++---------
 base/testfiles/tlb-isodate-001.tlg | 11 -----------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/base/doc/source2e.tex b/base/doc/source2e.tex
index 4f164430..9c74adef 100644
--- a/base/doc/source2e.tex
+++ b/base/doc/source2e.tex
@@ -156,7 +156,7 @@ page_precedence "rnaA"
 \setcounter{IndexColumns}{2}
 
 % Needed for documentation in ltoutenc.dtx
-\usepackage{textcomp}
+% \usepackage{textcomp}
 
 \begin{document}
  \title{The \LaTeXe\ Sources}
@@ -282,6 +282,8 @@ page_precedence "rnaA"
 
  \DocInclude{ltfntcmd} % \textrm etc
  
+ \DocInclude{lttextcomp} % companion symbols (new 2020)
+ 
  \DocInclude{ltpageno} % Page numbering
 
  \DocInclude{ltxref}   % Cross referencing
diff --git a/base/lttextcomp.dtx b/base/lttextcomp.dtx
index 43c36feb..11664072 100644
--- a/base/lttextcomp.dtx
+++ b/base/lttextcomp.dtx
@@ -425,22 +425,25 @@
 %    \begin{macrocode}
 \DeclareTextSymbolDefault{\textdollar}{TS1}
 \UndeclareTextCommand{\textdollar}  {OT1}         % don't use the OT1 def any longer
-
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
 \DeclareTextSymbolDefault{\textsterling}{TS1}
 \UndeclareTextCommand{\textsterling}{OT1}         % don't use the OT1 def any longer
-
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
 \DeclareTextSymbolDefault{\textperthousand}{TS1}
 \UndeclareTextCommand{\textperthousand}{T1}       % don't use the T1 def
                                                   % should actually not be declaed
                                                   % in the t1enc.def file instead
                                                   % otherwise fontenc would overwrite
                                                   % it again (legacy tests!)
-                                                  
 %    \end{macrocode}
 %    
+%    These are the standardd \texttt{itemize} and footnote symbols
+%    originally taken from \texttt{OMS} and now from \texttt{TS1}:
 %    \begin{macrocode}
-% these are the std itemize and footnote symbols originally taken from OMS
-
 \DeclareTextSymbolDefault{\textasteriskcentered}{TS1} 
 \DeclareTextSymbolDefault{\textbullet}{TS1}
 \DeclareTextSymbolDefault{\textdaggerdbl}{TS1}
@@ -448,9 +451,12 @@
 \DeclareTextSymbolDefault{\textparagraph}{TS1}
 \DeclareTextSymbolDefault{\textperiodcentered}{TS1}
 \DeclareTextSymbolDefault{\textsection}{TS1}
-
 %    \end{macrocode}
 %
+%    And here are the other \texttt{TS1} glyphs that are implemented
+%    by every font (or nearly everyone---a few are commented out and
+%    moved to sub-encoding 9,
+%    because they aren't around in one or two fonts. 
 %    \begin{macrocode}
 %%\DeclareTextSymbolDefault{\textbardbl}{TS1} % subst in sub-enc 9 above
 \DeclareTextSymbolDefault{\textbrokenbar}{TS1}
@@ -549,7 +555,7 @@
   \DeclareTextCommandDefault{\capitalnewtie}      {\tc at check@accent{\t}2\capitalnewtie}
 %    \end{macrocode}
 %    
-%    
+%    In Unicode engines we just execute the simple accents:
 %    \begin{macrocode}
 \else
   \def\capitalacute{\'}
@@ -964,7 +970,9 @@
 \DeclareEncodingSubset{TS1}{opensans-*}               {0}  % with a bunch of tofu inside
 \DeclareEncodingSubset{TS1}{cantarell-*}              {0}  % with a bunch of tofu inside
 \DeclareEncodingSubset{TS1}{fbb-*}                    {0}  % missing centoldstyle
-
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
 \DeclareEncodingSubset{TS1}{tli}                      {1}  % with lots of tofu inside
 %    \end{macrocode}
 %    
@@ -1269,7 +1277,9 @@
 %    \begin{macrocode}
 \InputIfFileExists{textcomp.cfg}
   {\PackageInfo{textcomp}{Local configuration file used}}{}
-\fi
+%    \end{macrocode}
+%    
+%    \begin{macrocode}
 %</TS1sty>
 %    \end{macrocode}
 %
diff --git a/base/testfiles/tlb-isodate-001.tlg b/base/testfiles/tlb-isodate-001.tlg
index 22892bbc..4500f735 100644
--- a/base/testfiles/tlb-isodate-001.tlg
+++ b/base/testfiles/tlb-isodate-001.tlg
@@ -65,15 +65,4 @@ LaTeX Warning: You have requested, on input line ..., version
 Package: ifthen ....-..-.. v... Standard LaTeX ifthen package (DPC)
 ) (textcomp.sty
 Package: textcomp ....-..-.. v... Standard LaTeX package
-Package textcomp Info: Sub-encoding information:
-(textcomp)               5 = only ISO-Adobe without \textcurrency
-(textcomp)               4 = 5 + \texteuro
-(textcomp)               3 = 4 + \textohm
-(textcomp)               2 = 3 + \textestimated + \textcurrency
-(textcomp)               1 = TS1 - \textcircled - \t
-(textcomp)               0 = TS1 (full)
-(textcomp)             Font families with sub-encoding setting implement
-(textcomp)             only a restricted character set as indicated.
-(textcomp)             Family '?' is the default used for unknown fonts.
-(textcomp)             See the documentation for details.
 )