plstmary (10may13)

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

5 files changed, 222 insertions, 110 deletions

diff --git a/Master/texmf-dist/doc/plain/plstmary/README b/Master/texmf-dist/doc/plain/plstmary/README
index 658abd2fe43..34b9340955f 100644
--- a/Master/texmf-dist/doc/plain/plstmary/README
+++ b/Master/texmf-dist/doc/plain/plstmary/README
@@ -3,40 +3,48 @@ plstmary: St. Mary's Road symbols for plainTeX
 
 LICENSE:
 
-The plstmary package is hereby placed in the public domain.
+  All files of the plstmary distribution (listed below) may be
+  distributed and/or modified under the conditions of the LaTeX Project
+  Public License, either version 1.3c of this license or (at your
+  option) any later version. The latest version of this license is in
+        http://www.latex-project.org/lppl.txt
+  and version 1.3c or later is part of all distributions of LaTeX
+  version 2008/12/01 or later.
+
+  While every effort has been made to make plstmary useful, it comes
+  with no warranty, expressed or implied.
 
 MANIFEST:
 
 The distribution consists of the files
 
-  * stmary.tex      Macros for producing the symbols in plain TeX.
-  * README          What you are reading now.
-  * plstmary.pdf    Documentation
-  * plstmary.tex    Documentation source.
+  * stmary.tex          Macros for use in plain TeX.
+  * README              What you are reading now.
+  * plstmary-doc.pdf    Documentation
+  * plstmary-doc.tex    Documentation source.
 
 DESCRIPTION:
 
-The commands used to produce the symbols are the same as those used in
-the stmaryrd package for LaTeX. Consult the documentation of that
-package for details not found in plstmary.pdf.
+(See plstmary-doc for more details.)
 
-By default, the symbols are provided for 10 point documents. Use one of
-the following commands to access a different size (9, 11, or 12 point).
-  \stmaryrdninepoint
-  \stmaryrdelevenpoint
-  \stmaryrdtwelvepoint
-The command \stmaryrdtenpoint restores the default if it has been
-changed.
+The command names used to produce the symbols are the same as those used
+in the stmaryrd package for LaTeX.
 
-If amsfonts are used, stmary.tex may redefine commands defined by
-amssym.tex. If you do not wish this to happen, input amssym.tex after
-stmary.tex.
+The file stmary.tex loads amssym.tex. Three of the commands defined in
+amssym.tex are redefined by stmary.tex, but the originals are saved
+under different names.
 
-VERSIONS:
+By default, the symbols are provided for use in 10 point documents.
+Commands for selecting different sizes are defined. These commands also
+affect the size of the AMS symbols, but have no effect on other math
+fonts nor on the text fonts.
 
-    0.4 -- 2013/04/16   Corrected \lbag, \Lbag, \binampersand and
+VERSIONS:
+    0.5 -- 2013/05/09   Autoloading of amssym, size changing for AMS
+                        fonts, and saving of changed AMS commands.
+    0.4 -- 2013/04/16   Correct \lbag, \Lbag, \binampersand and
                         \bindnasrepma
-    0.3 -- 2013/03/28   Reorganized internal macros,
+    0.3 -- 2013/03/28   Complete reorganization of internal macros,
     0.2 -- 2010/12/05   Typos corrected
     0.1 -- 2007/04/02   Initial version
 
diff --git a/Master/texmf-dist/doc/plain/plstmary/plstmary-doc.pdf b/Master/texmf-dist/doc/plain/plstmary/plstmary-doc.pdf
new file mode 100644
index 00000000000..12bcb5b13a6
--- /dev/null
+++ b/Master/texmf-dist/doc/plain/plstmary/plstmary-doc.pdf
diff --git a/Master/texmf-dist/doc/plain/plstmary/plstmary.tex b/Master/texmf-dist/doc/plain/plstmary/plstmary-doc.tex
index 6c9eb7902bf..3b3a8315a1e 100644
--- a/Master/texmf-dist/doc/plain/plstmary/plstmary.tex
+++ b/Master/texmf-dist/doc/plain/plstmary/plstmary-doc.tex
@@ -1,48 +1,56 @@
-\input amssym
 \input stmary
+\def\br{\hfil\break}
+\def\cmd#1{{\tt\string#1}}
 \font\headfont=cmr12
 \font\headsf=cmss12
