Cosmetics.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

protocol/key_components.svg

@@ -14,7 +14,7 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="key_components.svg">
+   sodipodi:docname="key_components.pdf">
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -30,8 +30,8 @@
      showgrid="false"
      inkscape:window-width="1860"
      inkscape:window-height="1200"
-     inkscape:window-x="123"
-     inkscape:window-y="77"
+     inkscape:window-x="122"
+     inkscape:window-y="76"
      inkscape:window-maximized="0" />
   <defs
      id="defs4">
@@ -170,7 +170,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -319,14 +319,14 @@
        sodipodi:linespacing="125%"
        id="text3850-3"
        y="910.59833"
-       x="15.441954"
+       x="43.299095"
        style="font-size:18px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Serif;-inkscape-font-specification:Serif Italic"
        xml:space="preserve"><tspan
          style="font-size:22px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Quattrocento;-inkscape-font-specification:Quattrocento Italic"
          y="910.59833"
-         x="15.441954"
+         x="43.299095"
          id="tspan3852-9"
-         sodipodi:role="line">Payment key</tspan></text>
+         sodipodi:role="line">Paying key</tspan></text>
     <text
        sodipodi:linespacing="125%"
        id="text3850-3-1"

protocol/protocol.tex

@@ -48,8 +48,8 @@
 \DefineBibliographyStrings{english}{
   page  = {page},
   pages = {pages},
-  backrefpage = {$\uparrow$ p\!},
-  backrefpages = {$\uparrow$ p\!}
+  backrefpage = {\mbox{$\uparrow$ p\!}},
+  backrefpages = {\mbox{$\uparrow$ p\!}}
 }
 
 \setlength{\oddsidemargin}{-0.25in}
@@ -376,7 +376,7 @@
 \newcommand{\EdDSAR}{\bytes{R}}
 \newcommand{\EdDSAS}{\bytes{S}}
 
-% merkle tree
+% Merkle tree
 \newcommand{\MerkleDepth}{\mathsf{d}}
 \newcommand{\MerkleNode}[2]{\mathsf{M}^{#1}_{#2}}
 \newcommand{\MerkleSibling}{\mathsf{sibling}}
@@ -384,7 +384,7 @@
 \newcommand{\MerkleHashLength}{\mathsf{\ell_{Merkle}}}
 \newcommand{\MerkleHash}{\bitseq{\MerkleHashLength}}
 
-% bitcoin
+% Bitcoin
 \newcommand{\vin}{\mathtt{vin}}
 \newcommand{\vout}{\mathtt{vout}}
 \newcommand{\nJoinSplit}{\mathtt{nJoinSplit}}
@@ -559,7 +559,7 @@ unspent valid \note, at a given point on the \blockchain, is one for which
 the \noteCommitment has been publicly revealed on the \blockchain prior to
 that point, but the \nullifier has not.
 
-\Transactions can contain ``transparent'' inputs, outputs, and scripts, which
+A \transaction can contain ``transparent'' inputs, outputs, and scripts, which
 all work basically as in \Bitcoin. They also contain a sequence of zero or
 more \joinSplitDescriptions. Each of these describes a \joinSplitTransfer\hairspace\footnote{
 \joinSplitTransfers in \Zcash generalize ``Mint'' and ``Pour'' \transactions
@@ -635,9 +635,9 @@ The notation $\range{a}{b}$ means the set of integers from $a$ through
 $b$ inclusive. $k\range{a}{b}$ means the set containing integers $kn$
 for all $n \in \range{a}{b}$.
 
-The notation $[f(x)$ for $x$ from $a$ up to $b]$ means the sequence
+The notation $[f(x)$ for $x$ from $a$ up to $b\,]$ means the sequence
 formed by evaluating $f$ on each integer from $a$ to $b$ inclusive, in
-ascending order. Similarly, $[f(x)$ for $x$ from $a$ down to $b]$ means
+ascending order. Similarly, $[f(x)$ for $x$ from $a$ down to $b\,]$ means
 the sequence formed by evaluating $f$ on each integer from $a$ to $b$
 inclusive, in descending order.
 
@@ -695,7 +695,7 @@ Arrows point from a component to any other component(s) that can be derived
 from it.
 
 \begin{center}
-\includegraphics[scale=.8]{key_components}
+\includegraphics[scale=.7]{key_components}
 \end{center}
 
 The composition of \paymentAddresses\changed{, \viewingKeys,} and \spendingKeys
@@ -727,7 +727,7 @@ hypothetical weakness in that cryptosystem.
 \nsubsection{\Notes}
 
 A \note (denoted $\NoteTuple{}$) is a tuple $\changed{(\AuthPublic, \Value,
-\NoteAddressRand, \NoteCommitRand)}$ which represents that a value $\Value$ is
+\NoteAddressRand, \NoteCommitRand)}$. It represents that a value $\Value$ is
 spendable by the recipient who holds the \spendingKey $\AuthPrivate$ corresponding
 to $\AuthPublic$, as described in the previous section.
 
@@ -1233,8 +1233,8 @@ as follows: for $0 \leq h < \MerkleDepth$ and $0 \leq i < 2^h$,
 A \merklePath from \merkleLeafNode $\MerkleNode{\MerkleDepth}{i}$ in the
 \incrementalMerkleTree is the sequence
 
-\hskip 2em $[\MerkleNode{h}{\MerkleSibling(h, i)} \text{ for }
-h \text{ from } \MerkleDepth \text{ down to } 1]$,
+\hskip 2em $[\hairspace\MerkleNode{h}{\MerkleSibling(h, i)} \text{ for }
+h \text{ from } \MerkleDepth \text{ down to } 1\hairspace]$,
 
 where
 
@@ -2168,8 +2168,7 @@ For a point $P \typecolon \GroupG{2} = (x_P, y_P)$:
   \item $P$ is encoded as $\Justthebox{\gtwobox}$.
 \end{itemize}
 
-\vspace{1ex}
-Non-normative notes:
+\subparagraph{Non-normative notes:}
 \begin{itemize}
   \item The use of big-endian byte order is different from the encoding
         of other integers in this protocol. The above encodings are consistent
@@ -2341,7 +2340,7 @@ Let $\ell := \frac{n}{k+1} + 1$.
 Let $m := \floor{\frac{512}{n}}$.
 
 Let $T := \concatbits([\GeneralCRH{n m}(\powtag, \powinput(g))$
-for $g$ from $0$ up to $\ceiling{\frac{N}{m}} - 1])$.
+for $g$ from $0$ up to $\ceiling{\frac{N}{m}} - 1\hairspace])$.
 
 % Blech. Dijkstra was right \cite{EWD831}.
 For $h \in \range{1}{N}$, let $X_h = T_{n(h-1)+1..nh}$.

protocol/zcash.bib

@@ -78,7 +78,7 @@ Last revised \mbox{May 19,} 2015.}
 }
 
 @misc{libsodium-Seal,
-   title={Sealed boxes \hspace{0.4em}---\hspace{0.4em} libsodium},
+   title={Sealed boxes \hspace{0.2em}---\hspace{0.2em} libsodium},
    url={https://download.libsodium.org/doc/public-key_cryptography/sealed_boxes.html},
    urldate={2016-02-01}
 }