add reviews pdf

paper/.gitignore

 CSM.thm
 tweetverif.tex
+!tweetverif-USENIX.pdf 
\ No newline at end of file

paper/Makefile

 TEX := $(filter-out tweetverif.tex,$(wildcard *.tex))
 FILES := $(TEX) $(wildcard tikz/*.tex) $(wildcard *.sty)
+REVIEWS := $(filter-out _reviews.tex,$(TEX)) $(wildcard _reviews/*.tex) $(wildcard *.sty)
 
 NO_COLOR="\033[0m"
 RED = "\033[38;5;009m"
@@ -15,21 +16,20 @@ BRIGHTRED = "\033[91m"
 BOLD = "\033[1m"
 
 
+all: tweetverif.pdf reviews.pdf
+
+
+# main pdf
 tweetverif.pdf: FORCE tweetverif.tex tweetnacl.diff
 	@echo $(BOLD)$(LIGHTPURPLE)"Building tweetverif.pdf"$(NO_COLOR)$(DARKGRAY)
 	python3 latexrun.py tweetverif.tex
 
+# main tex
 tweetverif.tex: FORCE $(FILES) collection.bib
 	@echo $(BOLD)$(YELLOW)"Generating tweetverif.tex"$(NO_COLOR)$(DARKGRAY)
 	python3 gen.py tweetverif.tex
 
-specs_map.pdf: FORCE _files.tex
-	@echo $(BOLD)$(LIGHTPURPLE)"Building specs_map.pdf"$(NO_COLOR)$(DARKGRAY)
-	python3 latexrun.py _files.tex
-	@echo $(BOLD)$(ORANGE)"Moving specs_map.pdf to ../"$(NO_COLOR)$(DARKGRAY)
-	@mv _files.pdf ../specs_map.pdf
-
-
+# list dependencies
 depend:
 	@for f in $(FILES) ; do \
 		echo $$f; \
@@ -37,6 +37,7 @@ depend:
 
 .PHONY: clean FORCE
 
+# generate diff between verified code and reference code
 tweetnacl.diff:
 	@echo $(BOLD)$(YELLOW)"Generating tweetnacl.diff"$(NO_COLOR)$(DARKGRAY)
 	diff -u ../proofs/vst/c/tweetnacl.c ../proofs/vst/c/tweetnaclVerifiableC.c > tweetnacl.diff.tmp; [ $$? -eq 1 ]
@@ -46,10 +47,14 @@ tweetnacl.diff:
 	cat tweetnacl.diff.tmp >> tweetnacl.diff
 	rm tweetnacl.diff.tmp
 
+
+
+
 clean:
 	@echo $(BOLD)$(RED)"cleaning..."$(NO_COLOR)
 	@rm -fr latex.out 2> /dev/null || true
-	@rm *.pdf 2> /dev/null || true
+	@rm tweetverif.pdf 2> /dev/null || true
+	@rm reviews.pdf 2> /dev/null || true
 	@rm *.aux 2> /dev/null || true
 	@rm *.bbl 2> /dev/null || true
 	@rm *.blg 2> /dev/null || true
@@ -64,8 +69,36 @@ clean:
 	@rm */*.aux 2> /dev/null || true
 	@rm tweetverif.tex 2> /dev/null || true
 	@rm tweetnacl.diff 2> /dev/null || true
+	@rm _reviews.tex 2> /dev/null || true
 
+# CHECK SPELLING
 spell:
 	@for f in $(TEX) ; do \
 		aspell -t -c $$f; \
 	done
+
+
+# Bunch of other pdfs
+feedback.pdf:
+	@echo $(BOLD)$(LIGHTPURPLE)"Building feedback.pdf"$(NO_COLOR)$(DARKGRAY)
+	python3 latexrun.py _includes/_feedback.tex
+	@mv _feedback.pdf feedback.pdf
+
+reviews.pdf: FORCE _reviews.tex _tpl_reviews.tex $(REVIEWS)
+	@echo $(BOLD)$(LIGHTPURPLE)"Building reviews.pdf"$(NO_COLOR)$(DARKGRAY)
+	python3 latexrun.py _reviews.tex
+	@mv _reviews.pdf reviews.pdf
+	
+_reviews.tex: FORCE _tpl_reviews.tex $(REVIEWS)
+	@echo $(BOLD)$(YELLOW)"Generating _reviews.tex"$(NO_COLOR)$(DARKGRAY)
+	python3 gen_reviews.py _reviews.tex
+
+
+# SPEC MAPS
+specs_map.pdf: FORCE _files.tex
+	@echo $(BOLD)$(LIGHTPURPLE)"Building specs_map.pdf"$(NO_COLOR)$(DARKGRAY)
+	python3 latexrun.py _files.tex
+	@echo $(BOLD)$(ORANGE)"Moving specs_map.pdf to ../"$(NO_COLOR)$(DARKGRAY)
+	@mv _files.pdf ../specs_map.pdf
+
+

paper/_reviews.tex

+\documentclass{article}
+\usepackage[a4paper, total={6in, 8in}]{geometry}
+
+\newif\ifusenix
+\newif\ifacm
+\newif\ifieee
+\newif\ifpublic
+
+\usenixfalse
+\acmfalse
+\ieeetrue
+
+\usepackage[final]{pdfpages}
+
+\usepackage{epsfig}
+\usepackage{setup}
+
+\input{_macros}
+
+\begin{document}
+
+\input{_todo}
+
+%don't want date printed
+\date{}
+
+\input{_reviews/A4_reviews-Usenix.tex}
+\input{_reviews/A4_reviews-UsenixA.tex}
+\input{_reviews/A4_reviews-UsenixB.tex}
+\input{_reviews/A4_reviews-UsenixC.tex}
+\input{_reviews/A4_reviews-UsenixD.tex}
+\input{_reviews/A4_reviews-UsenixE.tex}
+\input{_reviews/A4_reviews-UsenixF.tex}
+\input{_reviews/A4_reviews-UsenixG.tex}
+
+\newpage
+\pagestyle{empty}
+
+\includepdf[pages=1,pagecommand=\label{paper:usenix}]{tweetverif-USENIX.pdf}
+\includepdf[pages=2-]{tweetverif-USENIX.pdf}
+
+\end{document}

paper/_reviews/A4_reviews-Usenix.tex

-\newpage
-~\\
-\newpage
-
-\section{Prior reviews (Usenix Security 2020)}
-\label{appendix:past-reviews2}
-
-This paper has been submitted to Usenix Security 2020.
+This Paper has been submitted to IEEE S\&P on Oct 1st, 2019 and to Usenix Security 2020 on February 15, 2020.
 
 We thank and really appreciate the reviewers who took time to provide us with
 such detailed feedback.
 
+As follows, the reader will find the previous reviews in addition to our answers.
+From page \pageref{paper:usenix} of this document we provide our previous submission to Usenix Security, including our answers to the IEEE S\&P reviewers.
+
+

paper/_reviews/A4_reviews-UsenixA.tex

-\subsection{Usenix Security 2020 Review \#324A}
+\newpage
+\section{Usenix Security 2020 Review \#324A}
 
 \begin{tabular}{rl}
     \toprule

paper/_reviews/A4_reviews-UsenixB.tex

 \newpage
-\subsection{Usenix Security 2020 Review \#324B}
+\section{Usenix Security 2020 Review \#324B}
 
 \begin{tabular}{rl}
     \toprule

paper/_reviews/A4_reviews-UsenixC.tex

 \newpage
-\subsection{Usenix Security 2020 Review \#324C}
+\section{Usenix Security 2020 Review \#324C}
 
 \begin{tabular}{rl}
     \toprule

paper/_reviews/A4_reviews-UsenixD.tex

 \newpage
-\subsection{Usenix Security 2020 Review \#324D}
+\section{Usenix Security 2020 Review \#324D}
 
 \begin{tabular}{rl}
     \toprule

paper/_reviews/A4_reviews-UsenixE.tex

 \newpage
-\subsection{Usenix Security 2020 Review \#324E}
+\section{Usenix Security 2020 Review \#324E}
 
 \begin{tabular}{rl}
     \toprule

paper/_reviews/A4_reviews-UsenixF.tex

 \newpage
-\subsection{Usenix Security 2020 Review \#324F}
+\section{Usenix Security 2020 Review \#324F}
 
 \begin{tabular}{rl}
     \toprule

paper/_reviews/A4_reviews-UsenixG.tex

 \newpage
-\subsection{Usenix Security 2020 Review \#324G}
+\section{Usenix Security 2020 Review \#324G}
 
 \begin{tabular}{rl}
     \toprule

paper/_tpl_reviews.tex

+\documentclass{article}
+\usepackage[a4paper, total={6in, 8in}]{geometry}
+
+\newif\ifusenix
+\newif\ifacm
+\newif\ifieee
+\newif\ifpublic
+
+\usenixfalse
+\acmfalse
+\ieeetrue
+
+\usepackage[final]{pdfpages}
+
+\usepackage{epsfig}
+\usepackage{setup}
+
+\input{_macros}
+
+\begin{document}
+
+\input{_todo}
+
+%don't want date printed
+\date{}
+
+\intput{main}
+
+\newpage
+\pagestyle{empty}
+
+\includepdf[pages=1,pagecommand=\label{paper:usenix}]{tweetverif-USENIX.pdf}
+\includepdf[pages=2-]{tweetverif-USENIX.pdf}
+
+\end{document}

paper/gen.py

@@ -14,7 +14,7 @@ def save(fn, z):
     d.close()
 
 def read(fn):
-    data = '';
+    data = ''
     with open(fn, 'r', encoding="utf-8") as file:
         data = file.read()
     return data
@@ -43,9 +43,6 @@ def check_tex(s):
         raise argparse.ArgumentTypeError(msg)
     return s
 
-
-
-
 def parse_arguments():
     parser = argparse.ArgumentParser(description='Generate paper.')
     parser.add_argument('input', nargs=1, default='', help='input: paper.tex', type=check_tex)
@@ -58,10 +55,7 @@ def main():
     fn = parse_arguments()
 
     files = [x for x in glob.glob("**/*.tex", recursive=True) if not is_ignored(x) and is_tex(x) and not (x == fn) and is_not_tikz(x)]
-
-    # for f in files:
-    #     print(f)
-
+    
     main = [x for x in files if not is_appendix(x)]
     appendices = [x for x in files if is_appendix(x)]
 

paper/gen_reviews.py

+#!/usr/bin/env python3
+
+import os
+import glob
+import argparse
+from string import Template
+
+
+
+def save(fn, z):
+    # print(z)
+    d = open(fn, 'w', encoding="utf-8")
+    d.write(z)
+    d.close()
+
+def read(fn):
+    data = ''
+    with open(fn, 'r', encoding="utf-8") as file:
+        data = file.read()
+    return data
+
+
+
+def is_tex(fn):
+    return fn[-4:] == '.tex'
+
+def is_ignored(fn):
+    return fn[0:1] == '_'
+def is_appendix(fn):
+    return fn[0:1] == 'A'
+
+
+
+def is_not_tex(s):
+    return s != '' and s[-4:] != '.tex'
+
+def is_not_tikz(s):
+    return "tikz/" not in s
+
+def check_tex(s):
+    if is_not_tex(s):
+        msg = "%r is not a .tex" % s
+        raise argparse.ArgumentTypeError(msg)
+    return s
+
+
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(description='Generate paper.')
+    parser.add_argument('input', nargs=1, default='', help='input: paper.tex', type=check_tex)
+    args = parser.parse_args()
+
+    return args.input[0]
+
+def main():
+
+    fn = parse_arguments()
+
+    files = [x for x in glob.glob("_reviews/*.tex", recursive=True) if is_tex(x) and not (x == fn) and is_not_tikz(x)]
+
+    # for f in files:
+    #     print(f)
+
+    files.sort()
+
+    main_output = ''
+    for f in files:
+        main_output += "\\input{{{}}}\n".format(f)
+
+    appendix_output = ''
+
+    output = read('_tpl' + fn)
+    output = output.replace('\\intput{main}\n', '$main_output')
+    output = Template(output)
+    output = output.safe_substitute(main_output = main_output, appendix_output = appendix_output)
+    # print(output)
+
+    save(fn, output)
+
+main()