summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/base
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-06-25 22:12:48 +0000
committerKarl Berry <karl@freefriends.org>2016-06-25 22:12:48 +0000
commita0f8bf44384432ef1eb9955ad86c4f41f8d6a241 (patch)
tree7e807878f655b686b9ddd0e742be2e46cb512309 /Master/texmf-dist/source/latex/base
parent360fd69fcc11e619361439a66e44dc038090e9c5 (diff)
latex[2e] (25jun16)
git-svn-id: svn://tug.org/texlive/trunk@41542 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/base')
-rw-r--r--Master/texmf-dist/source/latex/base/ltclass.dtx5
-rw-r--r--Master/texmf-dist/source/latex/base/ltoutenc.dtx26
-rw-r--r--Master/texmf-dist/source/latex/base/ltvers.dtx11
3 files changed, 34 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/base/ltclass.dtx b/Master/texmf-dist/source/latex/base/ltclass.dtx
index 4e5573bce7f..988f9beb888 100644
--- a/Master/texmf-dist/source/latex/base/ltclass.dtx
+++ b/Master/texmf-dist/source/latex/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2014/09/29 v1.1i LaTeX Kernel (Class & Package Interface)]
+ [2016/06/20 v1.1j LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -629,9 +629,10 @@
\@onlypreamble\@ifl@t@r
% \end{macrocode}
%
+% \changes{v1.1j}{2016/06/20}
+% {don't declare as \cs{@onlypreamble}}
% \begin{macrocode}
\def\@parse@version#1/#2/#3#4#5\@nil{#1#2#3#4 }
-\@onlypreamble\@parse@version
% \end{macrocode}
% \end{macro}
% \end{macro}
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 @@
%<TS1>\ProvidesFile{ts1enc.def}[2001/06/05 v3.0e (jk/car/fm)
%<package>\ProvidesPackage{fontenc}
%<TS1sty>\ProvidesPackage{textcomp}
-%<OT1|T1|OMS|OML|OT4|package|TS1sty> [2005/09/27 v1.99g
+%<OT1|T1|OMS|OML|OT4|package|TS1sty> [2016/06/19 v1.99m
%<OT1|T1|OMS|OML|OT4|TS1> Standard LaTeX file]
%<package|TS1sty> 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 @@
%</2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{0000/00/00}{\textcommabelow}{comma accent}%
%<latexrelease>\let\textcommabelow\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-G\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-K\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-k\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-L\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-l\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-N\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-n\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-R\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-r\endcsname\@undefined
%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
%
@@ -1494,6 +1503,8 @@
%</2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{0000/00/00}{\textcommaabove}{comma above}%
%<latexrelease>\let\textcommaabove\@undefined
+%<latexrelease>\expandafter\let\csname\string\OT1\string\c-g\endcsname\@undefined
+%<latexrelease>\expandafter\let\csname\string\T1\string\c-g\endcsname\@undefined
%<latexrelease>\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}
diff --git a/Master/texmf-dist/source/latex/base/ltvers.dtx b/Master/texmf-dist/source/latex/base/ltvers.dtx
index 5dab5b2175c..c7415266ab4 100644
--- a/Master/texmf-dist/source/latex/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex/base/ltvers.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltvers.dtx}
- [2015/08/23 v1.0v LaTeX Kernel (Version Info)]
+ [2016/06/20 v1.0w LaTeX Kernel (Version Info)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltvers.dtx}
@@ -95,7 +95,7 @@
{2016/03/31}
%</2ekernel|latexrelease>
%<*2ekernel>
-\def\patch@level{1}
+\def\patch@level{2}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -167,10 +167,17 @@
% \end{macrocode}
%
% \begin{macro}{\IncludeInRelease}
+% \changes{v1.0w}{2015/02/21}
+% {set \cs{@currname} empty here (in case \cs{IncludeInRelease} input early)}
+% \begin{macrocode}
+%<2ekernel>\let\@currname\@empty
+% \end{macrocode}
+%
% \changes{v1.0n}{2015/01/07}{macro added}
% \changes{v1.0m}{2015/01/17}{modified with \cs{@currname}}
% \changes{v1.0o}{2015/01/19}{Optional argument}
% \changes{v1.0q}{2015/02/19}{Swap argument order}
+%
% \begin{macrocode}
%<*2ekernel|latexrelease>
\def\IncludeInRelease#1{\kernel@ifnextchar[%