From 7d8547203e1cd6d407319542be05abe39a7ee1de Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 11 Feb 2011 01:14:05 +0000 Subject: mathastext 1.12b (10feb11) git-svn-id: svn://tug.org/texlive/trunk@21363 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/mathastext/mathastext.sty | 69 +++++++++++++--------- 1 file changed, 42 insertions(+), 27 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mathastext') diff --git a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty index 3dd37fcafcb..b8e168998cb 100644 --- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty +++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty @@ -10,7 +10,7 @@ %% Copyright (C) 2011 by Jean-Francois Burnol %% %% Please report errors to jfbu at free dot fr -%% Documentation is also in `mathastext-doc.pdf' +%% Illustrative examples at %% http://jf.burnol.free.fr/mathastext.html %% %% This file may be distributed and/or modified under the @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesFile{mathastext.sty} - [2011/02/07 1.12 Use the text font in simple mathematics] + [2011/02/09 1.12b Use the text font in simple mathematics] \newif\ifXeTeX \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname XeTeXinterchartoks\endcsname\relax @@ -75,6 +75,8 @@ \def\mt@eui{EU1}\def\mt@euii{EU2} \newif\ifmt@alldelims \ifx\mt@oti\m@stextenc\mt@alldelimsfalse\else\mt@alldelimstrue\fi +%% new in v1.12b: +\def\mt@lyi{LY1} %% new or modified in v1.11: \DeclareOption{fouriervec}{\let\mt@fouriervec\@empty} \DeclareOption{nolessnomore}{\mt@alldelimsfalse} @@ -462,11 +464,14 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \ifx\mt@enc\mt@oti % OT1 \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}{123} \else +\ifx\mt@enc\mt@lyi % LY1 + \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}{150} +\else % make sure we have neither xetex nor luatex \ifXeTeX\mt@failedtrue\else\ifLuaTeX\mt@failedtrue\else \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont} {\expandafter\the\expandafter\csname\mt@enc\string\textendash\endcsname} \fi\fi -\fi\fi\fi\fi} +\fi\fi\fi\fi\fi} \def\do@the@emdashstuff{\edef\mt@enc{\m@stextenc} \ifx\mt@enc\mt@eui % xetex+fontspec \XeTeXmathcode`\-="2 "\the\symmtoperatorfont "2014 \relax @@ -479,12 +484,15 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \else \ifx\mt@enc\mt@oti % OT1 \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}{124} -\else % make sure we do not have xetex or luatex +\else +\ifx\mt@enc\mt@lyi % LY1 + \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont}{151} +\else % make sure we have neither xetex nor luatex \ifXeTeX\mt@failedtrue\else\ifLuaTeX\mt@failedtrue\else \DeclareMathSymbol{-}{\mathbin}{mtoperatorfont} {\expandafter\the\expandafter\csname\mt@enc\string\textemdash\endcsname} \fi\fi -\fi\fi\fi\fi} +\fi\fi\fi\fi\fi} \ifx\mtno@minus\@empty\else \mt@failedfalse \ifmt@endash\do@the@endashstuff\else @@ -638,20 +646,18 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathSymbol{\Im}{\mathord}{mtpsymbol}{"C1} \DeclareMathSymbol{\DotTriangle}{\mathord}{mtpsymbol}{92} \fi -\def\mt@font@tbu{operators} -\let\mt@mathord\mathord -\ifx\digamma\undefined\else\def\mt@font@tbu{1}\fi +\newif\ifmt@dogreek\mt@dogreektrue +\let\mt@mathord\mathalpha \ifx\mt@selfGreek\@empty \def\mt@font@tbu{mtoperatorfont} - \let\mt@mathord\mathalpha \else \ifx\mt@eulergreek\@empty \def\mt@font@tbu{mteulervm} - \let\mt@mathord\mathalpha \else \ifx\mt@symbolgreek\@empty \def\mt@font@tbu{mtpsymbol} + \let\mt@mathord\mathord + \else + \mt@dogreekfalse \fi\fi\fi -\def\mt@tmp{1} -\ifx\mt@font@tbu\mt@tmp\else -\DeclareMathSymbol{\Digamma}{\mt@mathord}{\mt@font@tbu}{"46} +\ifmt@dogreek \DeclareMathSymbol{\Alpha}{\mt@mathord}{\mt@font@tbu}{"41} \DeclareMathSymbol{\Beta}{\mt@mathord}{\mt@font@tbu}{"42} \DeclareMathSymbol{\Epsilon}{\mt@mathord}{\mt@font@tbu}{"45} @@ -665,15 +671,12 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathSymbol{\Rho}{\mt@mathord}{\mt@font@tbu}{"50} \DeclareMathSymbol{\Tau}{\mt@mathord}{\mt@font@tbu}{"54} \DeclareMathSymbol{\Chi}{\mt@mathord}{\mt@font@tbu}{"58} -\ifx\mt@symbolgreek\@empty - \ifx\mt@eulergreek\@empty\else - \ifx\mt@selfGreek\@empty\else +\ifx\mt@mathord\mathord %% attention le P de Symbol est un \Pi pas un \Rho \DeclareMathSymbol{\Rho}{\mathord}{mtpsymbol}{"52} %% attention le X de Symbol est un \Xi pas un \Chi \DeclareMathSymbol{\Chi}{\mathord}{mtpsymbol}{"43} %% attention le F de Symbol est un \Phi. Il n'y a pas de \Digamma -\let\Digamma\undefined \DeclareMathSymbol{\Gamma}{\mathord}{mtpsymbol}{"47} \DeclareMathSymbol{\Delta}{\mathord}{mtpsymbol}{"44} \DeclareMathSymbol{\Theta}{\mathord}{mtpsymbol}{"51} @@ -685,8 +688,8 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathSymbol{\Phi}{\mathord}{mtpsymbol}{"46} \DeclareMathSymbol{\Psi}{\mathord}{mtpsymbol}{"59} \DeclareMathSymbol{\Omega}{\mathord}{mtpsymbol}{"57} - \fi\fi \else +\DeclareMathSymbol{\Digamma}{\mathalpha}{\mt@font@tbu}{"46} \DeclareMathSymbol\Gamma {\mathalpha}{\mt@font@tbu}{"00} \DeclareMathSymbol\Delta {\mathalpha}{\mt@font@tbu}{"01} \DeclareMathSymbol\Theta {\mathalpha}{\mt@font@tbu}{"02} @@ -700,8 +703,6 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathSymbol\Omega {\mathalpha}{\mt@font@tbu}{"0A} \fi \fi -\let\omicron\undefined -\newcommand\omicron{\mt@saved@mathnormal{o}} \ifx\mt@eulergreek\@empty \DeclareMathSymbol{\alpha} {\mathalpha}{mteulervm}{"0B} \DeclareMathSymbol{\beta} {\mathalpha}{mteulervm}{"0C} @@ -717,7 +718,8 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathSymbol{\mu} {\mathalpha}{mteulervm}{"16} \DeclareMathSymbol{\nu} {\mathalpha}{mteulervm}{"17} \DeclareMathSymbol{\xi} {\mathalpha}{mteulervm}{"18} -\renewcommand\omicron{\MathEuler{o}} +\let\omicron\undefined +\DeclareMathSymbol{\omicron}{\mathalpha}{mteulervm}{"6F} \DeclareMathSymbol{\pi} {\mathalpha}{mteulervm}{"19} \DeclareMathSymbol{\rho} {\mathalpha}{mteulervm}{"1A} \DeclareMathSymbol{\sigma} {\mathalpha}{mteulervm}{"1B} @@ -752,7 +754,8 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathSymbol{\mu}{\mathord}{mtpsymbol}{"6D} \DeclareMathSymbol{\nu}{\mathord}{mtpsymbol}{"6E} \DeclareMathSymbol{\xi}{\mathord}{mtpsymbol}{"78} -\renewcommand\omicron{\mathord{\MathPSymbol{o}}} +\let\omicron\undefined +\DeclareMathSymbol{\omicron}{\mathord}{mtpsymbol}{"6F} \DeclareMathSymbol{\pi}{\mathord}{mtpsymbol}{"70} \DeclareMathSymbol{\rho}{\mathord}{mtpsymbol}{"72} \DeclareMathSymbol{\sigma}{\mathord}{mtpsymbol}{"73} @@ -770,6 +773,9 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathSymbol{\varphi}{\mathord}{mtpsymbol}{"6A} \DeclareMathSymbol{\partial}{\mathord}{mtpsymbol}{"B6} \DeclareMathSymbol{\wp}{\mathord}{mtpsymbol}{"C3} +\else +\ifx\omicron\undefined +\newcommand{\omicron}{\mt@saved@mathnormal{o}}\fi \fi\fi \edef\mt@enc{\m@stextenc}\newif\ifmt@goon\mt@goontrue \ifx\mt@enc\mt@eui % xetex and unicode font @@ -787,6 +793,10 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \ifx\mt@enc\mt@oti % OT1 \DeclareMathSymbol{\inodot}{\mathalpha}{mtletterfont}{16} \DeclareMathSymbol{\jnodot}{\mathalpha}{mtletterfont}{17} +\else +\ifx\mt@enc\mt@lyi % LY1 + \DeclareMathSymbol{\inodot}{\mathalpha}{mtletterfont}{16} + \DeclareMathSymbol{\jnodot}{\mathalpha}{mtletterfont}{17} \else \ifXeTeX\mt@goonfalse\else\ifLuaTeX\mt@goonfalse\else \DeclareMathSymbol{\inodot}{\mathalpha}{mtletterfont} @@ -794,7 +804,7 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathSymbol{\jnodot}{\mathalpha}{mtletterfont} {\expandafter\the\expandafter\csname\mt@enc\string\j\endcsname} \fi\fi -\fi\fi\fi\fi +\fi\fi\fi\fi\fi \ifx\mt@defaultimath\@empty\else \ifmt@goon \renewcommand{\imath}{\inodot} @@ -828,10 +838,15 @@ noplusnominus,noequal,noexclam,noasterisk,nospecials,nolessnomore}} \DeclareMathAccent{\hat}{\mathalpha}{mtoperatorfont}{94} \DeclareMathAccent{\dot}{\mathalpha}{mtoperatorfont}{95} \DeclareMathAccent{\mathring}{\mathalpha}{mtoperatorfont}{23} -\ifx\mt@oti\mt@enc\else - \typeout{** mathastext: `mathaccents'; accents have been assumed to be^^J% - ** as in OT1 encoding.} -\fi\fi\fi + \ifx\mt@lyi\mt@enc % LY1 encoding + \DeclareMathAccent{\dot}{\mathalpha}{mtoperatorfont}{5} + \else + \ifx\mt@oti\mt@enc\else + \typeout{** mathastext: math accents have been assumed to be^^J% + ** as in OT1 encoding.} + \fi + \fi +\fi\fi \ifmt@defaultsizes\else \providecommand\@xxxpt{29.86} \providecommand\@xxxvipt{35.83} -- cgit v1.2.3