-\hsize 6truein
-\hoffset .25in
-\def\!{\relax\ifmmode\mskip -\thinmuskip \else \negthinspace\fi}
 
 \centerline{\headsf plstmary: \headfont St.\ Mary's Road Font for Plain \TeX}
 \medskip
 \centerline{Dan Luecking}
-\centerline{\tt luecking \it \!at\/ \tt uark \it \!dot\/ \tt edu}
+\centerline{\tt luecking $\inplus$ uark $\boxdot$ edu}
 \bigskip
 
 \noindent The plstmary package provides plain TeX support for the St.\
 Mary's Road symbol font. After inputting the macro file {\tt
-stmary.tex}, all the symbols in the tables below become defined, except
-{\tt\string\oast} and {\tt\string\ocircle}. These two commands require
-that {\tt amssym.tex} be input. (They are the same symbols
-as {\tt\string\circledast} and {\tt\string\circledcirc}, defined in {\tt
-amssym.tex}. The point of defining them is to have matching
-`{\tt\string\o}\dots' and `{\tt\string\varo}\dots' pairs for all
-circles.)
-
-Some command names defined in the {\tt stmary.tex} overwrite command names
-in the {\tt amssym.tex}. If you wish to avoid that, you should load
-{\tt amssym.tex} after {\tt stmary.tex}.
+stmary.tex}, all the symbols in the tables below become defined. The two
+commands {\cmd\oast} and {\cmd\ocircle} require the AMS
+symbol font {\tt msam}, so {\tt stmary.tex} automatically inputs {\tt
+amssym.tex}. (These symbols are the same as {\cmd\circledast} and
+{\cmd\circledcirc}, defined in {\tt amssym.tex}. The point of
+defining them is to have matching `{\cmd\o}\dots' and
+`{\cmd\varo}\dots' pairs for all circles.)
 
 All the command names are the same as those in the LaTeX package
 {\tt stmaryrd.sty}. More details on the symbols and their usage may be found in
 the documentation of the LaTeX stmaryrd package.
 
+Some command names defined in the {\tt stmary.tex} overwrite command
+names in the {\tt amssym.tex}. The original definitions are stored in
+alternative commands. The affected commands are {\cmd\bigtriangledown},
+{\cmd\bigtriangleup} and {\cmd\boxdot}. The AMS versions are obtained
+with {\tt \string\amsbigtriangledown}, {\cmd\amsbigtriangleup} and
+{\cmd\amsboxdot}.
+
 The plstmary package allows minimal size changing. By default it
-produces symbols intended for ten point documents. It also supports nine,
-eleven, and twelve point documents. Use one of the following commands to
+produces symbols intended for ten point documents. It also supports
+eight, nine, eleven, and twelve point sizes. Use one of the following commands to
 change size:\hfil\break
-\indent{\tt \string\stmaryninepoint}\hfil\break
-\indent{\tt \string\stmaryelevenpoint}\hfil\break
-\indent{\tt \string\stmarytwelvepoint}\hfil\break
-You can use {\tt\string\stmarytenpoint} to restore the default if it has
-been changed.
+\indent{\cmd\stmaryrdeightpoint},\quad
+{\tt\ \string\stmaryrdninepoint},\br
+\indent{\cmd\stmaryrdelevenpoint},\quad
+{\cmd\stmaryrdtwelvepoint},\br
+\indent{\cmd\stmaryrdtenpoint} \ (to restore the default if it has been
+changed).\br
+These commands affect only the St.\ Mary Road symbols
+and, for convenience, the AMS fonts. They have no effect on the body
+text font nor on any other mathematical fonts. For changing the sizes of
+standard plain TeX fonts, you must either load a package for that
+purpose, of define your own macros.
 
 In order to get actual error-free output from these commands, one needs
-to have the St.\ Mary Road fonts installed, but they are available in
-all the major free TeX distributions: TeX Live, MiKTeX and MacTeX.
+to have the St.\ Mary Road fonts and the AMS fonts installed, but those
+are available in all the major free TeX distributions: TeX Live, MiKTeX
+and MacTeX.
 
 \bigskip
 \leftline{\bf Legal stuff}
@@ -56,7 +64,7 @@ authors.
 
 This plstmary package for plain TeX is hereby placed in the
 public domain. I am indebted to the creators of the fonts and of the
-stmaryrd LaTeX package. The file {\tt stmary.tex} is nothing but a
+stmaryrd LaTeX package. The file {\tt stmary.tex} is largely a
 reduction to plain TeX macros and TeX primitives of the code in {\tt
 stmaryrd.sty}.
 
@@ -66,7 +74,7 @@ stmaryrd.sty}.
 \medskip
 \noindent Some features of the LaTeX package have not been implemented
 in plstmary. For example, normally the symbol obtained with
-{\tt\string\oplus} has thin strokes while {\tt\string\varoplus} has
+{\cmd\oplus} has thin strokes while {\cmd\varoplus} has
 thicker strokes. The LaTeX package can be loaded with the {\tt
 heavycircles} option to reverse this for all the circled symbols. This
 is not implemented in plstmary. Also, the LaTeX package has the {\tt
@@ -74,24 +82,21 @@ only} option, allowing selected commands to be defined and no others.
 This is not implemented in plstmary.
 
 Also, I have made the following corrections (or possibly mistakes).
