diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2012-10-06 09:02:09 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2012-10-06 09:02:09 +0000 |
commit | 687e2700f7a54ad2d728a51821d85e6ed4965788 (patch) | |
tree | 7d53140dab578f6ce54c3c331a704a1d7359044e /Master/texmf-dist/source/latex/mathastext | |
parent | d98d400320f231c02f03a9a64f95d0163404dedd (diff) |
mathastext update
git-svn-id: svn://tug.org/texlive/trunk@27890 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/mathastext')
-rw-r--r-- | Master/texmf-dist/source/latex/mathastext/mathastext.dtx | 1224 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/mathastext/mathastext.ins | 2 |
2 files changed, 775 insertions, 451 deletions
diff --git a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx index 69243ba1700..0ddbe0ea87a 100644 --- a/Master/texmf-dist/source/latex/mathastext/mathastext.dtx +++ b/Master/texmf-dist/source/latex/mathastext/mathastext.dtx @@ -1,6 +1,7 @@ -% \iffalse +% \iffalse -*- coding: iso-latin-1; -*- %<*dtx> -\ProvidesFile{mathastext.dtx}[2012/09/27 v1.15b ] +\def\mstdocrevdate{2012/10/05} +\ProvidesFile{mathastext.dtx}[2012/10/05 v1.15c ] %</dtx> % \fi % \iffalse meta-comment @@ -18,73 +19,106 @@ % Please report errors to jfbu (at) free.fr % Many examples available at: % http://jf.burnol.free.fr/mathastext.html +% http://jf.burnol.free.fr/showcase.html % % \fi % \iffalse %<*driver> \documentclass[a4paper]{ltxdoc} -\usepackage{color} +\OnlyDescription +\CheckSum{3544} +\usepackage{color}\usepackage{xspace} +\definecolor{DarkMagenta}{RGB}{139,0,139} +\definecolor{ChoisiJeNeSaisPlusComment}{RGB}{225,95,0} \usepackage{amsmath}\allowdisplaybreaks -%\OnlyDescription -\usepackage[hscale=0.7]{geometry} -\usepackage[latin1]{inputenc} -\usepackage[hscale=0.7]{geometry} -\usepackage[bookmarks,pdfencoding=pdfdoc]{hyperref} -\hypersetup{colorlinks=true,% -linkcolor={blue},% +\usepackage[hscale=0.66]{geometry} +\usepackage[dvipdfmx,% pdftex creates a 3 to 4 times bigger file! +pdfencoding=pdfdoc,% +bookmarks=true,% +bookmarksopen=true,dvipdfmx-outline-open,% +]{hyperref} +% +\hypersetup{,% +colorlinks=true,% +linkcolor={red},% citecolor={red},% +urlcolor={ChoisiJeNeSaisPlusComment}, pdfauthor={Jean-Fran\c cois Burnol},% pdftitle={The mathastext package},% +pdfsubject={LaTeX, math fonts},% pdfkeywords={LaTeX, Fonts},% pdfstartview=FitH,% -pdfpagemode=UseOutlines} +pdfpagemode=UseOutlines,% +} %% \usepackage[T1]{fontenc} -\usepackage{lmodern} -\usepackage[subdued,italic,defaultmathsizes,symbolmisc,symbolre]{mathastext} -\MTDeclareVersion[n]{lmvtt}{T1}{lmvtt}{m}{n} +\usepackage[subdued,italic,defaultmathsizes,% +symbolmisc,symbolre,LGRgreek]{mathastext} +\MTupgreek\MTgreekfont{cmtt} +\MTDeclareVersion[n]{cmvtt}{T1}{cmvtt}{m}{n} +% \usepackage{newcent} \Mathastext[newcent] +% +\MTitgreek\MTupGreek\MTgreekfont{txr} \usepackage{times} \Mathastext[times] +% \usepackage[scaled]{helvet} \renewcommand\familydefault\sfdefault +\MTgreekfont{cmss} \Mathastext[helvet] -\begin{document}\MTversion{normal}\renewcommand\familydefault\sfdefault - \DocInput{mathastext.dtx} +\begin{document} +\MTversion{normal} +\renewcommand\familydefault\sfdefault +\DocInput{mathastext.dtx} \end{document} %</driver> % \fi % % \GetFileInfo{mathastext.dtx} % +% \newif\iftoggled +% \makeatletter +% \catcode`\§=13 +% ^^A \def§{\@ifnextchar|{\color{blue}}{|\color{black}\xspace}} +% \def§{\iftoggled\endgroup\toggledfalse\xspace\else +% \toggledtrue\begingroup\color{blue}\ttfamily\expandafter\string\fi} +% \makeatother +% +% \newcommand\mst{{\color{ChoisiJeNeSaisPlusComment}\ttfamily\bfseries mathastext}\xspace} +% \frenchspacing % \begin{center} -% {\Large The {\color{blue}\texttt{mathastext}} package}\\ +% {\Large The \mst package}\\ % Jean-Fran\c cois \textsc{Burnol}\\ -% \texttt{jfbu at free dot fr} +% \small \ttfamily +% \centerline{jfbu (at) free (dot) fr} +% \centerline{Package \fileversion\ from \filedate.} +% \centerline{This documentation: \mstdocrevdate.} % \end{center} % +% % \begin{abstract} -% The |mathastext| package\footnote{This document describes |mathastext| -% \fileversion\ (\filedate).} automatically (or only locally) changes the -% document fonts used in math mode for letters and digits (and a few other -% punctuation and symbol signs) to replace them by the font used for the -% text. Thus, the package makes it possible to use a quite arbitrary font -% without worrying too much that it does not have specially designed -% accompanying math fonts. Also, |mathastext| provides a simple mechanism in -% order to use more than one math-as-text font in the same document. +% The \mst package automatically (or only locally) changes the fonts +% used in math mode for the letters and digits (and a few other +% punctuation and symbol signs) and replaces them with the font used +% for the text. Thus, the package makes it possible to use a quite +% arbitrary font without worrying too much that it does not have +% specially designed accompanying math fonts. Also, \mst provides a +% simple mechanism in order to use more than one math-as-text font in +% the same document. % \end{abstract} % -% \section{What \texttt{mathastext} does} +% \section{What \texorpdfstring\mst{mathastext} does} % % \subsection{Examples} % -% |mathastext|'s basic aim to is to have the same font for text and +% \mst's basic aim to is to have the same font for text and % mathematics. Here is an example with -% Latin Modern typewriter proportional: +% Computer Modern typewriter proportional: % % {\advance\leftskip.1\linewidth\advance\rightskip.1\linewidth -% \MTversion{lmvtt} +% \MTversion{cmvtt} % Let $(X,Y)$ be two functions of a variable $a$. If they obey the differential % system $(VI_{\nu,n})$: % \begin{align*} @@ -109,7 +143,7 @@ pdfpagemode=UseOutlines} % $(\alpha,\beta,\gamma,\delta) = (\frac{(\nu+n)^2}2, % \frac{-(\nu+n+1)^2}2, \frac{n^2}2, \frac{1 - n^2}2)$.\par % } -% Note that the mathematical letters are not italicized. But perhaps we do +% Notice that the Latin (and Greek letters) are in upright shape. But perhaps we % insist on obeying the standardized habits: % % @@ -139,10 +173,10 @@ pdfpagemode=UseOutlines} % \frac{-(\nu+n+1)^2}2, \frac{n^2}2, \frac{1 - n^2}2)$.\par % } % -% This used the Times font (available in any \TeX{} distribution). Let us now -% be a bit more original and have our mathematics with italic letters from the -% sans serif font Helvetica, while the letters in text use New Century -% Schoolbook. +% This was typeset using the Times font (available in any \TeX{} +% distribution). Let us now be a bit more original and have our mathematics +% with italic letters from the sans serif font Helvetica, while the letters in +% text use New Century Schoolbook. % % % {\advance\leftskip.1\linewidth\advance\rightskip.1\linewidth @@ -184,16 +218,29 @@ pdfpagemode=UseOutlines} % + (1 - Y^2)\frac{2n a}{1 - a^2}\frac{X+aY}{1+a XY} % \end{align*} % then the quantity $q = a \frac{aX+Y}{X+aY}$ -% satisfies as function of $b= a^2$ the $P_{VI}$ differential equation.\par} +% satisfies as function of $b= a^2$ the $P_{VI}$ differential equation with +% parameters +% $(\alpha,\beta,\gamma,\delta) = (\frac{(\nu+n)^2}2, +% \frac{-(\nu+n+1)^2}2, \frac{n^2}2, \frac{1 - n^2}2)$.\par} +% +% \vskip\baselineskip Notice that the Greek letters also changed +% according to the \emph{math version}: \mst has indeed some (limited) +% capabilities to this effect (we used the |LGR| encoded fonts |cmtt|, +% |txr| (from |txfontsb| package), and |cmss|). As an +% aside, I mention here that for documents containing many fonts +% |pdflatex| produces truly larger files than |dvipdfmx| which embeds +% them in a compressed format (for this doc with the source code +% included --- 47 pages, it is circa 700KB vs 230KB). % % \subsection{Basic use} % -% The initial ideology of |mathastext| was to produce mathematical texts +% The initial ideology of \mst was to produce mathematical texts % with a very uniform look, not separating math from text as strongly as -% is usually done. As soon as one switches text fonts one realizes how -% extremely thin are the default \TeX{} fonts for mathematics. They +% is usually done. As soon as one tries out other fonts for text than the +% Computer Modern ones one realizes how +% extremely ``thin'' are the default \TeX{} fonts for mathematics: they % definitely do not fit well -% visually with the majority of text fonts. With |mathastext| and minimal +% visually with the majority of text fonts. With \mst and minimal % effort one can get one's (simple\dots{} or not) mathematics typeset in % a manner more compatible with the text, without having to look for an % especially designed font. Here is a minimal example of what to put in @@ -205,50 +252,113 @@ pdfpagemode=UseOutlines} % \usepackage[italic]{mathastext} % \end{verbatim} % \end{minipage}\\ -% The entire document, including in math mode letters, digits, and some -% signs, will then be typeset in Times. However, the Greek -% letters in math mode still come from the default fonts (or as -% specified by the user in the preamble with some other packages). And -% all the ``large'' math symbols are the default ones. In fact |mathastext|'s -% basic scope is strictly limited to the following characters from |ASCII|:\\ -% {\color{blue} -% \centerline{abcdefghijklmnopqrstuvwxyz}\\ -% \centerline{ABCDEFGHIJKLMNOPQRSTUVWXYZ}\\ -% \centerline{0123456789}\\ -% \DeleteShortVerb{\|}% -% \centerline{!\,?\,*\,,\,.\,:\,;\,+\,\textendash\,=\,(\,)\,[\,]\,/\,\#\,% -% \$\,\%\,\&\,$\mathord{<}\,\mathord{>}\,\mathord{|}$\,\{\,\} -% {\color{black}and }$\backslash$} \MakeShortVerb{\|}} -% -% Even for typesetting simple mathematics, the standard text fonts lack -% some important glyphs: in particular the prime ${}'$ indicating -% derivatives will be left by |mathastext| to the default (or current) -% math font, as the text font glyph {}'{} is not, as a rule, a -% satisfying alternative. Also the minus sign is picked up from the -% endash character, if available, not the hyphen character. And -% nothing is changed to the ``large'' math symbols, except for -% $\defaultprod$ and $\defaultsum$ in inline math which, like here: -% $\prod\sum$, will be taken from the Symbol Font if option -% |symbolmisc| was used. -% -% We specified in our minimal working example a |T1| encoding (|LY1| -% would have been ok, too) because the default |OT1| does not have the -% {\color{blue}\DeleteShortVerb{\|} -% $\mathord{<}\,\mathord{>}\,\mathord{|}$\,\{\,\}} and -% {\color{blue}$\backslash$\MakeShortVerb{\|}} glyphs. If |mathastext| -% detects |OT1| as the default encoding it will leave these characters -% to their defaults from the math fonts (the \emph{subdued} option, -% described next, acts a bit otherwise.) -% -% The present document illustrated the use of various fonts, so the set-up in -% the preamble is accordingly a bit more complicated: +% Throughout the entire document, all letters, digits, and punctuation signs +% inside math mode will then be typeset in Times\footnote{let's do as if we +% did not know the excellent |txfonts| package which employs Times for text +% and has a +% very complete math support, including many additional mathematical glyphs +% in comparison to the CM fonts.}. Here is the precise list of +% characters concerned by \mst, all from the basic |ASCII| set:\\ +% {\color{ChoisiJeNeSaisPlusComment}\bfseries +% \centerline{abcdefghijklmnopqrstuvwxyz}\\ +% \centerline{ABCDEFGHIJKLMNOPQRSTUVWXYZ}\\ +% \centerline{0123456789}\\ +% \DeleteShortVerb{\|}% +% \centerline{!\,?\,*\,,\,.\,:\,;\,+\,\textendash\,=\,(\,)\,[\,]\,/\,\#\,% +% \$\,\%\,\&\,$\mathord{<}\,\mathord{>}\,\mathord{|}$\,\{\,\} +% {\color{black}\mdseries and }$\backslash$}\MakeShortVerb{\|}} +% +% Missing from the list are the {}'{} and the {}-{}. Indeed the prime ${}'$ +% indicating derivatives is left to its default by \mst as the text font glyph +% {}'{} is not, as a rule, a satisfying alternative. Also the minus sign is +% picked up from the endash character \textendash, if available, and not the +% hyphen character -. And nothing is changed to the ``large'' math symbols, +% except for $\defaultprod$ and $\defaultsum$ in inline math which, like here: +% $\prod\sum$, will be taken from the Symbol Font if option §symbolmisc§ was +% used. +% +% The §italic§ option tells the letters to be in italic shape (they will be +% upright in operator names), as is the standardized habit. However, one +% should be aware that the built-in placement routines of \TeX{} in math mode +% expect the math italic to have some (tiny) white space around them, so that +% they don't ``stick'' to parentheses for example. Compare (as is done in any +% book on \LaTeX{}) the text italic with the math italic (here for Computer +% Modern):\footnote{Text fonts are equipped with ligature rules. The French +% Cursive font for example has complex ligature rules and they make +% cohabitation with \mst somewhat difficult in +% that case.}\\ +% \centerline{\itshape abcdefghijklmnopqrstuvwxyz} +% \centerline{$abcdefghijklmnopqrstuvwxyz$} +% +% Furthermore (and more importantly perhaps) the math parentheses are not the +% same as the text parentheses, compare {\itshape (ab)} (text italic) with +% ^^A\begingroup \mathcode`\(=16424\relax \mathcode`\)=20521 +% $(ab)$ (math): the math +% parentheses are upright! Fear not, \mst picks up the parentheses from the +% upright shape (it can be coerced to do otherwise). Nevertheless sometimes +% the text parentheses are just not that usable, so there is a package option +% §noparenthesis§. There are many more options (complete details given +% further on in this document), let me mention §basic§ (do only letters and +% digits) and §nodigits§ (perhaps the old style figures from text do not fit +% so well in math). +% +% +% I briefly alluded to the complex spacings in math mode, and it seems indeed +% to be a complicated affair to construct a math font for \TeX{}. When there +% are thousands of free text fonts and a handful of math ones, if your +% favorite text font does not mix so well with the available math ones, try +% out \mst. The following set-up often gives +% esthetically pleasing results: it is to use the sans-serif member of the +% font family for math, and the serif for text. This can be +% done the following way: \\[\baselineskip] +% \begin{minipage}{.5\linewidth} +% \begin{verbatim} +% \renewcommand\familydefault\sfdefault +% \usepackage{mathastext} +% \renewcommand\familydefault\rmdefault +% \begin{document} +% \end{verbatim} +% \end{minipage}\\ +% +% As said already none of the ``large'' math symbols is modified in any way by +% \mst. Only loading some math font packages such as |fourier|, |kpfonts|, +% |mathdesign|, +% |txfonts|, etc\dots{} will change them. Think of loading these packages +% before \mst, else they might undo what \mst did. An option §symbolmisc§ +% picks up many symbols (arrows for example) from the Symbol font. +% +% There is also the issue of Greek letters. Sometimes the text font has Greek +% glyphs, in |LGR| encoding (this will be mentioned in the documentation of +% the font package). Then option §LGRgreek§ tells \mst to pick up these Greek +% letters. And it is then possible to specify whether the Greek letters should +% be upright, or ``italic''\footnote{a more detailed discussion comes next. +% Note that the default CM and its replacement Latin Modern for european +% languages do both come with |LGR| encoded fonts.}. And if your text font is +% not distributed with Greek glyphs, and does not mix well with the CM ones +% then there is always the possibility to load, prior to \mst, some math +% packages such as |fourier|, |kpfonts|, |mathdesign|, |txfonts|, \dots{} +% +% +% We specified in our minimal working example a |T1| encoding (|LY1| would +% have been ok, too) because the default |OT1| does not have the +% {\color{ChoisiJeNeSaisPlusComment}\DeleteShortVerb{\|} +% $\mathord{<}\,\mathord{>}\,\mathord{|}$\,\{\,\}} and +% {\color{ChoisiJeNeSaisPlusComment}$\backslash$\MakeShortVerb{\|}} glyphs. If +% \mst detects |OT1| as the default encoding it will leave these characters to +% their defaults from the math fonts (the §subdued§ option, described next, +% acts a bit otherwise, it forces, contrarily to its usual low-key character, +% the replacement of |OT1| by |T1| for the fonts ultimately used with letters +% and digits in math mode.) +% +% The present document illustrated the use of various fonts, so its preamble +% set-up is accordingly a bit more complicated:\footnote{I have removed the Greek and Symbol font related stuff. See the |.dtx| source for the real thing.} % \begin{center} % \begin{minipage}{.5\linewidth} % \begin{verbatim} % \usepackage[T1]{fontenc} % \usepackage{lmodern} % \usepackage[subdued,italic,defaultmathsizes]{mathastext} -% \MTDeclareVersion[n]{lmvtt}{T1}{lmvtt}{m}{n} +% \MTDeclareVersion[n]{cmvtt}{T1}{cmvtt}{m}{n} % \usepackage{newcent} % \Mathastext[newcent] % \usepackage{times} @@ -260,66 +370,55 @@ pdfpagemode=UseOutlines} % \end{verbatim} % \end{minipage} % \end{center} -% Here we see that the document declared four |math versions|: |lmvtt|, -% |newcent|, |times|, and |helvet|. the names are arbitrary and only need to be -% suitable arguments to the \LaTeX{} \cs{DeclareMathVersion} command. The -% |normal| and |bold| original math versions \LaTeX{} remain, thanks -% to the |subdued| option, untouched by |mathastext|. +% Let us examine this code: it uses once the command §\MTDeclareVersion§ and +% three times the command §\Mathastext§, thus defining four +% |math versions|\footnote{|math versions| are discussed in the document +% |fntguide.pdf| +% from your \TeX{} distribution.}: |cmvtt|, |newcent|, |times|, and |helvet|. +% The names can be taken arbitrarily (they only need to be suitable arguments to +% the \LaTeX{} \cs{DeclareMathVersion} command which is invoked internally, so +% no spaces in the names). Two additional math versions preexist: the |normal| and +% |bold|, which, because there was the §subdued§ option, were left untouched by +% \mst. % -% Once these options are defined, the command +% Once these |math versions| are defined, % \cs{MTversion\{name\_of\_version\}} in the \emph{body} of the document % enacts the font switches. As is usual with \LaTeX{} one can limit the % scope to the inside of a group, or also switch back to the main set-up % through issuing a \cs{MTversion\{normal\}}. % -% \textbf{Important:} the normal and bold versions are the only ones for -% which the command \cs{MTversion} will set up (possibly) different fonts used -% in text vs math. All other versions, and also normal and bold if the -% |subdued| option is absent, when invoked with a \cs{MTversion} command, will +% \textbf{Important:} the |normal| and |bold| versions are the only ones for +% which the command \cs{MTversion} sets up (possibly) different fonts used +% in text vs math. With all other versions, and also with normal and bold if the +% §subdued§ option is absent, the \cs{MTversion} command will % set up the same fonts for text and math (letters, digits, and the few % other signs listed before). % -% So, \cs{MTversion} admits an optional argument in order to allow specifying -% different fonts for text and math: for example we used here -% \cs{MTversion[newcent]\{helvet\}} in order to get New Century Schoolbook -% for the text and Helvetica for the math. -% -% -% \subsection{The \texttt{subdued} option} -% -% This is new with |v1.15| (which almost immediately became |v1.15b|) -% of |mathastext|. It provides a manner to switch on the -% \emph{mathastextification} only for limited portions of the document, -% with the mechanism of math versions. Without the |subdued| option, -% the \emph{mathastextification} applies by default to the whole of the -% document (and one may define additional math versions in the -% preamble); with the |subdued| option the \emph{mathastextification} -% has to be activated by an explicit use of a \cs{MTversion} (also -% written \cs{Mathastextversion}) command in the document body, and the -% document preamble must contain at least one \cs{Mathastext} command -% (with the version name in square brackets) to define a math version, -% to be later used in the body. -% -% Note for the interested people: it is not exactly true that with the -% |subdued| option the font set-up in math is completely left -% untouched, but these are internal details of inner workings and -% should not be perceptible in most cases. The initial version of the -% package made some design choices based on a radical aim to -% \emph{mathastextify} everything, and completely cancelling this now -% would require defining even more internal structures and would lead -% in documents with many fonts to hit more easily against some -% limitations of \LaTeX{} regarding the number of fonts one can -% possibly declare in math mode. -% -% \subsection{The \texttt{italic} option} +% An optional argument to \cs{MTversion} allows to specify possibly distinct +% fonts for text and math: we used in the source of this document +% \cs{MTversion[newcent]\{helvet\}} in order to get New Century Schoolbook for +% the text and Helvetica for the math. The \LaTeX{} command +% \cs{mathversion\{name\_of\_version\}} will change only the fonts used in math +% mode. +% +% +% \subsection{The \texorpdfstring{\texttt{\color{blue}defaultmathsizes}}{defaultmathsizes} option} +% +% The default sizes give barely legible glyphs (for this author!) for +% subscripts of subscripts. So \mst makes more reasonable choices. It +% also redefines \cs{Huge} and defines a \cs{HUGE} size, copied from +% the |moresize| package. To cancel all of this use option +% §defaultmathsizes§. +% +% \subsection{The \texorpdfstring{\texttt{\color{blue}italic}}{italic} option} % % In the initial version |1.0|, the Latin letters in % mathematical mode assumed the exact same shape as in % text mode, and this meant, generally speaking, that % they would turn up upright. Doing this gives a very % uniform look to the document, so that one has to make -% an effort and read it with attention, I explained above -% why I did this on purpose. +% an effort and read it with attention, and this was +% one of the design goals of \mst. % % Nevertheless, soon after I posted the initial version % of the package to CTAN, I was overwhelmed by @@ -329,18 +428,35 @@ pdfpagemode=UseOutlines} % their kind remarks (chronological order).} on how to % have the letters be in italic shape. % -% Starting with version |1.1| the default is still, as in version |1.0|, -% for everything to be in upright shape, but it suffices to pass to the -% package the option |italic| to have italic Latin letters in math -% mode.\footnote{more precisely stated, the value of \cs{itdefault} is -% used.} There is also an option |frenchmath|\footnote{in versions of the -% package prior to |1.13|, it was necessary to also pass the option -% |italic| to enable |frenchmath|. This is now superfluous.} to make the +% The default is still, as in version |1.0|, for everything to be in +% upright shape, but it suffices to pass to the package the option +% §italic§ to have the Latin letters in math mode in italic +% shape.\footnote{more precisely stated, the value of \cs{itdefault} +% is used.} There is also an option §frenchmath§ to make the % uppercase letters nevertheless upright, because this is the way of % traditional French mathematical typography.\footnote{more precisely -% stated, the shape will be the one used for digits and operator names, -% thus by -% default \cs{shapedefault}.} +% stated, the shape used will be \cs{shapedefault}.} +% +% \subsection{The \texorpdfstring{\texttt{\color{blue}subdued}}{subdued} option} +% +% This option was introduced in |v1.15|. It provides a manner to switch on +% the \mst-\emph{ification} only for limited portions of the document, +% with the mechanism of math versions. Without the §subdued§ option, the +% \emph{mathastextification} applies by default to the whole of the document +% (and one may define additional math versions in the preamble); with the +% §subdued§ option the \emph{mathastextification} has to be activated by an +% explicit use of a \cs{MTversion} (also written \cs{Mathastextversion}) +% command in the document body, and the document preamble must contain at +% least one \cs{Mathastext} command (with the version name in square +% brackets) to define a math version, to be later used in the body. +% +% What do I do to really mute this annoying \mst? well, you should +% use additionally to §subdued§ the already mentioned option +% §defaultmathsizes§, and further options which will be explained +% next: §basic§, §defaultalphabets§, §defaultimath§, §nohbar§. The +% Greek related options dicussed next will not be subdued except for +% §LGRgreek§ and §LGRgreeks§. +% % \subsection{Basic example with math versions} % % @@ -358,7 +474,7 @@ pdfpagemode=UseOutlines} % \end{verbatim} % % The |newcent| package from the |psnfss| standard bundle of \LaTeX{} -% font packages sets up New Century Schoolbook (NCE) for the serif +% font packages sets up New Century Schoolbook (NCS) for the serif % font, Avant Garde for the sans font, and Courier for the typewriter % font. The command |\usepackage[subdued]{mathastext}| does not change % the |normal| @@ -370,7 +486,7 @@ pdfpagemode=UseOutlines} % family, as given by the current \cs{familydefault} value. At first % \cs{familydefault} is given as \cs{rmdefault}, so changing % \cs{rmdefault} is another, indirect, manner to change which font will -% be associated by |mathastext| to the given version name. Remember +% be associated by \mst to the given version name. Remember % though that if \cs{familydefault} points to some other value, % changing \cs{rmdefault} will not be effective for the \cs{Mathastext} % command. Just before |\begin{document}| we issue a last @@ -378,13 +494,13 @@ pdfpagemode=UseOutlines} % to be used in the text to be roman one, here NCS. % % In the body of a document \cs{MTversion} with a version name does -% three things: it changes the font for letters, digits, operator names +% three things:\footnote{well, it also sets up the LGR Greek letters, +% in case of option §LGRgreek§.} it changes the font for letters, digits, operator names % in math mode; it changes the font for text; and it resets the % |\(family,rm,sf,tt)default|s to their values as registered at the time of % definition of the version. You may wish to limit its scope to the -% inside of some group. -% -% One may also just use the \LaTeX{} command \cs{mathversion} to only +% inside of some group.% +% One may also use the \LaTeX{} command \cs{mathversion} in order to only % change the fonts in math. % % \subsection{Greek letters} @@ -393,40 +509,56 @@ pdfpagemode=UseOutlines} % to many text fonts, and as a result rarely mix % well with them (particularly if the Latin letters in % math mode are upright). The following options are -% provided by |mathastext|: +% provided by \mst: % \begin{description} % \item[no option:] nothing is done by the % package, Greek letters are the default Computer % Modern ones or have been set-up by other packages; % for example by the |fourier| package with option % `upright', which gives upright Greek letters. -% \item[LGRgreek:] this is for fonts which additionally -% to Latin letters also provide Greek letters in LGR -% encoding.\footnote{among examples known to the author are -% the Comfortaa and the Droid (serif and sans) fonts, -% and of course the Greek Font Society fonts such as -% GFS Didot.} -% \item[eulergreek:] the Greek letters will be taken from -% the Euler font which is included in all \LaTeX{} -% distributions (although no package loading is -% necessary for the user, nor done by |mathastext|, the -% file |uzeur.fd| from the |eulervm| package must be -% accessible to \LaTeX{} as it provides a mechanism to -% scale by an arbitrary factor the Euler font.) The -% letters are upright. -% \item[symbolgreek:] the Greek letters will be taken -% from the (Adobe) Symbol font. A command is provided +% \item[§LGRgreek§:] this is for fonts which additionally to Latin +% letters also provide Greek letters in |LGR| encoding. Here is a +% list from a 2012 standard \TeX{} installation: the Computer +% Modern, Latin Modern, and the CM-LGC fonts; the Greek Font +% Society fonts (such as GFS Didot), the epigrafica and kerkis +% packages, the txfontsb package which extends the txfonts package +% with LGR-encoded Greek letters; the Droid fonts, the DejaVu +% fonts, the Comfortaa font, and the Open Sans font. The LGR +% encoded CM/LM fonts (in serif, sans-serif and typewriter family) +% give nice Greek letters in upright shape (if you don't use option +% §italic§, the option §LGRgreek§ will use these upright Greek +% letters if no other package has changed math mode Greek), but +% those in italic shape are not the same glyphs as the default +% Greek letters from the OML encoded font |cmmi|, and they are not +% as nice. +% \item[§eulergreek§:] the Greek letters will be taken from the Euler font (the +% document does not have to load the eulervm package, \mst directly uses +% some file included in this package, as it provides a mechanism to scale +% by an arbitrary factor the Euler font.) The letters are upright. +% \item[§symbolgreek§:] the Greek letters will be taken +% from the (Adobe Postscript) Symbol font. A command is provided % so that the user can scale the Symbol font to let it -% better mix with the text font. The letters are upright. -% \item[selfGreek:] this option is in case the text font is available in -% OT1-encoding and does contain the glyphs for the eleven capital Greek -% letters of default \TeX{}. It does nothing for the lowercase Greek -% letters. The encoding used in the document does not have to be -% OT1.\footnote{contrarily to the previous versions of the package, -% |v1.14c| will not assume that the encoding is OT1-compatible, it will -% directly load the OT1-encoded version of the font.} +% better fit with the text font. The letters are upright. +% \item[§selfGreek§:] this option concerns only the eleven Greek +% capitals from the |OT1|-encoding. It does nothing for the +% lowercase Greek letters. The encoding used in the document does +% not have to be |OT1|. There is also a variant §selfGreeks§ to +% tell \mst to do this in all math versions. % \end{description} % +% There is also §LGRgreeks§ which tells \mst to pick up in each math +% version the letters from the |LGR| encoded font used in that version, +% and §selfGreeks§ to tell \mst to do as for §selfGreek§ but +% separately in all math versions. +% +% The §subdued§ option will preserve the Greek letters to their +% defaults in the normal and bold math versions only in the case of +% the options §LGRgreek§/§LGRgreeks§ (and of course in the case no +% Greek option was used). \textbf{Important}: to maintain Greek +% letters in +% normal and bold math to their initial state it is necessary to +% circumscribe the scope of each call to a |\MTversion{another_version}| +% to the inside of a group. % % \subsection{Shape of Greek letters} % @@ -436,50 +568,63 @@ pdfpagemode=UseOutlines} % ISO standard is to use italic shape for both lowercase % and uppercase. % -% The Euler and Symbol font not being available in other than their default -% upright shape, this question of shapes for Greek letters raises issues -% only in the case of the options |LGRgreek| and |selfGreek|. +% The Euler and Symbol fonts not being available in other than their +% default upright shape, this question of shapes for Greek letters +% raises issues only in the case of the options §LGRgreek§ and +% §selfGreek§. % -% The options |frenchmath|, |itgreek|, |upgreek|, |itGreek| and |upGreek| +% The options §frenchmath§, §itgreek§, §upgreek§, §itGreek§ and §upGreek§ % modify the Greek letter shapes according to the following rules, listed % from the lowest to the highest priority: % \begin{description} % \item[no option:] the lowercase Greek letters are in the same shape as % Latin letters, and the uppercase in the same shape as applied to digits % and operator names, -% \item[frenchmath:] both lowercase and uppercase are in the same shape as +% \item[§frenchmath§:] both lowercase and uppercase are in the same shape as % the digits and operator names (most of the time this means ``upright % shape'', but it can be otherwise), -% \item[itgreek,upgreek:] both lowercase and uppercase are in the +% \item[§itgreek,upgreek§:] both lowercase and uppercase are in the % \cs{itdefault}, respectively the \cs{updefault} shape (at the time of % loading the package or at the time of a subsequent call to % \cs{Mathastext} or \cs{MathastextWillUse}), -% \item[itGreek,upGreek:] same as above, but only for the uppercase +% \item[§itGreek,upGreek§:] same as above, but only for the uppercase % letters. % \end{description} % -% So, the default gives the classic \TeX{} behavior when option |italic| +% So, the default gives the classic \TeX{} behavior when option §italic§ % was passed. Each call to \cs{Mathastext} (or \cs{MathastextWillUse}) % macros (described in a later section) reinitializes the computation of % the shapes. % -% As described in the next section the package allows to define various -% ``math versions''. The fonts used for the Greek letters, and their -% shapes, are the same accross all math versions, except when options -% |LGRgreeks| or |selfGreeks| are passed to the package (Note the -% additional ``s''). It is then expected that all math versions will use -% fonts available in LGR encoding (or, OT1 encoding for the capital Greek -% letters), and the shapes will then also be local to the math version. +% As mentioned already the package allows to define various ``math +% versions''. In the case of $eulergreek$ or $symbolgreek$ they apply +% to all these versions. In the case of the options §LGRgreeks§ or +% §selfGreeks§ (notice the additional ``s''), each math version is +% assumed to have its text font available in |LGR| (or |OT1| +% encoding) and also the shapes will be local to the math version. +% +% Finally version |1.15c| of \mst introduces new preamble-only +% commands to change the shapes, and even the font, used for Greek +% letters, in case of package options §LGRgreek§/§selfGreek§. They +% are §\MTitgreek§, §\MTupgreek§, §\MTitGreek§, §\MTupGreek§: these +% are used like the options and change only the shapes for the math +% versions which will be declared \emph{next} in the preamble; and +% §\MTgreekfont\{name\_of\_font\}§ will tell the \emph{next} math +% versions to use that font family. To use this command you need to +% know the (little) name of a suitable font family available in |LGR| +% encoding: for example |lmr|, |txr| (needs |txfontsb| +% package on your system), |DejaVuSerif-TLF| (needs |dejavu| package +% on your system), etc\dots % % % \subsection{Unicode engines} % -% It is recommended to the user to look at the |mathspec| package, as a more -% powerful and nativally unicode-aware alternative. However, |mathastext| has +% It is recommended to the user to look at the |mathspec| package, as a far +% more powerful and nativally unicode-aware alternative. However, \mst has % been made minimally unicode-aware and can be used with Xe\TeX{} or % Lua\TeX{}. % -% Of course |mathastext| is extremely far from being able to define a math +% Of course \mst is extremely far from being able to define a math % font, as it applies basically only to a subset of the 32-127 ascii range, % and in particular it does not know how to use a given Unicode font % simultaneously for Latin and Greek letters. For this the user is strongly @@ -487,7 +632,7 @@ pdfpagemode=UseOutlines} % % To specify math versions using unicode fonts, only use the |fontspec| % \cs{setmainfont} command (with arbitrary optional features) prior to -% loading |mathastext|, or after and then followed by a \cs{Mathastext} +% loading \mst, or after and then followed by a \cs{Mathastext} % command with the name of the version in square brackets. It is possible to % mix unicode fonts and classical \TeX{} fonts, but due to the handling of % the minus sign in math mode (in particular), it is best to have either only @@ -495,15 +640,14 @@ pdfpagemode=UseOutlines} % or LY1 for example). % % \textbf{Important:} |fontspec| must be loaded with its \emph{no-math} -% option, and \emph{prior} to |mathastext|. +% option, and \emph{prior} to \mst. % % The package was not extensively tested with unicode engines, but I include % here two examples which compiled successfully with Xe\TeX{}, the first one -% on a Linux -% machine, the second one on a Mac OS X machine. The inclusion of |amsmath| -% and |mathtools| was just made in order to detect possible conflicts with -% the current version of |mathastext|. I commented out |mathtools| because -% with it one has to define one math version less to not generate errors. +% on a Linux machine, the second one on a Mac OS X machine. The inclusion of +% |amsmath| and |mathtools| was just made in order to detect possible +% conflicts with the current version of |mathastext|. I then commented out +% |mathtools| because in its presence less math versions can be defined. % \begin{verbatim} % \documentclass{article} % \usepackage[hscale=0.8]{geometry} @@ -587,34 +731,34 @@ pdfpagemode=UseOutlines} % % \subsection{Summary of main options} % \begin{description} -% \item[{\tt italic, frenchmath:}] italic letters in -% math, upright uppercase if |frenchmath|. -% \item[{\tt subdued}]: acts in a subdued way. The |normal| and |bold| +% \item[{§italic, frenchmath§}:] italic letters in +% math, upright uppercase if §frenchmath§. +% \item[{§subdued§}:] acts in a subdued way. The §normal§ and §bold§ % math versions are left (quasi) unchanged. -% \item[{\tt LGRgreek, eulergreek, symbolgreek:}] the +% \item[{§LGRgreek, eulergreek, symbolgreek§}:] the % Greek letters will be taken, respectively from the -% text font itself (in LGR encoding), or from the Euler +% text font itself (in |LGR| encoding), or from the Euler % font, or from the Postscript Symbol font. -% \item[{\tt symbolmax:}] all characters listed supra, +% \item[{§symbolmax§}:] all characters listed supra, % other than letters and digits, are taken from the % Symbol font. This option also makes a number of % further glyphs available, including some basic % mathematical arrows, as well as the sum and product % signs. For documents with very simple needs in -% mathematical symbols, |mathastext| with option -% |symbolmax| may give in the end a PDF file quite +% mathematical symbols, \mst with option +% §symbolmax§ may give in the end a PDF file quite % smaller than the one one would get without the % package. -% \item[{\tt defaultmathsizes:}] |mathastext| opts for bigger -% subscripts (and, copied from the |moresize| package, redefines -% \cs{Huge} and defines \cs{HUGE}). Use this option to prevent it from +% \item[{§defaultmathsizes§}:] the default of \mst is to declare bigger sizes +% in subscripts (it also copies code from the §moresize§ package to redefine +% \cs{Huge} and define \cs{HUGE}). Use this option to prevent it from % doing so. -% \item[{\tt defaultalphabets:}] by default, |mathastext| -% redeclares the math alphabets \cs{mathrm}, \cs{mathit}, -% etc\dots{} (but not \cs{mathcal}) to refer to the -% current document text fonts (at the time of loading the -% package). Use this option to prevent it from doing so -% (each alphabet also has its own disabling option). +% \item[{§defaultalphabets§}:] by default, \mst redeclares the math +% alphabets \cs{mathrm}, \cs{mathit}, etc\dots{} (but not +% \cs{mathcal}) to refer to the current document text fonts (at the +% time of loading the package and in each \mst math version). Use +% this option to prevent it from doing so (each alphabet also has +% its own disabling option). % \end{description} % % \subsection{Miscellaneous} @@ -623,7 +767,7 @@ pdfpagemode=UseOutlines} % \item[the en-dash as minus sign:] Very often the - % character from the text font does not give a good % minus sign. So by default, the package uses the -% en-dash sign \textendash{}. Use |noendash| to +% en-dash sign \textendash{}. Use §noendash§ to % deactivate it. Starting with version |1.12| of the % package this `en-dash as minus' should work in all % encodings, including Unicode (if |fontspec| has been @@ -632,16 +776,16 @@ pdfpagemode=UseOutlines} % % \item[hbar:] The definition of \cs{hbar} inherited from % default \LaTeX{} will in our context make use of the -% |h| of the current math font (so for us, it is also +% §h§ of the current math font (so for us, it is also % the text font, perhaps in italic shape), but the bar -% accross the |h| will come from the original default +% accross the §h§ will come from the original default % math font for letters (usually |cmmi|), and -% furthermore its placement on the |h| can be +% furthermore its placement on the §h§ can be % odd-looking. So we redefine \cs{hbar} to use only the -% text font (and this will be aware of the |italic| +% text font (and this will be aware of the §italic§ % option). Our construction does not always give an -% optimal result (and its scope is limited to the OT1, -% LY1 and T1 encodings), so an option |nohbar| +% optimal result (and its scope is limited to the |OT1|, +% |LY1| and |T1| encodings), so an option §nohbar§ % deactivates it. There is no \cs{hslash} provided by % the package, though. The version |1.12| of the % package when dealing with a Unicode font tries to get @@ -662,7 +806,7 @@ pdfpagemode=UseOutlines} % and the dotless i and j, the package expects to detect % either the EU1 encoding for XeTeX{} or the EU2 encoding % for Lua\LaTeX{} (this will be true if |fontspec| was -% loaded), or one of OT1, LY1 or T1, else it +% loaded), or one of |OT1|, |LY1| or |T1|, else it % will renounce and not attempt to access the en-dash or the % dotless i and j glyphs. With \LaTeX{} and Pdf\LaTeX{}, % there is no such limitation and all 8bit-encodings @@ -670,11 +814,11 @@ pdfpagemode=UseOutlines} % % \item[fontspec:] one more note to users of % Xe\TeX{}/Lua\LaTeX{} with |fontspec|: it has to be -% loaded \emph{with the option} |no-math|, -% \emph{and before} |mathastext|. +% loaded \emph{with the option} §no-math§, +% \emph{and before} \mst. % % \item[vec accent:] The default \cs{vec} accent is not -% appropriate for upright letters, so |mathastext| +% appropriate for upright letters, so \mst % provides a \cs{fouriervec} which takes its glyph in a % Fourier font, and an Ersatz \cs{pmvec} % which is reasonably good looking on upright letters @@ -682,7 +826,7 @@ pdfpagemode=UseOutlines} % to version |1.0|, the default \cs{vec} is not % overwritten with \cs{fouriervec}. And contrarily to % version |1.1|, one now needs to pass the option -% |fouriervec| to have the math accent \cs{fouriervec} +% §fouriervec§ to have the math accent \cs{fouriervec} % defined by the package. % % @@ -709,17 +853,17 @@ pdfpagemode=UseOutlines} % problem, and I will welcome any information by % knowledgeable people. % -% \item[math accents:] an option |mathaccents| is +% \item[math accents:] an option §mathaccents§ is % provided to pick up the accents in math mode from the -% text font, but the package knows only T1, LY1 or -% OT1-compatible encodings. +% text font, but the package knows only |T1|, |LY1| or +% |OT1|-compatible encodings. % % \end{description} % % Regarding the encoding-dependent glyphs: the en-dash, % the dotless i and j, the math accents, the hbar, are % encoding dependent and the relevant decisions are made -% by |mathastext| at the time it is loaded. So you can +% by \mst at the time it is loaded. So you can % use math versions with different encodings but, % regarding these characters only those with the same % encoding as the normal math version will display them @@ -728,11 +872,11 @@ pdfpagemode=UseOutlines} % \subsection{Commands} % % \subsubsection{Preamble-only commands} -% Nothing is necessary besides loading |mathastext|, possibly +% Nothing is necessary besides loading \mst, possibly % with some customizing options. The following commands provide % enhancements to the basic use of the package. % \begin{itemize} -% \item |\Mathastext|: reinitializes |mathastext| according to the current +% \item §\Mathastext§: reinitializes \mst according to the current % defaults of encoding, family, series and shape. % \begin{itemize} % \item It can also be preceded optionally by one or @@ -740,11 +884,11 @@ pdfpagemode=UseOutlines} % long names: \texttt{\char92Mathastextencoding}, % etc\dots{} The same applies to the other commands % mentioned in this section.} -% |\MTencoding|\marg{enc}, -% |\MTfamily|\marg{fam}, -% |\MTseries|\marg{ser}, -% |\MTshape|\marg{sh}, and, new with version -% |1.1|, |\MTlettershape|\marg{sh}. For +% §\MTencoding§\marg{enc}, +% §\MTfamily§\marg{fam}, +% §\MTseries§\marg{ser}, +% §\MTshape§\marg{sh}, and, new with version +% |1.1|, §\MTlettershape§\marg{sh}. For % example valid values are, respectively, \meta{T1}, % \meta{phv}, \meta{m}, \meta{n}, and \meta{it}: this % is the Helvetica font in T1-encoding, regular @@ -762,9 +906,16 @@ pdfpagemode=UseOutlines} % not use ``normal'' or ``bold''; this is already taken care of by a call % to \cs{Mathastext} without optional argument.} % \end{itemize} +% \item §\MTitgreek§, §\MTupgreek§, §\MTitGreek§, §\MTupGreek§: +% optional commands, active only in +% the case of the §LGRgreek§ option, to decide the shape of the +% Greek letters in the versions which will be declared next. +% \item §\MTgreekfont§\marg{fontfamily}: optional command with a mandatory +% argument which specifies the font for Greek letters in all \mst math +% versions declared afterwards. Only effective with §LGRgreek§ option. % \item -% |\MTWillUse|\oarg{ltsh}\marg{enc}\marg{fam}\marg{ser}\marg{sh}: -% tells |mathastext| to use the font with the +% §\MTWillUse§\oarg{ltsh}\marg{enc}\marg{fam}\marg{ser}\marg{sh}: +% tells \mst to use the font with the % specified encoding, family, series, and shape for % the letters and digits (and all other afflicted % characters) in math mode. The optional argument @@ -773,34 +924,34 @@ pdfpagemode=UseOutlines} % \meta{sc}. % % \item -% |\MTDeclareVersion|\oarg{ltsh}\marg{name}\marg{enc}\marg{fam}\marg{ser}\marg{sh}: +% §\MTDeclareVersion§\oarg{ltsh}\marg{name}\marg{enc}\marg{fam}\marg{ser}\marg{sh}: % declares that the document will have access to the font % with the specified characteristics, under the version name % \meta{name}. For % example:\\ % \hbox -% to\hsize{\hss|\MTDeclareVersion[sc]{palatino}{T1}{ppl}{b}{sl}|\hss} +% to\hsize{\hss§\MTDeclareVersion[sc]\{palatino\}\{T1\}\{ppl\}\{b\}\{sl\}§\hss} % declares under the name |palatino| a version where % mathematics will be typset using the Palatino font in % T1-encoding, bold, slanted, and the letters will in fact be % in caps and small caps (and bold).\footnote{I do not % especially recommend to use this in real life!} When the -% optional argument is absent, and |mathastext| was loaded -% with the |italic| option, then the default letter shape +% optional argument is absent, and \mst was loaded +% with the §italic§ option, then the default letter shape % will be |it|,\footnote{more precisely, the shape is the % latest value passed in one of the previously used package % commands to specify the shape of letters, or the \cs{itdefault} % of the time of loading the package.} else letters will % have the same shape as used for digits and operator-names. -% \item |\MTboldvariant|\marg{var}: when used before |\Mathastext|, +% \item §\MTboldvariant§\marg{var}: when used before §\Mathastext§, % specifies which bold % (|b|,|sb|,|bx|,\dots) to be used by \cs{mathbf} (and % \cs{boldmath}). Default is the \cs{bfdefault} at the time of -% loading |mathastext|. When used before the declaration +% loading \mst. When used before the declaration % of a version, decides the way \cs{mathbf} will act in this version. -% \item |\MTEulerScale|\marg{factor}: scales the Euler font by +% \item §\MTEulerScale§\marg{factor}: scales the Euler font by % \meta{factor}. -% \item |\MTSymbolScale|\marg{factor}: scales the Symbol font by +% \item §\MTSymbolScale§\marg{factor}: scales the Symbol font by % \meta{factor}. % \end{itemize} % @@ -808,7 +959,7 @@ pdfpagemode=UseOutlines} % % \begin{itemize} % \item -% |\MTVersion|\oarg{nametext}\marg{namemath}:\footnote{\cs{MTVersion} +% §\MTVersion§\oarg{nametext}\marg{namemath}:\footnote{\cs{MTVersion} % is also available as \cs{MTversion}.} in the absence % of the optional argument changes simultaneously the % text and the math fonts to be the fonts corresponding @@ -820,38 +971,38 @@ pdfpagemode=UseOutlines} % \end{itemize} % All further commands are for math mode only. % \begin{itemize} -% \item \cs{hbar}: this is constructed -% (in a way compatible with the |italic| option) from -% the |h| letter and the \={ } accent from the -% |mathastext| font. Note that \cs{mathrm}|{\hbar}| and +% \item §\hbar§: this is constructed +% (in a way compatible with the §italic§ option) from +% the §h§ letter and the \={ } accent from the +% \mst font. Note that \cs{mathrm}|{\hbar}| and % \cs{mathbf}|{\hbar}| should work and that \cs{hbar} -% does scale in subscripts and exponents. Only for T1 -% and OT1 (or LY1) encodings. -% \item |\fouriervec|: this is a |\vec| accent taken from the Fourier font; +% does scale in subscripts and exponents. Only for |T1| +% and |OT1| (or |LY1|) encodings. +% \item §\fouriervec§: this is a |\vec| accent taken from the Fourier font; % the |fourier| package need not be loaded. Active only -% if option |fouriervec|. -% \item |\pmvec|: this provides a poor man \cs{vec} accent command, for +% if option §fouriervec§. +% \item §\pmvec§: this provides a poor man \cs{vec} accent command, for % upright letters. It uses the right arrow. Does not change % size in subscripts and exponents. -% \item |\Mathnormal|, |\Mathrm|, |\Mathbf|, |\Mathit|, -% |\Mathsf|, |\Mathtt|: modifications of the +% \item §\Mathnormal§, §\Mathrm§, §\Mathbf§, §\Mathit§, +% §\Mathsf§, §\Mathtt§: modifications of the % original \cs{mathnormal}, \cs{mathrm}, \cs{mathbf}, % \cs{mathit}, \cs{mathsf}, \cs{mathtt}. By default, the % originals are overwritten with the new commands. -% \item |\mathnormalbold|: a bold version of \cs{mathnormal}. -% \item |\inodot|, |\jnodot|: the corresponding glyphs in +% \item §\mathnormalbold§: a bold version of \cs{mathnormal}. +% \item §\inodot§, §\jnodot§: the corresponding glyphs in % the chosen font for math mode. By default, will % overwrite |\imath| and |\jmath|. With version |1.12| -% by default |\i| and |\j| work also in math mode and -% give then |\inodot|, resp. |\jnodot|. This should work for +% by default §\i§ and §\j§ work also in math mode and +% give then §\inodot§, resp. §\jnodot§. This should work for % all 8bit-encodings having these glyphs, and % also in Unicode. -% \item |\MathEuler|, |\MathEulerBold|: math alphabets to access -% all the glyphs of the Euler font, if option |eulergreek| (or -% |eulerdigits|) was passed to the package. -% \item |\MathPSymbol|: math alphabet to access the Symbol font. -% \item when one of the options |symbolgreek|, -% |eulergreek|, or |selfGreek| is passed to the package +% \item §\MathEuler§, §\MathEulerBold§: math alphabets to access +% all the glyphs of the Euler font, if option §eulergreek§ (or +% §eulerdigits§) was passed to the package. +% \item §\MathPSymbol§: math alphabet to access the Symbol font. +% \item when one of the options §symbolgreek§, +% §eulergreek§, or §selfGreek§ is passed to the package % the capital Greek letters which look like their Latin % counterparts acquire names: \cs{Digamma}, % \cs{Alpha}, \cs{Beta}, \cs{Epsilon}, \cs{Zeta}, @@ -859,7 +1010,7 @@ pdfpagemode=UseOutlines} % \cs{Omicron}, \cs{Rho}, \cs{Tau}, \cs{Chi} (no % \cs{Digamma} for Symbol). Also an \cs{omicron} % control sequence is provided. -% \item LGR Greek and `var'-letters: only the +% \item |LGR| Greek and `var'-letters: only the % \cs{varsigma} is available in this encoding, so using % for example \cs{varphi} will load the previous default math % font. It might thus be suitable when recompiling @@ -869,26 +1020,26 @@ pdfpagemode=UseOutlines} % in case only the `variant' form of the letter was used % in the documents. % \item Miscelleneous mathematical symbols from the postscript Symbol font -% are made available (or replaced) when option |symbolmisc| is +% are made available (or replaced) when option §symbolmisc§ is % passed. They are \cs{prod}~$\prod$ \cs{sum}~$\sum$ -% \cs{implies}~$\implies$ \cs{impliedby}~$\impliedby$ \cs{iff}~$\iff$, +% \cs{implies}~$\implies$ \cs{impliedby}~$\impliedby$ \cs{iff}~$\iff$ % \cs{shortiff}~$\shortiff$ \cs{to}~$\to$ \cs{longto}~$\longto$ -% \cs{mapsto}~$\mapsto$ \cs{longmapsto}~$\longmapsto$, +% \cs{mapsto}~$\mapsto$ \cs{longmapsto}~$\longmapsto$ % \cs{aleph}~$\aleph$ \cs{inftypsy}~$\inftypsy$ \cs{emptyset}~$\emptyset$ -% \cs{surd}~$\surd$ \cs{nabla}~$\nabla$, \cs{angle}~$\angle$ +% \cs{surd}~$\surd$ \cs{nabla}~$\nabla$ \cs{angle}~$\angle$ % \cs{forall}~$\forall$ \cs{exists}~$\exists$ \cs{neg}~$\neg$ -% \cs{clubsuit}~$\clubsuit$, \cs{diamondsuit}~$\diamondsuit$ +% \cs{clubsuit}~$\clubsuit$ \cs{diamondsuit}~$\diamondsuit$ % \cs{heartsuit}~$\heartsuit$ \cs{spadesuit}~$\spadesuit$ -% \cs{smallint}~$\smallint$, \cs{wedge}~$\wedge$ \cs{vee}~$\vee$ -% \cs{cap}~$\cap$ \cs{cup}~$\cup$ \cs{bullet}~$\bullet$ \cs{div}~$\div$, +% \cs{smallint}~$\smallint$ \cs{wedge}~$\wedge$ \cs{vee}~$\vee$ +% \cs{cap}~$\cap$ \cs{cup}~$\cup$ \cs{bullet}~$\bullet$ \cs{div}~$\div$ % \cs{otimes}~$\otimes$ \cs{oplus}~$\oplus$ \cs{pm}~$\pm$ \cs{ast}~$\ast$ -% \cs{times}~$\times$ \cs{proptopsy}~$\proptopsy$, \cs{mid}~$\mid$ +% \cs{times}~$\times$ \cs{proptopsy}~$\proptopsy$ \cs{mid}~$\mid$ % \cs{leq}~$\leq$ \cs{geq}~$\geq$ \cs{approx}~$\approx$ -% \cs{supset}~$\supset$ \cs{subset}~$\subset$, \cs{supseteq}~$\supseteq$ +% \cs{supset}~$\supset$ \cs{subset}~$\subset$ \cs{supseteq}~$\supseteq$ % \cs{subseteq}~$\subseteq$ \cs{in}~$\in$ \cs{sim}~$\sim$ -% \cs{cong}~$\cong$ \cs{perp}~$\perp$, \cs{equiv}~$\equiv$ +% \cs{cong}~$\cong$ \cs{perp}~$\perp$ \cs{equiv}~$\equiv$ % \cs{notin}~$\notin$ \cs{langle}~$\langle$ \cs{rangle}~$\rangle$. And a -% \cs{DotTriangle}~$\DotTriangle$ is made available by option |symbolre| +% \cs{DotTriangle}~$\DotTriangle$ is made available by option §symbolre§ % (which overwrites \cs{Re} and \cs{Im}: $\Re,\Im$). The \cs{inftypsy} % and \cs{proptopsy} have these names to leave up to the user the choice % to replace (or no) the original (larger) \cs{infty} @@ -912,80 +1063,83 @@ pdfpagemode=UseOutlines} % \subsection{Complete list of options} % % \begin{itemize} -% \item |basic|: only mathastextify letters and digits. -% \item |subdued|: does not change the default fonts, activates only after an +% \item §basic§: only mathastextify letters and digits. +% \item §subdued§: does not change the default fonts, turns on the +% \mst-ification only after an % explicit \cs{MTversion} command. -% \item |italic|: the letters will default to italic shape in +% \item §italic§: the letters will default to italic shape in % math mode. -% \item |frenchmath|: |italic|, but uppercase Latin letters +% \item §frenchmath§: §italic§, but uppercase Latin letters % in the same font as for digits and operator names. In % general this means that they will be upright. In case of -% the |LGRgreek| option, |frenchmath| influences also the shape of the +% the §LGRgreek§ option, §frenchmath§ influences also the shape of the % Greek letters. -% \item |endash|, |emdash|: use the text font en-dash (\textendash) or even +% \item §endash§, §emdash§: use the text font en-dash (\textendash) or even % the em-dash (\textemdash, but this seems crazy) for the minus sign -% rather than {}-{}. |endash| option is default for the package. -% \item |noendash|: the minus sign will be the - from the +% rather than {}-{}. §endash§ option is default for the package. +% \item §noendash§: the minus sign will be the - from the % text font, not the en-dash \textendash. -% \item |nohbar|: prevents |mathastext| from defining its own +% \item §nohbar§: prevents \mst from defining its own % \cs{hbar}. -% \item |nolessnomore|: besides +% \item §nolessnomore§: besides % !\,?\,*\,,\,.\,:\,;\,+\,-\,=\,(\,)\,[\,]\,/\,\#\,\$\,\%\,\& -% |mathastext| treats also \DeleteShortVerb{\|} +% \mst treats also \DeleteShortVerb{\|} % $\mathord{<}\,\mathord{>}\,\mathord{|}$\, \{\,\} and % $\backslash$.\MakeShortVerb{\|} Use this option to not -% do it. The option |nolessnomore| is activated by default -% in case of OT1-encoding. -% \item further excluding options: |noexclam|\ !\,?\ -% |noasterisk|\ *\ |nopunctuation|\ ,\,.\,:\,;\ |noplus|, -% |nominus|, |noplusnominus|\ +\,\textendash{} |noequal|\ =\ -% |noparenthesis|\, (\,)\,[\,]\,/ \ |nospecials|\ -% \#\,\$\,\%\,\& and |nodigits|. -% \item |alldelims|: true by default, means that the -% characters excluded by |nolessnomore| are +% do it. The option §nolessnomore§ is activated by default +% in case of |OT1|-encoding. +% \item further excluding options: §noexclam§\ !\,?\ +% §noasterisk§\ *\ §nopunctuation§\ ,\,.\,:\,;\ §noplus§, +% §nominus§, §noplusnominus§\ +\,\textendash{} §noequal§\ =\ +% §noparenthesis§\, (\,)\,[\,]\,/ \ §nospecials§\ +% \#\,\$\,\%\,\& and §nodigits§. +% \item §alldelims§: true by default, means that the +% characters excluded by §nolessnomore§ are % treated. Use this option in case of a mono-width -% OT1-encoded font. -% \item |symbolgreek|, |symboldigits|: to let Greek letters (digits) use the +% |OT1|-encoded font. +% \item §symbolgreek§, §symboldigits§: to let Greek letters (digits) use the % Symbol font. -% \item |symbolre|: replaces \cs{Re} and \cs{Im} by the +% \item §symbolre§: replaces \cs{Re} and \cs{Im} by the % Symbol glyphs $\Re, \Im$ and defines a % \cs{DotTriangle} command ($\DotTriangle$). -% \item |symbolmisc|: takes quite a few glyphs, including logical arrows, -% product and sum signs from Symbol. They are listed \emph{supra}. You may -% also consider \cs{renewcommand}|{\int}{\smallint}| to maximize still more +% \item §symbolmisc§: takes quite a few glyphs, including logical arrows, +% product and sum signs from Symbol. They are listed \emph{supra}. A +% \cs{renewcommand}|{\int}{\smallint}| will maximize even more % the use of the Symbol font. -% \item |symboldelimiters|: the characters apart from +% \item §symboldelimiters§: the characters apart from % letters and digits will be taken from the Symbol font. -% \item |symbol|: combines |symbolgreek|, |symbolre|, and |symbolmisc|. -% \item |symbolmax|: combines |symbol| and |symboldelimiters|. -% \item |eulergreek|, |eulerdigits|: to let Greek letters (digits) use the +% \item §symbol§: combines §symbolgreek§, §symbolre§, and §symbolmisc§. +% \item §symbolmax§: combines §symbol§ and §symboldelimiters§. +% \item §eulergreek§, §eulerdigits§: to let Greek letters (digits) use the % Euler font. -% \item |LGRgreek|: this is for a font which is also available in -% LGR-encoding. -% \item |LGRgreeks|: each declared math version will be supposed to be with a +% \item §LGRgreek§: this is for a font which is also available in +% LGR-encoding. It is possible to change the font per math version, via +% the use of the §\MTgreekfont§ command in the preamble. +% \item §LGRgreeks§: each declared math version will be supposed to be with a % font which is also available in LGR-encoding. -% \item |selfGreek|: this is for a font which is also available in -% OT1-encoding and contains the glyphs for the default eleven capital Greek +% \item §selfGreek§: this is for a font which is also available in +% |OT1|-encoding and contains the glyphs for the default eleven capital Greek % letters. -% \item |selfGreeks|: each declared math version will be supposed to be with -% a font with the eleven capital Greek letters in its OT1-encoded +% \item §selfGreeks§: each declared math version will be supposed to be with +% a font with the eleven capital Greek letters in its |OT1|-encoded % version. -% \item |upgreek|, |itgreek|, |upGreek|, |itGreek|: +% \item §upgreek§, §itgreek§, §upGreek§, §itGreek§: % options to tell to use \cs{itdefault} or \cs{updefault} for the lowercase % and uppercase (or only the uppercase) Greek letters. Only operant -% in the case of the |LGRgreek(s)| and |selfGreek(s)| options. -% \item |mathaccents|: use the text font also for the math +% in the case of the §LGRgreek(s)§ and §selfGreek(s)§ options. +% \item §mathaccents§: use the text font also for the math % accents. As in vanilla \LaTeX{}, they are taken from the font % for the digits and \cs{log}-like names. Obey the alphabet -% changing commands. Will work only for T1, LY1, or OT1-compatible encodings. -% \item |defaultrm|, |defaultbf|, |defaulnormal|, |defaultit|, |defaultsf|, |defaultt|, |defaultalphabets|: do not +% changing commands. Will work only for |T1|, |LY1|, or |OT1|-compatible encodings. +% \item §defaultrm§, §defaultbf§, §defaulnormal§, §defaultit§, §defaultsf§, §defaultt§, §defaultalphabets§: do not % overwrite (respectively) \cs{mathrm}, \cs{mathbf}, % \cs{mathnormal}, \cs{mathit}, \cs{mathsf}, and % \cs{mathtt}, or all. -% \item |defaultimath|: do not overwrite \cs{imath} and +% \item §defaultimath§: do not overwrite \cs{imath} and % \cs{jmath}, do not extend \cs{i} and \cs{j} to math mode use. -% \item |defaultmathsizes|: do not change the \LaTeX{} defaults. -% \item |fouriervec|: provides a \cs{fouriervec} command. The user can then +% \item §defaultmathsizes§: do not change the \LaTeX{} defaults for the sizes +% of exponents and subscripts. +% \item §fouriervec§: provides a \cs{fouriervec} command. The user can then % add in the preamble \cs{let}\cs{vec}$=$\cs{fouriervec}. There is also % always available a ``poor man'' vec accent \cs{pmvec} for upright letters. % \end{itemize} @@ -995,9 +1149,11 @@ pdfpagemode=UseOutlines} % the first version of the package was issued. % % \begin{center} -% Numerous examples are available here:\\ -% \url{http://jf.burnol.free.fr/mathastext.html} +% Numerous examples to be found there:\\ +% \url{http://jf.burnol.free.fr/mathastext.html}\\ +% \url{http://jf.burnol.free.fr/showcase.html} % \end{center} +% \catcode`\§=12 % \StopEventually{} % % \section{Implementation} @@ -1005,9 +1161,9 @@ pdfpagemode=UseOutlines} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{mathastext} - [2012/09/27 v1.15b Use the text font in simple mathematics] + [2012/10/05 v1.15c Use the text font in simple mathematics] % \end{macrocode} -% I should load some package for this which I picked up I forgot where. +% I should load some package for this code which I picked up somewhere. % \begin{macrocode} \newif\ifXeTeX \begingroup\expandafter\expandafter\expandafter\endgroup @@ -1024,7 +1180,7 @@ pdfpagemode=UseOutlines} \LuaTeXtrue \fi % \end{macrocode} -% We turn off the official loggings as we intend to write our owns +% We turn off (sometimes) the official loggings. % \begin{macrocode} \def\mt@font@info@off{ \let\m@stext@info\@font@info @@ -1034,7 +1190,7 @@ pdfpagemode=UseOutlines} \def\mt@font@info@on{ \let\@font@info\m@stext@info \let\@font@warning\m@stext@warning} -\mt@font@info@off +%\mt@font@info@off % \end{macrocode} % \begin{macro}{\m@t@enc} % \begin{macro}{\m@t@fam} @@ -1042,7 +1198,10 @@ pdfpagemode=UseOutlines} % \begin{macro}{\m@t@opsh} % \begin{macro}{\m@t@bold} % \begin{macro}{\m@t@ltsh} -% Internal variables. +% \begin{macro}{\m@t@greekfont} +% \cs{m@t@greekfont} for use by the LGRgreek and selfGreek options. +% \cs{edef} in order to be able to set-up once and for all the Greek +% at the time of \cs{usepackage}. % \begin{macrocode} \def\m@t@enc{\encodingdefault} \def\m@t@fam{\familydefault} @@ -1050,6 +1209,7 @@ pdfpagemode=UseOutlines} \def\m@t@opsh{\shapedefault} %% will be default shape for operator names \def\m@t@bold{\bfdefault} \def\m@t@ltsh{\shapedefault} %% will be default shape for letters + \edef\m@t@greekfont{\familydefault} %% new with version 1.15c \newif\ifmt@proceed \newif\ifmt@failed % \end{macrocode} @@ -1059,6 +1219,7 @@ pdfpagemode=UseOutlines} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % March 9, 2011: v1.13 introduces the option LGRgreek; and I % make systematic use of \cs{if...} conditionals, for better % readability of the code and error checking (too late for @@ -1068,7 +1229,7 @@ pdfpagemode=UseOutlines} \def\mt@oti{OT1}\def\mt@ti{T1}\def\mt@eui{EU1}\def\mt@euii{EU2}\def\mt@lyi{LY1} % \end{macrocode} % \begin{macro}{Package options} -% Almost each option has an associated if... conditional +% Almost each option has an associated \cs{if...} conditional % \begin{macrocode} \newif\ifmt@italic \DeclareOption{italic}{\mt@italictrue\def\m@t@ltsh{\itdefault}} @@ -1168,9 +1329,8 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareOption{defaultalphabets}{\ExecuteOptions{defaultnormal,defaultrm,% defaultbf,defaultit,defaultsf,defaulttt}} % \end{macrocode} -% We intend to change the default script and scriptscript sizes, and also to -% declare a \cs{HUGE} size and modify the \cs{Huge} one at 12pt (taken from -% the |moresize| package). So we have an option to maintain default situation. +% |mathastext| considers the default script and especially scriptscript sizes to +% be far too small, and it will modify them. An option maintains the default. % \begin{macrocode} \newif\ifmt@defaultsizes \DeclareOption{defaultmathsizes}{\mt@defaultsizestrue} @@ -1178,6 +1338,9 @@ defaultbf,defaultit,defaultsf,defaulttt}} \DeclareOption{12pt}{\mt@twelvetrue} \newif\ifmt@fouriervec \DeclareOption{fouriervec}{\mt@fouriervectrue} +% \end{macrocode} +% v1.15: the subdued option. +% \begin{macrocode} \newif\ifmt@subdued \DeclareOption{subdued}{\mt@subduedtrue} \DeclareOption*{\PackageWarning{mathastext}{Unknown option `\CurrentOption'}} @@ -1185,12 +1348,17 @@ defaultbf,defaultit,defaultsf,defaulttt}} % \end{macro} % \begin{macrocode} \ProcessOptions\relax -%% +\ifmt@subdued % \end{macrocode} -% v1.15: the subdued option. % \begin{macro}{subdued} +% The subdued code was initiated during May 2011. I returned to |mathastext| +% on Sep 24, 2012, and finished this piece of code giving thus version 1.15. +% The point is to extract the data about how are letters and operators in the +% normal and bold versions. Due to the reassignement dones for characters I +% had decided in 2011 that the OT1 encoding should be replaced by T1. However +% the <, >, \{, \} and \string| are protected by the alldelimsfalse so there must be +% some other reason. % \begin{macrocode} -\ifmt@subdued %% \begingroup \def\install@mathalphabet#1#2{} @@ -1274,16 +1442,9 @@ defaultbf,defaultit,defaultsf,defaulttt}} \else \edef\mt@boldmv@operator{\expandafter\noexpand\csname \mt@tmp/\mt@reste\endcsname} \fi\fi -\fi % fin de \ifmt@subdued +\fi % fin de ce \ifmt@subdued % \end{macrocode} % \end{macro} -% The subdued code was initiated during May 2011, but left unfinished. I -% returned to get the job done with it on Sep 24, 2012 thus giving v1.15 -% It resets the normal and bold math versions to what they were before -% loading mathastext, up to some twist because now some characters such -% as <, >, are taken from the ``operator'' -% font (which is supposed to be the document text font) and OT1 encoding -% is not acceptable. % \begin{macro}{mtoperatorfont} % Declaration of the current default font as our math % font. The characteristics of the used font can be @@ -1355,7 +1516,14 @@ defaultbf,defaultit,defaultsf,defaulttt}} % selfGreek option is that we can force the use of the OT1 encoding. % % First we establish the cumulative effect of the greek related options. +% +% v1.15c introduces some possibilities to change the shapes of Greek letters +% in each math versions, and even the Greek font (in LGR encoding). The +% commands \cs{MTitgreek} etc... will be used in-between calls to +% \cs{Mathastext} and re-adjust the shapes. And the command \cs{MTgreekfont} +% changes the Greek font family. % \begin{macrocode} +\def\mt@update@greeksh{ \def\m@t@greek@lsh{\m@t@ltsh} %% default behavior \def\m@t@greek@ush{\m@t@opsh} \ifmt@itgreek\def\m@t@greek@lsh{\itdefault} @@ -1372,7 +1540,8 @@ defaultbf,defaultit,defaultsf,defaulttt}} \ifcase\mt@greek@select \or\def\m@t@greek@ush{\itdefault} \or\def\m@t@greek@ush{\updefault} - \fi + \fi} +\mt@update@greeksh \ifmt@LGRgreek \DeclareFontEncoding{LGR}{}{} \DeclareSymbolFont{mtlgrfontlower}{LGR} @@ -1497,13 +1666,13 @@ defaultbf,defaultit,defaultsf,defaulttt}} % we could as well have two really unrelated fonts but % this is really not the spirit of the package. % \begin{macrocode} -\DeclareRobustCommand\MTencoding[1]{\def\m@t@enc{#1}} -\DeclareRobustCommand\MTfamily[1]{\def\m@t@fam{#1}} -\DeclareRobustCommand\MTseries[1]{\def\m@t@ser{#1}} -\DeclareRobustCommand\MTshape[1]{\def\m@t@opsh{#1} +\newcommand*\MTencoding[1]{\def\m@t@enc{#1}} +\newcommand*\MTfamily[1]{\def\m@t@fam{#1}} +\newcommand*\MTseries[1]{\def\m@t@ser{#1}} +\newcommand*\MTshape[1]{\def\m@t@opsh{#1} \ifmt@italic\else\def\m@t@ltsh{#1}\fi} -\DeclareRobustCommand\MTboldvariant[1]{\def\m@t@bold{#1}} -\DeclareRobustCommand\MTlettershape[1]{\def\m@t@ltsh{#1}} +\newcommand*\MTboldvariant[1]{\def\m@t@bold{#1}} +\newcommand*\MTlettershape[1]{\def\m@t@ltsh{#1}} \let\Mathastextencoding\MTencoding \let\Mathastextfamily\MTfamily \let\Mathastextseries\MTseries @@ -1517,11 +1686,40 @@ defaultbf,defaultit,defaultsf,defaulttt}} % \end{macro} % \end{macro} % \end{macro} +% \begin{macro}{\MTitgreek} +% \begin{macro}{\MTupgreek} +% \begin{macro}{\MTitGreek} +% \begin{macro}{\MTupGreek} +% \begin{macro}{\MTgreekfont} +% v1.15c: These new macros can be used in-between calls to \cs{Mathastext}. +% They reset the shapes for Greek letters (applies to LGRgreek(s) and +% selfGreek(s) options). The \cs{MTgreekfont} presupposes either LGRgreek or +% selfGreek. |\MTgreekfont{\familydefault}| acts like turning on LGRgreeks or +% selfGreeks. +% \begin{macrocode} + \newcommand\MTitgreek{% +\mt@itgreektrue\mt@upgreekfalse\def\mt@greek@select{0}} + \newcommand\MTupgreek{% +\mt@upgreektrue\mt@itgreekfalse\def\mt@greek@select{0}} + \newcommand\MTitGreek{\def\mt@greek@select{1}} + \newcommand\MTupGreek{\def\mt@greek@select{2}} +\let\Mathastextitgreek\MTitgreek +\let\Mathastextupgreek\MTupgreek +\let\MathastextitGreek\MTitGreek +\let\MathastextupGreek\MTupGreek + \newcommand*\MTgreekfont[1]{\def\m@t@greekfont{#1}} +\let\Mathastextgreekfont\MTgreekfont +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % \begin{macro}{\MTWillUse} % This is a preamble-only command, it can be called more than once, only the % latest call counts. % \begin{macrocode} -\DeclareRobustCommand\MTWillUse[5][\@empty]{ +\newcommand*\MTWillUse[5][\@empty]{ \MTencoding{#2} \MTfamily{#3} \MTseries{#4} @@ -1552,18 +1750,16 @@ defaultbf,defaultit,defaultsf,defaulttt}} % \cs{Mathastext} act as the Declaration of a math % version, to be later used in the document. % \begin{macrocode} -\DeclareRobustCommand\Mathastext[1][\@empty]{ - \mt@font@info@off -\ifx\@empty#1 % no optional argument +\newcommand*\Mathastext[1][\@empty]{ +% \mt@font@info@off +\ifx\@empty#1 % no optional argument + \mt@update@greeksh \edef\mt@encoding@normal{\m@t@enc} \edef\mt@family@normal{\m@t@fam} \edef\mt@series@normal{\m@t@ser} \edef\mt@shape@normal{\m@t@opsh} \edef\mt@ltshape@normal{\m@t@ltsh} \edef\mt@itdefault@normal{\itdefault} -% \end{macrocode} -% v1.15c: we add a rmdefault thing here, in relation to usesans, usett options. -% \begin{macrocode} \edef\mt@rmdefault@normal{\rmdefault} \edef\mt@sfdefault@normal{\sfdefault} \edef\mt@ttdefault@normal{\ttdefault} @@ -1662,32 +1858,35 @@ defaultbf,defaultit,defaultsf,defaulttt}} % \begin{macrocode} \ifmt@LGRgreek \SetSymbolFont{mtlgrfontlower}{normal}{LGR} - {\mt@family@normal}{\mt@series@normal}{\m@t@greek@lsh} + {\m@t@greekfont}{\mt@series@normal}{\m@t@greek@lsh} \SetSymbolFont{mtlgrfontlower}{bold}{LGR} - {\mt@family@bold}{\mt@boldvariant@normal}{\m@t@greek@lsh} + {\m@t@greekfont}{\mt@boldvariant@normal}{\m@t@greek@lsh} \SetSymbolFont{mtlgrfontupper}{normal}{LGR} - {\mt@family@normal}{\mt@series@normal}{\m@t@greek@ush} + {\m@t@greekfont}{\mt@series@normal}{\m@t@greek@ush} \SetSymbolFont{mtlgrfontupper}{bold}{LGR} - {\mt@family@bold}{\mt@boldvariant@bold}{\m@t@greek@ush} + {\m@t@greekfont}{\mt@boldvariant@bold}{\m@t@greek@ush} \else \ifmt@selfGreek \SetSymbolFont{mtselfGreekfont}{normal}{OT1} - {\mt@family@normal}{\mt@series@normal}{\m@t@greek@ush} + {\m@t@greekfont}{\mt@series@normal}{\m@t@greek@ush} \SetSymbolFont{mtselfGreekfont}{bold}{OT1} - {\mt@family@bold}{\mt@boldvariant@bold}{\m@t@greek@ush} + {\m@t@greekfont}{\mt@boldvariant@bold}{\m@t@greek@ush} \fi\fi % \end{macrocode} % \end{macro} % \end{macro} % \begin{macrocode} -\typeout{** Latin letters in math versions normal (resp. bold) are now^^J% +\typeout{** Latin letters in the normal (resp. bold) math versions are now^^J% ** set up to use the fonts \mt@encoding@normal/\mt@family@normal/\mt@series@normal% -(\mt@boldvariant@normal)/\mt@ltshape@normal} +(\mt@boldvariant@normal)/\mt@ltshape@normal\space\ifmt@subdued(will be subdued)\fi} +\ifmt@LGRgreek + \typeout{** Greek letters (\m@t@greek@lsh/\m@t@greek@ush) will use + LGR/\m@t@greekfont\space\ifmt@subdued(will be subdued)\fi} +\fi \ifmt@nodigits\else - \typeout{** Other characters (digits, ...) and - \protect\log-like names will be^^J% -** typeset with the \expandafter`\mt@shape@normal' shape.} + \typeout{** Other characters (digits, ...) and \protect\log-like names will be^^J% +** typeset with the \mt@shape@normal\space shape.} \fi \else % optional argument, then we rather do DeclareVersion \edef\mt@tmp{#1}\def\mt@empty{} @@ -1698,7 +1897,7 @@ defaultbf,defaultit,defaultsf,defaulttt}} {\m@t@enc}{\m@t@fam}{\m@t@ser}{\m@t@opsh} \fi \fi -\mt@font@info@on +% \mt@font@info@on } % \end{macrocode} % \end{macro} @@ -1716,7 +1915,7 @@ defaultbf,defaultit,defaultsf,defaulttt}} % For version 1.1 we add an optional parameter specifying the shape to be used % for letters. % \begin{macrocode} -\DeclareRobustCommand\MTDeclareVersion[6][\@empty]{ +\newcommand*\MTDeclareVersion[6][\@empty]{ \mt@font@info@off \edef\mt@version{#2} \DeclareMathVersion{\mt@version} @@ -1741,7 +1940,7 @@ defaultbf,defaultit,defaultsf,defaulttt}} \typeout{** Latin letters in math version `#2' will use the font #3/#4/#5/\m@t@ltsh^^J% ** Other characters (digits, ...) and \protect\log-like names - will be in `#6' shape.} + will be in #6 shape.} \expandafter\edef\csname mt@ltshape@\mt@version\endcsname{\m@t@ltsh} \else \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#6} @@ -1754,7 +1953,7 @@ defaultbf,defaultit,defaultsf,defaulttt}} \typeout{** Latin letters in math version `#2' will use the font #3/#4/#5/#1^^J% ** Other characters (digits, ...) and \protect\log-like - names will be in `#6' shape.} + names will be in #6 shape.} \expandafter\edef\csname mt@ltshape@\mt@version\endcsname{#1} \fi \SetMathAlphabet{\Mathbf}{#2}{#3}{#4}{\m@t@bold}{#6} @@ -1796,16 +1995,31 @@ defaultbf,defaultit,defaultsf,defaulttt}} \ifmt@LGRgreeks \SetSymbolFont{mtlgrfontlower}{#2}{LGR}{#4}{#5}{\m@t@greek@lsh@loc} \SetSymbolFont{mtlgrfontupper}{#2}{LGR}{#4}{#5}{\m@t@greek@ush@loc} + \typeout{** Greek letters (\m@t@greek@lsh@loc/\m@t@greek@ush@loc) will use + LGR font #4} \else \ifmt@selfGreeks \SetSymbolFont{mtselfGreekfont}{#2}{OT1}{#4}{#5}{\m@t@greek@ush@loc} - \fi\fi + \typeout{** Capital Greek letters (\m@t@greek@lsh@loc/\m@t@greek@ush@loc) + will use OT1 font #4} + \else + \ifmt@LGRgreek + \SetSymbolFont{mtlgrfontlower}{#2}{LGR}{\m@t@greekfont}{#5}{\m@t@greek@lsh@loc} + \SetSymbolFont{mtlgrfontupper}{#2}{LGR}{\m@t@greekfont}{#5}{\m@t@greek@ush@loc} + \typeout{** Greek letters (\m@t@greek@lsh@loc/\m@t@greek@ush@loc) will use + LGR font \m@t@greekfont} + \else + \ifmt@selfGreek + \SetSymbolFont{mtselfGreekfont}{#2}{OT1}{\m@t@greekfont}{#5}{\m@t@greek@ush@loc} + \typeout{** Capital Greek letters (\m@t@greek@lsh@loc/\m@t@greek@ush@loc) + will use OT1 font \m@t@greekfont} + \fi\fi\fi\fi +\mt@font@info@on +} % \end{macrocode} % \end{macro} % \end{macro} % \begin{macrocode} - \mt@font@info@on -} \let\MathastextDeclareVersion\MTDeclareVersion % \end{macrocode} % \end{macro} @@ -1872,10 +2086,11 @@ defaultbf,defaultit,defaultsf,defaulttt}} \fi\fi % \end{macrocode} % \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 font. +% 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. % \begin{macrocode} -\DeclareRobustCommand\MTVersion[2][\@empty]{% +\newcommand*\MTVersion[2][\@empty]{% \mathversion{#2}% \ifx\@empty#1% no optional argument \edef\mt@tmp{#2} @@ -1891,7 +2106,7 @@ defaultbf,defaultit,defaultsf,defaulttt}} {\csname mt@shape@\mt@tmp\endcsname}% \edef\m@t@@encoding{\csname mt@encoding@\mt@tmp\endcsname}% \renewcommand{\encodingdefault}{\m@t@@encoding}% -%% modifications avec v1.15b +%% some modifications for v1.15b \edef\m@t@@famdefault{\csname mt@family@\mt@tmp\endcsname}% \renewcommand{\familydefault}{\m@t@@famdefault}% \edef\m@t@@series{\csname mt@series@\mt@tmp\endcsname}% @@ -1908,6 +2123,67 @@ defaultbf,defaultit,defaultsf,defaulttt}} \renewcommand{\sfdefault}{\m@t@@sfdefault}% \edef\m@t@@ttdefault{\csname mt@ttdefault@\mt@tmp\endcsname}% \renewcommand{\ttdefault}{\m@t@@ttdefault}% +%% extending subdued to LGRgreek with v1.15c +\ifmt@subdued +\ifmt@LGRgreek +\edef\mt@tmp{#2}% +\def\mt@@tmp{normal}% +\ifx\mt@tmp\mt@@tmp\else +\def\mt@@tmp{bold}% +\ifx\mt@tmp\mt@@tmp\else +\let\Alpha\Alpha@m@t +\let\Beta\Beta@m@t +\let\Gamma\Gamma@m@t +\let\Delta\Delta@m@t +\let\Epsilon\Epsilon@m@t +\let\Zeta\Zeta@m@t +\let\Eta\Eta@m@t +\let\Theta\Theta@m@t +\let\Iota\Iota@m@t +\let\Kappa\Kappa@m@t +\let\Lambda\Lambda@m@t +\let\Mu\Mu@m@t +\let\Nu\Nu@m@t +\let\Xi\Xi@m@t +\let\Omicron\Omicron@m@t +\let\Pi\Pi@m@t +\let\Rho\Rho@m@t +\let\Sigma\Sigma@m@t +\let\Tau\Tau@m@t +\let\Upsilon\Upsilon@m@t +\let\Phi\Phi@m@t +\let\Chi\Chi@m@t +\let\Psi\Psi@m@t +\let\Omega\Omega@m@t +% +\let\alpha\alpha@m@t +\let\beta\beta@m@t +\let\gamma\gamma@m@t +\let\delta\delta@m@t +\let\epsilon\epsilon@m@t +\let\zeta\zeta@m@t +\let\eta\eta@m@t +\let\theta\theta@m@t +\let\iota\iota@m@t +\let\kappa\kappa@m@t +\let\lambda\lambda@m@t +\let\mu\mu@m@t +\let\nu\nu@m@t +\let\xi\xi@m@t +\let\omicron\omicron@m@t +\let\pi\pi@m@t +\let\rho\rho@m@t +\let\varsigma\varsigma@m@t +\let\sigma\sigma@m@t +\let\tau\tau@m@t +\let\upsilon\upsilon@m@t +\let\phi\phi@m@t +\let\chi\chi@m@t +\let\psi\psi@m@t +\let\omega\omega@m@t +\let\Digamma\Digamma@m@t +\let\digamma\digamma@m@t +\fi\fi\fi\fi } \let\MathastextVersion\MTVersion \let\Mathastextversion\MTVersion @@ -2120,7 +2396,7 @@ defaultbf,defaultit,defaultsf,defaulttt}} % \begin{macro}{\hbar} % \begin{macro}{\mt@ltbar} % 2011/01/31, v1.1 I decide to settle the question of the |\hbar|. First, I -% should repeat the \LaTeX{} definition +% should recall the \LaTeX{} definition % \begin{macrocode} %%\def\hbar{{\mathchar'26\mkern-9muh}} %% (original definition from latex.ltx) @@ -2142,7 +2418,6 @@ defaultbf,defaultit,defaultsf,defaulttt}} % code redefining \$ etc in math mode (see below). Fixed. % \begin{macrocode} % -% J'AURAIS DU PRENDRE DES AUTRES NOMS BIEN AVANT \def\mt@mathrlap{\mathpalette\mt@mathrlapinternal} \def\mt@mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}} \def\do@the@hbarstuff{\edef\mt@tmp@enc{\encodingdefault} @@ -2221,8 +2496,8 @@ defaultbf,defaultit,defaultsf,defaulttt}} \mathord{\mt@font@tbu}{"7C}{largesymbols}{"0C} \DeclareMathSymbol\mid\mathrel{\mt@font@tbu}{"7C} % \end{macrocode} -% 24sep12: attention \`a ce lbrace qui pouvait enclencher une erreur sous -% xetex/luatex avec mathtools il semble. +% 24sep12: ce lbrace enclenchait une erreur sous xetex/luatex avec mathtools il +% semble. Mais est-ce que je veux vraiment faire cela? % \begin{macrocode} \let\lbrace\undefined \DeclareMathDelimiter{\lbrace} @@ -2571,59 +2846,59 @@ defaultbf,defaultit,defaultsf,defaulttt}} \DeclareMathSymbol{\wp}{\mathord}{mtpsymbol}{"C3} \fi\fi\fi %% -\ifmt@LGRgreek -\DeclareMathSymbol{\Alpha}{\mathalpha}{mtlgrfontupper}{65} -\DeclareMathSymbol{\Beta}{\mathalpha}{mtlgrfontupper}{66} -\DeclareMathSymbol{\Gamma}{\mathalpha}{mtlgrfontupper}{71} -\DeclareMathSymbol{\Delta}{\mathalpha}{mtlgrfontupper}{68} -\DeclareMathSymbol{\Epsilon}{\mathalpha}{mtlgrfontupper}{69} -\DeclareMathSymbol{\Zeta}{\mathalpha}{mtlgrfontupper}{90} -\DeclareMathSymbol{\Eta}{\mathalpha}{mtlgrfontupper}{72} -\DeclareMathSymbol{\Theta}{\mathalpha}{mtlgrfontupper}{74} -\DeclareMathSymbol{\Iota}{\mathalpha}{mtlgrfontupper}{73} -\DeclareMathSymbol{\Kappa}{\mathalpha}{mtlgrfontupper}{75} -\DeclareMathSymbol{\Lambda}{\mathalpha}{mtlgrfontupper}{76} -\DeclareMathSymbol{\Mu}{\mathalpha}{mtlgrfontupper}{77} -\DeclareMathSymbol{\Nu}{\mathalpha}{mtlgrfontupper}{78} -\DeclareMathSymbol{\Xi}{\mathalpha}{mtlgrfontupper}{88} -\DeclareMathSymbol{\Omicron}{\mathalpha}{mtlgrfontupper}{79} -\DeclareMathSymbol{\Pi}{\mathalpha}{mtlgrfontupper}{80} -\DeclareMathSymbol{\Rho}{\mathalpha}{mtlgrfontupper}{82} -\DeclareMathSymbol{\Sigma}{\mathalpha}{mtlgrfontupper}{83} -\DeclareMathSymbol{\Tau}{\mathalpha}{mtlgrfontupper}{84} -\DeclareMathSymbol{\Upsilon}{\mathalpha}{mtlgrfontupper}{85} -\DeclareMathSymbol{\Phi}{\mathalpha}{mtlgrfontupper}{70} -\DeclareMathSymbol{\Chi}{\mathalpha}{mtlgrfontupper}{81} -\DeclareMathSymbol{\Psi}{\mathalpha}{mtlgrfontupper}{89} -\DeclareMathSymbol{\Omega}{\mathalpha}{mtlgrfontupper}{87} -% -\DeclareMathSymbol{\alpha}{\mathalpha}{mtlgrfontlower}{97} -\DeclareMathSymbol{\beta}{\mathalpha}{mtlgrfontlower}{98} -\DeclareMathSymbol{\gamma}{\mathalpha}{mtlgrfontlower}{103} -\DeclareMathSymbol{\delta}{\mathalpha}{mtlgrfontlower}{100} -\DeclareMathSymbol{\epsilon}{\mathalpha}{mtlgrfontlower}{101} -\DeclareMathSymbol{\zeta}{\mathalpha}{mtlgrfontlower}{122} -\DeclareMathSymbol{\eta}{\mathalpha}{mtlgrfontlower}{104} -\DeclareMathSymbol{\theta}{\mathalpha}{mtlgrfontlower}{106} -\DeclareMathSymbol{\iota}{\mathalpha}{mtlgrfontlower}{105} -\DeclareMathSymbol{\kappa}{\mathalpha}{mtlgrfontlower}{107} -\DeclareMathSymbol{\lambda}{\mathalpha}{mtlgrfontlower}{108} -\DeclareMathSymbol{\mu}{\mathalpha}{mtlgrfontlower}{109} -\DeclareMathSymbol{\nu}{\mathalpha}{mtlgrfontlower}{110} -\DeclareMathSymbol{\xi}{\mathalpha}{mtlgrfontlower}{120} -\DeclareMathSymbol{\omicron}{\mathalpha}{mtlgrfontlower}{111} -\DeclareMathSymbol{\pi}{\mathalpha}{mtlgrfontlower}{112} -\DeclareMathSymbol{\rho}{\mathalpha}{mtlgrfontlower}{114} -\DeclareMathSymbol{\varsigma}{\mathalpha}{mtlgrfontlower}{99} -\DeclareMathSymbol{\sigma}{\mathalpha}{mtlgrfontlower}{115} -\DeclareMathSymbol{\tau}{\mathalpha}{mtlgrfontlower}{116} -\DeclareMathSymbol{\upsilon}{\mathalpha}{mtlgrfontlower}{117} -\DeclareMathSymbol{\phi}{\mathalpha}{mtlgrfontlower}{102} -\DeclareMathSymbol{\chi}{\mathalpha}{mtlgrfontlower}{113} -\DeclareMathSymbol{\psi}{\mathalpha}{mtlgrfontlower}{121} -\DeclareMathSymbol{\omega}{\mathalpha}{mtlgrfontlower}{119} -\DeclareMathSymbol{\digamma}{\mathalpha}{mtlgrfontlower}{147} -\DeclareMathSymbol{\Digamma}{\mathalpha}{mtlgrfontlower}{195} +\ifmt@LGRgreek % internal names for subdued implementation (1.15c) +\DeclareMathSymbol{\Alpha@m@t}{\mathalpha}{mtlgrfontupper}{65} +\DeclareMathSymbol{\Beta@m@t}{\mathalpha}{mtlgrfontupper}{66} +\DeclareMathSymbol{\Gamma@m@t}{\mathalpha}{mtlgrfontupper}{71} +\DeclareMathSymbol{\Delta@m@t}{\mathalpha}{mtlgrfontupper}{68} +\DeclareMathSymbol{\Epsilon@m@t}{\mathalpha}{mtlgrfontupper}{69} +\DeclareMathSymbol{\Zeta@m@t}{\mathalpha}{mtlgrfontupper}{90} +\DeclareMathSymbol{\Eta@m@t}{\mathalpha}{mtlgrfontupper}{72} +\DeclareMathSymbol{\Theta@m@t}{\mathalpha}{mtlgrfontupper}{74} +\DeclareMathSymbol{\Iota@m@t}{\mathalpha}{mtlgrfontupper}{73} +\DeclareMathSymbol{\Kappa@m@t}{\mathalpha}{mtlgrfontupper}{75} +\DeclareMathSymbol{\Lambda@m@t}{\mathalpha}{mtlgrfontupper}{76} +\DeclareMathSymbol{\Mu@m@t}{\mathalpha}{mtlgrfontupper}{77} +\DeclareMathSymbol{\Nu@m@t}{\mathalpha}{mtlgrfontupper}{78} +\DeclareMathSymbol{\Xi@m@t}{\mathalpha}{mtlgrfontupper}{88} +\DeclareMathSymbol{\Omicron@m@t}{\mathalpha}{mtlgrfontupper}{79} +\DeclareMathSymbol{\Pi@m@t}{\mathalpha}{mtlgrfontupper}{80} +\DeclareMathSymbol{\Rho@m@t}{\mathalpha}{mtlgrfontupper}{82} +\DeclareMathSymbol{\Sigma@m@t}{\mathalpha}{mtlgrfontupper}{83} +\DeclareMathSymbol{\Tau@m@t}{\mathalpha}{mtlgrfontupper}{84} +\DeclareMathSymbol{\Upsilon@m@t}{\mathalpha}{mtlgrfontupper}{85} +\DeclareMathSymbol{\Phi@m@t}{\mathalpha}{mtlgrfontupper}{70} +\DeclareMathSymbol{\Chi@m@t}{\mathalpha}{mtlgrfontupper}{81} +\DeclareMathSymbol{\Psi@m@t}{\mathalpha}{mtlgrfontupper}{89} +\DeclareMathSymbol{\Omega@m@t}{\mathalpha}{mtlgrfontupper}{87} +% +\DeclareMathSymbol{\alpha@m@t}{\mathalpha}{mtlgrfontlower}{97} +\DeclareMathSymbol{\beta@m@t}{\mathalpha}{mtlgrfontlower}{98} +\DeclareMathSymbol{\gamma@m@t}{\mathalpha}{mtlgrfontlower}{103} +\DeclareMathSymbol{\delta@m@t}{\mathalpha}{mtlgrfontlower}{100} +\DeclareMathSymbol{\epsilon@m@t}{\mathalpha}{mtlgrfontlower}{101} +\DeclareMathSymbol{\zeta@m@t}{\mathalpha}{mtlgrfontlower}{122} +\DeclareMathSymbol{\eta@m@t}{\mathalpha}{mtlgrfontlower}{104} +\DeclareMathSymbol{\theta@m@t}{\mathalpha}{mtlgrfontlower}{106} +\DeclareMathSymbol{\iota@m@t}{\mathalpha}{mtlgrfontlower}{105} +\DeclareMathSymbol{\kappa@m@t}{\mathalpha}{mtlgrfontlower}{107} +\DeclareMathSymbol{\lambda@m@t}{\mathalpha}{mtlgrfontlower}{108} +\DeclareMathSymbol{\mu@m@t}{\mathalpha}{mtlgrfontlower}{109} +\DeclareMathSymbol{\nu@m@t}{\mathalpha}{mtlgrfontlower}{110} +\DeclareMathSymbol{\xi@m@t}{\mathalpha}{mtlgrfontlower}{120} +\DeclareMathSymbol{\omicron@m@t}{\mathalpha}{mtlgrfontlower}{111} +\DeclareMathSymbol{\pi@m@t}{\mathalpha}{mtlgrfontlower}{112} +\DeclareMathSymbol{\rho@m@t}{\mathalpha}{mtlgrfontlower}{114} +\DeclareMathSymbol{\varsigma@m@t}{\mathalpha}{mtlgrfontlower}{99} +\DeclareMathSymbol{\sigma@m@t}{\mathalpha}{mtlgrfontlower}{115} +\DeclareMathSymbol{\tau@m@t}{\mathalpha}{mtlgrfontlower}{116} +\DeclareMathSymbol{\upsilon@m@t}{\mathalpha}{mtlgrfontlower}{117} +\DeclareMathSymbol{\phi@m@t}{\mathalpha}{mtlgrfontlower}{102} +\DeclareMathSymbol{\chi@m@t}{\mathalpha}{mtlgrfontlower}{113} +\DeclareMathSymbol{\psi@m@t}{\mathalpha}{mtlgrfontlower}{121} +\DeclareMathSymbol{\omega@m@t}{\mathalpha}{mtlgrfontlower}{119} +\DeclareMathSymbol{\digamma@m@t}{\mathalpha}{mtlgrfontlower}{147} +\DeclareMathSymbol{\Digamma@m@t}{\mathalpha}{mtlgrfontlower}{195} % cf http://milde.users.sourceforge.net/LGR/lgrxenc.def.html % et greek.ldf du package babel \fi @@ -2767,31 +3042,80 @@ defaultbf,defaultit,defaultsf,defaulttt}} \DeclareFontFamily{U}{psy}{} \DeclareFontShape{U}{psy}{m}{n}{<->s*[\psy@scale] psyr}{} \fi -% nouveau avec v1.15 (24 sep 2012): -% % \Mathastextversion{normal} -% 27 sep 2012: Mais non ça change trop avec le comportement des versions -% antérieures de mathastext, empêche ce que je faisais avant pour, par -% exemple, avoir la police sans en math (plus moyen de faire un -% renewcommand rmdefault après le usepackage mathastext, puisque c'est -% annulé par ce MTversion.) et l'utilisateur est ainsi obligé de définir -% deux math versions pour le même résultat. C'était idiot (je l'avais -% introduit au départ en relation avec l'option subdued, mais je suis allé -% trop loin dans cette direction qui retire trop de flexibilité) d'autant -% plus que ce que je fais avec mv@normal et mv@bold suffit. Bon, je vais -% donc faire une version v115b pour rectifier le tir. Avec options usesans -% et usett. Non finalement, pas ces options: induisait des complications -% avec m@t@fam. } +% \end{macrocode} +% \begin{macro}{subdued} +% The subdued option. Don't ask me how this works, I did it in May 2011 +% and have forgotten since. +% \begin{macrocode} \ifmt@subdued +\typeout{** ...entering subdued mode...} \expandafter\SetSymbolFont@ \expandafter\mv@normal\mt@normalmv@letter\symmtletterfont \expandafter\SetSymbolFont@ \expandafter\mv@bold\mt@boldmv@letter\symmtletterfont \expandafter\SetSymbolFont@ \expandafter\mv@normal\mt@normalmv@operator\symmtoperatorfont \expandafter\SetSymbolFont@ \expandafter\mv@bold\mt@boldmv@operator\symmtoperatorfont -\fi -\mt@font@info@on +\typeout{** ...done.} +% \end{macrocode} +% \end{macro} +% \begin{macrocode} +\else +\ifmt@LGRgreek +\let\Alpha\Alpha@m@t +\let\Beta\Beta@m@t +\let\Gamma\Gamma@m@t +\let\Delta\Delta@m@t +\let\Epsilon\Epsilon@m@t +\let\Zeta\Zeta@m@t +\let\Eta\Eta@m@t +\let\Theta\Theta@m@t +\let\Iota\Iota@m@t +\let\Kappa\Kappa@m@t +\let\Lambda\Lambda@m@t +\let\Mu\Mu@m@t +\let\Nu\Nu@m@t +\let\Xi\Xi@m@t +\let\Omicron\Omicron@m@t +\let\Pi\Pi@m@t +\let\Rho\Rho@m@t +\let\Sigma\Sigma@m@t +\let\Tau\Tau@m@t +\let\Upsilon\Upsilon@m@t +\let\Phi\Phi@m@t +\let\Chi\Chi@m@t +\let\Psi\Psi@m@t +\let\Omega\Omega@m@t +% +\let\alpha\alpha@m@t +\let\beta\beta@m@t +\let\gamma\gamma@m@t +\let\delta\delta@m@t +\let\epsilon\epsilon@m@t +\let\zeta\zeta@m@t +\let\eta\eta@m@t +\let\theta\theta@m@t +\let\iota\iota@m@t +\let\kappa\kappa@m@t +\let\lambda\lambda@m@t +\let\mu\mu@m@t +\let\nu\nu@m@t +\let\xi\xi@m@t +\let\omicron\omicron@m@t +\let\pi\pi@m@t +\let\rho\rho@m@t +\let\varsigma\varsigma@m@t +\let\sigma\sigma@m@t +\let\tau\tau@m@t +\let\upsilon\upsilon@m@t +\let\phi\phi@m@t +\let\chi\chi@m@t +\let\psi\psi@m@t +\let\omega\omega@m@t +\let\Digamma\Digamma@m@t +\let\digamma\digamma@m@t +\fi\fi +%\mt@font@info@on \endinput % \end{macrocode} -% \CheckSum{3127} % \Finale %\iffalse %<*dtx> diff --git a/Master/texmf-dist/source/latex/mathastext/mathastext.ins b/Master/texmf-dist/source/latex/mathastext/mathastext.ins index 53c95021b94..2d1eb78160a 100644 --- a/Master/texmf-dist/source/latex/mathastext/mathastext.ins +++ b/Master/texmf-dist/source/latex/mathastext/mathastext.ins @@ -19,7 +19,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2012/09/27} +\def\filedate{2012/10/04} \def\batchfile{mathastext.ins} \input docstrip.tex |