US-1 Add numbering for bullets. Bullets are numbered within the surrounding

paragraph or bullet, not within the relevant bulleted list, so that numbers are
unique. The main text formatting is unchanged; bullet numbers are placed in the
left margin, just like paragraph numbers.

Also fixes #177.

Author: zygoloid

source/layout.tex

@@ -21,19 +21,37 @@
 \checkandfixthelayout
 
 %%--------------------------------------------------
-%% Paragraph numbering
+%% Paragraph and bullet numbering
+
 \newcounter{Paras}
 \counterwithin{Paras}{chapter}
 \counterwithin{Paras}{section}
 \counterwithin{Paras}{subsection}
 \counterwithin{Paras}{subsubsection}
 \counterwithin{Paras}{paragraph}
 \counterwithin{Paras}{subparagraph}
+
+\newcounter{Bullets1}[Paras]
+\newcounter{Bullets2}[Bullets1]
+\newcounter{Bullets3}[Bullets2]
+\newcounter{Bullets4}[Bullets3]
+
 \makeatletter
-\def\pnum{\addtocounter{Paras}{1}\noindent\llap{{%
-  \scriptsize\raisebox{.7ex}{\arabic{Paras}}}\hspace{\@totalleftmargin}\quad}}
+\newcommand{\parabullnum}[2]{%
+\stepcounter{#1}%
+\noindent\makebox[0pt][l]{\makebox[#2][r]{%
+\scriptsize\raisebox{.7ex}%
+{\arabic{Paras}%
+\ifnum \value{Bullets1}>0 .\arabic{Bullets1}%
+\ifnum \value{Bullets2}>0 .\arabic{Bullets2}%
+\ifnum \value{Bullets3}>0 .\arabic{Bullets3}%
+\fi\fi\fi}%
+\hspace{\@totalleftmargin}\quad%
+}}}
 \makeatother
 
+\def\pnum{\parabullnum{Paras}{0pt}}
+
 % Leave more room for section numbers in TOC
 \cftsetindents{section}{1.5em}{3.0em}
 

source/styles.tex

@@ -129,11 +129,12 @@
 }
 
 %%--------------------------------------------------
-%% change list item markers to em-dash
-\renewcommand{\labelitemi}{---}
-\renewcommand{\labelitemii}{---}
-\renewcommand{\labelitemiii}{---}
-\renewcommand{\labelitemiv}{---}
+%% change list item markers to number and em-dash
+
+\renewcommand{\labelitemi}{---\parabullnum{Bullets1}{\labelsep}}
+\renewcommand{\labelitemii}{---\parabullnum{Bullets2}{\labelsep}}
+\renewcommand{\labelitemiii}{---\parabullnum{Bullets3}{\labelsep}}
+\renewcommand{\labelitemiv}{---\parabullnum{Bullets4}{\labelsep}}
 
 %%--------------------------------------------------
 %% set section numbering limit, toc limit