Changeset 12309 for trunk/documents/theses/dstn/numberparagraphs.sty

Timestamp:

07/02/2009 06:21:32 PM (14 months ago)

Author:

dstn

Message:

still wrestling with stupid paragraph numbering

File:

• trunk/documents/theses/dstn/numberparagraphs.sty (modified) (3 diffs)

trunk/documents/theses/dstn/numberparagraphs.sty

@@ -57 +57 @@
 \usepackage{ifthen}
 
+%\renewcommand{\section}[2]{\ifthenelse{\equal{#1}{*}}%
+%  {\mysectionstar{#2}}%
+%  {\mysection{#1}}%
+%}
+
+\renewenvironment{figure}{%
+  \nonumberparagraphs%
+  \@float{figure}}{%
+  \numberparagraphs%
+  \end@float}
+
+
+%%% section
+
 \let\mypkg@@section\section
 
-\renewcommand{\section}[2]{\ifthenelse{\equal{#1}{*}}%
-  {\mysectionstar{*}{#2}}%
-  {\mysection{#1}}%
+\renewcommand{\section}{\@ifstar
+  \mysectionstar%
+  \mysection%
 }
 
-\newcommand{\mysectionstar}[2]{%
+\newcommand{\mysectionstar}[1]{%
   \ifdonumberparagraphs%
   \nonumberparagraphs%
-  \mypkg@@section*{#2}%
+  \mypkg@@section*{#1}%
   \numberparagraphs%
   \else%
-  \mypkg@@section*{#2}%
+  \mypkg@@section*{#1}%
   \fi}
 
@@ -82 +96 @@
   \fi}
 
+%%% subsection
+
+\let\mypkg@@subsection\subsection
+
+\renewcommand{\subsection}{\@ifstar
+  \mysubsectionstar%
+  \mysubsection%
+}
+
+\newcommand{\mysubsectionstar}[1]{%
+  \ifdonumberparagraphs%
+  \nonumberparagraphs%
+  \mypkg@@subsection*{#1}%
+  \numberparagraphs%
+  \else%
+  \mypkg@@subsection*{#1}%
+  \fi}
+
+\newcommand{\mysubsection}[1]{%
+  \ifdonumberparagraphs%
+  \nonumberparagraphs%
+  \mypkg@@subsection{#1}%
+  \numberparagraphs%
+  \else%
+  \mypkg@@subsection{#1}%
+  \fi}
 
 
 
+%%% chapter, chapter*
+
 \let\mypkg@@chapter\chapter
-\renewcommand{\chapter}[1]{\ifdonumberparagraphs%
+
+%\renewcommand{\chapter}[2]{\ifthenelse{\equal{#1}{*}}%
+%  {\mychapterstar{#2}}%
+%  {\mychapter{#1}}%
+%}
+
+%\renewcommand\chapter{\@dblarg\@mychapter}
+%\newcommand\@mychapter{%
+%  \@ifstar%
+%  \mychapterstar%
+%  \mychapter%
+%}
+
+\renewcommand{\chapter}{\@ifstar
+  \@dblarg\@mychapterstar%
+  \@dblarg\@mychapternostar%
+}
+
+%\def\@ifstar#1{\@ifnextchar *{\@firstoftwo{#1}}}
+
+%\long\def\@dblarg#1{\kernel@ifnextchar[{#1}{\@xdblarg{#1}}}
+%\long\def\@xdblarg#1#2{#1[{#2}]{#2}}
+
+
+%\renewcommand{\chapter}{\@dblarg\@mychapterx}
+%\newcommand{\@mychapterx}{\@ifstar
+%  \mychapterstar%
+%  \@mychapter%
+%}
+
+
+\comment{
+\newcommand{\mychapterstar}[1]{%
+  \ifdonumberparagraphs%
+  \nonumberparagraphs%
+  \mypkg@@chapter*{#1}%
+  \numberparagraphs%
+  \else%
+  \mypkg@@chapter*{#1}%
+  \fi}
+
+\newcommand{\mychapter}[1]{%
+  \ifdonumberparagraphs%
   \nonumberparagraphs%
   \mypkg@@chapter{#1}%
@@ -93 +177 @@
   \mypkg@@chapter{#1}%
   \fi}
+}
+
+\def\@mychapterstar[#1]#2{%
+  \ifdonumberparagraphs%
+  \nonumberparagraphs%
+  \mypkg@@chapter*[#1]{#2}%
+  \numberparagraphs%
+  \else%
+  \mypkg@@chapter*[#1]{#2}%
+  \fi}
+
+\def\@mychapternostar[#1]#2{%
+  \ifdonumberparagraphs%
+  \nonumberparagraphs%
+  \mypkg@@chapter[#1]{#2}%
+  \numberparagraphs%
+  \else%
+  \mypkg@@chapter[#1]{#2}%
+  \fi}