summaryrefslogtreecommitdiff
path: root/macros/latex-dev/base/lttextcomp.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex-dev/base/lttextcomp.dtx')
-rw-r--r--macros/latex-dev/base/lttextcomp.dtx201
1 files changed, 100 insertions, 101 deletions
diff --git a/macros/latex-dev/base/lttextcomp.dtx b/macros/latex-dev/base/lttextcomp.dtx
index fc208c2e74..eca72e4d28 100644
--- a/macros/latex-dev/base/lttextcomp.dtx
+++ b/macros/latex-dev/base/lttextcomp.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019
+% Copyright (C) 2019-2020
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
@@ -33,7 +33,7 @@
%
%
\ProvidesFile{lttextcomp.dtx}
- [2019/12/24 v1.0a LaTeX Kernel (text companion symbols)]
+ [2020/01/25 v1.0b LaTeX Kernel (text companion symbols)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -73,7 +73,7 @@
%
%
% Preserve the old definition of \cs{oldstylenums} under a different name.
-%
+%
% This macro implements old style numerals but only works if we
% assume that the standard math fonts are used. Thus it needs
% changing in case other math encodings are used.
@@ -103,7 +103,7 @@
\endgroup
}
% \end{macrocode}
-%
+%
% And here is the improved one that adjusts depending on surroundings.
% \begin{macrocode}
\DeclareRobustCommand\oldstylenums[1]{%
@@ -173,8 +173,8 @@
%<latexrelease>
%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
-%
-%
+%
+%
@@ -211,14 +211,14 @@
% ends in \texttt{-*} then the star gets replaced by these common
% ending, e.g.,
%\begin{verbatim}
-% \DeclareEncodingSubeset{TS1}{Alegreya-*}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-*}{2}
%\end{verbatim}
% is the same as writing
%\begin{verbatim}
-% \DeclareEncodingSubeset{TS1}{Alegreya-LF}{2}
-% \DeclareEncodingSubeset{TS1}{Alegreya-OsF}{2}
-% \DeclareEncodingSubeset{TS1}{Alegreya-TLF}{2}
-% \DeclareEncodingSubeset{TS1}{Alegreya-TOsF}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-LF}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-OsF}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-TLF}{2}
+% \DeclareEncodingSubset{TS1}{Alegreya-TOsF}{2}
%\end{verbatim}
% If only some are needed then one can define them individually but
% in many cases all four are wanted, hence the shortcut.
@@ -229,13 +229,13 @@
% \begin{macrocode}
\def\DeclareEncodingSubset#1#2{%
\DeclareEncodingSubset@aux{#1}#2*\DeclareEncodingSubset@aux
-}
+}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\DeclareEncodingSubset@aux#1#2*#3\DeclareEncodingSubset@aux#4{%
% \end{macrocode}
-% if \verb=#3= is empty then there was no star, otherwise we we
+% if \verb=#3= is empty then there was no star, otherwise we
% define all four variants.
% \begin{macrocode}
\expandafter\ifx\expandafter X\detokenize{#3}X%
@@ -259,7 +259,7 @@
{\@font@info{Changing #2 sub-encoding to #1/#3}}%
\@namedef{#1:#2}{#3}}
% \end{macrocode}
-%
+%
% Any reason to allow those in the middle of documents?
% \begin{macrocode}
\@onlypreamble\DeclareEncodingSubset
@@ -331,7 +331,9 @@
% \begin{macro}{\tc@subst}
-%
+%
+% \changes{v1.0b}{2020/01/22}{The overall default is \cs{textcompsubstdefault}
+% not \cs{substdefault}}
% \begin{macrocode}
\def\tc@subst#1{%
\tc@errorwarn
@@ -347,7 +349,7 @@
\else\ifx\f@family\ttdef@ult
\fontfamily\ttsubstdefault
\else
- \fontfamily\substdefault
+ \fontfamily\textcompsubstdefault
\fi\fi\fi
% \end{macrocode}
% Whatever default was chosen, we claim now (locally hopefully)
@@ -411,7 +413,7 @@
% \begin{macrocode}
%\def\tc@check@accent{\CheckEncodingSubset\UseTextAccent{TS1}\tc@error}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\def\tc@check@accent#1{\CheckEncodingSubset\UseTextAccent{TS1}{\tc@swap@accent#1}}
\def\tc@swap@accent#1#2{\UseTextAccent{T1}#1}
@@ -425,30 +427,32 @@
% Here are the default definitions for the \texttt{TS1} symbols.
% First those that we assume are always available if a font
% implements \texttt{TS1}.
-%
+%
% \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}
-%
+% Using \cs{UndeclareTextCommand} above is enough only if the
+% encoding definition files are not reloaded afterwards. In the
+% past that happened if \texttt{fontenc} was used in the document
+% preamble (not not any longer). So in some sense it is better to fully remove
+% them from the encoding files, but for rollbacks it is easier to
+% keep them in for now.
+%
% These are the standard \texttt{itemize} and footnote symbols
% originally taken from \texttt{OMS} and now from \texttt{TS1}:
% \begin{macrocode}
-\DeclareTextSymbolDefault{\textasteriskcentered}{TS1}
+\DeclareTextSymbolDefault{\textasteriskcentered}{TS1}
\DeclareTextSymbolDefault{\textbullet}{TS1}
\DeclareTextSymbolDefault{\textdaggerdbl}{TS1}
\DeclareTextSymbolDefault{\textdagger}{TS1}
@@ -460,12 +464,12 @@
% 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.
+% because they aren't around in one or two fonts.
% \begin{macrocode}
%%\DeclareTextSymbolDefault{\textbardbl}{TS1} % subst in sub-enc 9 above
\DeclareTextSymbolDefault{\textbrokenbar}{TS1}
%%\DeclareTextSymbolDefault{\textcelsius}{TS1} % subst in sub-enc 9 above
-\DeclareTextSymbolDefault{\textcent}{TS1}
+\DeclareTextSymbolDefault{\textcent}{TS1}
\DeclareTextSymbolDefault{\textcopyright}{TS1}
\DeclareTextSymbolDefault{\textdegree}{TS1}
\DeclareTextSymbolDefault{\textdiv}{TS1}
@@ -489,7 +493,7 @@
%%\DeclareTextSymbolDefault{\texttwosuperior}{TS1} % subst in sub-enc 9 above
\DeclareTextSymbolDefault{\textyen}{TS1}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textcapitalcompwordmark}{TS1}
\DeclareTextSymbolDefault{\textascendercompwordmark}{TS1}
@@ -516,7 +520,7 @@
% \end{macrocode}
%
%
-%
+%
%
%
% \subsection{Sub-encoding \texttt{2} (majority of new OTF fonts via autoinst)}
@@ -534,7 +538,7 @@
% the basic accents instead. whether that works or not really
% depends on the font, something like \verb=\"X= usually comes out
% wrong in Unicode engines.
-%
+%
% \begin{macrocode}
\ifx\Umathcode\@undefined
\DeclareTextCommandDefault{\capitalacute} {\tc@check@accent{\'}2\capitalacute}
@@ -558,7 +562,7 @@
\DeclareTextCommandDefault{\newtie} {\tc@check@accent{\t}2\newtie}
\DeclareTextCommandDefault{\capitalnewtie} {\tc@check@accent{\t}2\capitalnewtie}
% \end{macrocode}
-%
+%
% In Unicode engines we just execute the simple accents:
% \begin{macrocode}
\else
@@ -580,7 +584,7 @@
\def\newtie{\t}
\fi
% \end{macrocode}
-%
+%
%
%
%
@@ -705,9 +709,9 @@
\DeclareTextCommandDefault{\textuparrow} {\tc@check@symbol4\textuparrow}
\DeclareTextCommandDefault{\textwon} {\tc@check@symbol4\textwon}
% \end{macrocode}
-%
%
-%
+%
+%
%
%
% \subsection{Sub-encoding \texttt{5} (most older PS fonts)}
@@ -731,17 +735,17 @@
\DeclareTextCommandDefault{\textestimated} {\tc@check@symbol5\textestimated}
\DeclareTextCommandDefault{\textnumero} {\tc@check@symbol5\textnumero}
% \end{macrocode}
-%
+%
%
%
%
% \subsection{Sub-encoding \texttt{6}}
%
% \begin{macrocode}
-\DeclareTextCommandDefault{\textflorin} {\tc@check@symbol6\textflorin}
+\DeclareTextCommandDefault{\textflorin} {\tc@check@symbol6\textflorin}
\DeclareTextCommandDefault{\textcurrency} {\tc@check@symbol6\textcurrency}
% \end{macrocode}
-%
+%
%
%
% \subsection{Sub-encoding \texttt{7}}
@@ -752,7 +756,7 @@
\DeclareTextCommandDefault{\textmu} {\tc@check@symbol7\textmu}
\DeclareTextCommandDefault{\textminus} {\tc@check@symbol7\textminus}
% \end{macrocode}
-%
+%
%
%
% \subsection{Sub-encoding \texttt{8}}
@@ -784,9 +788,9 @@
\DeclareTextCommandDefault{\texttwosuperior}{\tc@check@symbol{9}\texttwosuperior}
\DeclareTextCommandDefault{\textbardbl}{\tc@check@symbol{9}\textbardbl}
% \end{macrocode}
-%
%
-%
+%
+%
%
% \section{Unicode engine specials}
%
@@ -845,8 +849,8 @@
\DeclareTextSymbol{\textdollaroldstyle}{TS1}{138}
\DeclareTextSymbol{\textcentoldstyle} {TS1}{139}
% \end{macrocode}
-%
-%
+%
+%
% \begin{macrocode}
\fi % --- END of Unicode engines specials
% \end{macrocode}
@@ -857,9 +861,9 @@
% \ldots
%
% But first the default for anything that is not declared. We use
-% \texttt{9} which is most like much too conservative but with the
+% \texttt{9} which is most likely much too conservative, but with the
% advantage that we aren't getting missing glyphs (or at least that
-% this very very unlikely).
+% this is very unlikely).
% For nearly all font in the \TeX{} Live distribution of 2019
% ``correct'' classifications are given below, so that this default
% is only used for new font families, and over time the right
@@ -895,7 +899,7 @@
\DeclareEncodingSubset{TS1}{txss} {0}
\DeclareEncodingSubset{TS1}{txtt} {0}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{lmr} {1}
\DeclareEncodingSubset{TS1}{lmdh} {1}
@@ -904,43 +908,43 @@
\DeclareEncodingSubset{TS1}{lmvtt} {1}
\DeclareEncodingSubset{TS1}{lmtt} {1} % missing TM, SM, pertenthousand for some reason
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{ptmx} {2}
\DeclareEncodingSubset{TS1}{ptmj} {2}
\DeclareEncodingSubset{TS1}{ul8} {2}
% \end{macrocode}
-%
+%
% \begin{macrocode}
-\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm
-\DeclareEncodingSubset{TS1}{futj} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{futs} {5} % tofu for blank, ohm
+\DeclareEncodingSubset{TS1}{bch} {5} % tofu for blank, ohm
+\DeclareEncodingSubset{TS1}{futj} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{futs} {5} % tofu for blank, ohm
\DeclareEncodingSubset{TS1}{futx} {5} % probably (currently broken distrib)
-\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pag} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pbk} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pcr} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{phv} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pnc} {5} % tofu for blank, interrobang/down, ohm
\DeclareEncodingSubset{TS1}{pplj} {5} % tofu for blank
\DeclareEncodingSubset{TS1}{pplx} {5} % tofu for blank
\DeclareEncodingSubset{TS1}{ppl} {5} % tofu for blank interrobang/down
-\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{ptm} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{pzc} {5} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{ul9} {5} % tofu for blank, interrobang/down, ohm
% \end{macrocode}
-%
+%
% \begin{macrocode}
-\DeclareEncodingSubset{TS1}{dayroms} {6} % tofu for blank, interrobang/down, ohm
-\DeclareEncodingSubset{TS1}{dayrom} {6} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{dayroms} {6} % tofu for blank, interrobang/down, ohm
+\DeclareEncodingSubset{TS1}{dayrom} {6} % tofu for blank, interrobang/down, ohm
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{augie} {8} % really only missing euro
\DeclareEncodingSubset{TS1}{put} {8}
\DeclareEncodingSubset{TS1}{uag} {8} % probably (currently broken distrib)
-\DeclareEncodingSubset{TS1}{ugq} {8}
+\DeclareEncodingSubset{TS1}{ugq} {8}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{zi4} {9}
% \end{macrocode}
@@ -960,7 +964,7 @@
%
% Below are the newer fonts that have support files for
% \LaTeX{}. With very few exceptions the classifications are done
-% so that that all characters are correctly produced (either being
+% so that all characters are correctly produced (either being
% available in the font or substituted.
%
% There are a few fonts that contain ``tofu'' squares in places
@@ -975,11 +979,11 @@
\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}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{Alegreya-*} {2}
\DeclareEncodingSubset{TS1}{AlegreyaSans-*} {2}
@@ -990,13 +994,13 @@
\DeclareEncodingSubset{TS1}{Tempora-TLF} {2}
\DeclareEncodingSubset{TS1}{Tempora-TOsF} {2}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{Arimo-TLF} {3}
\DeclareEncodingSubset{TS1}{Carlito-*} {3}
\DeclareEncodingSubset{TS1}{FiraSans-*} {3}
\DeclareEncodingSubset{TS1}{IBMPlexSans-TLF} {3}
-\DeclareEncodingSubset{TS1}{Merriweather-OsF} {3}
+\DeclareEncodingSubset{TS1}{Merriweather-OsF} {3}
\DeclareEncodingSubset{TS1}{Montserrat-*} {3}
\DeclareEncodingSubset{TS1}{MontserratAlternates-*} {3}
\DeclareEncodingSubset{TS1}{SourceCodePro-TLF} {3}
@@ -1005,7 +1009,7 @@
\DeclareEncodingSubset{TS1}{SourceSerifPro-*} {3}
\DeclareEncodingSubset{TS1}{Tinos-TLF} {3}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{AccanthisADFStdNoThree-LF}{4}
\DeclareEncodingSubset{TS1}{Cabin-TLF} {4}
@@ -1028,7 +1032,7 @@
\DeclareEncodingSubset{TS1}{LinguisticsPro-OsF} {4}
\DeclareEncodingSubset{TS1}{LinuxBiolinumT-*} {4}
\DeclareEncodingSubset{TS1}{LinuxLibertineT-*} {4}
-\DeclareEncodingSubset{TS1}{MerriweatherSans-OsF} {4}
+\DeclareEncodingSubset{TS1}{MerriweatherSans-OsF} {4}
\DeclareEncodingSubset{TS1}{MintSpirit-*} {4}
\DeclareEncodingSubset{TS1}{MintSpiritNoTwo-*} {4}
\DeclareEncodingSubset{TS1}{PTMono-TLF} {4}
@@ -1046,9 +1050,9 @@
\DeclareEncodingSubset{TS1}{SticksTooText-*} {4}
\DeclareEncodingSubset{TS1}{UniversalisADFStd-LF} {4}
% \end{macrocode}
-%
+%
% \begin{macrocode}
-\DeclareEncodingSubset{TS1}{Almendra-OsF} {5}
+\DeclareEncodingSubset{TS1}{Almendra-OsF} {5}
\DeclareEncodingSubset{TS1}{Baskervaldx-*} {5}
\DeclareEncodingSubset{TS1}{BaskervilleF-*} {5}
\DeclareEncodingSubset{TS1}{Bitter-TLF} {5}
@@ -1071,7 +1075,7 @@
\DeclareEncodingSubset{TS1}{TheanoOldStyle-TLF} {5}
\DeclareEncodingSubset{TS1}{TheanoOldStyle-TOsF} {5}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{Crimson-TLF} {6}
\DeclareEncodingSubset{TS1}{IBMPlexMono-TLF} {6}
@@ -1083,7 +1087,7 @@
\DeclareEncodingSubset{TS1}{LinuxLibertineMonoT-TLF} {6}
\DeclareEncodingSubset{TS1}{Overlock-LF} {6}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{CormorantGaramond-*} {7}
\DeclareEncodingSubset{TS1}{Heuristica-TLF} {7}
@@ -1100,16 +1104,16 @@
\DeclareEncodingSubset{TS1}{QuattrocentoSans-TLF} {7}
\DeclareEncodingSubset{TS1}{XCharter-TLF} {7}
\DeclareEncodingSubset{TS1}{XCharter-TOsF} {7}
-\DeclareEncodingSubset{TS1}{erewhon-*} {7}
-\DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7}
-\DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7}
-\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing
+\DeclareEncodingSubset{TS1}{erewhon-*} {7}
+\DeclareEncodingSubset{TS1}{ComicNeue-TLF} {7}
+\DeclareEncodingSubset{TS1}{ComicNeueAngular-TLF} {7}
+\DeclareEncodingSubset{TS1}{Forum-LF} {7} % the superiors are missing
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{Cochineal-*} {8}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareEncodingSubset{TS1}{AlgolRevived-TLF} {9}
% \end{macrocode}
@@ -1120,7 +1124,7 @@
% \section{Legacy symbol support for lists and footnote symbols}
%
% \begin{macro}{\UseLegacyTextSymbols}
-%
+%
% \begin{macrocode}
\def\UseLegacyTextSymbols{%
\DeclareTextSymbolDefault{\textasteriskcentered}{OMS}%
@@ -1152,7 +1156,7 @@
% Here are new names for the legacy symbols that \LaTeX{} used to
% pick up from the \texttt{OMS} encoded fonts (and used dor itemize
% lists or footnote symbols.
-%
+%
% We go the roundabout way via separate OMS declarations so that
%\begin{verbatim}
% \renewcommand\textbullet{\textlegacybullet}
@@ -1168,7 +1172,7 @@
\DeclareTextSymbol{\textlegacyperiodcentered}{OMS}{1} % "01
\DeclareTextSymbol{\textlegacysection}{OMS}{120} % "78
% \end{macrocode}
-%
+%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textlegacyasteriskcentered}{OMS}
\DeclareTextSymbolDefault{\textlegacybardbl}{OMS}
@@ -1217,7 +1221,7 @@
%<latexrelease> \fi
%<latexrelease> \char`\$\egroup}
%<latexrelease>\DeclareTextCommand{\textperthousand}{T1}
-%<latexrelease> {\%\char 24 }
+%<latexrelease> {\%\char 24 }
%<latexrelease>
%<latexrelease>\DeclareTextSymbolDefault{\textasteriskcentered}{OMS}
%<latexrelease>\DeclareTextSymbolDefault{\textbullet}{OMS}
@@ -1333,8 +1337,8 @@
%<latexrelease>\DeclareTextCommand{\textpertenthousand}{T1}
%<latexrelease> {\%\char 24\char 24 }
%<latexrelease>
-%<latexrelease>\let\textlangle\@undefined
-%<latexrelease>\let\textrangle\@undefined
+%<latexrelease>\let\textlangle\@undefined
+%<latexrelease>\let\textrangle\@undefined
%<latexrelease>
%<latexrelease>\let\textcolonmonetary\@undefined
%<latexrelease>\let\textdong\@undefined
@@ -1379,7 +1383,7 @@
%<latexrelease>\let\textlegacyparagraph\@undefined
%<latexrelease>\let\textlegacyperiodcentered\@undefined
%<latexrelease>\let\textlegacysection\@undefined
-%<latexrelease>
+%<latexrelease>
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
%</2ekernel>
@@ -1390,7 +1394,7 @@
%
% \section{The \texttt{textcomp} package}
%
-%
+%
% \begin{macrocode}
%<*TS1sty>
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
@@ -1460,12 +1464,12 @@
\InputIfFileExists{textcomp.cfg}
{\PackageInfo{textcomp}{Local configuration file used}}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
%</TS1sty>
% \end{macrocode}
%
-%
+%
%
% \subsection{The old textcomp package code}
%
@@ -1529,7 +1533,7 @@
\string\textcurrency\MessageBreak
\space\space 4 = 5 + \string\texteuro\MessageBreak
\space\space 3 = 4 + \string\textohm\MessageBreak
- \space\space 2 = 3 + \noexpand\textestimated+
+ \space\space 2 = 3 + \noexpand\textestimated+
\string\textcurrency\MessageBreak
\space\space 1 = TS1 - \noexpand\textcircled-
\string\t\MessageBreak
@@ -1981,7 +1985,7 @@
% \end{macrocode}
% The |\textcircled| and |\t| are handled specially, unless the
% current font has a subset id of 0 (i.e. full \texttt{TS1}) we
-% pick the symbols up from the the math font encodings, i.e., the
+% pick the symbols up from the math font encodings, i.e., the
% third argument to |\CheckEncodingSubset| uses |\UseTextAccent| to
% get them from there.
% \begin{macrocode}
@@ -2191,7 +2195,7 @@
\InputIfFileExists{textcomp.cfg}
{\PackageInfo{textcomp}{Local configuration file used}}{}
% \end{macrocode}
-%
+%
% \begin{macrocode}
\fi
% \end{macrocode}
@@ -2208,8 +2212,3 @@
\endinput
-
-
-
-
-