diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2011-08-02 19:14:51 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2011-08-02 19:14:51 +0000 |
commit | cd6ea9d1647c9759b64bb84c9db4fbe85fd68501 (patch) | |
tree | c966fe39cac50d73d404ba5eb5e6f9a7e86090d5 /Master/texmf-dist/tex/latex/base | |
parent | c7dc62be48e8b177ca923c449a385b51ac14b918 (diff) |
latex update 2011-05-08
git-svn-id: svn://tug.org/texlive/trunk@23339 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/base')
-rw-r--r-- | Master/texmf-dist/tex/latex/base/doc.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/base/latex.ltx | 29 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/base/lppl.tex | 17 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/base/ltpatch.ltx | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/base/shortvrb.sty | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/base/textcomp.sty | 14 |
6 files changed, 53 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/base/doc.sty b/Master/texmf-dist/tex/latex/base/doc.sty index 363ad1b4f73..99cdb43dd03 100644 --- a/Master/texmf-dist/tex/latex/base/doc.sty +++ b/Master/texmf-dist/tex/latex/base/doc.sty @@ -38,7 +38,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{doc} - [2006/02/02 v2.1d + [2010/02/04 v2.1e Standard LaTeX documentation package (FMi)] %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -193,7 +193,9 @@ \@ifundefined{Module}{% \def\Module#1{\mod@math@codes$\langle\mathsf{#1}\rangle$} }{} -\def\mod@math@codes{\mathcode`\|="226A \mathcode`\&="2026} +\def\mod@math@codes{\mathcode`\|="226A \mathcode`\&="2026 + \mathcode`\-="702D \mathcode`\+="702B + \mathcode`\:="703A \mathcode`\=="703D } \newskip\MacrocodeTopsep \MacrocodeTopsep = 3pt plus 1.2pt minus 1pt \newdimen\MacroIndent \settowidth\MacroIndent{\rmfamily\scriptsize 00\ } diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index d8129c1ee77..124b01d9901 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -521,7 +521,7 @@ \nonfrenchspacing %%% From File: ltvers.dtx \def\fmtname{LaTeX2e} -\edef\fmtversion{2009/09/24} +\edef\fmtversion{2011/06/27} \iffalse \def\reserved@a#1/#2/#3\@nil{% \count@\year @@ -2738,10 +2738,19 @@ Type H <return> for immediate help.}% %%% From File: ltfssdcl.dtx %% Copyright (C) 1989-1998 Frank Mittelbach and Rainer Sch\"opf, %% all rights reserved. -\def\in@#1#2{% - \def\in@@##1#1##2##3\in@@{% - \ifx\in@##2\in@false\else\in@true\fi}% - \in@@#2#1\in@\in@@} +\def\in@#1#2% + {% + \begingroup + \def\in@@##1#1{}% + \toks@\expandafter{\in@@#2{}{}#1}% + \edef\in@@{\the\toks@}% + \expandafter\endgroup + \ifx\in@@\@empty + \in@false + \else + \in@true + \fi + } \newif\ifin@ \let\version@list=\@empty \@onlypreamble\version@list @@ -3770,21 +3779,23 @@ Type H <return> for immediate help.}% \fi \fi } +\newif\ifmaybe@ic + \def \maybe@ic {\futurelet\@let@token\maybe@ic@} \def \maybe@ic@ {% \ifdim \fontdimen\@ne\font>\z@ \else - \@tempswatrue + \maybe@ictrue \expandafter\@tfor\expandafter\reserved@a\expandafter:\expandafter=% \nocorrlist \do \t@st@ic - \if@tempswa \sw@slant \fi + \ifmaybe@ic \sw@slant \fi \fi } \def \t@st@ic {% \expandafter\let\expandafter\reserved@b\expandafter=\reserved@a\relax \ifx\reserved@b\@let@token - \@tempswafalse + \maybe@icfalse \@break@tfor \fi } @@ -3897,7 +3908,7 @@ Type H <return> for immediate help.}% \let\@setckpt\@gobbletwo \let\@newl@bel\@testdef \@tempswafalse - \makeatletter \input\jobname.aux + \makeatletter \@@input\jobname.aux \fi \@dofilelist \ifdim \font@submax >\fontsubfuzz\relax diff --git a/Master/texmf-dist/tex/latex/base/lppl.tex b/Master/texmf-dist/tex/latex/base/lppl.tex index 999acdd6292..9cef93ba6b4 100644 --- a/Master/texmf-dist/tex/latex/base/lppl.tex +++ b/Master/texmf-dist/tex/latex/base/lppl.tex @@ -1,7 +1,7 @@ % % $Id: lppl.tex 5882 2008-05-04 17:28:59Z mittelba $ % -% Copyright 1999 2002-2008 LaTeX3 Project +% Copyright 1999 2002-2011 LaTeX3 Project % Everyone is allowed to distribute verbatim copies of this % license document, but modification of it is not allowed. % @@ -197,7 +197,8 @@ on the Work, and compile this Derived Work, thus creating a Compiled Work based on the Derived Work. - \item\label{LPPL:item:conditions} If you are not the Current Maintainer of the + \item\label{LPPL:item:conditions} If you are not the Current Maintainer + of the Work, you may distribute a Derived Work provided the following conditions are met for every component of the Work unless that component clearly states in the copyright notice that it is exempt @@ -213,7 +214,8 @@ modified version of this component to the user when used interactively with that Base Interpreter. - \item\label{LPPL:item:changelog} Every component of the Derived Work contains prominent + \item\label{LPPL:item:changelog} Every component of the Derived Work + contains prominent notices detailing the nature of the changes to that component, or a prominent reference to another file that is distributed as part of the Derived Work and that contains a complete and @@ -226,7 +228,8 @@ of the Derived Work unless those persons have stated explicitly that they do provide such support for the Derived Work. - \item\label{LPPL:item:unmodifiedcopy} You distribute at least one of the following with the Derived Work: + \item\label{LPPL:item:unmodifiedcopy} You distribute at least one of + the following with the Derived Work: \begin{enumerate} \item A complete, unmodified copy of the Work; if your distribution of a modified component is made by offering @@ -244,8 +247,8 @@ distribute a Compiled Work generated from a Derived Work, as long as the Derived Work is distributed to all recipients of the Compiled Work, and as long as the conditions of - Clause~\ref{LPPL:item:conditions}, above, are met with regard to the Derived - Work. + Clause~\ref{LPPL:item:conditions}, above, are met with regard to the + Derived Work. \item The conditions above are not intended to prohibit, and hence do not apply to, the modification, by any method, of any component @@ -259,7 +262,7 @@ relax or nullify any sections of this license as they pertain to the results of applying that process. - \item \null + \item \begin{enumerate} \item A Derived Work may be distributed under a different license provided that license itself honors the conditions listed in diff --git a/Master/texmf-dist/tex/latex/base/ltpatch.ltx b/Master/texmf-dist/tex/latex/base/ltpatch.ltx index 12c5af2a021..4ee7485cccb 100644 --- a/Master/texmf-dist/tex/latex/base/ltpatch.ltx +++ b/Master/texmf-dist/tex/latex/base/ltpatch.ltx @@ -1,9 +1,9 @@ %%%% -%%%% Patch file for the LaTeX2e kernel dated 2009/09/24 -%%%% (2009/09/24) +%%%% Patch file for the LaTeX2e kernel dated 2011/06/27 +%%%% (2011/06/27) -\def\fmtversion@topatch{2009/09/24} % This patch will not work with +\def\fmtversion@topatch{2011/06/27} % This patch will not work with % any other release. \def\patch@level{0} @@ -19,7 +19,7 @@ *********************************************^^J% ltpatch.ltx has fixed certain problems with the `kernel' of LaTeX.^^J% Certain other files in the LaTeX distribution have also been updated^^J% -since the last release (list correct as of 2009/09/24):^^J% +since the last release (list correct as of 2011/06/27):^^J% base/xxxxxxx.dtx..............(patch 1)^^J% unpacked/yyyyyyy.cls..........(patch 1)^^J% ^^J% diff --git a/Master/texmf-dist/tex/latex/base/shortvrb.sty b/Master/texmf-dist/tex/latex/base/shortvrb.sty index 2b871da4cd1..752172e7676 100644 --- a/Master/texmf-dist/tex/latex/base/shortvrb.sty +++ b/Master/texmf-dist/tex/latex/base/shortvrb.sty @@ -38,7 +38,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{shortvrb} - [2006/02/02 v2.1d + [2010/02/04 v2.1e Standard LaTeX documentation package (FMi)] %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/base/textcomp.sty b/Master/texmf-dist/tex/latex/base/textcomp.sty index df5b4a95c73..85bc8b80723 100644 --- a/Master/texmf-dist/tex/latex/base/textcomp.sty +++ b/Master/texmf-dist/tex/latex/base/textcomp.sty @@ -308,6 +308,20 @@ \DeclareEncodingSubset{TS1}{txr} {0} \DeclareEncodingSubset{TS1}{txss} {0} \DeclareEncodingSubset{TS1}{txtt} {0} +\DeclareEncodingSubset{TS1}{lmr} {0} +\DeclareEncodingSubset{TS1}{lmdh} {0} +\DeclareEncodingSubset{TS1}{lmss} {0} +\DeclareEncodingSubset{TS1}{lmssq} {0} +\DeclareEncodingSubset{TS1}{lmvtt} {0} +\DeclareEncodingSubset{TS1}{qhv} {0} +\DeclareEncodingSubset{TS1}{qag} {0} +\DeclareEncodingSubset{TS1}{qbk} {0} +\DeclareEncodingSubset{TS1}{qcr} {0} +\DeclareEncodingSubset{TS1}{qcs} {0} +\DeclareEncodingSubset{TS1}{qpl} {0} +\DeclareEncodingSubset{TS1}{qtm} {0} +\DeclareEncodingSubset{TS1}{qzc} {0} +\DeclareEncodingSubset{TS1}{qhvc} {0} \DeclareEncodingSubset{TS1}{futs} {4} \DeclareEncodingSubset{TS1}{futx} {4} \DeclareEncodingSubset{TS1}{futj} {4} |