Cleanup of old-style lists

diff --git a/ucwmac2.tex b/ucwmac2.tex
index e7c48e8287cdd64668dc1a59c42a210e01627f8a..bd4ffda22517a98fdfcabd2034df9591ab0ace0a 100644 (file)
--- a/ucwmac2.tex
+++ b/ucwmac2.tex
@@ -340,25 +340,47 @@
        \fi
 }
 
        \fi
 }
 

+\def\endlist{\par\endgroup\postitemize}
+
+% List styles
+\sdef{item:o}{\raise0.2ex\hbox{$\bullet$}}
+\sdef{item:O}{\raise0.2ex\hbox{$\circ$}}
+\sdef{item:*}{\raise0.2ex\hbox{$\ast$}}
+\sdef{item:-}{--}
+\sdef{item:.}{\raise0.2ex\hbox{$\cdot$}}
+\sdef{item:n}{\the\itemcount}
+\sdef{item:i}{\romannumeral\itemcount}
+\sdef{item:I}{\uppercase\expandafter{\romannumeral\itemcount}}
+\sdef{item:a}{\char\numexpr 96+\itemcount\relax}
+\sdef{item:A}{\char\numexpr 64+\itemcount\relax}
+\sdef{item:g}{$\ifcase\itemcount\or\alpha\or\beta\or\gamma\or\delta\or\epsilon\or
+\zeta\or\eta\or\theta\or\iota\or\kappa\or\lambda\or\mu\or\nu\or\xi\or\pi\or\rho
+\or\sigma\or\tau\or\upsilon\or\phi\or\chi\or\psi\or\omega\fi$}
+
+% List meta-styles
+\sdef{metaitem:=.}{\markerinner.}
+\sdef{metaitem:=)}{\markerinner)}
+\sdef{metaitem:(=)}{(\markerinner)}
+
+% Old-style lists
+

 \def\itemize#1{\inititemize\setbox\itembox\llap{#1\hskip\itemmarkerskip}%
 \let\:=\singleitem}
 
 \def\singleitem{\par\leavevmode\copy\itembox\ignorespaces}
 
 \def\itemize#1{\inititemize\setbox\itembox\llap{#1\hskip\itemmarkerskip}%
 \let\:=\singleitem}
 
 \def\singleitem{\par\leavevmode\copy\itembox\ignorespaces}
 

-\def\endlist{\par\endgroup\postitemize}
-
-% Markers for \itemize
-\def\ibull{\raise0.2ex\hbox{$\bullet$}}
-\def\idot{\raise0.2ex\hbox{$\cdot$}}
-\def\istar{\raise0.2ex\hbox{$\ast$}}
-

 \def\numlist#1{\inititemize\itemcount=0\let\:=\numbereditem
 \let\itemnumbering=#1}
 
 \def\numbereditem{\par\leavevmode\advance\itemcount by 1
 \llap{\itemnumbering\hskip\itemmarkerskip}\ignorespaces}
 
 \def\numlist#1{\inititemize\itemcount=0\let\:=\numbereditem
 \let\itemnumbering=#1}
 
 \def\numbereditem{\par\leavevmode\advance\itemcount by 1
 \llap{\itemnumbering\hskip\itemmarkerskip}\ignorespaces}
 

-% Numbering styles for \numlist
+% Old-style markers
+
+\def\ibull{\raise0.2ex\hbox{$\bullet$}}
+\def\idot{\raise0.2ex\hbox{$\cdot$}}
+\def\istar{\raise0.2ex\hbox{$\ast$}}
+

 \def\nnorm{\the\itemcount}
 \def\ndotted{\nnorm.}
 \def\nparen{\nnorm)}
 \def\nnorm{\the\itemcount}
 \def\ndotted{\nnorm.}
 \def\nparen{\nnorm)}


@@ -371,26 +393,6 @@
 \zeta\or\eta\or\theta\or\iota\or\kappa\or\lambda\or\mu\or\nu\or\xi\or\pi\or\rho
 \or\sigma\or\tau\or\upsilon\or\phi\or\chi\or\psi\or\omega\fi$)}
 
 \zeta\or\eta\or\theta\or\iota\or\kappa\or\lambda\or\mu\or\nu\or\xi\or\pi\or\rho
 \or\sigma\or\tau\or\upsilon\or\phi\or\chi\or\psi\or\omega\fi$)}
 

-% List styles
-\sdef{item:o}{\raise0.2ex\hbox{$\bullet$}}
-\sdef{item:O}{\raise0.2ex\hbox{$\circ$}}
-\sdef{item:*}{\raise0.2ex\hbox{$\ast$}}
-\sdef{item:-}{--}
-\sdef{item:.}{\raise0.2ex\hbox{$\cdot$}}
-\sdef{item:n}{\the\itemcount}
-\sdef{item:i}{\romannumeral\itemcount}
-\sdef{item:I}{\uppercase\expandafter{\romannumeral\itemcount}}
-\sdef{item:a}{\char\numexpr 96+\itemcount\relax}
-\sdef{item:A}{\char\numexpr 64+\itemcount\relax}
-\sdef{item:g}{$\ifcase\itemcount\or\alpha\or\beta\or\gamma\or\delta\or\epsilon\or
-\zeta\or\eta\or\theta\or\iota\or\kappa\or\lambda\or\mu\or\nu\or\xi\or\pi\or\rho
-\or\sigma\or\tau\or\upsilon\or\phi\or\chi\or\psi\or\omega\fi$}
-
-% List meta-styles
-\sdef{metaitem:=.}{\markerinner.}
-\sdef{metaitem:=)}{\markerinner)}
-\sdef{metaitem:(=)}{(\markerinner)}
-

 %%% Miscellanea %%%
 
 % {\I italic} with automatic italic correction
 %%% Miscellanea %%%
 
 % {\I italic} with automatic italic correction