summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/mathdesign/mathdesign.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/mathdesign/mathdesign.sty')
-rw-r--r--Master/texmf-dist/tex/latex/mathdesign/mathdesign.sty135
1 files changed, 87 insertions, 48 deletions
diff --git a/Master/texmf-dist/tex/latex/mathdesign/mathdesign.sty b/Master/texmf-dist/tex/latex/mathdesign/mathdesign.sty
index 9e557824be7..e58e31d813a 100644
--- a/Master/texmf-dist/tex/latex/mathdesign/mathdesign.sty
+++ b/Master/texmf-dist/tex/latex/mathdesign/mathdesign.sty
@@ -26,7 +26,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{mathdesign}
-[2006/01/29 v1.55 Math Design Project]
+[2013/08/29 v2.31 Math Design Project]
%% -------------------------------------------------------------------
%% Code to use a key-val like syntax in options
@@ -72,77 +72,107 @@
%% Avalaible families
-\DeclareOption{utopia}{\gdef\@MDfont{mdput}}
-\DeclareOption{mdput}{\gdef\@MDfont{mdput}}
-\DeclareOption{adobe-utopia}{\gdef\@MDfont{mdput}}
+\define@key{MD}{family}[mdbch]{%
+ \gdef\MD@default@family{#1}}
-\DeclareOption{garamond}{\gdef\@MDfont{mdugm}}
-\DeclareOption{mdugm}{\gdef\@MDfont{mdugm}}
-\DeclareOption{urw-garamond}{\gdef\@MDfont{mdugm}}
+\DeclareOption{utopia}{\gdef\MD@default@family{mdput}}
+\DeclareOption{mdput}{\gdef\MD@default@family{mdput}}
+\DeclareOption{adobe-utopia}{\gdef\MD@default@family{mdput}}
+\DeclareOption{Adobe Utopia}{\gdef\MD@default@family{mdput}}
-\DeclareOption{charter}{\gdef\@MDfont{mdbch}}
-\DeclareOption{mdbch}{\gdef\@MDfont{mdbch}}
-\DeclareOption{bitstream-charter}{\gdef\@MDfont{mdbch}}
+\DeclareOption{garamond}{\gdef\MD@default@family{mdugm}}
+\DeclareOption{mdugm}{\gdef\MD@default@family{mdugm}}
+\DeclareOption{urw-garamond}{\gdef\MD@default@family{mdugm}}
+\DeclareOption{URW Garamond}{\gdef\MD@default@family{mdugm}}
-\DeclareOption{mdfga}{\gdef\@MDfont{mdfga}}
-\DeclareOption{fontsite-garamond}{\gdef\@MDfont{mdfga}}
+\DeclareOption{charter}{\gdef\MD@default@family{mdbch}}
+\DeclareOption{mdbch}{\gdef\MD@default@family{mdbch}}
+\DeclareOption{bitstream-charter}{\gdef\MD@default@family{mdbch}}
+\DeclareOption{Bitstream Charter}{\gdef\MD@default@family{mdbch}}
+
+% Commercial fonts
+\DeclareOption{utopiastd}{\gdef\MD@default@family{mdpus}}
+\DeclareOption{mdpus}{\gdef\MD@default@family{mdpus}}
+\DeclareOption{adobe-utopiastd}{\gdef\MD@default@family{mdpus}}
+\DeclareOption{Adobe UtopiaStd}{\gdef\MD@default@family{mdpus}}
+
+\DeclareOption{mdpgd}{\gdef\MD@default@family{mdpgd}}
+\DeclareOption{adobe-garamond}{\gdef\MD@default@family{mdpgd}}
+\DeclareOption{Adobe Garamond}{\gdef\MD@default@family{mdpgd}}
+
+\DeclareOption{itccharter}{\gdef\MD@default@family{mdici}}
+\DeclareOption{mdici}{\gdef\MD@default@family{mdici}}
+\DeclareOption{itc-charter}{\gdef\MD@default@family{mdici}}
+\DeclareOption{ITC Charter}{\gdef\MD@default@family{mdici}}
%% Activate expert fonts
-\newif\if@MDexpert
-\DeclareOption{expert}{\@MDexperttrue}
+\newif\if@MD@expert
+\DeclareOption{expert}{\@MD@experttrue}
%% Slanted or upright version of various fonts
-
-\newif\if@MDcapupright \@MDcapuprightfalse
-\newif\if@MDgrupright \@MDgruprightfalse
-\newif\if@MDGRupright \@MDGRuprighttrue
+
+\newif\if@MD@capupright \@MD@capuprightfalse
+\newif\if@MD@lowupright \@MD@lowuprightfalse
+\newif\if@MD@grupright \@MD@gruprightfalse
+\newif\if@MD@GRupright \@MD@GRuprighttrue
\define@key{MD}{uppercase}[italicized]{%
- \ifthenelse{\equal{#1}{italicized}}{\@MDcapuprightfalse}
- {\ifthenelse{\equal{#1}{upright}}{\@MDcapuprighttrue}{}}}
+ \ifthenelse{\equal{#1}{italicized}}{\@MD@capuprightfalse}
+ {\ifthenelse{\equal{#1}{upright}}{\@MD@capuprighttrue}{}}}
+
+\define@key{MD}{lowercase}[italicized]{%
+ \ifthenelse{\equal{#1}{italicized}}{\@MD@lowuprightfalse}
+ {\ifthenelse{\equal{#1}{upright}}{\@MD@lowuprighttrue}{}}}
\define@key{MD}{greekuppercase}[upright]{%
- \ifthenelse{\equal{#1}{italicized}}{\@MDGRuprightfalse}
- {\ifthenelse{\equal{#1}{upright}}{\@MDGRuprighttrue}{}}}
+ \ifthenelse{\equal{#1}{italicized}}{\@MD@GRuprightfalse}
+ {\ifthenelse{\equal{#1}{upright}}{\@MD@GRuprighttrue}{}}}
\define@key{MD}{greeklowercase}[italicized]{%
- \ifthenelse{\equal{#1}{italicized}}{\@MDgruprightfalse}
- {\ifthenelse{\equal{#1}{upright}}{\@MDgruprighttrue}{}}}
+ \ifthenelse{\equal{#1}{italicized}}{\@MD@gruprightfalse}
+ {\ifthenelse{\equal{#1}{upright}}{\@MD@gruprighttrue}{}}}
-%% euro symbol support
+\gdef\MD@greek@family{letters}
+
+\define@key{MD}{greekfamily}[default]{%
+ \selectgreekfamily{#1}}
-\newif\if@MDeuro\@MDeurotrue
+\newcommand{\selectgreekfamily}[1]{%
+ \ifthenelse{\equal{#1}{bodoni}}{\gdef\MD@greek@family{mdgrb}}{}
+ \ifthenelse{\equal{#1}{didot}}{\gdef\MD@greek@family{mdgrd}}{}
+}
+
+%% euro symbol support
+\newif\if@MD@euro\@MD@eurotrue
\define@key{MD}{euro}[true]{%
- \ifthenelse{\equal{#1}{true}}{\global\@MDeurotrue}
- {\global\@MDeurofalse}}
+ \ifthenelse{\equal{#1}{true}}{\global\@MD@eurotrue}
+ {\global\@MD@eurofalse}}
%% scaled sans serif and typewritefonts
-
-\newif\if@MDsfscaled\@MDsfscaledtrue
+\newif\if@MD@sfscaled\@MD@sfscaledtrue
\define@key{MD}{sfscaled}[true]{%
- \ifthenelse{\equal{#1}{true}}{\global\@MDsfscaledtrue}
- {\global\@MDsfscaledfalse}}
+ \ifthenelse{\equal{#1}{true}}{\global\@MD@sfscaledtrue}
+ {\global\@MD@sfscaledfalse}}
-\newif\if@MDttscaled\@MDttscaledtrue
+\newif\if@MD@ttscaled\@MD@ttscaledtrue
\define@key{MD}{ttscaled}[true]{%
- \ifthenelse{\equal{#1}{true}}{\global\@MDttscaledtrue}
- {\global\@MDttscaledfalse}}
+ \ifthenelse{\equal{#1}{true}}{\global\@MD@ttscaledtrue}
+ {\global\@MD@ttscaledfalse}}
%% Type of calligraphic alphabet
-
-\newif\if@MDcmcal \@MDcmcalfalse
+\newif\if@MD@cmcal \@MD@cmcalfalse
\define@key{MD}{cal}[cmcal]{%
- \ifthenelse{\equal{#1}{cmcal}}{\@MDcmcaltrue }
- {\ifthenelse{\equal{#1}{script}}{\@MDcmcalfalse}{}}}
+ \ifthenelse{\equal{#1}{cmcal}}{\@MD@cmcaltrue }
+ {\ifthenelse{\equal{#1}{script}}{\@MD@cmcalfalse}{}}}
\ProcessOptions
-\@ifundefined{@MDfont}
+\@ifundefined{MD@default@family}
{\PackageWarning{mathdesign}{No font specified}}
{\InputIfFileExists{mathdesign.cfg}{}{}
- \InputIfFileExists{\@MDfont.cfg}{}{}
- \ExecuteOptions{\@MDfont Options}}
+ \InputIfFileExists{\MD@default@family.cfg}{}{}
+ \ExecuteOptions{\MD@default@family Options}}
\ProcessUnusedOptions{MD}
@@ -160,7 +190,7 @@
\@ifpackageloaded{#2}{\PackageWarning{mathdesign/#1}{%
Package '#2' shouldn't be used in conjonction with
package #1 (use option #2 instead)}}{}}}
-
+
%% ----------------------------------------------------------------
%% Undefines symbol name before definition
@@ -189,11 +219,21 @@
}%
\egroup}
+% The square root macro is defined with some hard coded dimensions. We
+% change that.
+\def\r@@t#1#2{%
+ \setbox\z@\hbox{$\m@th#1\sqrtsign{#2}$}%
+ \dimen@\ht\z@ \advance\dimen@-\dp\z@
+ \setbox\@tempboxa\hbox{$\m@th#1\sqrtsign{}$}%
+ \dimen@i\wd\@tempboxa
+ \kern.33\dimen@i\raise.66\dimen@\copy\rootbox
+ \kern-.66\dimen@i\box\z@}
+
%% -------------------------------------------------------------------
%% Define or undefine small caps
%% -------------------------------------------------------------------
-\if@MDexpert\else\renewcommand\scdefault{fsc}\fi
+\if@MD@expert\else\renewcommand\scdefault{fsc}\fi
\newcommand{\fscshape}[1]{\fontshape{fsc}\selectfont #1}
\newcommand{\ficshape}[1]{\fontshape{fic}\selectfont #1}
@@ -203,14 +243,14 @@
%% Some tweaking
%% -------------------------------------------------------------------
-\delimiterfactor950
+%\delimiterfactor950
%% -------------------------------------------------------------------
%% Load the family style file
%% -------------------------------------------------------------------
-\@ifundefined{@MDfont}
+\@ifundefined{MD@default@family}
{}
- {\RequirePackage{\@MDfont}}
+ {\RequirePackage{\MD@default@family}}
%% ----------------------------------------------------------------
%% Encoding is automatically set to T1
@@ -219,4 +259,3 @@
\RequirePackage[T1]{fontenc}
\endinput
-