summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/mathastext
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-09-28 22:46:45 +0000
committerKarl Berry <karl@freefriends.org>2012-09-28 22:46:45 +0000
commitc6784524d97e1dd3fa24af09237521f863257fbf (patch)
tree671614c43e1c685d50bd6821e7f2f534df22e6e8 /Master/texmf-dist/tex/latex/mathastext
parent5532da0334f19f07353a3c4a85b5b848bc6b3f90 (diff)
mathastext (28sep12)
git-svn-id: svn://tug.org/texlive/trunk@27842 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/mathastext')
-rw-r--r--Master/texmf-dist/tex/latex/mathastext/mathastext.sty134
1 files changed, 116 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
index 8192a9d8e3a..11d5164abdf 100644
--- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
+++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty
@@ -7,7 +7,7 @@
%% mathastext.dtx (with options: `package')
%% This is a generated file.
%%
-%% Copyright (C) 2011 by Jean-Francois Burnol
+%% Copyright (C) 2011, 2012 by Jean-Francois Burnol
%%
%% Please report errors to jfbu (at) free.fr
%% Many examples available here:
@@ -31,7 +31,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mathastext}
- [2011/04/04 v1.14c Use the text font in simple mathematics]
+ [2012/09/27 v1.15b Use the text font in simple mathematics]
\newif\ifXeTeX
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname XeTeXinterchartoks\endcsname\relax
@@ -63,9 +63,7 @@
\def\m@t@ltsh{\shapedefault} %% will be default shape for letters
\newif\ifmt@proceed
\newif\ifmt@failed
-\def\mt@oti{OT1}\def\mt@ti{T1}
-\def\mt@eui{EU1}\def\mt@euii{EU2}
-\def\mt@lyi{LY1}
+\def\mt@oti{OT1}\def\mt@ti{T1}\def\mt@eui{EU1}\def\mt@euii{EU2}\def\mt@lyi{LY1}
\newif\ifmt@italic
\DeclareOption{italic}{\mt@italictrue\def\m@t@ltsh{\itdefault}}
\newif\ifmt@frenchmath
@@ -169,9 +167,96 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareOption{12pt}{\mt@twelvetrue}
\newif\ifmt@fouriervec
\DeclareOption{fouriervec}{\mt@fouriervectrue}
+\newif\ifmt@subdued
+ \DeclareOption{subdued}{\mt@subduedtrue}
\DeclareOption*{\PackageWarning{mathastext}{Unknown option `\CurrentOption'}}
-%%
\ProcessOptions\relax
+%%
+\ifmt@subdued
+%%
+\begingroup
+\def\install@mathalphabet#1#2{}
+%%
+\@tempcntb=\mathcode`\a
+\divide\@tempcntb by 256
+\@tempcnta\@tempcntb
+\divide\@tempcnta by 16
+\multiply\@tempcnta by 16
+\advance\@tempcntb-\@tempcnta
+%%
+\@tempcnta\z@
+\def\getanddefine@fonts#1#2{%
+\ifnum\@tempcnta=\@tempcntb
+\gdef\mt@normalmv@letter{#2}%
+\fi
+\advance\@tempcnta\@ne
+}%
+\mv@normal
+%%
+\@tempcnta\z@
+\def\getanddefine@fonts#1#2{%
+\ifnum\@tempcnta=\@tempcntb
+\gdef\mt@boldmv@letter{#2}%
+\fi
+\advance\@tempcnta\@ne
+}%
+\mv@bold
+%%
+\@tempcntb=\mathcode`\1
+\divide\@tempcntb by 256
+\@tempcnta\@tempcntb
+\divide\@tempcnta by 16
+\multiply\@tempcnta by 16
+\advance\@tempcntb-\@tempcnta
+%%
+\@tempcnta\z@
+\def\getanddefine@fonts#1#2{%
+\ifnum\@tempcnta=\@tempcntb
+\gdef\mt@normalmv@operator{#2}%
+\fi
+\advance\@tempcnta\@ne
+}%
+\mv@normal
+%%
+\@tempcnta\z@
+\def\getanddefine@fonts#1#2{%
+\ifnum\@tempcnta=\@tempcntb
+\gdef\mt@boldmv@operator{#2}%
+\fi
+\advance\@tempcnta\@ne
+}%
+\mv@bold
+%%
+\endgroup
+%%
+\edef\mt@funnyoti{\expandafter\expandafter\expandafter\@gobble\expandafter\string\csname OT1\endcsname}
+\def\mt@@debut#1/#2/#3/#4/{#1}
+\def\mt@@reste#1/#2/#3/#4/{#2/#3/#4}
+%%
+\edef\mt@tmp{\expandafter\expandafter\expandafter\@gobble\expandafter\string\mt@normalmv@operator}
+\edef\mt@debut{\expandafter\mt@@debut\mt@tmp/}
+\edef\mt@reste{\expandafter\mt@@reste\mt@tmp/}
+%%
+\edef\mt@tmp{\encodingdefault}
+\ifx\mt@debut\mt@funnyoti
+\ifx\mt@tmp\mt@oti
+\edef\mt@normalmv@operator{\expandafter\noexpand\csname T1/\mt@reste\endcsname}
+\else
+\edef\mt@normalmv@operator{\expandafter\noexpand\csname \mt@tmp/\mt@reste\endcsname}
+\fi\fi
+%%
+\edef\mt@tmp{\expandafter\expandafter\expandafter\@gobble\expandafter\string\mt@boldmv@operator}
+\edef\mt@debut{\expandafter\mt@@debut\mt@tmp/}
+\edef\mt@reste{\expandafter\mt@@reste\mt@tmp/}
+%%
+\edef\mt@tmp{\encodingdefault}
+\ifx\mt@debut\mt@funnyoti
+\ifx\mt@tmp\mt@oti
+\edef\mt@boldmv@operator{\expandafter\noexpand\csname T1/\mt@reste\endcsname}
+\else
+\edef\mt@boldmv@operator{\expandafter\noexpand\csname \mt@tmp/\mt@reste\endcsname}
+\fi\fi
+\fi % fin de \ifmt@subdued
\DeclareSymbolFont{mtoperatorfont}
{\m@t@enc}{\m@t@fam}{\m@t@ser}{\m@t@opsh}
\DeclareSymbolFont{mtletterfont}
@@ -272,6 +357,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\edef\mt@shape@normal{\m@t@opsh}
\edef\mt@ltshape@normal{\m@t@ltsh}
\edef\mt@itdefault@normal{\itdefault}
+ \edef\mt@rmdefault@normal{\rmdefault}
\edef\mt@sfdefault@normal{\sfdefault}
\edef\mt@ttdefault@normal{\ttdefault}
\edef\mt@boldvariant@normal{\m@t@bold}
@@ -282,6 +368,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\edef\mt@ltshape@bold{\m@t@ltsh}
\edef\mt@boldvariant@bold{\m@t@bold}
\edef\mt@itdefault@bold{\itdefault}
+ \edef\mt@rmdefault@bold{\rmdefault}
\edef\mt@sfdefault@bold{\sfdefault}
\edef\mt@ttdefault@bold{\ttdefault}
%%
@@ -397,6 +484,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\expandafter\edef\csname mt@shape@\mt@version\endcsname{#6}
\expandafter\edef\csname mt@boldvariant@\mt@version\endcsname{\m@t@bold}
\expandafter\edef\csname mt@itdefault@\mt@version\endcsname{\itdefault}
+ \expandafter\edef\csname mt@rmdefault@\mt@version\endcsname{\rmdefault}
\expandafter\edef\csname mt@sfdefault@\mt@version\endcsname{\sfdefault}
\expandafter\edef\csname mt@ttdefault@\mt@version\endcsname{\ttdefault}
\newif\ifmt@reallynoopt\mt@reallynoopttrue
@@ -498,8 +586,9 @@ 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}%
- \edef\m@t@@family{\csname mt@family@\mt@tmp\endcsname}%
- \renewcommand{\rmdefault}{\m@t@@family}%
+%% modifications avec 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}%
\renewcommand{\mddefault}{\m@t@@series}%
\edef\m@t@@shape{\csname mt@shape@\mt@tmp\endcsname}%
@@ -508,6 +597,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\renewcommand{\bfdefault}{\m@t@@boldvariant}%
\edef\m@t@@itdefault{\csname mt@itdefault@\mt@tmp\endcsname}%
\renewcommand{\itdefault}{\m@t@@itdefault}%
+ \edef\m@t@@rmdefault{\csname mt@rmdefault@\mt@tmp\endcsname}%
+ \renewcommand{\rmdefault}{\m@t@@rmdefault}%
\edef\m@t@@sfdefault{\csname mt@sfdefault@\mt@tmp\endcsname}%
\renewcommand{\sfdefault}{\m@t@@sfdefault}%
\edef\m@t@@ttdefault{\csname mt@ttdefault@\mt@tmp\endcsname}%
@@ -623,12 +714,11 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\mkern-7mu\smash\mt@minus@sign$}
\fi
\def\do@the@endashstuff{\edef\mt@tmp@enc{\encodingdefault}
-\ifx\mt@tmp@enc\mt@eui % xetex+fontspec
- \XeTeXmathcode`\-="2 \symmtoperatorfont "2013 \relax
+ \ifx\mt@tmp@enc\mt@eui % xetex+fontspec
+ \AtBeginDocument{\XeTeXmathcode`\-="2 \symmtoperatorfont "2013 \relax}
\else
\ifx\mt@tmp@enc\mt@euii % luatex+fontspec
- \luatexUmathcode`\-="2 \symmtoperatorfont "2013 \relax
-\else
+ \AtBeginDocument{\luatexUmathcode`\-="2 \symmtoperatorfont "2013 \relax}
\ifx\mt@tmp@enc\mt@ti % T1
\DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}{21}
\else
@@ -645,10 +735,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi\fi\fi\fi\fi}
\def\do@the@emdashstuff{\edef\mt@tmp@enc{\encodingdefault}
\ifx\mt@tmp@enc\mt@eui % xetex+fontspec
- \XeTeXmathcode`\-="2 \symmtoperatorfont "2014 \relax
+ \AtBeginDocument{\XeTeXmathcode`\-="2 \symmtoperatorfont "2014 \relax}
\else
\ifx\mt@tmp@enc\mt@euii % luatex+fontspec
- \luatexUmathcode`\-="2 \symmtoperatorfont "2014 \relax
+ \AtBeginDocument{\luatexUmathcode`\-="2 \symmtoperatorfont "2014 \relax}
\ifx\mt@tmp@enc\mt@ti % T1
\DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}{22}
\else
@@ -673,8 +763,8 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\fi
%%\def\hbar{{\mathchar'26\mkern-9muh}}
%% (original definition from latex.ltx)
-\def\mathrlap{\mathpalette\mathrlapinternal}
-\def\mathrlapinternal#1#2{\rlap{$\mathsurround=0pt#1{#2}$}}
+\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}
\ifx\mt@tmp@enc\mt@eui % xetex and unicode font
\XeTeXmathchardef\hbar="7 \symmtletterfont "0127 \relax
@@ -687,7 +777,7 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\else %% assume OT1. Bad idea? Should not provoke an error anyhow
\DeclareMathAccent{\mt@ltbar}{\mathalpha}{mtletterfont}{22}
\fi
- \def\hbar{\mathrlap{\mt@ltbar{\ }}h}
+ \def\hbar{\mt@mathrlap{\mt@ltbar{\ }}h}
\fi\fi}
\ifmt@nohbar\else\do@the@hbarstuff\fi
\ifmt@noplus\else
@@ -721,8 +811,10 @@ defaultbf,defaultit,defaultsf,defaulttt}}
\DeclareMathDelimiter\vert
\mathord{\mt@font@tbu}{"7C}{largesymbols}{"0C}
\DeclareMathSymbol\mid\mathrel{\mt@font@tbu}{"7C}
+\let\lbrace\undefined
\DeclareMathDelimiter{\lbrace}
{\mathopen}{\mt@font@tbu}{"7B}{largesymbols}{"08}
+\let\rbrace\undefined
\DeclareMathDelimiter{\rbrace}
{\mathclose}{\mt@font@tbu}{"7D}{largesymbols}{"09}
\fi
@@ -1124,11 +1216,17 @@ defaultbf,defaultit,defaultsf,defaulttt}}
** To keep LaTeX defaults, use option `defaultmathsizes'.}
\fi
\AtBeginDocument{
- \ifmt@needsymbol
+\ifmt@needsymbol
\DeclareFontFamily{U}{psy}{}
\DeclareFontShape{U}{psy}{m}{n}{<->s*[\psy@scale] psyr}{}
\fi
}
+\ifmt@subdued
+\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
\endinput
%%