plstmary (10may13)

git-svn-id: svn://tug.org/texlive/trunk@30377 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 84 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/plain/plstmary/stmary.tex b/Master/texmf-dist/tex/plain/plstmary/stmary.tex
index ae46d88e712..9df3c13c367 100644
--- a/Master/texmf-dist/tex/plain/plstmary/stmary.tex
+++ b/Master/texmf-dist/tex/plain/plstmary/stmary.tex
@@ -1,13 +1,7 @@
 % Loads stmaryrd symbols for 10pt plain TeX documents.
-% Use \stmaryrdninepoint for nine point documents.
-% Use \stmaryrdelevenpoint for eleven point documents.
-% Use \stmaryrdtwelvepoint for twelve point documents.
 %
-% See the LaTeX stmaryrd package docs for details on the symbols
-% available and the commands to access them.
-%
-\def\plainstmaryversion{0.4}%
-\edef\restoreallcatcodes{%
+\def\plstmaryversion{0.5a}%
+\edef\restorestmarycatcodes{%
    \catcode`\noexpand\@=\number\catcode`\@\relax
    \catcode`\noexpand\!=\number\catcode`\!\relax}%
 %
@@ -22,25 +16,98 @@
 \font\stmaryeleven  stmary10 at10.95pt
 \font\stmarytwelve  stmary10 at12pt
 %
+% AMS fonts: 10, 7 and 5 pt sizes loaded in amssym.tex.
+% St. Mary Road only needs msam, but we load msbm as well.
+%
+\input amssym
+\font\twelvemsa = msam10 at 12pt
+\font\elevenmsa = msam10 at 10.95pt
+\font\ninemsa   = msam9
+\font\eightmsa  = msam8
+\font\sixmsa    = msam6
+\font\twelvemsb = msbm10 at 12pt
+\font\elevenmsb = msbm10 at 10.95pt
+\font\ninemsb   = msbm9
+\font\eightmsb  = msbm8
+\font\sixmsb    = msbm6
+%
+\def\stmaryrdeightpoint{%
+          \textfont\stmaryrdfam \stmaryeight
+        \scriptfont\stmaryrdfam \stmarysix
+  \scriptscriptfont\stmaryrdfam \stmaryfive
+  \amseightpoint
+}%
+\def\amseightpoint{%
+          \textfont\msafam \eightmsa
+        \scriptfont\msafam \sixmsa
+  \scriptscriptfont\msafam \fivemsa
+          \textfont\msbfam \eightmsb
+        \scriptfont\msbfam \sixmsb
+  \scriptscriptfont\msbfam \fivemsb
+}%
+%
 \def\stmaryrdninepoint{%
           \textfont\stmaryrdfam \stmarynine
         \scriptfont\stmaryrdfam \stmaryseven
-  \scriptscriptfont\stmaryrdfam \stmaryfive}%
+  \scriptscriptfont\stmaryrdfam \stmaryfive
+  \amsninepoint
+}%
+\def\amsninepoint{%
+          \textfont\msafam \ninemsa
+        \scriptfont\msafam \sevenmsa
+  \scriptscriptfont\msafam \fivemsa
+          \textfont\msbfam \ninemsb
+        \scriptfont\msbfam \sevenmsb
+  \scriptscriptfont\msbfam \fivemsb
+}%
 %
 \def\stmaryrdtenpoint{%
           \textfont\stmaryrdfam \stmaryten
         \scriptfont\stmaryrdfam \stmaryseven
-  \scriptscriptfont\stmaryrdfam \stmaryfive}%
+  \scriptscriptfont\stmaryrdfam \stmaryfive
+  \amstenpoint
+}%
+\def\amstenpoint{%
+          \textfont\msafam \tenmsa
+        \scriptfont\msafam \sevenmsa
+  \scriptscriptfont\msafam \fivemsa
+          \textfont\msbfam \tenmsb
+        \scriptfont\msbfam \sevenmsb
+  \scriptscriptfont\msbfam \fivemsb
+}%
 %
 \def\stmaryrdelevenpoint{%
           \textfont\stmaryrdfam \stmaryeleven
         \scriptfont\stmaryrdfam \stmaryeight
-  \scriptscriptfont\stmaryrdfam \stmarysix}%
+  \scriptscriptfont\stmaryrdfam \stmarysix
+  \amselevenpoint
+}%
+\def\amselevenpoint{%
+          \textfont\msafam \elevenmsa
+        \scriptfont\msafam \eightmsa
+  \scriptscriptfont\msafam \sixmsa
+          \textfont\msbfam \elevenmsb
+        \scriptfont\msbfam \eightmsb
+  \scriptscriptfont\msbfam \sixmsb
+}%
 %
 \def\stmaryrdtwelvepoint{%
           \textfont\stmaryrdfam \stmarytwelve
         \scriptfont\stmaryrdfam \stmaryeight
-  \scriptscriptfont\stmaryrdfam \stmarysix}%
+  \scriptscriptfont\stmaryrdfam \stmarysix
+  \amstwelvepoint
+}%
+\def\amstwelvepoint{%
+          \textfont\msafam \twelvemsa
+        \scriptfont\msafam \eightmsa
+  \scriptscriptfont\msafam \sixmsa
+          \textfont\msbfam \twelvemsb
+        \scriptfont\msbfam \eightmsb
+  \scriptscriptfont\msbfam \sixmsb
+}%
+\let\amsboxdot\boxdot
+\let\amsbigtriangledown\bigtriangledown
+\let\amsbigtriangleup\bigtriangleup
 %
 \catcode`\@=11
 %
@@ -128,11 +195,8 @@
 \stm@rel  \supsetpluseq{47}%
 \stm@open \Lbag{48}%
 \stm@close\Rbag{49}%
-%
-% \def instead of \let in case amssym is loaded later
-\def\oast{\circledast}%
-\def\ocircle{\circledcirc}%
-%
+\edef\llbracket{\delimiter"4!4A!71}%
+\edef\rrbracket{\delimiter"5!4B!79}%
 \stm@open \llparenthesis{4C}%
 \stm@close\rrparenthesis{4D}%
 \stm@bin  \binampersand{4E}%
@@ -163,8 +227,8 @@
 \stm@op   \biginterleave{67}%
 \stm@op   \bignplus{70}%
 %
-\edef\llbracket{\delimiter"4!4A!71}%
-\edef\rrbracket{\delimiter"5!4B!79}%
+\let\oast\circledast         % msam "7E
+\let\ocircle\circledcirc     % msam "7D
 %
 \def\@tempa#1{%
   \def\varcopyright{%
@@ -185,5 +249,5 @@
 \def\longmapsfrom{\longleftarrow\mapsfromchar}%
 \def\Longmapsfrom{\Longleftarrow\Mapsfromchar}%
 %
-\restoreallcatcodes
+\restorestmarycatcodes
 \stmaryrdtenpoint