diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/mathastext/README | 20 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mathastext/mathastext.pdf | bin | 277761 -> 372494 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mathastext/mathastext.tex | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf | bin | 41444 -> 41503 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/mathastext/mathastext.dtx | 173 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/mathastext/mathastext.ins | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/mathastext/mathastext.sty | 49 |
11 files changed, 148 insertions, 122 deletions
diff --git a/Master/texmf-dist/doc/latex/mathastext/README b/Master/texmf-dist/doc/latex/mathastext/README index e6c2fa61cf9..1575a9eaedc 100644 --- a/Master/texmf-dist/doc/latex/mathastext/README +++ b/Master/texmf-dist/doc/latex/mathastext/README @@ -5,7 +5,7 @@ Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol. + mathastext + + + + `Use the text font in math mode' + - + v1.3b 2013/12/11 + + + v1.3c 2013/12/14 + + jfbu (at) free.fr + +-------------------------------------------+ @@ -128,17 +128,17 @@ other options therein. 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). +1.3c [2013/12/14] + + * added a starred variant to \MTversion which tells mathastext to +only do the math set-up and not modify the text fonts. * 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. +for symbols and large symbols to be the bold ones when the user sets up +the series of a mathastextified font to be bold in a mathastext-declared +version. * renamed \defaultprod to \MToriginalprod, \defaultsum to \MToriginalsum, (this is in case of option symbolmisc). @@ -146,6 +146,10 @@ is a mathastextified in a mathastext-declared version. * changes to the dtx organization; options for generating the documentation can be customized in generated mathastext.tex file. + * 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). + 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 Binary files differindex 96d9a48a49b..939e9dca396 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 index 709efe97c0b..4a0befb79d4 100644 --- a/Master/texmf-dist/doc/latex/mathastext/mathastext.tex +++ b/Master/texmf-dist/doc/latex/mathastext/mathastext.tex @@ -1,7 +1,7 @@ -\def\MSTpkgdate {2013/12/11} -\def\MSTpkgversion {1.3b} +\def\MSTpkgdate {2013/12/14} +\def\MSTpkgversion {1.3c} %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: %% http://jf.burnol.free.fr/mathastext.html diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf Binary files differindex 9c455c610b5..176c5003408 100644 --- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.pdf +++ 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 376eef67d25..04e5d6c53b5 100644 --- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex +++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestalphabets.tex @@ -1,7 +1,7 @@ \def\testfileincipit{Test file to accompany \texttt{mathastext} -version \texttt{1.3b} of \texttt{2013/12/11}} +version \texttt{1.3c} of \texttt{2013/12/14}} %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: %% http://jf.burnol.free.fr/mathastext.html diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex index 190cc6d6837..41617ee37bc 100644 --- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex +++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestmathversions.tex @@ -1,7 +1,7 @@ \def\testfileincipit{Test file to accompany \texttt{mathastext} -version \texttt{1.3b} of \texttt{2013/12/11}} +version \texttt{1.3c} of \texttt{2013/12/14}} %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: %% http://jf.burnol.free.fr/mathastext.html diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex index 004c0517dca..284047b0fa7 100644 --- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex +++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodelinux.tex @@ -1,7 +1,7 @@ \def\testfileincipit{Test file to accompany \texttt{mathastext} -version \texttt{1.3b} of \texttt{2013/12/11}} +version \texttt{1.3c} of \texttt{2013/12/14}} %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: %% http://jf.burnol.free.fr/mathastext.html diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex index eb33ee8973d..4adb2080fce 100644 --- a/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex +++ b/Master/texmf-dist/doc/latex/mathastext/mathastexttestunicodemacos.tex @@ -1,7 +1,7 @@ \def\testfileincipit{Test file to accompany \texttt{mathastext} -version \texttt{1.3b} of \texttt{2013/12/11}} +version \texttt{1.3c} of \texttt{2013/12/14}} %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: %% http://jf.burnol.free.fr/mathastext.html diff --git a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx index bd1a5e510b6..01e34f124f3 100644 --- a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx +++ b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx @@ -1,19 +1,19 @@ % -*- coding: iso-latin-1; time-stamp-format: "%02d-%02m-%:y %02H:%02M:%02S %Z" -*- -% File: mathastext.dtx, package: 1.3b (2013/12/11), documentation: 2013/12/11 +% File: mathastext.dtx, package: 1.3c (2013/12/14), documentation: 2013/12/14 % License: LaTeX Project Public License 1.3c or later. % Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol <jfbu at free dot fr> %<*dtx> -\def\lasttimestamp{Time-stamp: <11-12-2013 23:43:37 CET>} +\def\lasttimestamp{Time-stamp: <14-12-2013 17:31:20 CET>} %</dtx> %<*drv|ins> -\def\MSTpkgdate {2013/12/11} -\def\MSTpkgversion {1.3b} +\def\MSTpkgdate {2013/12/14} +\def\MSTpkgversion {1.3c} %</drv|ins> % This file (mathastext.dtx) is to be processed with the pdfetex engine, % it does not compile under the Unicode engines lualatex or xelatex. % %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %<package>%% Use the text font in math mode (jfB) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: @@ -902,6 +902,8 @@ Changes for this release: the declared math version (first optional argument of §\Mathastext§ or first mandatory argument of §\MTDeclareVersion§). Typical use will be with this final optional argument set to be |[bold]|. +\item §\MTversion§ has a starred variant which will not modify the document text + fonts, but only the math fonts (for those characters treated by \mst). \item in case of option §symbolmisc§: |\defaultprod| and |\defaultsum| have been renamed to, respectively, |\MToriginalprod| and |\MToriginalsum|. \end{enumerate} @@ -1423,11 +1425,13 @@ mode. It is recommended to use instead the package command to that case, \item sets the font which will be used in math mode for letters (including math operator names), digits, punctuations and other ascii symbols, -\item sets the font of the document text (if another version name is - additionally passed as optional argument, it uses instead the corresponding - font for text), -\item resets the |\(family,rm,sf,tt)default|s to their values as - registered at the time of definition of the version, +\item the non-starred variant sets the font of the document text (if another + version name is additionally passed as optional argument, it uses instead the + corresponding font for text), and + resets the |\(family,rm,sf,...)default|s to their values as + registered at the time of definition of the version. The starred variant + (which has only one mandatory argument) does not change anything to the + text font set-up. \item (see sections \ref{sec:mathskips} and \ref{sec:ic}) re-issues the command §\MTmathactiveletters§ to let a to z, A to Z, be mathematically active in order to automatically insert the skips as defined by the user with @@ -1748,20 +1752,15 @@ font it is thus recommended to use the commands in the preamble before the the version. They will be remembered when this math version is entered in the document. The commands may also be used directly in the document body. -Also, when the §subdued§ option has been used, the normal and bold math -versions have by default zero length skips. Note though that there is no -|\MTversion{normal}| done implicitely by the package when the document -body starts\footnote{when \cs{MTversion} is used, \mst resets all font - defaults, so for example a \cs{renewcommand\string\sfdefault} at the - end of the preamble would be overruled if \cs{MTversion\{normal\}} was - done automatically. Perhaps this behavior of \cs{MTversion} will - change in a future version of the package.} (\emph{i.e.} at the level -of |\begin{document}|), even when the §subdued§ option is in force. As a - result the last use in the preamble of the |\MT...skip| commands - decides the skips which will be initially used; this is cancelled if - |\begin{document}| is followed with |\MTversion{normal}|, in which - case the skips used are the ones in force at the latest - \cs{Mathastext} (without optional argument) preamble use, or just +Also, when the §subdued§ option has been used, the normal and bold math versions +have by default zero length skips. There is no |\MTversion{normal}|\footnote{or + even \texttt{\char92MTversion*\{normal\}}.} done implicitely by the package +when the document body starts (\emph{i.e.} at the level of |\begin{document}|), + even when the §subdued§ option is in force. As a result the last use in the + preamble of the |\MT...skip| commands decides the skips which will be + initially used; this is cancelled if |\begin{document}| is followed with + |\MTversion{normal}|, in which case the skips used are the ones in force at + the latest \cs{Mathastext} (without optional argument) preamble use, or just zero skips under the |subdued| regime. \endgroup @@ -2543,7 +2542,7 @@ option). ``normal'' or ``bold'';} this is already taken care of by the initial loading of the package or a later command \cs{Mathastext} without any optional argument.} - \item \textbf{inheritance:} starting with version |1.3b| a second optional + \item \textbf{inheritance:} starting with version |1.3c| a second optional argument \oarg{other\_version} will transfer its set-up for things not affected by \mst action, like large symbols, to the declared math version whose name was given as first optional argument. The main use @@ -2794,23 +2793,25 @@ Greek letters in the versions which will be declared next. \subsubsection{Body-only commands} \begin{enumerate}[label=$\bullet$] -\item §\MTversion§\oarg{nametext}\marg{namemath}, also known as +\item §\MTversion§\oarg{nametext}\marg{namemath}, + §\MTversion§$\ast$\marg{namemath}, also known as §\Mathastextversion§ (and as \cs{MTVersion}, and - \cs{mathastextversion}): in the absence - of the optional argument changes simultaneously the - text and the math fonts to be the fonts corresponding - to the version \meta{namemath}. If there is an - optional argument then the text fonts will use - \meta{nametext} and the math mode will use - \meta{namemath}. - - It is worth repeating that \mst \cs{MTversion} \emph{also} modifies the - \emph{text} font: this is due to the initial logic of the package to keep text - and math in sync. To change only the math fonts, one may use - the \LaTeX{} command \cs{mathversion}, but this is not - recommended as \cs{MTversion} goes through quite a few additional - configuration steps (cf. \autoref{sec:mathversions}). - + \cs{mathastextversion}): + \begin{enumerate}[label=$\bullet$] + \item the non-starred version changes + \emph{both} the document text fonts and the math fonts (for those characters + treated by \mst): the mandatory argument is the math version to be used + for math; the optional argument is the name of (another) \mst-declared math + version, the font which was chosen during its declaration will be set as + document text font (and |\familydefault| etc\dots also are + redefined). In the absence of the optional argument, the mandatory one is + used. The versions \emph{must} be either |normal|, or |bold|, or previously + declared ones via §\Mathastext§ or §\MTDeclareVersion§. + \item the starred variant does the math set-up, but changes \emph{nothing} to + the text fonts (see \autoref{sec:mathversions} for a description of the math + set-up, which summarizes + what is done additionally to only using \LaTeX{}'s |\mathversion|). + \end{enumerate} \cs{MTversion}\oarg{nametext}\marg{namemath} does §\MTmathactiveletters§ (except for |\MTversion{normal}| and |\MTversion{bold}| under package option |subdued|), and, if the font used in math mode is not @@ -2914,7 +2915,8 @@ all the glyphs of the Euler font, if option |eulergreek| (or Regarding the \cs{prod} and \cs{sum} commands: they will use the Symbol glyphs $\prod\sum$ in inline math, and in display math the Computer Modern - ones (or whatever is set up by other packages) : \[\prod\sum\] The package + ones (or whatever is set up by other packages; here we have the symbols from + |txfonts|): \[\prod\sum\] The package provides \cs{prodpsy} and \cs{sumpsy}: if one really wants in all situations the Symbol glyphs, one can do \cs{let}\cs{prod}\cs{prodpsy} and \cs{let}\cs{sum}\cs{sumpsy}. Also \cs{MToriginalprod} and \cs{MToriginalsum} @@ -3074,17 +3076,16 @@ Numerous examples will be found there:\\ \begin{multicols}{2} \begin{verbatim} -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). +1.3c [2013/12/14] + + * added a starred variant to \MTversion which tells mathastext to only do the +math set-up and not modify the text fonts. * 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. +symbols and large symbols to be the bold ones when the user sets up the series +of a mathastextified font to be bold in a mathastext-declared version. * renamed \defaultprod to \MToriginalprod, \defaultsum to \MToriginalsum, (this is in case of option symbolmisc). @@ -3092,6 +3093,10 @@ mathastextified in a mathastext-declared version. * changes to the dtx organization; options for generating the documentation can be customized in generated mathastext.tex file. + * 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). + 1.3a [2013/09/04] * the somewhat silly \string's are removed from the \MTsetmathskips command @@ -3424,7 +3429,7 @@ encodings, Unicode inclusive. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {mathastext} - [2013/12/11 v1.3b Use the text font in math mode (jfB)] + [2013/12/14 v1.3c Use the text font in math mode (jfB)] % \end{macrocode} % Testing for XeTeX and LuaLaTeX. I should load some package for this code which % I copied somewhere (perhaps from the |iftex| package? or some post on @@ -3974,6 +3979,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % macros as first argument to the command. % \begin{macro}{\MTnonletters-}\begin{macro}{obeymathxx} % \begin{macro}{\MTnonletters-}\begin{macro}{donotobeymathxx} +% \begin{macro}{\resetMathstrut@} % These macros are modified in version |1.3a| [2013/09/04] in order to % cleverly adjust, or not, the |amsmath| \cs{resetMathstrut@}. When used in % the preamble, they just modify \cs{mst@the}. And there is code at begin @@ -4052,7 +4058,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % \end{macrocode} % \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro} % \end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro}\end{macro} -% \end{macro}\end{macro}\end{macro}\end{macro} +% \end{macro}\end{macro}\end{macro}\end{macro}\end{macro} % \begin{macro}{\MTsetmathskips} % \begin{macro}{\MTunsetmathskips} % |1.3| [2013/09/02]: user level command to specify extra spaces in math mode @@ -4687,7 +4693,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % Versions |1.15x| brought some adaptations related to the subdued % option. % -% |1.3b| adds a second optional parameter to inherit previous settings +% |1.3c| adds a second optional parameter to inherit previous settings % from another version; mostly done to inherit the bold version fonts for % symbols and large symbols. This is done in |\MTDeclareVersion|. % \begin{macrocode} @@ -4924,7 +4930,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % redefine the `normal' and `bold' versions and issue a warning in % that case! % -% |1.3b| (|2013/12/11|) adds an extra optional parameter after all +% |1.3c| (|2013/12/14|) adds an extra optional parameter after all % previous ones, to inherit the settings from another version. Typically % to be used with [bold]. I take this opportunity to sanitize a bit some % line endings to avoid generating (in the preamble, document macros were @@ -4943,11 +4949,12 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \ifx\mst@tmp\empty\else \global\expandafter\let\csname mv@\mst@version\expandafter\endcsname \csname mv@#1\endcsname - \typeout{** Math version \mst@version\space inherits from `#1\string'.}% + \typeout{** Math version `\mst@version\string' inherits from `#1\string'.}% \fi \expandafter\MTDeclareVersion@@\mst@declareversionargs } \newcommand*\MTDeclareVersion@@[6]{% + \edef\mst@tmp{#1}% \expandafter\edef\csname mst@encoding@\mst@version\endcsname{#3}% \expandafter\edef\csname mst@family@\mst@version\endcsname{#4}% \expandafter\edef\csname mst@series@\mst@version\endcsname{#5}% @@ -4966,23 +4973,23 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \ifx\mst@tmp\empty \ifmst@italic \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{\mst@ltsh}% - \typeout{** Latin letters in math version `#2\string' will use the font - #3/#4/#5/\mst@ltsh^^J% - ** Other characters (digits, ...) and \protect\log-like names + \typeout{** Latin letters in math version `#2\string' will use the font + #3/#4/#5/\mst@ltsh^^J% + ** Other characters (digits, ...) and \protect\log-like names will be in #6 shape.}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{\mst@ltsh}% \else \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#6}% - \typeout{** Latin letters in math version `#2\string' will use the fonts - #3/#4/#5(\mst@bold)/#6}% + \typeout{** Latin letters in math version `#2\string' will use the fonts + #3/#4/#5(\mst@bold)/#6}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#6}% \fi \else \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#1}% \typeout{** Latin letters in math version `#2\string' will use the font - #3/#4/#5/#1^^J% - ** Other characters (digits, ...) and \protect\log-like - names will be in #6 shape.}% + #3/#4/#5/#1^^J% + ** Other characters (digits, ...) and \protect\log-like + names will be in #6 shape.}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}% \fi \ifmst@nonormalbold\else @@ -5059,7 +5066,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \@onlypreamble\MathastextDeclareVersion % \end{macrocode} % \end{macro} -% \begin{macro}{\MTVersion} +% \begin{macro}{\MTversion} +% \begin{macro}{\MTversion@} +% \begin{macro}{\MTversion@s} +% \begin{macro}{\MTversion@@} % This is a wrapper around \LaTeX{}'s \cs{mathversion}: here we have an % optional argument allowing a quick and easy change of the text fonts % additionally to the math fonts. Present already in the initial @@ -5081,14 +5091,19 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % % |1.3|: activation of italic corrections is now separated from actual math % activation of letters. +% +% |1.3c|: a starred variant is added which does not modify the text fonts, +% only the math set-tup. % \begin{macrocode} -\newcommand*\MTVersion[2][]{% +\newcommand*\MTversion {\@ifstar\MTversion@s\MTversion@ } +\newcommand*\MTversion@s [1]{\mathversion{#1}\MTversion@@ {#1}} +\newcommand*\MTversion@ [2][]{% \mathversion{#2}% \edef\mst@tmpa{#1}% \ifx\mst@tmpa\empty - \def\mst@tmp{#2}% + \edef\mst@tmp{#2}% \else - \def\mst@tmp{#1}% + \let\mst@tmp\mst@tmpa \fi \usefont{\csname mst@encoding@\mst@tmp\endcsname}% {\csname mst@family@\mst@tmp\endcsname}% @@ -5113,7 +5128,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \renewcommand{\sfdefault}{\mst@@sfdefault}% \edef\mst@@ttdefault{\csname mst@ttdefault@\mst@tmp\endcsname}% \renewcommand{\ttdefault}{\mst@@ttdefault}% - \edef\mst@tmp{#2}% + \MTversion@@ {#2}% +} +\newcommand*\MTversion@@ [1]{% + \edef\mst@tmp{#1}% %% v1.15e: muskips \expandafter \mst@exists@muskip\csname mst@exists@skip@\mst@tmp\endcsname\relax @@ -5129,10 +5147,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \edef\mst@tmpa{\csname mst@ltshape@\mst@tmp\endcsname}% \edef\mst@tmpb{\csname mst@shape@\mst@tmp\endcsname}% \MTicinmath - \@for\mst@tmp:=it,sl\do{\ifx\mst@tmp\mst@tmpa\MTnoicinmath\fi}% + \@for\mst@tmpc:=it,sl\do{\ifx\mst@tmpc\mst@tmpa\MTnoicinmath\fi}% \ifmst@frenchmath \MTICinmath - \@for\mst@tmp:=it,sl\do{\ifx\mst@tmp\mst@tmpb\MTnoICinmath\fi}% + \@for\mst@tmpc:=it,sl\do{\ifx\mst@tmpc\mst@tmpb\MTnoICinmath\fi}% \fi %% v1.15c: extending subdued to LGRgreek %% v1.15f: subdueing math alphabets in a simpler way than in 1.15e @@ -5142,7 +5160,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \MTeasynonlettersobeymathxx \ifmst@asterisk\let\mst@doasterisk\mst@@doasterisk\fi \ifmst@subdued - \edef\mst@tmp{#2}% \def\mst@tmpa{normal}% \ifx\mst@tmp\mst@tmpa \mst@restorealphabets @@ -5169,12 +5186,12 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \fi \fi } -\let\MathastextVersion\MTVersion -\let\Mathastextversion\MTVersion -\let\MTversion\MTVersion -\let\mathastextversion\MTVersion +\let\MathastextVersion\MTversion +\let\Mathastextversion\MTversion +\let\MTVersion\MTversion +\let\mathastextversion\MTversion % \end{macrocode} -% \end{macro} +% \end{macro}\end{macro}\end{macro}\end{macro} % \begin{macro}{\Mathastext} % Initialization call: % \begin{macrocode} @@ -5777,7 +5794,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % why I had different looking code depending on the engine XeTeX, LuaTeX or % default. Removed. % -% |1.3b| [2013/12/11]: I have absolutely no idea why I removed the XeTeX and +% |1.3c| [2013/12/14]: I have absolutely no idea why I removed the XeTeX and % LuaTeX code at the time of |1.2d|! the code for tex/pdftex engine could not % accomodate more than 16 math families. Code for XeTeX and LuaTeX again added. % (and since TL2013 no more problems with |\luatexUmathcode|.) @@ -5858,7 +5875,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % but this did not go well with subscripts and exponents. % % Note oct 2012: maybe I should re-examine what I did? -% |1.3b| ([2013/12/11]) renames |\defaultprod| to |\MToriginalprod| and +% |1.3c| ([2013/12/14]) renames |\defaultprod| to |\MToriginalprod| and % |\defaultsum| to % |\MToriginalsum|. % \begin{macrocode} @@ -6513,7 +6530,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} Grave accent \` Left brace \{ Vertical bar \| Right brace \} Tilde \~} -\CheckSum{5103} +\CheckSum{5116} \makeatletter\check@checksum\makeatother \Finale %% diff --git a/Master/texmf-dist/source/latex/mathastext/mathastext.ins b/Master/texmf-dist/source/latex/mathastext/mathastext.ins index e54f5c45deb..1666c117e16 100644 --- a/Master/texmf-dist/source/latex/mathastext/mathastext.ins +++ b/Master/texmf-dist/source/latex/mathastext/mathastext.ins @@ -1,7 +1,7 @@ -\def\MSTpkgdate {2013/12/11} -\def\MSTpkgversion {1.3b} +\def\MSTpkgdate {2013/12/14} +\def\MSTpkgversion {1.3c} %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: %% http://jf.burnol.free.fr/mathastext.html diff --git a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty index 0900723cefe..59f70128ab2 100644 --- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty +++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %%---------------------------------------------------------------- -%% The mathastext package (version 1.3b of December 10, 2013) +%% The mathastext package (version 1.3c of December 14, 2013) %% Use the text font in math mode (jfB) %% Copyright (C) 2011, 2012, 2013 by Jean-Francois Burnol %% Examples of use of mathastext: @@ -30,7 +30,7 @@ %%---------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {mathastext} - [2013/12/11 v1.3b Use the text font in math mode (jfB)] + [2013/12/14 v1.3c Use the text font in math mode (jfB)] \newif\ifmst@XeTeX \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname XeTeXinterchartoks\endcsname\relax @@ -770,11 +770,12 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \ifx\mst@tmp\empty\else \global\expandafter\let\csname mv@\mst@version\expandafter\endcsname \csname mv@#1\endcsname - \typeout{** Math version \mst@version\space inherits from `#1\string'.}% + \typeout{** Math version `\mst@version\string' inherits from `#1\string'.}% \fi \expandafter\MTDeclareVersion@@\mst@declareversionargs } \newcommand*\MTDeclareVersion@@[6]{% + \edef\mst@tmp{#1}% \expandafter\edef\csname mst@encoding@\mst@version\endcsname{#3}% \expandafter\edef\csname mst@family@\mst@version\endcsname{#4}% \expandafter\edef\csname mst@series@\mst@version\endcsname{#5}% @@ -793,23 +794,23 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \ifx\mst@tmp\empty \ifmst@italic \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{\mst@ltsh}% - \typeout{** Latin letters in math version `#2\string' will use the font - #3/#4/#5/\mst@ltsh^^J% - ** Other characters (digits, ...) and \protect\log-like names + \typeout{** Latin letters in math version `#2\string' will use the font + #3/#4/#5/\mst@ltsh^^J% + ** Other characters (digits, ...) and \protect\log-like names will be in #6 shape.}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{\mst@ltsh}% \else \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#6}% - \typeout{** Latin letters in math version `#2\string' will use the fonts - #3/#4/#5(\mst@bold)/#6}% + \typeout{** Latin letters in math version `#2\string' will use the fonts + #3/#4/#5(\mst@bold)/#6}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#6}% \fi \else \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#1}% \typeout{** Latin letters in math version `#2\string' will use the font - #3/#4/#5/#1^^J% - ** Other characters (digits, ...) and \protect\log-like - names will be in #6 shape.}% + #3/#4/#5/#1^^J% + ** Other characters (digits, ...) and \protect\log-like + names will be in #6 shape.}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}% \fi \ifmst@nonormalbold\else @@ -870,13 +871,15 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \let\MathastextDeclareVersion\MTDeclareVersion \@onlypreamble\MTDeclareVersion \@onlypreamble\MathastextDeclareVersion -\newcommand*\MTVersion[2][]{% +\newcommand*\MTversion {\@ifstar\MTversion@s\MTversion@ } +\newcommand*\MTversion@s [1]{\mathversion{#1}\MTversion@@ {#1}} +\newcommand*\MTversion@ [2][]{% \mathversion{#2}% \edef\mst@tmpa{#1}% \ifx\mst@tmpa\empty - \def\mst@tmp{#2}% + \edef\mst@tmp{#2}% \else - \def\mst@tmp{#1}% + \let\mst@tmp\mst@tmpa \fi \usefont{\csname mst@encoding@\mst@tmp\endcsname}% {\csname mst@family@\mst@tmp\endcsname}% @@ -901,7 +904,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \renewcommand{\sfdefault}{\mst@@sfdefault}% \edef\mst@@ttdefault{\csname mst@ttdefault@\mst@tmp\endcsname}% \renewcommand{\ttdefault}{\mst@@ttdefault}% - \edef\mst@tmp{#2}% + \MTversion@@ {#2}% +} +\newcommand*\MTversion@@ [1]{% + \edef\mst@tmp{#1}% %% v1.15e: muskips \expandafter \mst@exists@muskip\csname mst@exists@skip@\mst@tmp\endcsname\relax @@ -917,10 +923,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \edef\mst@tmpa{\csname mst@ltshape@\mst@tmp\endcsname}% \edef\mst@tmpb{\csname mst@shape@\mst@tmp\endcsname}% \MTicinmath - \@for\mst@tmp:=it,sl\do{\ifx\mst@tmp\mst@tmpa\MTnoicinmath\fi}% + \@for\mst@tmpc:=it,sl\do{\ifx\mst@tmpc\mst@tmpa\MTnoicinmath\fi}% \ifmst@frenchmath \MTICinmath - \@for\mst@tmp:=it,sl\do{\ifx\mst@tmp\mst@tmpb\MTnoICinmath\fi}% + \@for\mst@tmpc:=it,sl\do{\ifx\mst@tmpc\mst@tmpb\MTnoICinmath\fi}% \fi %% v1.15c: extending subdued to LGRgreek %% v1.15f: subdueing math alphabets in a simpler way than in 1.15e @@ -930,7 +936,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \MTeasynonlettersobeymathxx \ifmst@asterisk\let\mst@doasterisk\mst@@doasterisk\fi \ifmst@subdued - \edef\mst@tmp{#2}% \def\mst@tmpa{normal}% \ifx\mst@tmp\mst@tmpa \mst@restorealphabets @@ -957,10 +962,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \fi \fi } -\let\MathastextVersion\MTVersion -\let\Mathastextversion\MTVersion -\let\MTversion\MTVersion -\let\mathastextversion\MTVersion +\let\MathastextVersion\MTversion +\let\Mathastextversion\MTversion +\let\MTVersion\MTversion +\let\mathastextversion\MTversion \Mathastext \ifmst@eulergreek \typeout{** Greek letters will use the Euler font. Use^^J% |