Work in progress.

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

protocol/Makefile

@@ -1,19 +1,40 @@
 protocol.pdf: protocol.tex zcash.bib incremental_merkle.pdf key_components.pdf
 	$(MAKE) pdf
 
-LATEX=pdflatex
+sapling.pdf: protocol.tex zcash.bib incremental_merkle.pdf key_components.pdf
+	$(MAKE) sapling
 
 .PHONY: pdf
 pdf:
 	printf '\\renewcommand{\\docversion}{Version %s}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
-	# If $(LATEX) fails, touch an input so that 'make' won't think it is up-to-date next time.
+	# If latexmk fails, touch an input so that 'make' won't think it is up-to-date next time.
 	rm -f protocol.aux protocol.bbl protocol.blg protocol.brf protocol.bcf
-	$(LATEX) protocol.tex || { touch incremental_merkle.pdf; exit 1; }
-	biber protocol
-	$(LATEX) protocol.tex || { touch incremental_merkle.pdf; exit 1; }
-	$(LATEX) protocol.tex || { touch incremental_merkle.pdf; exit 1; }
-	$(LATEX) protocol.tex || { touch incremental_merkle.pdf; exit 1; }
+	latexmk -bibtex -pdf protocol || { touch incremental_merkle.pdf; exit 1; }
+
+.PHONY: pvcpdf
+pvcpdf:
+	printf '\\renewcommand{\\docversion}{Version %s}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
+	# If latexmk fails, touch an input so that 'make' won't think it is up-to-date next time.
+	rm -f protocol.aux protocol.bbl protocol.blg protocol.brf protocol.bcf
+	latexmk -bibtex -pdf -pvc protocol
+
+.PHONY: sapling
+sapling:
+	printf '\\toggletrue{issapling}\n\\renewcommand{\\docversion}{Version %s [Sapling]}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
+	# If latexmk fails, touch an input so that 'make' won't think it is up-to-date next time.
+	rm -f sapling.aux sapling.bbl sapling.blg sapling.brf sapling.bcf
+	latexmk -bibtex -pdf -jobname=sapling protocol || { touch incremental_merkle.pdf; exit 1; }
+
+.PHONY: pvcsapling
+pvcsapling:
+	printf '\\toggletrue{issapling}\n\\renewcommand{\\docversion}{Version %s [Sapling]}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
+	# If latexmk fails, touch an input so that 'make' won't think it is up-to-date next time.
+	rm -f sapling.aux sapling.bbl sapling.blg sapling.brf sapling.bcf
+	latexmk -bibtex -pdf -jobname=sapling -pvc protocol
 
 .PHONY: clean
 clean:
-	rm -f protocol.dvi protocol.pdf protocol.bbl protocol.blg protocol.brf protocol.toc protocol.aux protocol.out protocol.log protocol.bcf protocol.run.xml protocol.ver
+	rm -f protocol.dvi protocol.pdf protocol.bbl protocol.blg protocol.brf     protocol.toc \
+              protocol.aux protocol.out protocol.log protocol.bcf protocol.run.xml protocol.ver \
+              sapling.dvi  sapling.pdf  sapling.bbl  sapling.blg  sapling.brf      sapling.toc \
+              sapling.aux  sapling.out  sapling.log  sapling.bcf  sapling.run.xml

protocol/protocol.ver

@@ -1 +1,2 @@
-\renewcommand{\docversion}{Version 2017.0-beta-2.7}
+\toggletrue{issapling}
+\renewcommand{\docversion}{Version 2017.0-beta-2.7-2-g260895 [Sapling]}

protocol/zcash.bib

@@ -59,6 +59,13 @@ Lecture Notes in Computer Science; Springer, 2013.},
    urldate={2016-09-01}
 }
 
+@misc{Bowe2017,
+   author={Sean Bowe},
+   title={ebfull/pairing source code, BLS12-381 -- README.md as of commit e726600},
+   url={https://github.com/ebfull/pairing/tree/e72660056e00c93d6b054dfb08ff34a1c67cb799/src/bls12_381},
+   urldate={2017-07-16}
+}
+
 @misc{BGG2016,
    author={Sean Bowe and Ariel Gabizon and Matthew Green},
    title={A multi-party protocol for constructing the public parameters of the {P}inocchio zk-{SNARK}},
@@ -196,9 +203,10 @@ Received \mbox{March 20,} 2012.}
    urldate={2016-08-14}
 }
 
