i've done a lot of work

1 files changed, 37 insertions, 21 deletions

diff --git a/cer/cer.tex b/cer/cer.tex
index a434386..7a60ab1 100644
--- a/cer/cer.tex
+++ b/cer/cer.tex
@@ -1,5 +1,6 @@
 \font\tinyx=cmr8 at 6pt \def\tiny{\tinyx \baselineskip=6pt}
 \font\headx=cmb8 at 9pt \def\head{\headx \baselineskip=9pt}
+\font\bigx=cmb14 \def\big{\bigx \baselineskip=14pt}
 
 \hoffset -0.5in
 \voffset -0.5in
@@ -22,8 +23,8 @@
 \vskip 2ex plus 0pt
 }
 
-\def\column#1#2{ %width %count %text=
-  \def\item##1{
+\long\def\column#1#2{ %width %count %text=
+  \long\def\item##1{
     \noindent \vrule \vbox{
       \hrule \hsize#1 ##1
       \hrule
@@ -32,9 +33,9 @@
   #2%
 }
 
-\def\row#1#2#3{ %width %count %text
+\long\def\row#1#2#3{ %width %count %text
   \count10=0
-  \def\item##1{
+  \long\def\item##1{
     \hskip 0.4em
     \vbox{
       \hsize #1 \smallskip
@@ -48,33 +49,48 @@
 \def\@question{}
 \def\question#1{\def\@question{#1}}
 \def\@claim{} \def\claim#1{\def\@claim{#1}}
-\def\@evidence{} \def\evidence#1{\def\@evidence{#1}}
-\def\@justification{} \def\justification#1{\def\@justification{#1}}
-\def\@data{} \def\@tablewidth{} \def\@columns{}
-\def\data#1#2#3{% columns, width, data 
-  \def\@columns{#1} \dimen1=#2\relax
-  \dimendef\@tablewidth=1
-  \def\@data{\noexpand{#3}}
+\long\def\@evidence{} \long\def\evidence#1{\def\@evidence{#1}}
+\long\def\@justification{} \long\def\justification#1{\def\@justification{#1}}
+
+\def\@data{} \dimendef\@tablewidth=1
+\def\data#1#2#3{
+  \dimen1=#2
+  \def\endlinex{\cr \noexpand\endliner}
+  \edef\@data{#3}
+  \def\preamb{#1}
 }
 
+%\def\cp#1{#1}
+%\def\preambloop{
+%  & \vrule \text{##}
+%  \advance \@columns by -1
+%  \ifnum \@columns>0 \span\preambloop \fi
+%}
+%\def\makepreamb{
+%  \vrule width 1pt \text{##}
+%  \advance \@columns by -1
+%  \ifnum \@columns>0 \span\preambloop \fi
+%  \vrule width 1pt \cr
+%}
+
 \def\makedata{
-  \def\text##1{\ \tiny \tolerance=10000 \hbadness=10000 \hbox to \@tablewidth{\vbox{\vskip1ex \noindent \hsize\@tablewidth ##1 \smallskip}} }
-  \halign{\def\endlinex{\cr \noalign{\hrule height 0.05pt}}\def\ampsub{&}\relax
-  \vrule width 1pt \text{##} & \vrule \text{##} \vrule width 1pt \cr %currently two columns but will need to be updated 
-    \noalign{\hrule height 1pt} \@data \noalign{\hrule height 1pt}
+  \def\text##1{\tiny \tolerance=10000 \hbadness=10000 \hbox to \@tablewidth{\hskip1em \vbox{\vskip1ex \noindent \advance \@tablewidth by -2.25em \hsize\@tablewidth ##1 \smallskip} \hskip1em} }
+  \def\endliner{\noalign{\hrule height 0.05pt}}
+  \halign{\span\preamb
+    \noalign{\hrule height 1pt}
+    \@data
+    \noalign{\hrule height 1pt}
   }
 }
 
-\def\pad#1{\smallskip #1 \smallskip}
-\def\parsub{\par}
-\def\makedoc{
+\long\def\pad#1{\smallskip #1 \smallskip}
+\long\def\makedoc{
   \column{7.4in}{
     \item{\pad{{\bf Question:} \@question}}
     \item{\pad{{\bf Claim:} \@claim}}
     \item{\row{3.6015in}{2}{
-      \item{ {\bf Evidence:} \parsub\parsub \noindent\makedata\parsub\smallskip \@evidence \smallskip}
-      \item{ {\bf Justification (Reasoning) of the Evidence:} \parsub \@justification \smallskip }
+      \item{ {\bf Evidence:}\par \noindent\makedata\par\smallskip \@evidence \smallskip}
+      \item{ {\bf Justification (Reasoning) of the Evidence:} \par\@justification \smallskip }
     }}
   }
 }
-