From 67262a49138e713fca67ad2ec494f718c2dda821 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 18 Jun 2014 23:12:46 +0000 Subject: mathdots (12jun14) git-svn-id: svn://tug.org/texlive/trunk@34301 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/mathdots/mathdots.sty | 93 +++++++++--------- .../texmf-dist/tex/generic/mathdots/mathdots.tex | 105 +++++++++++---------- 2 files changed, 107 insertions(+), 91 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/mathdots/mathdots.sty b/Master/texmf-dist/tex/generic/mathdots/mathdots.sty index 6bc3ec5b05e..4d50d782890 100644 --- a/Master/texmf-dist/tex/generic/mathdots/mathdots.sty +++ b/Master/texmf-dist/tex/generic/mathdots/mathdots.sty @@ -8,7 +8,7 @@ %% %% ------------------------------------------------------------------- %% -%% Copyright 2001--2006, Daniel H. Luecking +%% Copyright 2001--2014, Daniel H. Luecking %% %% Mathdots may be distributed and/or modified under the conditions of the %% LaTeX Project Public License, either version 1.3 of this license or (at @@ -23,26 +23,26 @@ %% \ifx\documentclass\UndEfInEd\input mathdots \expandafter\endinput\fi \ProvidesPackage{mathdots} -[2006/03/16 v0.8 Improve and add various macros for dots in math.]% -\def\MD@us#1{\@nameuse{#1style}}% -\def\MD@uf#1{\@nameuse{#1font}0}% -\def\MD@t{text}\def\MD@s{script}\def\MD@ss{scriptscript}% -\newdimen\MD@unit \MD@unit\p@ -\def\MD@changestyle#1{\relax\MD@unit0.1\fontdimen6\MD@uf{#1}% - \everymath\expandafter{\the\everymath\MD@us{#1}}}% -\def\MD@dot{$\m@th\ldotp$}% -\def\MD@palette#1{\mathchoice{#1\MD@t}{#1\MD@t}{#1\MD@s}{#1\MD@ss}}% -\def\MD@ddots#1{{\MD@changestyle{#1}% - \mkern1mu\raise7\MD@unit\vbox{\kern7\MD@unit\hbox{\MD@dot}}% - \mkern2mu\raise4\MD@unit\hbox{\MD@dot}% - \mkern2mu\raise \MD@unit\hbox{\MD@dot}\mkern1mu}}% -\def\MD@vdots#1{\vbox{\MD@changestyle{#1}% - \baselineskip4\MD@unit\lineskiplimit\z@ - \kern6\MD@unit\hbox{\MD@dot}\hbox{\MD@dot}\hbox{\MD@dot}}}% -\def\MD@iddots#1{{\MD@changestyle{#1}% - \mkern1mu\raise \MD@unit\hbox{\MD@dot}% - \mkern2mu\raise4\MD@unit\hbox{\MD@dot}% - \mkern2mu\raise7\MD@unit\vbox{\kern7\MD@unit\hbox{\MD@dot}}}}% +[2014/06/11 v0.9 Improve and add various macros for dots in math.]% +\def\MDo@us#1{\@nameuse{#1style}}% +\def\MDo@uf#1{\@nameuse{#1font}0}% +\def\MDo@t{text}\def\MDo@s{script}\def\MDo@ss{scriptscript}% +\newdimen\MDo@unit \MDo@unit\p@ +\def\MDo@changestyle#1{\relax\MDo@unit0.1\fontdimen6\MDo@uf{#1}% + \everymath\expandafter{\the\everymath\MDo@us{#1}}}% +\def\MDo@dot{$\m@th\ldotp$}% +\def\MDo@palette#1{\mathchoice{#1\MDo@t}{#1\MDo@t}{#1\MDo@s}{#1\MDo@ss}}% +\def\MDo@ddots#1{{\MDo@changestyle{#1}% + \mkern1mu\raise7\MDo@unit\vbox{\kern7\MDo@unit\hbox{\MDo@dot}}% + \mkern2mu\raise4\MDo@unit\hbox{\MDo@dot}% + \mkern2mu\raise \MDo@unit\hbox{\MDo@dot}\mkern1mu}}% +\def\MDo@vdots#1{\vbox{\MDo@changestyle{#1}% + \baselineskip4\MDo@unit\lineskiplimit\z@ + \kern6\MDo@unit\hbox{\MDo@dot}\hbox{\MDo@dot}\hbox{\MDo@dot}}}% +\def\MDo@iddots#1{{\MDo@changestyle{#1}% + \mkern1mu\raise \MDo@unit\hbox{\MDo@dot}% + \mkern2mu\raise4\MDo@unit\hbox{\MDo@dot}% + \mkern2mu\raise7\MDo@unit\vbox{\kern7\MDo@unit\hbox{\MDo@dot}}}}% \DeclareRobustCommand\fixedvdots{% \vbox{\baselineskip4\p@ \lineskiplimit\z@ \kern6\p@\hbox{.}\hbox{.}\hbox{.}}}% @@ -59,31 +59,38 @@ \let\originalddots=\ddots \let\originalvdots=\vdots \let\originaliddots=\iddots -\DeclareRobustCommand\ddots{% - \mathinner{\MD@palette\MD@ddots}}% -\DeclareRobustCommand\iddots{% - \mathinner{\MD@palette\MD@iddots}}% -\DeclareRobustCommand\vdots{% - \mathinner{\MD@palette\MD@vdots}}% -\newbox\MD@dotsbox -\newmuskip\MD@prekern -\newmuskip\MD@postkern -\newmuskip\MD@dotkern -\MD@prekern 0mu -\MD@postkern -1mu -\MD@dotkern -1.3mu -\def\MD@dotsaccent#1{\mathpalette{\MD@@dotsaccent{#1}}}% -\def\MD@@dotsaccent#1#2#3{% - {\setbox\MD@dotsbox\hbox{$#2\mkern\MD@prekern#1\mkern\MD@postkern$}% - \mathop{#3\kern\z@}\limits^{% - \text{\vbox to-1.4\ex@{\kern-1.8\ex@\copy\MD@dotsbox\vss}}}}% -}% +\DeclareRobustCommand\MDoddots{% + \mathinner{\MDo@palette\MDo@ddots}}% +\DeclareRobustCommand\MDoiddots{% + \mathinner{\MDo@palette\MDo@iddots}}% +\DeclareRobustCommand\MDovdots{% + \mathinner{\MDo@palette\MDo@vdots}}% +\let\ddots \MDoddots +\let\iddots\MDoiddots +\let\vdots \MDovdots +\newbox\MDo@dotsbox +\newmuskip\MDoprekern +\newmuskip\MDopostkern +\newmuskip\MDodotkern +\MDoprekern 0mu +\MDopostkern -1mu +\MDodotkern -1.3 mu +\def\MDo@dotsaccent#1{\mathpalette{\MDo@@dotsaccent{#1}}}% \let\originaldddot \dddot \let\originalddddot\ddddot +\def\MDo@@dotsaccent#1#2#3{% + {\setbox\MDo@dotsbox\hbox{$#2\mkern\MDoprekern#1\mkern\MDopostkern$}% + \mathop{#3\kern\z@}\limits^{% + \text{\vbox to-1.4\ex@{\kern-1.8\ex@\copy\MDo@dotsbox\vss}}}}% +}% \@ifpackageloaded{amsmath}{% - \def\MD@D{\mathchar"5F\mkern\MD@dotkern}% - \DeclareRobustCommand\dddot {\MD@dotsaccent{\MD@D\MD@D\MD@D}}% - \DeclareRobustCommand\ddddot{\MD@dotsaccent{\MD@D\MD@D\MD@D\MD@D}}% + \def\MDo@D{\mathchar"5F\mkern\MDodotkern}% + \DeclareRobustCommand\MDodddot {% + \MDo@dotsaccent{\MDo@D\MDo@D\MDo@D}}% + \DeclareRobustCommand\MDoddddot{% + \MDo@dotsaccent{\MDo@D\MDo@D\MDo@D\MDo@D}}% + \let\dddot \MDodddot + \let\ddddot\MDoddddot }{}% \endinput %% diff --git a/Master/texmf-dist/tex/generic/mathdots/mathdots.tex b/Master/texmf-dist/tex/generic/mathdots/mathdots.tex index 25d1f88338d..dfd4cfc2514 100644 --- a/Master/texmf-dist/tex/generic/mathdots/mathdots.tex +++ b/Master/texmf-dist/tex/generic/mathdots/mathdots.tex @@ -8,7 +8,7 @@ %% %% ------------------------------------------------------------------- %% -%% Copyright 2001--2006, Daniel H. Luecking +%% Copyright 2001--2014, Daniel H. Luecking %% %% Mathdots may be distributed and/or modified under the conditions of the %% LaTeX Project Public License, either version 1.3 of this license or (at @@ -21,8 +21,8 @@ %% Maintainer is Daniel H. Luecking. The Base Interpreters associated with %% mathdots are plain TeX and LaTeX %% -\def\mathdotsfiledate{2006/03/16}% -\def\mathdotsfileversion{0.8}% +\def\mathdotsfiledate{2014/06/11}% +\def\mathdotsfileversion{0.9}% \expandafter \ifx\csname MathDots\mathdotsfileversion\endcsname\relax \else @@ -34,25 +34,25 @@ \catcode`\noexpand\@=\the\catcode`@}% \catcode`\@=11 \def\@nameuse#1{\csname#1\endcsname}% -\def\MD@us#1{\@nameuse{#1style}}% -\def\MD@uf#1{\@nameuse{#1font}0}% -\def\MD@t{text}\def\MD@s{script}\def\MD@ss{scriptscript}% -\newdimen\MD@unit \MD@unit\p@ -\def\MD@changestyle#1{\relax\MD@unit0.1\fontdimen6\MD@uf{#1}% - \everymath\expandafter{\the\everymath\MD@us{#1}}}% -\def\MD@dot{$\m@th\ldotp$}% -\def\MD@palette#1{\mathchoice{#1\MD@t}{#1\MD@t}{#1\MD@s}{#1\MD@ss}}% -\def\MD@ddots#1{{\MD@changestyle{#1}% - \mkern1mu\raise7\MD@unit\vbox{\kern7\MD@unit\hbox{\MD@dot}}% - \mkern2mu\raise4\MD@unit\hbox{\MD@dot}% - \mkern2mu\raise \MD@unit\hbox{\MD@dot}\mkern1mu}}% -\def\MD@vdots#1{\vbox{\MD@changestyle{#1}% - \baselineskip4\MD@unit\lineskiplimit\z@ - \kern6\MD@unit\hbox{\MD@dot}\hbox{\MD@dot}\hbox{\MD@dot}}}% -\def\MD@iddots#1{{\MD@changestyle{#1}% - \mkern1mu\raise \MD@unit\hbox{\MD@dot}% - \mkern2mu\raise4\MD@unit\hbox{\MD@dot}% - \mkern2mu\raise7\MD@unit\vbox{\kern7\MD@unit\hbox{\MD@dot}}}}% +\def\MDo@us#1{\@nameuse{#1style}}% +\def\MDo@uf#1{\@nameuse{#1font}0}% +\def\MDo@t{text}\def\MDo@s{script}\def\MDo@ss{scriptscript}% +\newdimen\MDo@unit \MDo@unit\p@ +\def\MDo@changestyle#1{\relax\MDo@unit0.1\fontdimen6\MDo@uf{#1}% + \everymath\expandafter{\the\everymath\MDo@us{#1}}}% +\def\MDo@dot{$\m@th\ldotp$}% +\def\MDo@palette#1{\mathchoice{#1\MDo@t}{#1\MDo@t}{#1\MDo@s}{#1\MDo@ss}}% +\def\MDo@ddots#1{{\MDo@changestyle{#1}% + \mkern1mu\raise7\MDo@unit\vbox{\kern7\MDo@unit\hbox{\MDo@dot}}% + \mkern2mu\raise4\MDo@unit\hbox{\MDo@dot}% + \mkern2mu\raise \MDo@unit\hbox{\MDo@dot}\mkern1mu}}% +\def\MDo@vdots#1{\vbox{\MDo@changestyle{#1}% + \baselineskip4\MDo@unit\lineskiplimit\z@ + \kern6\MDo@unit\hbox{\MDo@dot}\hbox{\MDo@dot}\hbox{\MDo@dot}}}% +\def\MDo@iddots#1{{\MDo@changestyle{#1}% + \mkern1mu\raise \MDo@unit\hbox{\MDo@dot}% + \mkern2mu\raise4\MDo@unit\hbox{\MDo@dot}% + \mkern2mu\raise7\MDo@unit\vbox{\kern7\MDo@unit\hbox{\MDo@dot}}}}% \def\fixedvdots{% \vbox{\baselineskip4\p@ \lineskiplimit\z@ \kern6\p@\hbox{.}\hbox{.}\hbox{.}}}% @@ -69,36 +69,45 @@ \let\originalddots=\ddots \let\originalvdots=\vdots \let\originaliddots=\iddots -\def\ddots{% - \mathinner{\MD@palette\MD@ddots}}% -\def\iddots{% - \mathinner{\MD@palette\MD@iddots}}% -\def\vdots{% - \mathinner{\MD@palette\MD@vdots}}% +\def\MDoddots{% + \mathinner{\MDo@palette\MDo@ddots}}% +\def\MDoiddots{% + \mathinner{\MDo@palette\MDo@iddots}}% +\def\MDovdots{% + \mathinner{\MDo@palette\MDo@vdots}}% \wlog{Mathdots Info: Redefining \string\ddots.}% \wlog{Mathdots Info: Redefining \string\vdots.}% -\newbox\MD@dotsbox -\newmuskip\MD@prekern -\newmuskip\MD@postkern -\newmuskip\MD@dotkern -\MD@prekern 0mu -\MD@postkern -1mu -\MD@dotkern -1.3mu -\def\MD@dotsaccent#1{\mathpalette{\MD@@dotsaccent{#1}}}% -\def\MD@@dotsaccent#1#2#3{% - {\setbox\MD@dotsbox\hbox{$#2\mkern\MD@prekern#1\mkern\MD@postkern$}% - \mathop{#3\kern\z@}\limits^{% - \text{\vbox to-1.4\ex@{\kern-1.8\ex@\copy\MD@dotsbox\vss}}}}% -}% +\let\ddots \MDoddots +\let\iddots\MDoiddots +\let\vdots \MDovdots +\newbox\MDo@dotsbox +\newmuskip\MDoprekern +\newmuskip\MDopostkern +\newmuskip\MDodotkern +\MDoprekern 0mu +\MDopostkern -1mu +\MDodotkern -1.3 mu +\def\MDo@dotsaccent#1{\mathpalette{\MDo@@dotsaccent{#1}}}% \let\originaldddot \dddot \let\originalddddot\ddddot -\def\amstexfmtname{AmS-TeX}% -\ifx\amstexfmtname\fmtname - \def\MD@D{\mathchar"5F\mkern\MD@dotkern}% - \wlog{Mathdots Info: Redefining \string\dddot.}% - \wlog{Mathdots Info: Redefining \string\ddddot.}% - \def\dddot {\MD@dotsaccent{\MD@D\MD@D\MD@D}}% - \def\ddddot{\MD@dotsaccent{\MD@D\MD@D\MD@D\MD@D}}% +\def\MDo@@dotsaccent#1#2#3{% +{% + \setbox\MDo@dotsbox\hbox{$#2\mkern\MDoprekern#1\mkern\MDopostkern$}% + \mathop{#3\kern\z@}\limits^{\text{\ex@.2326ex + \vbox to-1.4\ex@{\kern-1.8\ex@\copy\MDo@dotsbox\vss}}}% +}}% +\ifx\amstexloaded@\relax % true if amstex has been loaded + % A backup test in case \amstexloaded@ became \relax by accident: + \ifx\ddddot\UndEfInEd + \else + \def\MDo@D{\mathchar"5F\mkern\MDodotkern}% + \wlog{Mathdots Info: Redefining \string\dddot.}% + \wlog{Mathdots Info: Redefining \string\ddddot.}% + \def\MDodddot {\MDo@dotsaccent{\MDo@D\MDo@D\MDo@D}}% + \def\MDoddddot{\MDo@dotsaccent{\MDo@D\MDo@D\MDo@D\MDo@D}}% + \let\dddot \MDodddot + \let\ddddot\MDoddddot + \fi \fi \csname MathDots\mathdotsfileversion\endcsname \endinput -- cgit v1.2.3