[latex3-commits] [latex2e-public] r1394 - make undeclared textcomposite an error, add declaration of tu comma below and re-order declarations of tu macron

noreply at latex-project.org noreply at latex-project.org
Fri Feb 24 23:47:50 CET 2017


Author: carlisle
Date: 2017-02-24 23:47:50 +0100 (Fri, 24 Feb 2017)
New Revision: 1394

Modified:
   trunk/base/ltoutenc.dtx
Log:
make undeclared textcomposite an error, add declaration of tu comma below and re-order declarations of tu macron

Modified: trunk/base/ltoutenc.dtx
===================================================================
--- trunk/base/ltoutenc.dtx	2017-02-24 15:25:58 UTC (rev 1393)
+++ trunk/base/ltoutenc.dtx	2017-02-24 22:47:50 UTC (rev 1394)
@@ -38,14 +38,14 @@
 %<TU>\ProvidesFile{tuenc.def}
 %<package>\ProvidesPackage{fontenc}
 %<TS1sty>\ProvidesPackage{textcomp}
-%<OT1|T1|OMS|OML|OT4|TU|package|TS1sty> [2017/02/22 v2.0g
+%<OT1|T1|OMS|OML|OT4|TU|package|TS1sty> [2017/02/24 v2.0h
 %<OT1|T1|OMS|OML|OT4|TS1|TU>         Standard LaTeX file]
 %<package|TS1sty>                 Standard LaTeX package]
 %
 %<*driver>
 % \fi
 \ProvidesFile{ltoutenc.dtx}
-             [2017/02/22 v2.0g LaTeX Kernel (font encodings)]
+             [2017/02/24 v2.0h LaTeX Kernel (font encodings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutenc.dtx}
@@ -857,6 +857,8 @@
 % \changes{v1.7z}{1996/05/23}
 %      {Modified to cope with new \cs{add at accent} command: required
 %      removal of check for one argument-command}
+% \changes{v2.0h}{2017/02/24}{%
+%     add check whether the accent command is defined for this encoding}
 % \begin{macro}{\DeclareTextComposite}
 % \changes{v1.7l}{1995/06/09}{Rewrote \cs{DeclareTextComposite} to
 %    define the composite as a no-argument command rather than a
@@ -880,6 +882,9 @@
 %    \begin{macrocode}
 \def\DeclareTextCompositeCommand#1#2#3#4{%
   \expandafter\let\expandafter\reserved at a\csname#2\string#1\endcsname
+  \ifx\reserved at a\relax
+   \@latex at error{\string#1 not declared in encoding #2}\@eha
+  \else
   \expandafter\expandafter\expandafter\ifx
   \expandafter\@car\reserved at a\relax\relax\@nil \@text at composite \else
       \edef\reserved at b##1{%
@@ -892,7 +897,8 @@
       \expandafter\reserved at b\expandafter{\reserved at a{##1}}%
    \fi
    \expandafter\def\csname\expandafter\string\csname
-      #2\endcsname\string#1-\string#3\@empty\endcsname{#4}}
+      #2\endcsname\string#1-\string#3\@empty\endcsname{#4}%
+  \fi}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -2853,8 +2859,6 @@
 \DeclareTextSymbol{\OE}                  \UnicodeEncodingName{"0152}
 \DeclareTextSymbol{\oe}                  \UnicodeEncodingName{"0153}
 \DeclareTextSymbol{\textflorin}          \UnicodeEncodingName{"0192}
-\DeclareTextComposite{\=}             \UnicodeEncodingName{Y}{"0232}
-\DeclareTextComposite{\=}             \UnicodeEncodingName{y}{"0232}
 \DeclareTextSymbol{\j}                   \UnicodeEncodingName{"0237}
 \DeclareTextSymbol{\textasciicaron}      \UnicodeEncodingName{"02C7}
 \DeclareTextSymbol{\textasciibreve}      \UnicodeEncodingName{"02D8}
@@ -2862,8 +2866,6 @@
 \DeclareTextSymbol{\textgravedbl}        \UnicodeEncodingName{"02F5}
 \DeclareTextSymbol{\texttildelow}        \UnicodeEncodingName{"02F7}
 \DeclareTextSymbol{\textbaht}            \UnicodeEncodingName{"0E3F}
-\DeclareTextComposite{\=}             \UnicodeEncodingName{G}{"1E20}
-\DeclareTextComposite{\=}             \UnicodeEncodingName{g}{"1E21}
 \DeclareTextSymbol{\SS}                  \UnicodeEncodingName{"1E9E}
 \DeclareTextSymbol{\textcompwordmark}    \UnicodeEncodingName{"200C}
 \DeclareTextSymbol{\textendash}          \UnicodeEncodingName{"2013}
@@ -2944,17 +2946,21 @@
 \DeclareUnicodeAccent{\'}                \UnicodeEncodingName{"0301}
 \DeclareUnicodeAccent{\^}                \UnicodeEncodingName{"0302}
 \DeclareUnicodeAccent{\~}                \UnicodeEncodingName{"0303}
+\DeclareUnicodeAccent{\=}                \UnicodeEncodingName{"0304}
+\DeclareUnicodeAccent{\u}                \UnicodeEncodingName{"0306}
+\DeclareUnicodeAccent{\.}                \UnicodeEncodingName{"0307}
 \DeclareUnicodeAccent{\"}                \UnicodeEncodingName{"0308}
+\DeclareUnicodeAccent{\r}                \UnicodeEncodingName{"030A}
 \DeclareUnicodeAccent{\H}                \UnicodeEncodingName{"030B}
-\DeclareUnicodeAccent{\r}                \UnicodeEncodingName{"030A}
 \DeclareUnicodeAccent{\v}                \UnicodeEncodingName{"030C}
-\DeclareUnicodeAccent{\u}                \UnicodeEncodingName{"0306}
-\DeclareUnicodeAccent{\=}                \UnicodeEncodingName{"0304}
-\DeclareUnicodeAccent{\.}                \UnicodeEncodingName{"0307}
 \DeclareUnicodeAccent{\b}                \UnicodeEncodingName{"0332}
+\DeclareUnicodeAccent{\d}                \UnicodeEncodingName{"0323}
 \DeclareUnicodeAccent{\c}                \UnicodeEncodingName{"0327}
-\DeclareUnicodeAccent{\d}                \UnicodeEncodingName{"0323}
 \DeclareUnicodeAccent{\k}                \UnicodeEncodingName{"0328}
+\DeclareTextCommand\textcommabelow       \UnicodeEncodingName[1]
+  {\hmode at bgroup\ooalign{\null#1\crcr\hidewidth\raise-.31ex
+   \hbox{\check at mathfonts\fontsize\ssf at size\z@
+   \math at fontsfalse\selectfont,}\hidewidth}\egroup}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -3158,8 +3164,12 @@
 \DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{s}{"0219}
 \DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{T}{"021A}
 \DeclareTextComposite{\textcommabelow}\UnicodeEncodingName{t}{"021B}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{Y}{"0232}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{y}{"0232}
 \DeclareTextComposite{\.}             \UnicodeEncodingName{B}{"1E02}
 \DeclareTextComposite{\.}             \UnicodeEncodingName{b}{"1E03}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{G}{"1E20}
+\DeclareTextComposite{\=}             \UnicodeEncodingName{g}{"1E21}
 %    \end{macrocode}
 %
 %    \begin{macrocode}



More information about the latex3-commits mailing list