Various tweaks.

diff --git a/configure.in b/configure.in
index 9fcf588..7b27bc1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.1 2002/02/19 23:27:57 mdw Exp $
+dnl $Id: configure.in,v 1.2 2003/09/06 11:25:28 mdw Exp $
 dnl
 dnl Configuration script for strayman
 dnl
@@ -28,12 +28,15 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.2  2003/09/06 11:25:28  mdw
+dnl Various tweaks.
+dnl
 dnl Revision 1.1  2002/02/19 23:27:57  mdw
 dnl Initial revision.
 dnl
 
 AC_INIT(strayman.ins)
-AM_INIT_AUTOMAKE(strayman, 1.1.0)
+AM_INIT_AUTOMAKE(strayman, 1.1.2)
 mdw_DIR_TEXMF
 AC_OUTPUT(Makefile)
 

diff --git a/strayman.dtx b/strayman.dtx
index 8e71a9a..0e5d830 100644 (file)
--- a/strayman.dtx
+++ b/strayman.dtx
@@ -1,6 +1,6 @@
 % \begin{meta-comment}
 %
-% $Id: strayman.dtx,v 1.2 2002/02/24 12:45:56 mdw Exp $
+% $Id: strayman.dtx,v 1.3 2003/09/06 11:25:28 mdw Exp $
 %
 % Document class for Straylight manuals
 %
@@ -9,6 +9,9 @@
 %----- Revision history -----------------------------------------------------
 %
 % $Log: strayman.dtx,v $
+% Revision 1.3  2003/09/06 11:25:28  mdw
+% Various tweaks.
+%
 % Revision 1.2  2002/02/24 12:45:56  mdw
 % Fix banners.
 %
@@ -54,10 +57,10 @@
 % \begin{meta-comment} <Package preamble>
 %<+strayman>\NeedsTeXFormat{LaTeX2e}
 %<+strayman>\ProvidesClass{strayman}
-%<+strayman>              [1996/03/26 1.05 Straylight document class]
+%<+strayman>              [2003/09/04 1.10 Straylight document class]
 % \end{meta-comment}
 %
-% \CheckSum{2919}
+% \CheckSum{2888}
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -560,7 +563,6 @@
 \newcommand\LARGE{\@setfontsize\LARGE\@xiipt\@xivpt\@setparskip}
 \newcommand\huge{\@setfontsize\huge\@xviipt{20}\@setparskip}
 \newcommand\Huge{\@setfontsize\Huge\@xxpt{26}\@setparskip}
-\newcommand\listingsize{\@setfontsize\listingsize\@viipt\@viiipt\@setparskip}
 %</8pt>
 %<*9pt>
 \newcommand\scriptsize{\@setfontsize\scriptsize\@vipt\@viipt\@setparskip}
@@ -570,7 +572,6 @@
 \newcommand\LARGE{\@setfontsize\LARGE\@xivpt{17}\@setparskip}
 \newcommand\huge{\@setfontsize\huge\@xviipt{20}\@setparskip}
 \newcommand\Huge{\@setfontsize\Huge\@xxpt{26}\@setparskip}
-\newcommand\listingsize{\@setfontsize\listingsize\@viipt\@viiipt\@setparskip}
 %</9pt>
 %<*10pt>
 \newcommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt\@setparskip}
@@ -580,7 +581,6 @@
 \newcommand\LARGE{\@setfontsize\LARGE\@xviipt{22}\@setparskip}
 \newcommand\huge{\@setfontsize\huge\@xxpt{25}\@setparskip}
 \newcommand\Huge{\@setfontsize\Huge\@xxvpt{30}\@setparskip}
-\newcommand\listingsize{\@setfontsize\listingsize\@viipt\@viiipt\@setparskip}
 %</10pt>
 %<*11pt>
 \newcommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}\@setparskip}
@@ -590,7 +590,6 @@
 \newcommand\LARGE{\@setfontsize\LARGE\@xviipt{22}\@setparskip}
 \newcommand\huge{\@setfontsize\huge\@xxpt{25}\@setparskip}
 \newcommand\Huge{\@setfontsize\Huge\@xxvpt{30}\@setparskip}
-\newcommand\listingsize{\@setfontsize\listingsize\@viiipt{9.5}\@setparskip}
 %</11pt>
 %<*12pt>
 \newcommand\scriptsize{\@setfontsize\scriptsize\@viiipt{9.5}\@setparskip}
@@ -600,8 +599,8 @@
 \newcommand\LARGE{\@setfontsize\LARGE\@xxpt{25}\@setparskip}
 \newcommand\huge{\@setfontsize\huge\@xxvpt{30}\@setparskip}
 \let\Huge\huge