+% I was unable to find a way to make this MAEÁ2010 ☹
 @inproceedings{MAEA2010,
-   author={V. Gayoso Mart{\'i}nez and F. Hern{\'a}ndez Alvarez and
-L. Hern{\'a}ndez Encinas and C. S{\'a}nchez {\'A}vila},
+   author={V. Gayoso Martínez and F. Hernández Alvarez and
+L. Hernández Encinas and C. Sánchez Ávila},
    title={A {C}omparison of the {S}tandardized {V}ersions of {ECIES}},
    booktitle={Proceedings of Sixth International Conference on Information Assurance and Security,
 23--25 August 2010, Atlanta, GA, USA. ISBN: 978-1-4244-7407-3},
@@ -228,7 +236,7 @@ L. Hern{\'a}ndez Encinas and C. S{\'a}nchez {\'A}vila},
 }
 
 @misc{BDEHR2011,
-   author={Johannes Buchmann and Erik Dahmen and Sarah Ereth and Andreas H{\"u}lsing and Markus R{\"u}ckert},
+   author={Johannes Buchmann and Erik Dahmen and Sarah Ereth and Andreas Hülsing and Markus Rückert},
    title={On the {S}ecurity of the {W}internitz {O}ne-{T}ime {S}ignature {S}cheme (full version)},
    url={https://eprint.iacr.org/2011/191},
    urldate={2016-09-05},
@@ -239,66 +247,66 @@ Received \mbox{April 13,} 2011.}
 @misc{vanS2014,
    author={Nicolas van Saberhagen},
    title={CryptoNote v 2.0},
-   note={Date disputed.},
+   note={Date falsified.},
    url={https://cryptonote.org/whitepaper.pdf},
    urldate={2016-08-17},
 }
 
-@misc{Bitcoin-Base58,
+@misc{Bitc-Base58,
    title={Base58{C}heck encoding --- {B}itcoin {W}iki},
    url={https://en.bitcoin.it/wiki/Base58Check_encoding},
    urldate={2016-01-26}
 }
 
-@misc{Bitcoin-secp256k1,
+@misc{Bitc-secp256k1,
    title={Secp256k1 --- {B}itcoin {W}iki},
    url={https://en.bitcoin.it/wiki/Secp256k1},
    urldate={2016-03-14}
 }
 
-@misc{Bitcoin-CoinJoin,
+@misc{Bitc-CoinJoin,
    title={Coin{J}oin --- {B}itcoin {W}iki},
    url={https://en.bitcoin.it/wiki/CoinJoin},
    urldate={2016-08-17}
 }
 
-@misc{Bitcoin-Format,
+@misc{Bitc-Format,
    title={Raw {T}ransaction {F}ormat --- {B}itcoin {D}eveloper {R}eference},
    url={https://bitcoin.org/en/developer-reference#raw-transaction-format},
    urldate={2016-03-15}
 }
 
-@misc{Bitcoin-Block,
+@misc{Bitc-Block,
    title={Block {H}eaders --- {B}itcoin {D}eveloper {R}eference},
    url={https://bitcoin.org/en/developer-reference#block-headers},
    urldate={2017-04-25}
 }
 
-@misc{Bitcoin-nBits,
+@misc{Bitc-nBits,
    title={Target n{B}its --- {B}itcoin {D}eveloper {R}eference},
    url={https://bitcoin.org/en/developer-reference#target-nbits},
    urldate={2016-08-13}
 }
 
-@misc{Bitcoin-Multisig,
+@misc{Bitc-Multisig,
    title={P2SH multisig (definition) --- {B}itcoin {D}eveloper {R}eference},
    url={https://bitcoin.org/en/developer-guide#term-p2sh-multisig},
    urldate={2016-08-19}
 }
 
-@misc{Bitcoin-P2SH,
+@misc{Bitc-P2SH,
    title={P2SH (definition) --- {B}itcoin {D}eveloper {R}eference},
    url={https://bitcoin.org/en/developer-guide#term-p2sh},
    urldate={2016-08-24}
 }
 
-@misc{Bitcoin-P2PKH,
+@misc{Bitc-P2PKH,
    title={P2PKH (definition) -- {B}itcoin {D}eveloper {R}eference},
    url={https://bitcoin.org/en/developer-guide#term-p2pkh},
    urldate={2016-08-24}
 }
 
-@misc{Bitcoin-Protocol,
+@misc{Bitc-Protocol,
    title={Protocol documentation --- {B}itcoin {W}iki},
    url={https://en.bitcoin.it/wiki/Protocol_documentation},
    urldate={2016-10-02}
@@ -346,8 +354,8 @@ Received \mbox{April 13,} 2011.}
 
 @misc{BIP-31,
    author={Mike Hearn},
-   title={Pong message},
-   howpublished={Bitcoin Improvement Proposal 31. Created April 11, 2012},
+   title={Pong\, message},
+   howpublished={Bitcoin\, Improvement\, Proposal\, 31.\; Created\, April\, 11,\, 2012},
    url={https://github.com/bitcoin/bips/blob/master/bip-0031.mediawiki},
    urldate={2016-10-02}
 }