From 8f3da545eaa430c490a92af72401daf28e1f32d7 Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Sun, 17 Dec 2017 00:10:47 +0000
Subject: [PATCH] Cosmetics.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 protocol/protocol.tex | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/protocol/protocol.tex b/protocol/protocol.tex
index d98c4766..d027201f 100644
--- a/protocol/protocol.tex
+++ b/protocol/protocol.tex
@@ -138,7 +138,7 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
 
 \mathchardef\mhyphen="2D
 
-% http://tex.stackexchange.com/a/309445/78411
+% https://tex.stackexchange.com/a/309445/78411
 \DeclareFontFamily{U}{FdSymbolA}{}
 \DeclareFontShape{U}{FdSymbolA}{m}{n}{
     <-> s*[.4] FdSymbolA-Regular
@@ -865,22 +865,22 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
 
 \newcommand{\consensusrule}[1]{\needspace{3ex}\subparagraph{Consensus rule:}{#1}}
 \newenvironment{consensusrules}{\introlist\subparagraph{Consensus rules:}\begin{itemize}}{\end{itemize}}
-\newcommand{\sproutonlyitem}[1]{\item \sapling{[\Sprout only]\,} {#1}}
-\newcommand{\saplingonlyitem}[1]{\sprout{}\sapling{\item {[\Sapling only]}\, {#1}}}
-\newcommand{\prenuzeroitem}[1]{\sprout{}\sapling{\item {[Pre-\NUZero]}\, {#1}}}
-\newcommand{\nuzeroonlyitem}[1]{\sprout{}\sapling{\item {[\NUZero only]}\, {#1}}}
-\newcommand{\sproutonly}[1]{\sapling{[\Sprout only]\,} {#1}}
+\newcommand{\sproutonlyitem}[1]{\item \notsprout{[\Sprout only]\,} {#1}}
+\newcommand{\saplingonlyitem}[1]{\sapling{\item {[\Sapling only]}\, {#1}}}
+\newcommand{\prenuzeroitem}[1]{\item \notsprout{[Pre-\NUZero]\,} {#1}}
+\newcommand{\nuzeroonlyitem}[1]{\nuzero{\item {[\NUZero only]}\, {#1}}}
+\newcommand{\sproutonly}[1]{\notsprout{[\Sprout only]\,} {#1}}
 \newcommand{\saplingonly}[1]{\sapling{[\Sapling only]\, {#1}}}
-\newcommand{\prenuzero}[1]{\sapling{[Pre-\NUZero]\, {#1}}}
-\newcommand{\nuzeroonly}[1]{\sapling{[\NUZero only]\, {#1}}}
+\newcommand{\prenuzero}[1]{\notsprout{[Pre-\NUZero]\,} {#1}}
+\newcommand{\nuzeroonly}[1]{\nuzero{[\NUZero only]\, {#1}}}
 
 \newcommand{\securityrequirement}[1]{\needspace{3ex}\subparagraph{Security requirement:}{#1}}
 \newenvironment{securityrequirements}{\introlist\subparagraph{Security requirements:}\begin{itemize}}{\end{itemize}}
 \newcommand{\pnote}[1]{\subparagraph{Note:}{#1}}
 \newenvironment{pnotes}{\introlist\subparagraph{Notes:}\begin{itemize}}{\end{itemize}}
-\newcommand{\sproutonlypnote}[1]{\sapling{[\Sprout only]\,\,} \textbf{Note:\,} {#1}}
-\newcommand{\prenuzeropnote}[1]{\sapling{[Pre-\NUZero]\,\,} \textbf{Note:\,} {#1}}
-\newcommand{\nuzeroonlypnote}[1]{\sapling{[\NUZero only]\,\,} \textbf{Note:\,} {#1}}
+\newcommand{\sproutonlypnote}[1]{\notsprout{[\Sprout only]\,\,} \textbf{Note:\,} {#1}}
+\newcommand{\prenuzeropnote}[1]{\notsprout{[Pre-\NUZero]\,\,} \textbf{Note:\,} {#1}}
+\newcommand{\nuzeroonlypnote}[1]{\nuzero{[\NUZero only]\,\,} \textbf{Note:\,} {#1}}
 
 \newcommand{\affiliation}{\hairspace$^\dagger$\;}
 
@@ -2002,9 +2002,9 @@ When this sequence is non-empty, the \transaction also includes encodings of a
 $\JoinSplitSig$ public verification key and signature.
 
 \introlist
-Each \joinSplitDescription consists of $(\vpubOld, \vpubNew, \rt,
-\nfOld{\allOld}, \cmNew{\allNew}, \EphemeralPublic, \RandomSeed,
-\h{\allOld}, \ProofSproutJoinSplit, \TransmitCiphertext{\allNew})$
+A \joinSplitDescription consists of $(\vpubOld, \vpubNew, \rt, \nfOld{\allOld},
+\cmNew{\allNew}, \EphemeralPublic, \RandomSeed, \h{\allOld}, \ProofSproutJoinSplit,
+\TransmitCiphertext{\allNew})$
 
 where
 \begin{itemize}
@@ -2220,7 +2220,7 @@ $\h{i} = \PRFpk{\AuthPrivateOld{i}}(i, \hSig)$.
 
 \sproutonly{
 The correctness of $\h{\allOld}$ is enforced by the \joinSplitStatement
-specified in \crossref{sproutnonmalleablejs}. This ensures that a holder of
+given in \crossref{sproutnonmalleablejs}. This ensures that a holder of
 all of the $\AuthPrivateOld{\allOld}$ for every \joinSplitDescription in the
 \transaction has authorized the use of the private signing key corresponding
 to $\joinSplitPubKey$ to sign this \transaction.
@@ -4668,8 +4668,8 @@ adversary.)
 The $\NoteAddressRand$ value for each output \note is then derived from
 a random private seed $\NoteAddressPreRand$ and $\hSig$ using
 $\PRFrho{\NoteAddressPreRand}$. The correct construction of
-$\NoteAddressRand$ for each output \note is enforced by the \joinSplitStatement
-(\crossref{sproutuniquerho}).
+$\NoteAddressRand$ for each output \note is enforced by
+\crossref{sproutuniquerho} in the \joinSplitStatement.
 }
 
 \sproutonly{
@@ -5005,6 +5005,7 @@ The errors in the proof of Ledger Indistinguishability mentioned in
     \item Refer to $\TransmitPrivate$ as a \receivingKey rather than as a
           viewing key.
     \item Updates for \incomingViewingKey support.
+    \nuzero{\item{Refer to Network Upgrade 0 as \NUZero.}}
 \end{itemize}
 
 \introlist
@@ -5013,7 +5014,7 @@ The errors in the proof of Ledger Indistinguishability mentioned in
 \begin{itemize}
     \item Correct the non-normative note describing how to check the order
           of $\Proof{B}$.
-    \saplingonlyitem{Initial version of draft \Sapling protocol specification.}
+    \sapling{\item{Initial version of draft \Sapling protocol specification.}}
 \end{itemize}
 
 \introlist