-\newcommand\listingsize{\@setfontsize\listingsize\@viiipt{9.5}\@setparskip}
 %</12pt>
+%<+8pt|9pt|10pt|11pt|12pt>\let\listingsize\footnotesize
 %<*text>
 \def\scriptsize{\@setfontsize\scriptsize\@xpt\@xiipt\@setparskip}
 \let\tiny\scriptsize
@@ -1600,8 +1599,10 @@
 %
 %    \begin{macrocode}
 \if@article
-  \def\@topsect{\section*}
+  \def\@topsect@star{\section*}
+  \let\@topsect\section
 \else
+  \let\@topsect@star\chapter
   \let\@topsect\chapter
 \fi
 %    \end{macrocode}
@@ -1680,7 +1681,7 @@
   \leftmargin\leftmarginiii%
   \labelwidth\leftmarginiii%
     \advance\labelwidth-\labelsep%
-  \partopsep\p@\@plus\z@\@minus\p@%
+%  \partopsep\p@\@plus\z@\@minus\p@%
 }
 \def\@listiv{%
   \leftmargin\leftmarginiv%
@@ -1982,13 +1983,14 @@
 \abovecaptionskip10\p@
 \belowcaptionskip0\p@
 %
+\long\def\captionstyle#1#2{\itshape #1: #2}
 \long\def\@makecaption#1#2{%
   \vskip\abovecaptionskip%
-  \sbox\@tempboxa{#1: #2}%
+  \sbox\@tempboxa{\captionstyle{#1}{#2}}%
   \ifdim\wd\@tempboxa>\hsize%
-    #1: #2\par%
+    \unhbox\@tempboxa\par%
   \else%
-    \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
+    \hb@xt@\hsize{\hfil\unhbox\@tempboxa\hfil}%
   \fi%
   \vskip\belowcaptionskip%
 }
@@ -2048,19 +2050,15 @@
 % file, and then restore the old layout.
 %
 %    \begin{macrocode}
-\newcommand\tableofcontents{%
-  \if@twocolumn%
-    \@restonecoltrue%
-    \onecolumn%
-  \else%
-    \@restonecolfalse%
-  \fi%
-  \@topsect\contentsname%
-  {\parskip\z@\@starttoc{toc}}%
-  \if@restonecol%
-    \twocolumn%
-  \fi%
+\def\@tocthing#1#2{%
+  \@ifnextchar[{\@tocthing@i{#1}{#2}}{\@tocthing@i{#1}{#2}[\relax][\relax]}%
+}
+\def\@tocthing@i#1#2[#3][#4]{%
+  \if@twocolumn\@restonecoltrue\onecolumn\else\@restonecolfalse\fi%
+  \@topsect@star{#1}#3{\parskip\z@\@starttoc{#2}}#4%
+  \if@restonecol\twocolumn\fi%
 }
+\newcommand\tableofcontents{\@tocthing\contentsname{toc}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -2278,30 +2276,9 @@
 % These macros are terribly similar to the other ones.
 %
 %    \begin{macrocode}
-\newcommand\listoffigures{%
-  \if@twocolumn%
-    \@restonecoltrue\onecolumn%
-  \else%
-    \@restonecolfalse%
-  \fi%
-  \@topsect\listfigurename%
-  {\parskip\z@ \@starttoc{lof}}%
-  \if@restonecol\twocolumn\fi%
-}
-%
-\newcommand\l@figure{\@dottedtocline{1}{1.5em}{2.5em}}
-%
-\newcommand\listoftables{%
-  \if@twocolumn%
-    \@restonecoltrue\onecolumn%
-  \else%
-    \@restonecolfalse%
-  \fi%
-  \@topsect\listtablename%
-  {\parksip\z@ \@starttoc{lot}}%
-  \if@restonecol\twocolumn\fi%
-}
-%
+\newcommand\listoffigures{\@tocthing\listfigurename{lof}}
+\newcommand\l@figure{\@dottedtocline{0}{0pt}{2em}}
+\newcommand\listoftables{\@tocthing\listtablename{lot}}
 \let\l@table\l@figure
 %    \end{macrocode}
 %
@@ -2554,8 +2531,8 @@
 %
 %    \begin{macrocode}
 \newcommand\contentsname{Contents}
-\newcommand\listfigurename{List of Figures}
-\newcommand\listtablename{List of Tables}
+\newcommand\listfigurename{List of figures}
+\newcommand\listtablename{List of tables}
 \if@article\newcommand\bibname{References}
 \else\newcommand\bibname{Bibliography}\fi
 \newcommand\indexname{Index}