From 5637ff5e782e48a900434b08e93b1251633ab3d6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Jan 2013 00:02:54 +0000 Subject: mathastext 1.2e (11jan13) git-svn-id: svn://tug.org/texlive/trunk@28805 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/mathastext/README | 37 +++- .../texmf-dist/doc/latex/mathastext/mathastext.pdf | Bin 316056 -> 328387 bytes .../latex/mathastext/testmathastextalphabets.tex | 241 +++++++++++++++++++++ .../doc/latex/mathastext/testmathastextlinux.tex | 84 +++++++ .../doc/latex/mathastext/testmathastextmacos.tex | 81 +++++++ .../mathastext/testmathastextmathversions.tex | 36 +++ 6 files changed, 478 insertions(+), 1 deletion(-) create mode 100644 Master/texmf-dist/doc/latex/mathastext/testmathastextalphabets.tex create mode 100644 Master/texmf-dist/doc/latex/mathastext/testmathastextlinux.tex create mode 100644 Master/texmf-dist/doc/latex/mathastext/testmathastextmacos.tex create mode 100644 Master/texmf-dist/doc/latex/mathastext/testmathastextmathversions.tex (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/mathastext/README b/Master/texmf-dist/doc/latex/mathastext/README index 136080be0a5..910fab50eee 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 by Jean-Francois Burnol. + mathastext + + + + `Use the text font in math mode' + - + v1.2d 2013/01/02 + + + v1.2e 2013/01/10 + + jfbu (at) free.fr + +-------------------------------------------+ @@ -93,6 +93,41 @@ illustrate some features of the package. CHANGE LOG +1.2e [2013/01/10] + +This version should be the last one in the 1.2 series as it seems to +correct most of the main problems which were introduced with the massive +use of mathematically active characters in versions 1.2 and 1.2b. + + * It is indeed a thorny point when one wants to modify only in math mode + how an active character acts, without breaking things. The package now + does that /only/ if the activation appears to originate in the Babel + system, as it is then possible to modify appropriately the Babel macros + \user@active and \normal@char. The relevant issues are + discussed in section 2.10 of the user manual, in the test file + testmathastextalphabets.tex, and in the source code comments to the + macro \mst@mathactivate. The inherent incompatibility of Babel with + packages having made mathematically active the characters itself makes + document active is circumvented by this interference of mathastext. A + generally applicable Babel patch could be derived from the method used + by mathastext. + + * The technique of mathematical activation is maintained only for the + characters which are not catcode active (at the entrance in math mode, + as mathastext does all its activation job at everymath and everydisplay). + + * Sadly, the feature of added italic corrections introduced in version + 1.2b did not behave as described in the user manual, due to forgotten + group braces. Fixed. + + * The command \MTlowerast from the user manual of v1.2d was not the one + implemented in the source code. Fixed. + + * The test files automatically extracted from a latex run on the dtx file + have been revised and extended. + + * The code is better documented. + 1.2d [2013/01/02] * an incompatibility with amsmath (its macro \resetMathstrut@), diff --git a/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf b/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf index 468da5e4071..59f456827df 100644 Binary files a/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf and b/Master/texmf-dist/doc/latex/mathastext/mathastext.pdf differ diff --git a/Master/texmf-dist/doc/latex/mathastext/testmathastextalphabets.tex b/Master/texmf-dist/doc/latex/mathastext/testmathastextalphabets.tex new file mode 100644 index 00000000000..9afbabc28c2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/mathastext/testmathastextalphabets.tex @@ -0,0 +1,241 @@ +\def\testfileincipit{Test file to accompany \texttt{mathastext} +version \texttt{v1.2e} of \texttt{2013/01/10.}} +%% +%% Package `mathastext' by Jean-Francois Burnol +%% Copyright (C) 2011, 2012 by Jean-Francois Burnol +%% +%% This file `testmathastextalphabets.tex' is for testing the extended +%% scope of the math alphabet commands with package `mathastext', via +%% the package command \MTnonlettersobeymathxx. +%% +%% Compile either with latex, pdflatex, lualatex (pdf output) or xelatex. +%% +%% See `mathastext.dtx' for the copyright and conditions of distribution or +%% modification. +%% +\documentclass{article} +\usepackage[hscale=0.66]{geometry} +\usepackage{amsmath} +\usepackage{mathtools}\mathtoolsset{centercolon} +%% WARNING THIS IS INCOMPATIBLE WITH BABEL+FRENCHB +%% BUT WITH MATHASTEXT LOADED THIS IS CORRECTED +%% *IF* \MTnonlettersobeymathxx IS MADE USE OF. +\usepackage{iftex} +\ifXeTeX +\usepackage[no-math]{fontspec} +\setmainfont[ExternalLocation, + Mapping=tex-text, + BoldFont=texgyretermes-bold, + ItalicFont=texgyretermes-italic, + BoldItalicFont=texgyretermes-bolditalic]{texgyretermes-regular} +\setmonofont[ExternalLocation, + Mapping=tex-text]{texgyrecursor-regular} +\setsansfont[ExternalLocation, + Mapping=tex-text]{texgyreheros-regular} +\else +\ifLuaTeX % for pdf output +\usepackage[no-math]{fontspec} +\setmainfont[Ligatures=TeX]{TeX Gyre Termes} +\setmonofont[Ligatures=TeX]{TeX Gyre Cursor} +\setsansfont[Ligatures=TeX]{TeX Gyre Heros} +\else +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{tgtermes} +\usepackage{tgcursor} +\usepackage{tgheros} +\fi\fi +\usepackage{metalogo} % must be loaded /after/ [no-math]fontspec +\usepackage[french]{babel} +\usepackage[italic,asterisk]{mathastext} +\MTlettershape{n}\Mathastext[upright] +\MTnonlettersobeymathxx +\MTexplicitbracesobeymathxx +\delimitershortfall-1pt +\begin{document} +\testfileincipit + +The package makes +${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}\,{\{}\,{\}}$, +the asterisk $*$, and $.\,/\,\vert\,\backslash\,{\#}\,{\$}\,{\%}\,{\&}$ obey the +math alphabet commands (this is the maximal list, some characters may have been +excluded by the corresponding package options). For the characters listed first +the mechanism involves a `mathematical activation'. + +As this process may create incompatibilities, it will be put into action +for +${!}\,{?}\,{,}\,{:}\,{;}\,{+}\,{-}\,{=}\,{(}\,{)}\,{[}\,{]}\,{<}\,{>}$ +only if the user makes use of the package command +\verb|\MTnonlettersobeymathxx| (and the braces necessitate +\verb|\MTexplicitbracesobeymathxx|). + +It could be that one such character has been made `active' in the entire +document by some other package, typically a language definition file for the +\verb|babel| system. Here for example we have used \verb|babel| with the +\verb|french| option, which makes the high punctuation characters !?:; active +throughout the document (extra spacing is put in front of the character when +used in text; no change in math but perhaps for other languages and characters +this could happen, it is up to the language definition file to decide). + +When \verb|mathastext| detects that a character it wants to `mathematically +activate' is already `active', it does not go further except if it seems that +the activation was done by Babel. If the activation was done by Babel, then +\verb|mathastext| replaces the expansion of the active character in math mode by +what is necessary to achieve its goal. It does not additionally mathematically +activate the character; rather it makes sure that the character is \emph{not} +mathematically active. In the present document the colon was made mathematically +active by \verb|mathtools| but this was already canceled in the preamble by +\verb|mathastext| as it was loaded later. And it is better so, because the +combination \verb|babel| (with option \verb|frenchb|) +\verb|mathtools| (with +\verb|centercolon|) makes \verb|$:$| create an infinite loop! + +But even if someone had mathematically activated the colon after the preamble, +or after the loading of \verb|mathastext|, this would be canceled again +automatically for each inline or displayed mathematical formula (if the user +does \verb|\MTnonlettersobeymathxx|). + +The conclusion with \verb|\MTnonlettersobeymathxx| is: if some package has tried +to make the character mathematically active, this will be overruled by +\verb|mathastext|; if some package has made the character globally active, then +the package wins except if it is Babel, as \verb|mathastext| may in the latter +case safely modify the action in math mode (paying attention to the fact that +the character should be usable in \verb|\label| and \verb|\ref| in and outside +of math mode). The displayed equations below have been labeled using various +characters from our list, to test if it works ok with then. + +\def\testformula{\Biggl\lbrace\biggl(\left(\left[[\sin(a) + \cos(b) - \log(c) = +\sec(d)]\right]\right)\biggr)\Biggr\rbrace} +\begin{equation}\testformula\label{eq:1}\end{equation} +\begin{equation}\mathnormalbold{\testformula}\label{eq;2}\end{equation} +\begin{equation}\mathrm{\testformula}\label{eq?3}\end{equation} +\begin{equation}\mathbf{\testformula}\label{eq!4}\end{equation} +\begin{equation}\mathit{\testformula}\label{eq(5}\end{equation} +\begin{equation}\mathtt{\testformula}\label{eq)6}\end{equation} +\begin{equation}\mathsf{\testformula}\label{eq=7}\end{equation} + +Equations above are numbered \ref{eq:1}, \ref{eq;2}, \ref{eq?3}, \ref{eq!4}, and +$\ref{eq(5}$, $\ref{eq)6}$, and $\ref{eq=7}$. + +\def\testline#1{$#1$&$\mathnormalbold{#1}$&$\mathrm{#1}$&$\mathbf{#1}$&$\mathit{#1}$&$\mathtt{#1}$&$\mathsf{#1}$} + +\begin{tabular}{ccccccc} +\testline{a!b}\\ +\testline{a?b}\\ +\testline{a,b}\\ +\testline{a;b}\\ +\testline{a:b}\\ +\testline{a:=b}\\ +\testline{a\vcentcolon= b}\\ +\testline{a\colon b}\\ +\testline{a.b}\\ +\testline{a-b}\\ +\testline{a+b}\\ +\testline{a=b}\\ +\testline{ab}\\ +\testline{}\\ +\testline{\mathopen{<} x,y\mathclose{>}}\\ +\testline{\left< x,y\right>}\\ +\testline{a/b}\\ +\testline{a\backslash b}\\ +\testline{a\setminus b}\\ +\testline{a|b}\\ +\testline{a\mid b}\\ +\testline{(a,b)}\\ +\testline{[a,b]}\\ +\testline{\{a,b\}} +\end{tabular} + +The question mark has been made active by \verb|babel+frenchb|. +\verb|mathastext| has imposed in math mode its ways (now \verb|$\mathbf{???}$| +gives $\mathbf{???}$). As the extra spacing is added by \verb|frenchb| only in +text, we had to use the math alphabet to check that indeed \verb|mathastext| +overruled Babel. + +To double-check we will now make \string? mathematically active: +\verb|\mathcode`?="8000|\mathcode`?="8000. This is a sure cause for disaster +normally with Babel (don't do this at home without \verb|mathastext|!). But here +with \verb|$?$| no bad surprise (infinite loop!) awaits us: just $?$. + +Let's take some other character which was not made active by +\verb|babel+frenchb|, for example the opening parenthesis: +\verb|\catcode`(=\active \def ({X}|. +Let's try now \verb|( vs $($|.\begingroup\catcode`(=\active \gdef ({X} This +gives ( vs $($\endgroup. We see that \verb|mathastext| does not +attempt anything (this could not safely be done for technical reasons). + +We have now cancelled the activation of the parenthesis, and let's make it only +mathematically active with \verb|\mathcode`(="8000|.\mathcode`(="8000\ If +we try \verb|$((($| we see that nothing special happens $((($. The +mathematically active character was overruled by \verb|mathastext|. + +But if we now issue +\verb|\MTnonlettersdonotobeymathxx|\MTnonlettersdonotobeymathxx\ we get $((($ +from the input \verb|$((($|. This shows that indeed the parenthesis had been +made mathematically active. + +By the way +don't do this at home without \verb|mathastext|: \verb|amsmath| is not +compatible with a mathematically active opening parenthesis, and +\verb|mathastext| does a patch. Always load \verb|amsmath| before +\verb|mathastext|. + +\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 +it.\footnote{\texttt{\char92MTversion\{upright\}}. This maintains + the status of the `difficult non-letters'.}\footnote{as we + left \string? mathematically active, we initially had the bad surprise + to fall into an infinite loop. And indeed we had forgotten our + previous \texttt{\char92MTnonlettersdonotobeymathxx}. So a new + \texttt{\char92MTnonlettersobeymathxx} was done to prevent this + problem of \texttt{babel} when it activates a character which is + mathematically active.} +Then, italic corrections are added,\footnote{this has an effect only + with \LaTeX{} and PDF\LaTeX{} not with \XeTeX{} or \LuaLaTeX{}.} as we +can see here, to correct the positioning of the subscript: $f_i^i$. +After using \verb|\MTnoicinmath| to turns off the +feature\MTnoicinmath{}, this is $f_i^i$. Let's turn it back on +(\verb|\MTicinmath|)\MTicinmath{} and try \verb|$f_{abc}^{def}$|, this +gives $f_{abc}^{def}$, or this other one: $f^{f_{abc}^{def}}_u$. Without +italic corrections\MTnoicinmath: $f_{abc}^{def}$, and respectively +$f^{f_{abc}^{def}}_u$.\MTicinmath We can also check that the added +italic corrections do not prevent the formation of ligatures when using +the math alphabets, apart from \verb|\mathnormal| (which comes first): +$\mathnormal{ff}$, $\mathrm{ff}$, $\mathit{ff}$, $\mathbf{ff}$, +$\mathtt{ff}$ (no ligature in teletype) and $\mathsf{ff}$. + +\begin{tabular}{ccccccc} +\testline{a!b}\\ +\testline{a?b}\\ +\testline{a,b}\\ +\testline{a;b}\\ +\testline{a:b}\\ +\testline{a:=b}\\ +\testline{a\vcentcolon= b}\\ +\testline{a\colon b}\\ +\testline{a.b}\\ +\testline{a-b}\\ +\testline{a+b}\\ +\testline{a=b}\\ +\testline{ab}\\ +\testline{}\\ +\testline{\mathopen{<} x,y\mathclose{>}}\\ +\testline{\left< x,y\right>}\\ +\testline{a/b}\\ +\testline{a\backslash b}\\ +\testline{a\setminus b}\\ +\testline{a|b}\\ +\testline{a\mid b}\\ +\testline{(a,b)}\\ +\testline{[a,b]}\\ +\testline{\{a,b\}} +\end{tabular} + +\end{document} +\endinput +%% +%% End of file `testmathastextalphabets.tex'. diff --git a/Master/texmf-dist/doc/latex/mathastext/testmathastextlinux.tex b/Master/texmf-dist/doc/latex/mathastext/testmathastextlinux.tex new file mode 100644 index 00000000000..16c437b413a --- /dev/null +++ b/Master/texmf-dist/doc/latex/mathastext/testmathastextlinux.tex @@ -0,0 +1,84 @@ +\def\testfileincipit{Test file to accompany \texttt{mathastext} +version \texttt{v1.2e} of \texttt{2013/01/10.}} +%% +%% Package `mathastext' by Jean-Francois Burnol +%% Copyright (C) 2011, 2012 by Jean-Francois Burnol +%% +%% This file `testmathastextlinux.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. +%% +%% See `mathastext.dtx' for the copyright and conditions of distribution or +%% modification. +%% +\documentclass{article} +\usepackage[hscale=0.8]{geometry} +\usepackage{multicol} +\usepackage[no-math]{fontspec} +\usepackage{lmodern} +\usepackage[subdued,italic,asterisk]{mathastext} +\setmainfont[Color=999999]{Verdana} \Mathastext[Verdana] +\setmainfont[Color=0000FF]{Arial} \Mathastext[Arial] +\setmainfont[Color=00C000]{DejaVu Serif} \Mathastext[DejaVu] +\setmainfont[Color=FF0000]{Andale Mono} \Mathastext[Andale] +\setmainfont[Color=C000C0]{URW Chancery L} \Mathastext[Chancery] +\setmainfont[Color=800080]{URW Palladio L} \Mathastext[Palladio] +\setmainfont[Color=808000]{Liberation Serif} \Mathastext[Liberation] +\MTDeclareVersion{Times}{T1}{ptm}{m}{n} +\begin{document} +\MTversion{normal} +\testfileincipit + +This test uses \verb|mathastext| with its \emph{italic}, \emph{asterisk}, and +\emph{subdued} options. The base document fonts are the Latin Modern ones (in +OpenType format). The other fonts used were chosen from those of a Linux +machine. We also used the Times font in T1 encoding, to illustrate a warning +from the user manual when using different encodings in the various math +versions: here the minus sign has disappeared from the Times math mode block, +precisely for this matter of encoding. + +Furthermore we test if the non-letter characters obey the math alphabet +\verb|\mathbf|. In the normal and bold math versions, this feature +is de-activated, as option \emph{subdued} was used; and if activated we +should then use in these math versions the package \verb|\Mathbf| rather +than \verb|\mathbf| which is there still the original one, which will +use encoding \verb|OT1| in the normal and bold versions, as we loaded +\verb|fontspec| with its option \emph{no-math}. + +Some among the fonts tested have no bold variant or no italic variant. + +\newcommand\TEST[1]{\MTversion{#1}\def\tmpa{#1}% + \def\tmpb{normal}\def\tmpc{bold}% + \ifx\tmpa\tmpb\else\ifx\tmpa\tmpc\else \MTnonlettersobeymathxx + \MTexplicitbracesobeymathxx\fi\fi +\begin{multicols}{2} +\hbox to\columnwidth{\hbox to\columnwidth{\hfil + $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}} + \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ } + \centerline{ $0123456789$ } + \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,% + \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ } + \centerline{ $\mathbf{!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,% + \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash}$ } +\columnbreak + \centerline{ abcdefghijklmnopqrstuvwxyz } + \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ } + \centerline{ 0123456789} + \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,% + \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 } + \centerline{\bfseries !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,% + \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 } +\end{multicols}} +\begin{multicols}{2} + \centerline{\textbf{math mode}} +\columnbreak + \centerline{ \textbf{text} } +\end{multicols} +\TEST{DejaVu}\TEST{Verdana}\TEST{Andale}\TEST{Palladio} +\TEST{Arial}\TEST{Chancery}\TEST{Liberation} +\TEST{bold}\TEST{normal}\TEST{Times} +\end{document} +\endinput +%% +%% End of file `testmathastextlinux.tex'. diff --git a/Master/texmf-dist/doc/latex/mathastext/testmathastextmacos.tex b/Master/texmf-dist/doc/latex/mathastext/testmathastextmacos.tex new file mode 100644 index 00000000000..6e5dda6a751 --- /dev/null +++ b/Master/texmf-dist/doc/latex/mathastext/testmathastextmacos.tex @@ -0,0 +1,81 @@ +\def\testfileincipit{Test file to accompany \texttt{mathastext} +version \texttt{v1.2e} of \texttt{2013/01/10.}} +%% +%% Package `mathastext' by Jean-Francois Burnol +%% Copyright (C) 2011, 2012 by Jean-Francois Burnol +%% +%% This file `testmathastextmacos.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). +%% +%% See `mathastext.dtx' for the copyright and conditions of distribution or +%% modification. +%% +\documentclass{article} +\usepackage[hscale=0.85]{geometry} +\usepackage{multicol} +\usepackage[no-math]{fontspec} +\usepackage{lmodern} +\usepackage[subdued,italic,asterisk]{mathastext} +\setmainfont[Color=FF0000]{Hoefler Text} \Mathastext[Hoefler] +\setmainfont[Color=336633]{American Typewriter}\Mathastext[Typewriter] +\setmainfont[Color=0000FF]{Herculanum} \Mathastext[Herculanum] +\setmainfont[Color=FF00FF]{Didot} \Mathastext[Didot] +\setmainfont[Color=999999]{Comic Sans MS} \Mathastext[Comic] +\MTDeclareVersion{Times}{T1}{ptm}{m}{n} +\begin{document} +\MTversion{normal} +\testfileincipit + +This test uses \verb|mathastext| with its \emph{italic}, \emph{asterisk}, and +\emph{subdued} options. The base document fonts are the Latin Modern ones (in +OpenType format). The other fonts used were chosen from those of a Mac OS +machine. We also used the Times font in T1 encoding, to illustrate a warning +from the user manual when using different encodings in the various math +versions: here the minus sign has disappeared from the Times math mode block, +precisely for this matter of encoding. + +Furthermore we test if the non-letter characters obey the math alphabet +\verb|\mathbf|. In the normal and bold math versions, this feature is +de-activated, as option \emph{subdued} was used; and if activated we +should then use in these math versions the package \verb|\Mathbf| rather +than \verb|\mathbf| which is there still the original one, which will +use encoding \verb|OT1| in the normal and bold versions, as we loaded +\verb|fontspec| with its option \emph{no-math}. + +Some among the fonts tested have no bold variant or no italic variant. + +\newcommand\TEST[1]{\MTversion{#1}\def\tmpa{#1}% + \def\tmpb{normal}\def\tmpc{bold}% + \ifx\tmpa\tmpb\else\ifx\tmpa\tmpc\else \MTnonlettersobeymathxx + \MTexplicitbracesobeymathxx\fi\fi +\begin{multicols}{2} +\hbox to\columnwidth{\hbox to\columnwidth{\hfil + $abcdefghijklmnopqrstuvwxyz$\hfil}\kern-2.5em{#1}} + \centerline{ $ABCDEFGHIJKLMNOPQRSTUVWXYZ$ } + \centerline{ $0123456789$ } + \centerline{ $!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,% + \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash$ } + \centerline{ $\mathbf{!\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,% + \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\backslash}$ } +\columnbreak + \centerline{ abcdefghijklmnopqrstuvwxyz } + \centerline{ ABCDEFGHIJKLMNOPQRSTUVWXYZ } + \centerline{ 0123456789 } + \centerline{ !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,% + \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 } + \centerline{\bfseries !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,% + \$\,\%\,\&\,<\,>\,|\,\{\,\}\,\char92 } +\end{multicols}} +\begin{multicols}{2} + \centerline{\textbf{math mode}} +\columnbreak + \centerline{ \textbf{text} } +\end{multicols} +\TEST{Didot}\TEST{Comic}\TEST{normal}\TEST{Herculanum} +\TEST{Hoefler}\TEST{Typewriter}\TEST{bold}\TEST{Times} +\end{document} +\endinput +%% +%% End of file `testmathastextmacos.tex'. diff --git a/Master/texmf-dist/doc/latex/mathastext/testmathastextmathversions.tex b/Master/texmf-dist/doc/latex/mathastext/testmathastextmathversions.tex new file mode 100644 index 00000000000..630f7ef6882 --- /dev/null +++ b/Master/texmf-dist/doc/latex/mathastext/testmathastextmathversions.tex @@ -0,0 +1,36 @@ +\def\testfileincipit{Test file to accompany \texttt{mathastext} +version \texttt{v1.2e} of \texttt{2013/01/10.}} +%% +%% Package `mathastext' by Jean-Francois Burnol +%% Copyright (C) 2011, 2012 by Jean-Francois Burnol +%% +%% This file `testmathastextversions.tex' is for testing the enhanced +%% concept of math versions provided by the package `mathastext'. +%% +%% See `mathastext.dtx' for the copyright and conditions of distribution or +%% modification. +%% +\documentclass{article} +\usepackage[T1]{fontenc} +\usepackage{newcent} +\usepackage[subdued]{mathastext} +\Mathastext[newcent] +\renewcommand\familydefault\ttdefault +\Mathastext[courier] +\renewcommand\familydefault\sfdefault +\Mathastext[avantgarde] +\renewcommand\familydefault\rmdefault +\begin{document} +\testfileincipit + +text in NewCentury and $math\ as\ in\ default$,% +\MTversion{courier} text in Courier and $math\ in\ Courier$,% +\MTversion{avantgarde} text in AvantGarde and $math\ in\ AvantGarde$,% +\MTversion[newcent]{courier} text in NewCentury and $math\ in\ +Courier$,\MTversion{bold} text in bold NewCentury and $math\ as\ in\ +bold\ default$,\MTversion[courier]{avantgarde} text in Courier and +$math\ in\ AvantGarde$. +\end{document} +\endinput +%% +%% End of file `testmathastextmathversions.tex'. -- cgit v1.2.3