Merge branch 'modular'

6 files changed, 19 insertions, 15 deletions

diff --git a/README.md b/README.md
index 6109630..06fd8f6 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This repository comprises work and planning for Holden Rohrer, Holden Watson, an
 
 ## Structure
 
-TeX documents are used to create pdfs and should be compiled with `pdftex` in the main directory, as provided by your software distributor (e.g. MacTeX or TeX Live). Example:
+TeX documents are used to create pdfs and should be compiled with `pdftex` in their local directories, as provided by your software distributor (e.g. MacTeX or TeX Live). Example:
 
 ``
 pdftex main.tex
diff --git a/format.tex b/format.tex
index bcff360..f35624a 100644
--- a/format.tex
+++ b/format.tex
@@ -17,7 +17,7 @@
 \font\fourteenrm=cmr12 at 14pt
 \font\twelverm=cmr12
 
-%% Header
+%% Headers
 {\obeylines\parindent=0in
 Holden Rohrer, Holden Watson, and Nithya Jayakumar
 2019 Oct 21
@@ -25,9 +25,15 @@ Applied Combinatorics--Math 3012
 Livshyts
 \medskip
 }
+
+%% Sectioning
 \def\titlesub#1#2{\centerline{\fourteenbf #1}\centerline{#2}\bigskip}
 \newcount\sections \newcount\subsections
-\outer\def\section#1\par{\advance\sections by 1\thesection{#1}}
+\def\section#1\par{\advance\sections by 1\thesection{#1}}
 \def\thesection#1{\vskip .3\hsize\goodbreak\vskip -.3\hsize\bigskip\noindent{\fourteenrm\the\sections\ #1\bigskip}}
-\outer\def\subsection#1\par{\advance\subsections by 1\thesubsection{#1}}
+\def\subsection#1\par{\advance\subsections by 1\thesubsection{#1}}
 \def\thesubsection#1{\vskip .15\hsize\goodbreak\vskip -.15\hsize\medskip\noindent{\twelverm\the\sections.\the\subsections\ #1\medskip}}
+
+%% Modular Sections
+\def\include#1\par{\section #1\par\par\input #1\relax}
+\def\sinclude#1\par{\subsection #1\par\par\input #1\relax}
diff --git a/progress.tex b/progress/Overview.tex
index 47be42d..a6f57c0 100644
--- a/progress.tex
+++ b/progress/Overview.tex
@@ -1,16 +1,5 @@
-\input format
-\titlesub{Part 2: Progress Report}{Topic: Distributed Systems Integrity and Correctness}
-
-\section Overview
-
 There's a famous problem in computer science called the Two Generals' Problem. It follows two Roman camps on opposite sides of a valley, claimed by enemies. Each can send a scout to the other to decide when to attack---which is necessary because if either attacks alone he is guaranteed to lose---but there is no guarantee the scout will arrive. Clearly, one message cannot guarantee consensus between the two. But neither can thirty---or a billion. 
 
 This is global consensus in a distributed system, and is still an unsolved problem so far as such a problem can be ``solved.'' This is because it is intimately intertwined with novel technologies, starting with the internet and routing paths (even though it's about 50 years old), torrent software, the TOR network, server redundancy in commercial applications, and the almighty cryptocurrency. % Are all of them necessary? If so, long sentence.
 
 We want to review existing literature on the topic as well as practical applications of those principles (e.g. Bitcoin's consensus algorithm and its failures),\footnote{$^1$}{\link{https://bitcointalk.org/index.php?topic=702755.0}} so 
-
-\section Products
-
-In line with the project requirements, we are going to draw up 
-
-\bye
diff --git a/progress/Products.tex b/progress/Products.tex
new file mode 100644
index 0000000..8adc3d4
--- /dev/null
+++ b/progress/Products.tex
@@ -0,0 +1 @@
+In line with the project requirements, we intend to synthesize
diff --git a/progress/progress.pdf b/progress/progress.pdf
new file mode 100644
index 0000000..e897b86
--- /dev/null
+++ b/progress/progress.pdf
diff --git a/progress/progress.tex b/progress/progress.tex
new file mode 100644
index 0000000..dd92573
--- /dev/null
+++ b/progress/progress.tex
@@ -0,0 +1,8 @@
+\input ../format
+\titlesub{Part 2: Progress Report}{Topic: Distributed Systems Integrity and Correctness}
+
+\include Overview
+
+\include Products
+
+\bye