latex2e (13jul16)

git-svn-id: svn://tug.org/texlive/trunk@41688 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 17 insertions, 3 deletions

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