mathastext (12dec13)

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

8 files changed, 176 insertions, 83 deletions

diff --git a/Master/texmf-dist/doc/latex/mathastext/README b/Master/texmf-dist/doc/latex/mathastext/README
index d39def6a0e3..e6c2fa61cf9 100644
--- a/Master/texmf-dist/doc/latex/mathastext/README
+++ b/Master/texmf-dist/doc/latex/mathastext/README
@@ -5,31 +5,22 @@ Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol.
         +                 mathastext                +
         +                                           +
         +      `Use the text font in math mode'     +
-        +             v1.3a  2013/09/04             +
+        +             v1.3b  2013/12/11             +
         +             jfbu (at) free.fr             +
         +-------------------------------------------+
 
-  The files of this package may be distributed and/or modified
-  under the conditions of the LaTeX Project Public License,
-  either version 1.3 of this license or (at your option) any
-  later version.
+This Work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.3 of this license or (at your option) any later
+version.
 
-  The latest version of this license is in
-    http://www.latex-project.org/lppl.txt
-  and version 1.3 or later is part of all distributions of
-  LaTeX version 2003/12/01 or later.
-
-
-                    INSTALLATION
-
-Run latex or pdflatex on mathastext.dtx (or tex on mathastext.ins)
-to create the mathastext.sty file. Move the .sty file to a
-suitable location within the TeX installation. Run latex twice
-more on mathastext.dtx to finish producing the documentation.
-
-During this process test files have been generated which serve to
-illustrate some features of the package.
+The latest version of this license is in
+  http://www.latex-project.org/lppl.txt
+and version 1.3 or later is part of all distributions of
+LaTeX version 2003/12/01 or later.
 
+The Author of this Work is 
+   Jean-Francois Burnol <jfbu at free dot fr>
 
                     INTRODUCTION
 
@@ -50,35 +41,35 @@ try out mathastext: it will simply use the text font also
 for the math!
 
 
-                        USAGE
+                      USAGE
 
-          `mathastext' is a LaTeX package
+  `mathastext' is a LaTeX package
 
-              \usepackage{mathastext}
+      \usepackage{mathastext}
 
-          The document will use in math mode the text font
-          as configured at package loading time, for these
-          characters:
+  The document will use in math mode the text font
+  as configured at package loading time, for these
+  characters:
 
-              abcdefghijklmnopqrstuvwxyz
-              ABCDEFGHIJKLMNOPQRSTUVWXYZ
-              0123456789
-              !?,.:;+-=()[]/#$%&<>|{}\
+      abcdefghijklmnopqrstuvwxyz
+      ABCDEFGHIJKLMNOPQRSTUVWXYZ
+      0123456789
+      !?,.:;+-=()[]/#$%&<>|{}\
 
-          The command \MTsetmathskips allows to set up extra
-          spacings around each given letter.
+  The command \MTsetmathskips allows to set up extra
+  spacings around each given letter.
 
-          Use multiple \Mathastext[name]'s to define in the
-          preamble various math versions using each a given
-          text font, to be later activated in the document  
-          body via the command \MTversion{name}.
+  Use multiple \Mathastext[name]'s to define in the
+  preamble various math versions using each a given
+  text font, to be later activated in the document  
+  body via the command \MTversion{name}.
 
-          With the subdued option, mathastext will be active
-          only inside such math versions distinct from the
-          normal and bold.
+  With the subdued option, mathastext will be active
+  only inside such math versions distinct from the
+  normal and bold.
 
-          Main options: italic, defaultmathsizes, subdued,
-                        asterisk, LGRgreek.
+  Main options: italic, defaultmathsizes, subdued,
+                asterisk, LGRgreek.
 
 Use the `italic' option to get the Latin letters in math
 mode be in italics. Digits and log-like operator names
@@ -108,9 +99,53 @@ Examples available there:
      http://jf.burnol.free.fr/showcase.html
 
 
