Factor out duplication between note and example macros.

Author: zygoloid

source/layout.tex

@@ -32,14 +32,18 @@
 %%--------------------------------------------------
 %% Paragraph and bullet numbering
 
-\newcounter{Paras}
-\counterwithin{Paras}{chapter}
-\counterwithin{Paras}{section}
-\counterwithin{Paras}{subsection}
-\counterwithin{Paras}{subsubsection}
-\counterwithin{Paras}{paragraph}
-\counterwithin{Paras}{subparagraph}
+% create a new counter that resets for each new subclause
+\newcommand{\newsubclausecounter}[1]{
+\newcounter{#1}
+\counterwithin{#1}{chapter}
+\counterwithin{#1}{section}
+\counterwithin{#1}{subsection}
+\counterwithin{#1}{subsubsection}
+\counterwithin{#1}{paragraph}
+\counterwithin{#1}{subparagraph}
+}
 
+\newsubclausecounter{Paras}
 \newcounter{Bullets1}[Paras]
 \newcounter{Bullets2}[Bullets1]
 \newcounter{Bullets3}[Bullets2]

source/macros.tex

@@ -92,7 +92,7 @@
       \or\let\s=\subparagraph\let\l=\label
       \fi%
 \s[#3]{#3\hfill[#2]}\l{#2}\addxref{#2}%
-\setcounter{note}{0}\setcounter{example}{0}}
+}
 
 % A convenience feature (mostly for the convenience of the Project
 % Editor, to make it easy to move around large blocks of text):
@@ -267,16 +267,23 @@
 \newcommand{\leftshift}[1]{\ensuremath{\mathbin{\mathsf{lshift}_{#1}}}}
 
 %% Notes and examples
-\newcounter{note}
-\newcounter{example}
 \newcommand{\noteintro}[1]{[\textit{#1}:\space}
-\newcommand{\noteoutro}[1]{\textit{\,---\,end #1}\kern.5pt]}
-\newenvironment{note}[1][Note]
-{\par\small\addtocounter{note}{1}\noteintro{#1 \thenote}}
-{\noteoutro{note}\par}
-\newenvironment{example}[1][Example]
-{\par\small\addtocounter{example}{1}\noteintro{#1 \theexample}}
-{\noteoutro{example}\par}
+\newcommand{\noteoutro}[1]{\textit{\,---\,#1}\kern.5pt]}
+
+% \newnoteenvironment{ENVIRON}{BEGIN TEXT}{END TEXT}
+% Creates a note-like environment beginning with BEGIN TEXT and
+% ending with END TEXT. A counter with name ENVIRON indicates the
+% number of this kind of note / example that has occurred in this
+% subclause.
+\newcommand{\newnoteenvironment}[3]{
+\newsubclausecounter{#1}
+\newenvironment{#1}
+{\def\noteend{#3}\par\small\stepcounter{#1}\noteintro{#2}}
+{\noteoutro{\noteend}\par}
+}
+
+\newnoteenvironment{note}{Note \arabic{note}}{end note}
+\newnoteenvironment{example}{Example \arabic{example}}{end example}
 
 %% Library function descriptions
 \newcommand{\Fundescx}[1]{\textit{#1}}
@@ -624,11 +631,9 @@
 
 %%--------------------------------------------------
 %% Definitions section for "Terms and definitions"
-\newcounter{termnote}
 \newcommand{\nocontentsline}[3]{}
 \newcommand{\definition}[2]{%
 \addxref{#2}%
-\setcounter{termnote}{0}%
 \let\oldcontentsline\addcontentsline%
 \let\addcontentsline\nocontentsline%
 \ifcase\value{SectionDepth}
@@ -642,6 +647,4 @@
 \let\addcontentsline\oldcontentsline%
 }
 \newcommand{\defncontext}[1]{\textlangle#1\textrangle}
-\newenvironment{defnote}
-{\small\addtocounter{termnote}{1}\noteintro{Note \thetermnote{} to entry}}
-{\noteoutro{note}\space}
+\newnoteenvironment{defnote}{Note \arabic{defnote} to entry}{end note}