-(1)~In {\tt stmaryrd.sty}, the commands {\tt\string\lbag} and
-{\tt\string\rbag} are defined as binary operations, but the
+(1)~In {\tt stmaryrd.sty}, the commands {\cmd\lbag} and
+{\cmd\rbag} are defined as binary operations, but the
 documentation says they are delimiters. In {\tt stmary.tex}, I have
 defined them as delimiters. (2)~In {\tt stmaryrd.sty}, the commands
-{\tt\string\binampersand} and {\tt\string\bindnasrepma} are defined as
-delimiters, but their names clearly state that they are binary
-operations (and the stmaryrd package documentation does not list them
-among the delimiters). In {\tt stmary.tex}, I have defined them as
+{\cmd\binampersand} and {\cmd\bindnasrepma} are defined as
+delimiters, but their names clearly imply that they are intended to be
+binary operations (and the stmaryrd package documentation does not list
+them among the delimiters). In {\tt stmary.tex}, I have defined them as
 binary operations. I have no idea if I have chosen the correct usages
 for these four commands, and I would be happy to change them back if
 someone would let me know.
 
-
-\bigskip
-The tables start on the next page.
-
+\medskip
 \bigskip
-\vfil\eject
+\filbreak
 \halign{%
 \strut\quad\tt#\hfil\quad
 &             #\hfil\qquad
@@ -125,12 +130,16 @@ The tables start on the next page.
 &$\bbslash$\cr
  \string\moo
 &$\moo$
-&\string\boxast
-&$\boxast$\cr
- \string\boxbar
-&$\boxbar$
-&\string\boxdot
-&$\boxdot$\cr
+&\string\merge
+&$\merge$\cr
+ \string\nplus
+&$\nplus$
+&\string\boxbar
+&$\boxbar$\cr
+ \string\boxdot
+&$\boxdot$
+&\string\amsboxdot
+&$\amsboxdot$\cr
  \string\boxslash
 &$\boxslash$
 &\string\boxbslash
@@ -141,8 +150,8 @@ The tables start on the next page.
 &$\boxbox$\cr
  \string\boxempty
 &$\boxempty$
-&\string\merge
-&$\merge$\cr
+&\string\boxast
+&$\boxast$\cr
  \string\vartimes
 &$\vartimes$
 &\string\fatsemi
@@ -205,11 +214,11 @@ The tables start on the next page.
 &$\talloblong$\cr
  \string\interleave
 &$\interleave$
-&\string\nplus
-&$\nplus$\cr
-\noalign{\smallskip\hrule\smallskip}
+&&\cr
+\noalign{\smallskip\hrule}
 }
 
+\medskip
 \bigskip
 \filbreak
 \halign{%
@@ -218,8 +227,6 @@ The tables start on the next page.
 \bf Relations\hidewidth\cr
 \noalign{\smallskip\hrule\smallskip}
 %
-%
-%
  \string\inplus
 &$\inplus$
 &\string\niplus
@@ -260,6 +267,18 @@ The tables start on the next page.
 &$\ntrianglelefteqslant$
 &\string\ntrianglerighteqslant
 &$\ntrianglerighteqslant$\cr
+\noalign{\smallskip\hrule}
+}
+
+\medskip
+\bigskip
+\filbreak
+\halign{%
+\strut\quad  \tt#\hfil\quad & #\hfil\qquad
+           & \tt#\hfil\quad & #\hfil\enspace\cr
+\bf Arrows\hidewidth\cr
+\noalign{\smallskip\hrule\smallskip}
+%
  \string\leftrightarroweq
 &$\leftrightarroweq$
 &\string\shortrightarrow
@@ -284,20 +303,21 @@ The tables start on the next page.
 &$\longmapsfrom$
 &\string\Longmapsfrom
 &$\Longmapsfrom$\cr
-\noalign{\smallskip\hrule\smallskip}
+\noalign{\smallskip\hrule}
 }
 
+\medskip
 \bigskip
-\noindent The commands {\tt\string\arrownot} and {\tt\string\Arrownot}
+\noindent The commands {\cmd\arrownot} and {\cmd\Arrownot}
 can be placed in front of horizontal arrows to negate them:
-{\tt\string\arrownot\string\rightarrow} produces
+{\cmd\arrownot\cmd\rightarrow} produces
         $\arrownot\rightarrow$ and
-        {\tt\string\Arrownot\string\Rightarrow} produces
+        {\cmd\Arrownot\cmd\Rightarrow} produces
         $\Arrownot\Rightarrow$.
