mirror of https://github.com/zcash/zips.git
Refer to NU0 as Overwinter.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
parent
a04949caf3
commit
fad74d8574
|
@ -25,14 +25,14 @@ pvcpdf:
|
||||||
|
|
||||||
.PHONY: sapling
|
.PHONY: sapling
|
||||||
sapling:
|
sapling:
|
||||||
printf '\\toggletrue{issapling}\n\\renewcommand{\\docversion}{Version %s [NU0+Sapling]}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
|
printf '\\toggletrue{issapling}\n\\renewcommand{\\docversion}{Version %s [\\SaplingSpec]}' "$$(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.
|
# 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
|
rm -f sapling.aux sapling.bbl sapling.blg sapling.brf sapling.bcf
|
||||||
latexmk -bibtex -pdf -jobname=sapling protocol || { touch incremental_merkle.pdf; exit 1; }
|
latexmk -bibtex -pdf -jobname=sapling protocol || { touch incremental_merkle.pdf; exit 1; }
|
||||||
|
|
||||||
.PHONY: pvcsapling
|
.PHONY: pvcsapling
|
||||||
pvcsapling:
|
pvcsapling:
|
||||||
printf '\\toggletrue{issapling}\n\\renewcommand{\\docversion}{Version %s [NU0+Sapling]}' "$$(git describe --tags --abbrev=6)" |tee protocol.ver
|
printf '\\toggletrue{issapling}\n\\renewcommand{\\docversion}{Version %s [\\SaplingSpec]}' "$$(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.
|
# 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
|
rm -f sapling.aux sapling.bbl sapling.blg sapling.brf sapling.bcf
|
||||||
latexmk -bibtex -pdf -jobname=sapling -pvc protocol
|
latexmk -bibtex -pdf -jobname=sapling -pvc protocol
|
||||||
|
|
|
@ -88,6 +88,7 @@
|
||||||
\setlist[lines]{itemsep=-0.5ex,topsep=0ex,before=\vspace{1ex},leftmargin=1.5em,label=,after=\vspace{1ex}}
|
\setlist[lines]{itemsep=-0.5ex,topsep=0ex,before=\vspace{1ex},leftmargin=1.5em,label=,after=\vspace{1ex}}
|
||||||
|
|
||||||
\newcommand{\docversion}{Version unavailable (check protocol.ver)}
|
\newcommand{\docversion}{Version unavailable (check protocol.ver)}
|
||||||
|
\newcommand{\SaplingSpec}{Overwinter+Sapling}
|
||||||
\newtoggle{issapling}
|
\newtoggle{issapling}
|
||||||
\togglefalse{issapling}
|
\togglefalse{issapling}
|
||||||
\InputIfFileExists{protocol.ver}{}{}
|
\InputIfFileExists{protocol.ver}{}{}
|
||||||
|
@ -210,7 +211,7 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
|
||||||
\newcommand{\Zerocash}{\termbf{Zerocash}}
|
\newcommand{\Zerocash}{\termbf{Zerocash}}
|
||||||
\newcommand{\Sprout}{\notsprout{\termbf{Sprout}}}
|
\newcommand{\Sprout}{\notsprout{\termbf{Sprout}}}
|
||||||
\newcommand{\Sapling}{\termbf{Sapling}}
|
\newcommand{\Sapling}{\termbf{Sapling}}
|
||||||
\newcommand{\NUZero}{\termbf{NU0}}
|
\newcommand{\NUZero}{\termbf{Overwinter}}
|
||||||
\newcommand{\Bitcoin}{\termbf{Bitcoin}}
|
\newcommand{\Bitcoin}{\termbf{Bitcoin}}
|
||||||
\newcommand{\CryptoNote}{\termbf{CryptoNote}}
|
\newcommand{\CryptoNote}{\termbf{CryptoNote}}
|
||||||
\newcommand{\ZEC}{\termbf{ZEC}}
|
\newcommand{\ZEC}{\termbf{ZEC}}
|
||||||
|
|
Loading…
Reference in New Issue