mathfam256 (14sep19)

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

5 files changed, 63 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/mathfam256/LICENSE b/Master/texmf-dist/doc/latex/mathfam256/LICENSE
index 8f03f674db4..c463b620a91 100644
--- a/Master/texmf-dist/doc/latex/mathfam256/LICENSE
+++ b/Master/texmf-dist/doc/latex/mathfam256/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 Hironobu Yamashita
+Copyright (c) 2016-2019 Hironobu Yamashita
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -11,9 +11,9 @@ modification, are permitted provided that the following conditions are met:
   this list of conditions and the following disclaimer in the documentation
   and/or other materials provided with the distribution.
 
-* Neither the name of platex nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
+* Neither the name of the copyright holder nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/Master/texmf-dist/doc/latex/mathfam256/README.md b/Master/texmf-dist/doc/latex/mathfam256/README.md
index b23ebf214ff..2cdc8663eef 100644
--- a/Master/texmf-dist/doc/latex/mathfam256/README.md
+++ b/Master/texmf-dist/doc/latex/mathfam256/README.md
@@ -34,6 +34,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
 
 ## Release Date
 
-2018-01-22
+**not tagged**; later than 2019-09-14?
 
 Hironobu Yamashita
diff --git a/Master/texmf-dist/doc/latex/mathfam256/mathfam256.pdf b/Master/texmf-dist/doc/latex/mathfam256/mathfam256.pdf
index 0427fd08d1d..96dc7d411f3 100644
--- a/Master/texmf-dist/doc/latex/mathfam256/mathfam256.pdf
+++ b/Master/texmf-dist/doc/latex/mathfam256/mathfam256.pdf
diff --git a/Master/texmf-dist/doc/latex/mathfam256/mathfam256.tex b/Master/texmf-dist/doc/latex/mathfam256/mathfam256.tex
index 6685c5babf0..396d018138f 100644
--- a/Master/texmf-dist/doc/latex/mathfam256/mathfam256.tex
+++ b/Master/texmf-dist/doc/latex/mathfam256/mathfam256.tex
@@ -36,8 +36,8 @@ change for \epTeX/\eupTeX\ (``FAM256'' patch based on \OMEGA\ is applied).
 
 However, the ``native'' kernel support is limited:
 \begin{itemize}
-\item Lamed (\LaTeX\ on Aleph) is not supported at all.
 \item The upper limit for math symbol families is still limited to 16.
+\item Lamed (\LaTeX\ on Aleph) is not supported at all.
 \end{itemize}
 
 The package \textsf{mathfam256} is an attempt to resolve this situation;
@@ -55,7 +55,7 @@ The \verb+\omath...+ primitives are originally introduced in
 \OMEGA\ (Omega), and are currently available in the followings.
 Without one of these, the package causes an error.
 \begin{itemize}
-\item \pLaTeX/\upLaTeX, run on \epTeX/\eupTeX\ (Japanese TeX engine)
+\item \pLaTeX/\upLaTeX, run on \epTeX/\eupTeX\ (Japanese \TeX\ engine)
 \item Lamed, run on Aleph (successor of \OMEGA)
 \end{itemize}
 
@@ -81,7 +81,7 @@ possible.
 256個までの数式ファミリをサポートするものが現れています。
 
 この状況を鑑み、\LaTeXe カーネル（2015/01/01以降）では、
-Unicode対応のXe\TeX とLua\LaTeX について、数式ファミリ（正確には
+Unicode対応のXe\TeX とLua\TeX について、数式ファミリ（正確には
 \verb+\DeclareMathAlphebet+で使われる数式アルファベット）の上限を256に
 増やしています。同様に、\pLaTeXe/\upLaTeXe カーネル（2016/11/29以降）も、
 \OMEGA ベースのいわゆる「FAM256パッチ」が適用された\epTeX/\eupTeX について、
@@ -93,8 +93,8 @@ Unicode対応のXe\TeX とLua\LaTeX について、数式ファミリ（正確�
 
 しかし、この“ネイティブな”カーネルのサポートには限界があります：
 \begin{itemize}
-\item Lamed (\LaTeX\ on Aleph)は全く考慮されていない。
 \item 数式シンボルフォントの上限は依然として16のままである（安全のため）。