-For long arrows, there are {\tt\string\longarrownot} and
-{\tt\string\Longarrownot}.
-
-
+For long arrows, there are {\cmd\longarrownot}{\cmd\longrightarrow}:
+$\longarrownot\longrightarrow$ \ and {\cmd\Longarrownot}{\cmd\Longrightarrow}:
+                                $\Longarrownot\Longrightarrow$.
+\medskip
 \bigskip
 \filbreak
 \halign{%
@@ -309,6 +329,10 @@ For long arrows, there are {\tt\string\longarrownot} and
 &$\bigtriangledown$
 &\string\bigtriangleup
 &$\bigtriangleup$\cr
+ \string\amsbigtriangledown
+&$\amsbigtriangledown$
+&\string\amsbigtriangleup
+&$\amsbigtriangleup$\cr
  \string\bigcurlyvee
 &$\bigcurlyvee$
 &\string\bigcurlywedge
@@ -323,10 +347,10 @@ For long arrows, there are {\tt\string\longarrownot} and
 &$\biginterleave$\cr
  \string\bignplus
 &$\bignplus$\cr
-\noalign{\smallskip\hrule\smallskip}
+\noalign{\smallskip\hrule}
 }
 
-
+\medskip
 \bigskip
 \filbreak
 \halign{%
@@ -354,9 +378,10 @@ For long arrows, there are {\tt\string\longarrownot} and
 &$\llceil$
 &\string\rrceil
 &$\rrceil$\cr
-\noalign{\smallskip\hrule\smallskip}
+\noalign{\smallskip\hrule}
 }
 
+\medskip
 \bigskip
 \filbreak
 \halign{%
@@ -368,10 +393,12 @@ For long arrows, there are {\tt\string\longarrownot} and
 &$\llbracket$
 &\string\rrbracket
 &$\rrbracket$\cr
-\noalign{\smallskip\hrule\smallskip}
+\noalign{\smallskip\hrule}
 }
 
-Examples of extended double brackets:\quad
+\vskip-\baselineskip
+\noindent
+Examples of expanded double brackets:\quad
 $
 \left\llbracket \matrix{a\cr} \right\rrbracket\quad
 \left\llbracket \matrix{a\cr b\cr} \right\rrbracket\quad
@@ -381,7 +408,7 @@ $
 \left\llbracket \matrix{a\cr b\cr c\cr d\cr e\cr f\cr} \right\rrbracket
 $
 
-\bigskip
+\vskip-\baselineskip
 \filbreak
 \halign{%
 \strut\quad \tt#\hfil\quad & #\hfil\qquad
@@ -392,18 +419,31 @@ $
 &$\lightning$
 &\string\varcopyright
 &$\varcopyright$\cr
-\noalign{\smallskip\hrule\smallskip}
+\noalign{\smallskip\hrule}
 }
 
-\def\br{\hfil\break}
-\def\cmd#1{{\tt\string#1}}
+\medskip
+\bigskip
+\filbreak
+\noindent
+\leftline{\bf Size changing}
+
+\medskip\noindent
+{8pt: \stmaryrdeightpoint $\lbag x \inplus a \rbag \amsboxdot b$.\quad
+ 9pt: \stmaryrdninepoint$\lbag x \inplus a \rbag \amsboxdot b$.\quad
+10pt: \stmaryrdtenpoint$\lbag x \inplus a \rbag \amsboxdot b$.\quad
+11pt: \stmaryrdelevenpoint$\lbag x \inplus a \rbag \amsboxdot b$.\quad
+12pt: \stmaryrdtwelvepoint$\lbag x \inplus a \rbag \amsboxdot b$.}
+
 \bigskip
 \leftline{\bf Version history}
 
 \medskip
 \noindent
+    0.5 --- 2013/05/09\quad   Size changing for AMS, saving AMS
+                              definitions.\br
     0.4 --- 2013/04/16\quad   Corrected \cmd\lbag, \cmd\Lbag,
-                              \cmd\binampersand and \cmd\bindnasrepma\br
+                              \cmd\binampersand{} and \cmd\bindnasrepma\br
     0.3 --- 2013/03/28\quad   Reorganized internal macros\br
     0.2 --- 2010/12/05\quad   Typos corrected\br
     0.1 --- 2007/04/02\quad   Initial version
diff --git a/Master/texmf-dist/doc/plain/plstmary/plstmary.pdf b/Master/texmf-dist/doc/plain/plstmary/plstmary.pdf
deleted file mode 100644
index 951b60ba30c..00000000000
--- a/Master/texmf-dist/doc/plain/plstmary/plstmary.pdf
+++ /dev/null
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