From a0f8bf44384432ef1eb9955ad86c4f41f8d6a241 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 Jun 2016 22:12:48 +0000 Subject: latex[2e] (25jun16) git-svn-id: svn://tug.org/texlive/trunk@41542 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/base/ltoutenc.dtx | 26 ++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/source/latex/base/ltoutenc.dtx') diff --git a/Master/texmf-dist/source/latex/base/ltoutenc.dtx b/Master/texmf-dist/source/latex/base/ltoutenc.dtx index 41037d0d5bf..c96b2578937 100644 --- a/Master/texmf-dist/source/latex/base/ltoutenc.dtx +++ b/Master/texmf-dist/source/latex/base/ltoutenc.dtx @@ -37,14 +37,14 @@ %\ProvidesFile{ts1enc.def}[2001/06/05 v3.0e (jk/car/fm) %\ProvidesPackage{fontenc} %\ProvidesPackage{textcomp} -% [2005/09/27 v1.99g +% [2016/06/19 v1.99m % Standard LaTeX file] % Standard LaTeX package] % %<*driver> % \fi \ProvidesFile{ltoutenc.dtx} - [2015/12/30 v1.99n LaTeX Kernel (font encodings)] + [2016/06/19 v1.99m LaTeX Kernel (font encodings)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltoutenc.dtx} @@ -1470,6 +1470,15 @@ % %\IncludeInRelease{0000/00/00}{\textcommabelow}{comma accent}% %\let\textcommabelow\@undefined +%\expandafter\let\csname\string\T1\string\c-G\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-K\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-k\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-L\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-l\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-N\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-n\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-R\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-r\endcsname\@undefined %\EndIncludeInRelease % \end{macrocode} % @@ -1494,6 +1503,8 @@ % %\IncludeInRelease{0000/00/00}{\textcommaabove}{comma above}% %\let\textcommaabove\@undefined +%\expandafter\let\csname\string\OT1\string\c-g\endcsname\@undefined +%\expandafter\let\csname\string\T1\string\c-g\endcsname\@undefined %\EndIncludeInRelease % \end{macrocode} % @@ -1699,8 +1710,11 @@ % T1 encoding is given more extensive set of overloads for \verb|\c| % But here we just adjust \verb|\c{g}|. % \changes{v1.99n}{2015/02/16}{Added composites for \cs{c}} +% \changes{v1.99m}{2016/06/19}{OT1 definition (was duplicate T1 definition)} % \begin{macrocode} -\DeclareTextCompositeCommand{\c}{T1}{g}{\textcommaabove{g}} +\ifx\textcommaabove\@undefined\else +\DeclareTextCompositeCommand{\c}{OT1}{g}{\textcommaabove{g}} +\fi % \end{macrocode} % % \begin{macrocode} @@ -2056,8 +2070,11 @@ % \end{macrocode} % \changes{v1.99n}{2015/02/16}{Added composites for \c{c}} % \begin{macrocode} -\DeclareTextCompositeCommand{\c}{T1}{G}{\textcommabelow{G}} +\ifx\textcommaabove\@undefined\else \DeclareTextCompositeCommand{\c}{T1}{g}{\textcommaabove{g}} +\fi +\ifx\textcommabelow\@undefined\else +\DeclareTextCompositeCommand{\c}{T1}{G}{\textcommabelow{G}} \DeclareTextCompositeCommand{\c}{T1}{K}{\textcommabelow{K}} \DeclareTextCompositeCommand{\c}{T1}{k}{\textcommabelow{k}} \DeclareTextCompositeCommand{\c}{T1}{L}{\textcommabelow{L}} @@ -2066,6 +2083,7 @@ \DeclareTextCompositeCommand{\c}{T1}{n}{\textcommabelow{n}} \DeclareTextCompositeCommand{\c}{T1}{R}{\textcommabelow{R}} \DeclareTextCompositeCommand{\c}{T1}{r}{\textcommabelow{r}} +\fi % \end{macrocode} % % \begin{macrocode} -- cgit v1.2.3