+\item Lamed (\LaTeX\ on Aleph)は全く考慮されていない。
 \end{itemize}
 
 この\textsf{mathfam256}パッケージは、この状況を改善する試みです。
@@ -139,7 +139,7 @@ Unicode対応のXe\TeX とLua\LaTeX について、数式ファミリ（正確�
   掲示板「\TeX\ Q\ \&\ A」，2009/02/21．\\
   \url{http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/52799.html}
  \bibitem{eptexdoc} 北川 弘典，「\epTeX について」．\\
-  \verb+$TEXMFDIST/doc/ptex/ptex-base/etex_man.pdf+
+  \verb+$TEXMFDIST/doc/ptex/ptex-base/eptexdoc.pdf+
 \end{thebibliography}
 
 \end{document}
diff --git a/Master/texmf-dist/tex/latex/mathfam256/mathfam256.sty b/Master/texmf-dist/tex/latex/mathfam256/mathfam256.sty
index 9749f8f8972..6b0fb9dc7e2 100644
--- a/Master/texmf-dist/tex/latex/mathfam256/mathfam256.sty
+++ b/Master/texmf-dist/tex/latex/mathfam256/mathfam256.sty
@@ -1,6 +1,9 @@
 %
 % mathfam256.sty
+% 2019/09/14 v0.3  Hironobu Yamashita (aminophen)
+%   -- bug fix and support LaTeX2e 2019-10-01
 % 2018/01/22 v0.2  Hironobu Yamashita (aminophen)
+%   -- first CTAN version
 % 2016/12/26 v0.1  Hironobu Yamashita (aminophen)
 % 2009/02/20 v0.01 Kazuyoshi Yamamoto (ymt)
 %
@@ -13,7 +16,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{mathfam256}
-  [2018/01/22 v0.2 Extend math family up to 256]
+  [2019/09/14 v0.3 Extend math family up to 256]
 
 %% engine check
 \ifx\omathchar\@undefined
@@ -24,9 +27,11 @@
     * upLaTeX (run on e-upTeX)\MessageBreak
     * Lamed (run on Aleph)\MessageBreak
     It seems you are running unsupported engine}\@ehc
+  \expandafter\endinput
 \fi
 \ifx\numexpr\@undefined
   \PackageError{mathfam256}{This package requires e-TeX features}\@ehc
+  \expandafter\endinput
 \fi
 
 %% engine check has been done, so always 256
@@ -93,6 +98,20 @@
     {\e@alloc\mathgroup\chardef{\count18}\m@ne\e@mathgroup@top}%
 }
 
+%% LaTeX2e 2019/10/01 makes lots of commands robust;
+%% follow both old and new behavior
+\edef\omfcclvi@reset{%
+  \catcode`\noexpand\&=\the\catcode`\&\relax
+  \catcode`\noexpand\~=\the\catcode`\~\relax
+  \let\noexpand\omfcclvi@reset\noexpand\@undefined}
+\@ifl@t@r\fmtversion{2019/10/01}{%
+  \catcode`\&=9\relax
+  \catcode`\~=14\relax
+}{%
+  \catcode`\&=14\relax
+  \catcode`\~=9\relax
+}
+
 %% use \omath... primitives for low-level commands
 \def\set@mathchar#1#2#3#4{%
   \ifnum#1<\sixt@@n
@@ -114,6 +133,7 @@
   \else
     \xdef#2{\omathaccent"\mathchar@type#3\hexnumber@@#100#4\relax}%
   \fi
+& \MakeRobust#2%
 }
 \def\set@mathdelimiter#1#2#3#4#5#6{%
   \@tempswatrue
@@ -125,6 +145,7 @@
     \xdef#3{\odelimiter"\mathchar@type#4\hexnumber@@#100#5%
                        "\hexnumber@@#200#6\relax}%
   \fi
+& \MakeRobust#3%
 }
 \def\set@@mathdelimiter#1#2#3#4#5{%
   \@tempswatrue
@@ -302,13 +323,19 @@
   \ifin@
     \begingroup
       \if\relax\noexpand#1% is command?
