zec
/
zips
mirror of https://github.com/zcash/zips.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make the Blossom spec the default. 

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2019-08-23 15:25:37 +01:00
parent c62ebaa504
commit 6a92b3459e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
protocol/Makefile
View File

@ -49,7 +49,6 @@ auxsapling:
sapling:
$(MAKE) auxsapling
mv -f aux/sapling.pdf .
cp -f sapling.pdf protocol.pdf
.PHONY: pvcsapling
pvcsapling:
@ -69,6 +68,7 @@ auxblossom:
blossom:
$(MAKE) auxblossom
mv -f aux/blossom.pdf .
cp -f blossom.pdf protocol.pdf
.PHONY: pvcblossom
pvcblossom:
@ -100,7 +100,6 @@ nolatexmk-sapling:
$(LATEX) -jobname=sapling protocol.tex || { touch incremental_merkle.png; exit 1; }
sh mymakeindex.sh -o sapling.ind sapling.idx
$(LATEX) -jobname=sapling protocol.tex || { touch incremental_merkle.png; exit 1; }
cp -f sapling.pdf protocol.pdf
.PHONY: nolatexmk-blossom
nolatexmk-blossom:
@ -113,6 +112,7 @@ nolatexmk-blossom:
$(LATEX) -jobname=blossom protocol.tex || { touch incremental_merkle.png; exit 1; }
sh mymakeindex.sh -o blossom.ind blossom.idx
$(LATEX) -jobname=blossom protocol.tex || { touch incremental_merkle.png; exit 1; }
cp -f blossom.pdf protocol.pdf
.PHONY: clean
clean:
@ -128,4 +128,4 @@ clean:
blossom.idx blossom.ilg blossom.ind blossom.ind.original
.PHONY: all
all: sapling sprout blossom
all: blossom sapling sprout

7
protocol/protocol.tex
View File

@ -520,15 +520,14 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
\newcommand{\blossom}[1]{\texorpdfstring{{\setblossom{#1}}}{#1}}
\newcommand{\notblossom}[1]{}
\newcommand{\notbeforeblossom}[1]{#1}
\pagecolor{magenta!4}
\newcommand{\baseurl}{https://zips.z.cash/protocol/blossom.pdf}
\newcommand{\baseurl}{https://zips.z.cash/protocol/protocol.pdf}
} {
\newcommand{\setblossom}{}
\newcommand{\blossom}[1]{}
\newcommand{\notblossom}[1]{#1}
\newcommand{\notbeforeblossom}[1]{}
\iftoggle{issapling}{
\newcommand{\baseurl}{https://zips.z.cash/protocol/protocol.pdf}
\newcommand{\baseurl}{https://zips.z.cash/protocol/sapling.pdf}
} {
\newcommand{\baseurl}{https://zips.z.cash/protocol/sprout.pdf}
}
@ -542,7 +541,6 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
\newcommand{\setoverwinter}{\color{\overwintercolor}}
\newcommand{\overwinter}[1]{\texorpdfstring{{\setoverwinter{#1}}}{#1}}
\newcommand{\optSprout}[1]{{#1}^\mathsf{Sprout}}
%\pagecolor{yellow!3}
} {
\newcommand{\sprout}[1]{#1}
\newcommand{\notsprout}[1]{}
@ -10206,6 +10204,7 @@ Peter Newell's illustration of the Jubjub bird, from \cite{Carroll1902}.
\item Remove ``optimized'' \texttt{Makefile} targets (which actually produced
a larger PDF, with TeXLive 2019).
\item Remove ``html'' \texttt{Makefile} targets.
\item Make the \Blossom spec the default.
\end{itemize}
\historyentry{2019.0.4}{2019-07-23}