summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-07-13 22:34:16 +0000
committerKarl Berry <karl@freefriends.org>2016-07-13 22:34:16 +0000
commit34f243dce079f616b05982574fcaa361c21eb1fe (patch)
treeaf8c344ef876ad9ebc757a07a24c32b6f8b054e1 /Master/texmf-dist/source
parent340fd1eddc14e61d3f7e4b493269dcb960cdb3bc (diff)
latex2e (13jul16)
git-svn-id: svn://tug.org/texlive/trunk@41688 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/graphics/color.dtx4
-rw-r--r--Master/texmf-dist/source/latex/graphics/graphics-drivers.ins5
-rw-r--r--Master/texmf-dist/source/latex/graphics/graphics.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tools/bm.dtx18
-rw-r--r--Master/texmf-dist/source/latex/tools/tabularx.dtx2
5 files changed, 30 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/graphics/color.dtx b/Master/texmf-dist/source/latex/graphics/color.dtx
index 14bd364f4fc..d85b78349d8 100644
--- a/Master/texmf-dist/source/latex/graphics/color.dtx
+++ b/Master/texmf-dist/source/latex/graphics/color.dtx
@@ -19,7 +19,7 @@
%<driver> \ProvidesFile{color.drv}
% \fi
% \ProvidesFile{color.dtx}
- [2016/06/02 v1.1d Standard LaTeX Color (DPC)]
+ [2016/07/10 v1.1e Standard LaTeX Color (DPC)]
%
% \iffalse
%<*driver>
@@ -147,6 +147,8 @@
% The |setpagesize| option requests that the driver option sets the page size.
% \changes{v1.1d}{2016/06/02}
% {(no)setpagesize options added}
+% (Whichever option is used, the page size is not set by this package if |\mag|
+% has been changed from its default value.)
% \begin{macrocode}
\newif\ifGin@setpagesize\Gin@setpagesizetrue
\DeclareOption{setpagesize}{\Gin@setpagesizetrue}
diff --git a/Master/texmf-dist/source/latex/graphics/graphics-drivers.ins b/Master/texmf-dist/source/latex/graphics/graphics-drivers.ins
index f8964f0f2b1..dda92883ae1 100644
--- a/Master/texmf-dist/source/latex/graphics/graphics-drivers.ins
+++ b/Master/texmf-dist/source/latex/graphics/graphics-drivers.ins
@@ -22,8 +22,9 @@
% These ones probably work
\generate{%
- \file{dvips.def}{%
- \from{drivers.dtx}{dvips,color1,psrulesZ,dosrules,macrules}}
+% dvips.def moved to graphics-def distribution
+% \file{dvips.def}{%
+% \from{drivers.dtx}{dvips,color1,psrulesZ,dosrules,macrules}}
\file{dvipdf.def}{%
\from{drivers.dtx}{dvipdf,color1,psrulesZ}}
\file{dvipsone.def}{%
diff --git a/Master/texmf-dist/source/latex/graphics/graphics.dtx b/Master/texmf-dist/source/latex/graphics/graphics.dtx
index feca08c1e8f..c77b88a6ebf 100644
--- a/Master/texmf-dist/source/latex/graphics/graphics.dtx
+++ b/Master/texmf-dist/source/latex/graphics/graphics.dtx
@@ -19,7 +19,7 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2016/06/02 v1.0s Standard LaTeX Graphics (DPC,SPQR)]
+ [2016/07/10 v1.0t Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -117,6 +117,10 @@
% of the standard |%%BoundingBox|. These are used by some applications
% to get round the restriction that BoundingBox comments should only
% have integer values.
+% \item[setpagesize, nosetpagesize]
+% The |setpagesize| option requests that the driver option sets the page size.
+% (Whichever option is used, the page size is not set by this package if |\mag|
+% has been changed from its default value.)
% \item[demo] Instead of including a graphics file, make
% |\includegraphics| insert a black rectangle of size 150\,pt by
% 100\,pt unless either dimension was already specified by another
@@ -515,6 +519,8 @@
% \begin{option}{setpagesize}
% \begin{option}{nosetpagesize}
% The |setpagesize| option requests that the driver option sets the page size.
+% (Whichever option is used, the page size is not set by this package if |\mag|
+% has been changed from its default value.)
% \changes{v1.0s}{2016/06/02}
% {(no)setpagesize options added}
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/tools/bm.dtx b/Master/texmf-dist/source/latex/tools/bm.dtx
index 6dcefa78a65..785cbacce30 100644
--- a/Master/texmf-dist/source/latex/tools/bm.dtx
+++ b/Master/texmf-dist/source/latex/tools/bm.dtx
@@ -37,7 +37,7 @@
%<driver>\ProvidesFile{bm.drv}
% \fi
% \ProvidesFile{bm.dtx}
- [2016/02/27 v1.2a Bold Symbol Support (DPC/FMi)]
+ [2016/07/07 v1.2b Bold Symbol Support (DPC/FMi)]
%
% \iffalse
%<*driver>
@@ -1170,7 +1170,21 @@
\count@\delcode`#1\relax
\bm@delimiter
\else
- \bm@mathchar
+% \end{macrocode}
+% \changes{v1.2b}{2016/07/07}
+% {Check for mathchar values being reported as if via \cs{Umathchar}}
+% Here we need to check for LuaTeX merging mathchar values with Umathchar.
+% \begin{macrocode}
+ \ifnum\count@>"8000
+ \Umathcharnumdef\@tempa\count@
+ \xdef\meaning@{\meaning\@tempa}%
+ \expandafter\bm@mchar@test\meaning@""""\@nil\@tempa
+ \else
+ \bm@mathchar
+ \fi
+% \end{macrocode}
+%
+% \begin{macrocode}
\fi
\fi
\else
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx
index 3d2b641789e..0b98296eb31 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx
@@ -96,7 +96,7 @@
% comp.text.tex}.
%
% \DescribeEnv{tabularx}
-% "\begin{tabularx}{"\meta{width}"}{"\meta{preamble}"}"\\
+% "\begin{tabularx}{"\meta{width}"}["\meta{pos}"]{"\meta{preamble}"}"\\
% The arguments of "tabularx" are essentially the same as those of
% the standard "tabular*" environment. However rather than adding space
% between the columns to achieve the desired width, it adjusts the