-        \edef\reserved@a{\noexpand\in@{\string\mathchar}{\meaning#1}}%
+&       \edef\reserved@b{\expandafter\noexpand
+&                        \csname\expandafter\@gobble\string#1\space\endcsname}%
+        \edef\reserved@a
+          {\noexpand\in@{\expandafter\@gobble\string\mathchar}%
+~                       {\meaning#1}}%
+&                       {\meaning#1\expandafter\meaning\reserved@b}}%
         \reserved@a
+&       \global\expandafter\let\reserved@b\@undefined
         \ifin@
           \oset@mathsymbol{#1}{#2}{#3}{#4}%
           \@font@info{Redeclaring math symbol \string#1}%
         \else
-            \expandafter\ifx
+          \expandafter\ifx
             \csname\expandafter\@gobble\string#1\endcsname
             \relax
             \oset@mathsymbol{#1}{#2}{#3}{#4}%
@@ -341,9 +368,16 @@
   \ifin@
     \begingroup
       \if\relax\noexpand#1% is command?
-        \edef\reserved@a{\noexpand\in@{\string\mathaccent}{\meaning#1}}%
+        \edef\reserved@a{\noexpand\in@
+~          {\expandafter\@gobble\string\mathaccent}{\meaning#1}}%
+&         {\expandafter\@gobble\string\mathaccent}
+&         {\expandafter\meaning
+&          \csname\expandafter\@gobble\string#1\space\endcsname}}%
         \reserved@a
         \ifin@
+&         \expandafter\let
+&           \csname\expandafter\@gobble\string#1\space\endcsname
+&           \@undefined
           \oset@mathaccent{#1}{#2}{#3}{#4}%
           \@font@info{Redeclaring math accent \string#1}%
         \else
@@ -367,7 +401,9 @@
 \def\oset@mathaccent#1#2#3#4{%
   \xdef#1{\omathaccent%
     \number
-    \numexpr"1000000*\mathchar@type#2+"10000*\csname sym#3\endcsname+#4}}
+    \numexpr"1000000*\mathchar@type#2+"10000*\csname sym#3\endcsname+#4}%
+& \MakeRobust#1%
+}
 \@onlypreamble\oset@mathaccent
 %\def\DeclareMathDelimiter#1{%
 %  \if\relax\noexpand#1%
@@ -398,13 +434,17 @@
        \expandafter{\group@list}%
     \ifin@
       \begingroup
-        \edef\reserved@a{\noexpand\in@{\string\delimiter}{\meaning#1}}%
+        \edef\reserved@a{\noexpand\in@
+          {\expandafter\@gobble\string\delimiter}%
+~         {\meaning#1}}%
+&         {\expandafter\meaning\csname\expandafter\@gobble\string#1\space\endcsname}}%
         \reserved@a
         \ifin@
+&         \expandafter\let\csname\expandafter\@gobble\string#1\space\endcsname\@undefined
           \oset@mathdelimiter{#1}{#2}{#3}{#4}{#5}{#6}%
           \@font@info{Redeclaring math delimiter \string#1}%
         \else
-            \expandafter\ifx
+          \expandafter\ifx
             \csname\expandafter\@gobble\string#1\endcsname
             \relax
             \oset@mathdelimiter{#1}{#2}{#3}{#4}{#5}{#6}%
@@ -445,6 +485,7 @@
     \numexpr"10000*\csname sym#5\endcsname+#6%
   \xdef#1{\odelimiter\number\count\z@\space \number\count\tw@}%
   \endgroup
+& \MakeRobust#1%
 }
 \@onlypreamble\oset@mathdelimiter
 \def\oset@@mathdelimiter#1#2#3#4#5{%
@@ -461,7 +502,8 @@
        \relax
      \let#1\radical
   \fi
-  \edef\reserved@a{\noexpand\in@{\string\radical}{\meaning#1}}%
+  \edef\reserved@a{\noexpand\in@
+       {\expandafter\@gobble\string\radical}{\meaning#1}}%
   \reserved@a
   \ifin@
     \expandafter\in@\csname sym#2\expandafter\endcsname
@@ -491,5 +533,8 @@
 }
 \@onlypreamble\oset@mathradical
 
+%% reset
+\omfcclvi@reset
+
 %% all done
 \endinput