+Installation:
+=============
+ 
+* with mathastext.ins: run tex on mathastext.ins to generate the package
+style file mathastext.sty as well as mathastext.tex and some test files.
+
+* without mathastext.ins: run tex on mathastext.dtx to generate the
+package style file mathastext.sty as well as mathastext.tex and some
+test files. (and also mathastext.ins)
+ 
+  Move the style file mathastext.sty to a location where TeX can find
+  it. In a TDS compliant hierarchy this will be
+  <TDS>:tex/latex/mathastext/mathastext.sty
+
+*documentation*: run latex thrice on mathastext.tex then dvipdfmx. Or,
+run pdflatex thrice on mathastext.dtx. In the former case the
+documentation is with source code included, in the latter without. The
+file mathastext.tex can be customized to change the font size or set
+other options therein.
+
+   (Note: one cannot use lualatex/xelatex to compile the documentation.)
+
+*test files*: mathastexttestmathversions.tex
+              mathastexttestunicodemacos.tex
+              mathastexttestunicodelinux.tex
+              mathastexttestalphabets.tex
 
 CHANGE LOG
 
+1.3b [2013/12/11]
+
+   * 1.2d code for \#, \$, \%, and \& modified erroneously the earlier
+correct 1.2c code and created a bug showing up with more than 16 math
+families (a possibility only with lualatex or xelatex).
+
+   * added second optional version name argument to \Mathastext and to
+\MTDeclareVersion, to transfer settings for things not otherwise changed
+by mathastext from a math version to the one declared. This is mainly
+for symbols and large symbols to be boldened also when a bold text font
+is a mathastextified in a mathastext-declared version.
+
+   * renamed \defaultprod to \MToriginalprod, \defaultsum to
+\MToriginalsum, (this is in case of option symbolmisc).
+
+   * changes to the dtx organization; options for generating the
+documentation can be customized in generated mathastext.tex file.
+
 1.3a [2013/09/04]
 
    * the somewhat silly \string's are removed from the \MTsetmathskips
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf b/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
index b3910321a3b..96d9a48a49b 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastext.tex b/Master/texmf-dist/doc/latex/mathastext/mathastext.tex
new file mode 100644
index 00000000000..709efe97c0b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastext.tex
@@ -0,0 +1,32 @@
+\def\MSTpkgdate    {2013/12/11}
+\def\MSTpkgversion {1.3b}
+%%----------------------------------------------------------------
+%% The mathastext package (version 1.3b of December 10, 2013)
+%% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
+%% Examples of use of mathastext:
+%%        http://jf.burnol.free.fr/mathastext.html
+%%        http://jf.burnol.free.fr/showcase.html
+%%----------------------------------------------------------------
+%% This is a generated file. Run latex thrice on this file mathastext.tex then
+%% run dvipdfmx on mathastext.dvi to produce the documentation mathastext.pdf,
+%% with the package source code included.
+%%
+%% Customize as desired the class options and the two toggles below.
+%%
+%% See mathastext.dtx for the copyright and the conditions for distribution
+%% and/or modification of this work.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{mathastext.tex}%
+[\MSTpkgdate\space v\MSTpkgversion\space
+       driver file for mathastext documentation (jfB)]%
+\PassOptionsToClass{a4paper,fontsize=11pt}{scrdoc}
+\chardef\Withdvipdfmx 1 % replace 1<space> by 0<space> for using latex/pdflatex
+\chardef\NoSourceCode 0 % replace 0<space> by 1<space> for no source code
+\input mathastext.dtx
+%%% Local Variables:
+%%% mode: latex
+%%% End:
+\endinput
+%%
+%% End of file `mathastext.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf
new file mode 100644
index 00000000000..9c455c610b5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex
index f38273070b8..376eef67d25 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex
@@ -1,10 +1,12 @@
 \def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3a} of \texttt{2013/09/04.}}
-%%
-%% Package `mathastext', for LaTeX2e.
-%% Author: Jean-Francois Burnol
+version \texttt{1.3b} of \texttt{2013/12/11}}
+%%----------------------------------------------------------------
+%% The mathastext package (version 1.3b of December 10, 2013)
 %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%%
+%% Examples of use of mathastext:
+%%        http://jf.burnol.free.fr/mathastext.html
+%%        http://jf.burnol.free.fr/showcase.html
+%%----------------------------------------------------------------
 %% This file `mathastexttestalphabets.tex' is for testing the extended
 %% scope of the math alphabet commands with package `mathastext', via
 %% the package command \MTnonlettersobeymathxx.
@@ -23,6 +25,8 @@ version \texttt{1.3a} of \texttt{2013/09/04.}}
 %% *IF* \MTnonlettersobeymathxx IS MADE USE OF.
 \usepackage{iftex}
 \ifXeTeX
