From b8d14be93379e4a61ccb6d06a7c30a39dfe44481 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Sat, 26 Jan 2008 19:33:42 +0000 Subject: [PATCH] strayman: Don't clobber the outer setting of \parsep. --- strayman.dtx | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/strayman.dtx b/strayman.dtx index aac12a1..d1327ba 100644 --- a/strayman.dtx +++ b/strayman.dtx @@ -35,7 +35,7 @@ %<+strayman> [2003/09/04 1.10 Straylight document class] % \end{meta-comment} % -% \CheckSum{3022} +% \CheckSum{3040} %% \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 @@ -56,7 +56,7 @@ % \begin{meta-comment} % %<*driver> -\documentclass[10pt,a4paper,times,cmtt]{strayman} +\documentclass[10pt,a4paper,book]{strayman} \input{mdwtools} \usepackage{mdwlist} \describesclass{strayman} @@ -139,17 +139,6 @@ % \item [\texttt{square} \| \texttt{rounded}] These options are passed % directly to the \package{syntax} package, when it's loaded. % -% \item [\texttt{helvetica}] Typeset headings in the Helvetica font, -% not in Computer Modern. -% -% \item [\texttt{palatino}] Typeset the main body text in Palatino, and -% headings in Helvetica. The |\tt| font is changed to Courier, but -% see the \texttt{cmtt} option. -% -% \item [\texttt{times}] Typeset the main body text in Times, and headings -% in Helvetica. The |\tt| font is changed to Courier, but see the -% \texttt{cmtt} option. -% % \end{description} % % @@ -196,15 +185,15 @@ %<*strayman> \newcommand\@ptsize{} \newif\if@restonecol\@restonecolfalse -\newif\if@titlepage\@titlepagetrue +\newif\if@titlepage\@titlepagefalse \newif\if@openright\@openrighttrue \newif\if@openbib\@openbibfalse \newif\if@appendix\@appendixfalse -\newif\if@article\@articlefalse +\newif\if@article\@articletrue \newif\if@offsetpages\@offsetpagestrue -\newif\if@numbering\@numberingfalse -\newif\if@herefloats\@herefloatstrue -\newif\if@runinsubsubsec\@runinsubsubsecfalse +\newif\if@numbering\@numberingtrue +\newif\if@herefloats\@herefloatsfalse +\newif\if@runinsubsubsec\@runinsubsubsectrue \newif\if@indentpar \newdimen\pagesurround \let\headfam\rmfamily @@ -288,12 +277,14 @@ \DeclareOption{fleqn}{\input{fleqn.clo}} \DeclareOption{openbib}{\@openbibtrue} \DeclareOption{article}{\@articletrue} +\DeclareOption{noarticle}{\@articlefalse} \DeclareOption{numbering}{\@numberingtrue} \DeclareOption{nonumbering}{\@numberingfalse} \DeclareOption{runinsubsubsec}{\@runinsubsubsectrue} \DeclareOption{noruninsubsubsec}{\@runinsubsubsecfalse} \DeclareOption{indentpar}{\@indentpartrue} \DeclareOption{noindentpar}{\@indentparfalse} +\DeclareOption{book}{\@titlepagetrue\@articlefalse} % \end{macrocode} % % \subsection{Set up the options} @@ -301,19 +292,26 @@ % We set up some default options, and then read the user's. % % \begin{macrocode} -\ExecuteOptions{a5paper,8pt,twoside,onecolumn,final,openright} +\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final} \ProcessOptions % \end{macrocode} % % If this is PDF\TeX\ then tell it the page bounds. % % \begin{macrocode} -\@ifundefined{pdfpageheight}{ - \relax -}{ +\newif\ifpdfing\pdfingfalse +\if1\ifx\pdfoutput\@@undefined@@0\else\the\pdfoutput\fi + \pdfingtrue +\fi +\ifpdfing \pdfpageheight\paperheight \pdfpagewidth\paperwidth -} + \AtEndOfClass{% + \RequirePackage[% + pdftex, bookmarks = true, bookmarksnumbered = true, bookmarksdepth = 3, + colorlinks = true, linkcolor = blue, breaklinks = true]{hyperref} + } +\fi % \end{macrocode} % % \subsection{Read in the text size option} @@ -1656,7 +1654,7 @@ \itemsep\z@% } \let\@listi\@listI -\@listi\topsep\parskip% +\@listi% \def\@listii{% \leftmargin\leftmarginii% \labelwidth\leftmarginii% -- 2.11.0