+\expandafter\def\expandafter\testfileincipit\expandafter
+ {\testfileincipit\ (compiled with \XeLaTeX)}
 \usepackage[no-math]{fontspec}
 \setmainfont[ExternalLocation,
              Mapping=tex-text,
@@ -35,6 +39,8 @@ version \texttt{1.3a} of \texttt{2013/09/04.}}
              Mapping=tex-text]{texgyreheros-regular}
 \else
 \ifLuaTeX % for pdf output
+\expandafter\def\expandafter\testfileincipit\expandafter
+ {\testfileincipit\ (compiled with \LuaLaTeX)}
 \usepackage[no-math]{fontspec}
 \setmainfont[Ligatures=TeX]{TeX Gyre Termes}
 \setmonofont[Ligatures=TeX]{TeX Gyre Cursor}
@@ -176,18 +182,14 @@ Let's try the input
 \verb|( and $($|.
 \begingroup
 \catcode`(=\active \gdef ({X}
-This gives ( and $($.
-We
-see that \verb|mathastext| does not attempt to modify the definition of the
-active character, as this activation was not done via the \verb|babel| services.
-\catcode`\(=12
-\mathcode`(="8000
-We now revert the parenthesis to catcode other (but maintain \verb|\def ({X}| as
-definition of its active version), and then make it mathematically
-active using the command \verb|\mathcode`(="8000|.
-If we try
-\verb|$((($| we see that the parenthesis is not converted into an $X$: $((($.
-The mathematically active character was overruled by \verb|mathastext|.
+This gives ( and $($. We see that \verb|mathastext| does not attempt to modify
+the definition of the active character, as this activation was not done via the
+\verb|babel| services. \catcode`\(=12 \mathcode`(="8000 We now revert the
+parenthesis to catcode other (but maintain \verb|\def ({X}| as definition of its
+active version), and then make it mathematically active using the command
+\verb|\mathcode`(="8000|. If we try \verb|$((($| we see that the parenthesis is
+not converted into an $X$: $((($. The mathematically active character was
+overruled by \verb|mathastext|.
 
 Issuing \verb|\MTnonlettersdonotobeymathxx|\MTnonlettersdonotobeymathxx\ we do
 get the $X$'s from the input \verb|$((($|: $((($
@@ -196,7 +198,6 @@ This shows that \verb|mathastext| now does not modify in math mode the
 non-letter \verb|(|.
 
 \MTversion{upright}\MTnonlettersobeymathxx
-
 We defined in the preamble of the document a \verb|mathastext|-enhanced
 math version (named \verb|upright|) having the Latin letters upright in
 math mode. Let's switch to
@@ -208,9 +209,9 @@ inserts italic corrections for better positioning of the subscript:
 \verb|$f_i^i$| gives
 $f_i^i$.
 After \verb|\MTnoicinmath| which turns off this feature\MTnoicinmath{}, the same
-input gives $f_i^i$, which is different. \footnote{last time I tried, this only
-  worked with
-  PDF\LaTeX{}, not with \LuaLaTeX{} or \XeTeX{}.}
+input gives $f_i^i$, which is different.
+\footnote{last time I tried, this only worked with PDF\LaTeX{}, not with
+  \LuaLaTeX{} or \XeTeX{}.}
 
 Again with italic corrections on (\verb|\MTicinmath|)\MTicinmath{}
 \verb|$f_{abc}^{def}$| gives $f_{abc}^{def}$, and here is another one:
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex
index f2fcad0ffa7..190cc6d6837 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex
@@ -1,10 +1,12 @@
 \def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3a} of \texttt{2013/09/04.}}
-%%
-%% Package `mathastext', for LaTeX2e.
-%% Author: Jean-Francois Burnol
+version \texttt{1.3b} of \texttt{2013/12/11}}
+%%----------------------------------------------------------------
+%% The mathastext package (version 1.3b of December 10, 2013)
 %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%%
+%% Examples of use of mathastext:
+%%        http://jf.burnol.free.fr/mathastext.html
+%%        http://jf.burnol.free.fr/showcase.html
+%%----------------------------------------------------------------
 %% This file `mathastexttestversions.tex' is for testing the enhanced
 %% concept of math versions provided by the package `mathastext'.
 %%
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestlinux.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex
index 47dfc05a7b4..004c0517dca 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestlinux.tex
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex
@@ -1,12 +1,14 @@
 \def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3a} of \texttt{2013/09/04.}}
-%%
-%% Package `mathastext', for LaTeX2e.
-%% Author: Jean-Francois Burnol
+version \texttt{1.3b} of \texttt{2013/12/11}}
+%%----------------------------------------------------------------
+%% The mathastext package (version 1.3b of December 10, 2013)
 %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%%
-%% This file `mathastexttestlinux.tex' is for testing the use of the package
-%% `mathastext' with the unicode engines XeTeX or LuaLaTeX.
+%% Examples of use of mathastext:
+%%        http://jf.burnol.free.fr/mathastext.html
+%%        http://jf.burnol.free.fr/showcase.html
+%%----------------------------------------------------------------
+%% This file `mathastexttestunicodelinux.tex' is for testing the use
+%% of the package `mathastext' with the unicode engines XeTeX or LuaLaTeX.
 %%
 %% Fonts available on a Linux machine are used.
 %%
@@ -18,6 +20,16 @@ version \texttt{1.3a} of \texttt{2013/09/04.}}
 \usepackage{multicol}
 \usepackage[no-math]{fontspec}
 \usepackage{lmodern}
+\usepackage{metalogo}
+\usepackage{iftex}
+\ifXeTeX
+\expandafter\def\expandafter\testfileincipit\expandafter
+ {\testfileincipit\ (compiled with \XeLaTeX)}
+\else
+\ifLuaTeX
+\expandafter\def\expandafter\testfileincipit\expandafter
+ {\testfileincipit\ (compiled with \LuaLaTeX)}
+\fi\fi
 \usepackage[subdued,italic,asterisk]{mathastext}
 \setmainfont[Color=999999]{Verdana}      \Mathastext[Verdana]
 \setmainfont[Color=0000FF]{Arial}        \Mathastext[Arial]
@@ -82,4 +94,4 @@ Some among the fonts tested have no bold variant or no italic variant.
 \end{document}
 \endinput
 %%
-%% End of file `mathastexttestlinux.tex'.
+%% End of file `mathastexttestunicodelinux.tex'.
diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmacos.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex
index 87819f5f4a2..eb33ee8973d 100644
--- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmacos.tex
+++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex
@@ -1,12 +1,14 @@
 \def\testfileincipit{Test file to accompany \texttt{mathastext}
-version \texttt{1.3a} of \texttt{2013/09/04.}}
-%%
-%% Package `mathastext', for LaTeX2e.
-%% Author: Jean-Francois Burnol
+version \texttt{1.3b} of \texttt{2013/12/11}}
+%%----------------------------------------------------------------
+%% The mathastext package (version 1.3b of December 10, 2013)
 %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol
-%%
-%% This file `mathastexttestmacos.tex' is for testing the use of the package
-%% `mathastext' with the unicode engines XeTeX or LuaLaTeX.
+%% Examples of use of mathastext:
+%%        http://jf.burnol.free.fr/mathastext.html
+%%        http://jf.burnol.free.fr/showcase.html
+%%----------------------------------------------------------------
+%% This file `mathastexttestunicodemacos.tex' is for testing the use
+%% of the package `mathastext' with the unicode engines XeTeX or LuaLaTeX.
 %%
 %% Mac OS X specific fonts are used (10.8.2).
 %%
@@ -19,6 +21,15 @@ version \texttt{1.3a} of \texttt{2013/09/04.}}
 \usepackage[no-math]{fontspec}
 \usepackage{lmodern}
 \usepackage{metalogo}
+\usepackage{iftex}
+\ifXeTeX
+\expandafter\def\expandafter\testfileincipit\expandafter
+ {\testfileincipit\ (compiled with \XeLaTeX)}
+\else
+\ifLuaTeX
+\expandafter\def\expandafter\testfileincipit\expandafter
+ {\testfileincipit\ (compiled with \LuaLaTeX)}
+\fi\fi
 \usepackage[subdued,italic,asterisk]{mathastext}
 \setmainfont[Color=FF0000]{Hoefler Text}  \Mathastext[Hoefler]
 \setmainfont[Color=336633]{American Typewriter}\Mathastext[Typewriter]
@@ -85,4 +96,4 @@ such a difference between the two engines.
 \end{document}
 \endinput
 %%
-%% End of file `mathastexttestmacos.tex'.
+%% End of file `mathastexttestunicodemacos.tex'.