Add text to lsr

1 files changed, 129 insertions, 49 deletions

diff --git a/lsr_env.tex b/lsr_env.tex
index 4ce5761..d74cd82 100644
--- a/lsr_env.tex
+++ b/lsr_env.tex
@@ -18,6 +18,7 @@
     openaction=ToggleViewer,
     focus=width,
     click=yes,
+    style=\rm,
 ]
 %\placebookmarks[chapter,section,subsection,subsubsection][chapter,section]
 %\setupinteractionscreen[option=bookmark]
@@ -32,6 +33,19 @@
 \setuptolerance[stretch,tolerant]
 
 \setuplayout[
+  edgedistance=1cm,
+  backspace=2cm,
+  rightmargin=5cm,
+  leftmargin=0cm,
+  topspace=1cm,
+  header=1cm,
+  footer=1cm,
+  headerdistance=0.5cm,
+  width=fit,
+  height=fit,
+]
+
+\definelayout[wide][
   backspace=3cm,
   margin=2cm,
   topspace=1.25cm,
@@ -41,19 +55,36 @@
   width=middle,
 ]
 
+\setuphead[chapter][
+  style={\bfd},
+  header=empty,
+  align=flushright,
+  numbercommand=\marginhead,
+  after={\blank[4*line]},
+  before={\blank[2*line,force]},
+]
+
 \startsectionblockenvironment [backpart]
-\setuplayout[
-  backspace=3cm,
-  margin=2cm,
-  topspace=1.25cm,
-  header=1.25cm,
-  footer=1.25cm,
-  height=middle,
-  width=middle,
+\setuplayout[wide]
+\setupheads[chapter][
+  after=,
+  before=,
+  style={\bfd},
+  header=empty,
+  align=flushleft,
 ]
+\setuppagenumbering[location={footer,middle}]
 \stopsectionblockenvironment
 
 \startsectionblockenvironment [frontpart]
+\setuplayout[wide]
+\setupheads[chapter][
+  after=,
+  before=,
+  style={\bfd},
+  header=empty,
+  align=flushleft,
+]
 \setuppagenumbering[location={footer,middle}]
 \stopsectionblockenvironment
 
@@ -63,10 +94,6 @@
 % ==========================================================================
 % Headers
 % ==========================================================================
-\setuphead[chapter][
-  style={\bfd},
-  header=empty,
-]
 
 \startMPinclusions
   numeric ChapterPageDone[];
@@ -82,10 +109,10 @@
   if n > 0 : % ignore pages before the first chapter
     if unknown ChapterPageDone[n] : % This is the first page a new chapter
           draw (x,PaperHeight) -- (x,PaperHeight-TopSpace+Header-HeaderDistance-75)
-            withpen pencircle scaled 0.5mm;;
+            withpen pencircle scaled 0.5mm;
         ChapterPageDone[n] := 1 ;
     else :
-      draw (x2,PaperHeight) -- (x2,PaperHeight-TopSpace+Header)
+      draw (x2,PaperHeight) -- (x2,PaperHeight-TopSpace+Header);
     fi;
   fi;
   StopPage;
@@ -110,37 +137,17 @@
 
 \define[1]\marginhead{\margintitle[location=right]{\switchtobodyfont[30pt] #1}}
 
-\setuphead[section][style={\bfc}]
-\setuphead[subsection][style={\bfb}]
-\setuphead[subsubsection][style={\bfa},after={\blank[0.2cm]}]
+\setuphead[section][style={\bfb}]
+\setuphead[subsection][style={\bfa}]
+\setuphead[subsubsection][style={\bf},after={\blank[0.2cm]}]
+
+\setuppagenumbering[location=]
+\setuplabeltext[chapter=]
+\setupheadertexts[margin][][{{\it \getmarking[chapter]}\wordright{\pagenumber}}]
+\setupheadertexts[text][][{\someheadnumber[chapter][current]}]
+% \setupheader[text][style=smallcaps,after=\hrule]
+% \setupheader[margin][style=smallcaps]
 
-\startsectionblockenvironment [bodypart]
-\setuplayout[
-  edgedistance=1cm,
-  backspace=2cm,
-  rightmargin=5cm,
-  leftmargin=0cm,
-  topspace=1cm,
-  header=1cm,
-  footer=1cm,
-  headerdistance=0.5cm,
-  width=fit,
-  height=fit,
-]
-  \setuppagenumbering[location=]
-  \setuplabeltext[chapter=]
-  \setupheadertexts[margin][][{{\it \getmarking[chapter]}\wordright{\pagenumber}}]
-  \setupheadertexts[text][][{\someheadnumber[chapter][current]}]
-  %\setupheader[text][style=smallcaps,after=\hrule]
-  %\setupheader[margin][style=smallcaps]
-  \setuphead[chapter][
-    style={\bfd},
-    header=empty,
-    align=flushright,
-    numbercommand=\marginhead,
-    after={\blank[4*line]},
-    before={\blank[2*line,force]},
-  ]
 %\setuplabeltext[chapter=Chapter~]
 %\setuphead[chapter][
 %  style={\bfd},
@@ -150,6 +157,9 @@
 %  after={\blank[4*line]},
 %  before={\blank[4*big,force]},
 %]
+
+\startsectionblockenvironment [bodypart]
+\setuplayout[reset]
 \setcounter[userpage][1]
 \stopsectionblockenvironment
 
@@ -214,6 +224,15 @@
 \setupcaption[subfigure][numbercommand=\groupedcommand{(}{)},numberconversion=a,prefix=no,way=bytext]
 \setuplabeltext[subfigure=]
 
+\newdimen\LeftMarginSize
+\LeftMarginSize=\dimexpr \backspace + \rightmarginwidth + \rightmargindistance \relax
+\newdimen\TextAreaSize
+\TextAreaSize=\dimexpr \textwidth + \rightmarginwidth + \rightmargindistance \relax
+\definefloat[marginfigure][textmarginfigures]
+\setupfloat[marginfigure][location={inner},width=\TextAreaSize,number=figure]
+\setupcaptions[marginfigure][leftmargin=\dimexpr \LeftMarginSize / 2 \relax]
+\setuplabeltext[marginfigure=Figure~]
+
 %\definereferenceformat[sfig][left={\determineheadnumber[figure]\currentheadnumber.}]
 
 \appendvalue{stopplacefigure}{\resetcounter[subfigure]}
@@ -307,17 +326,17 @@
 
 \setupexternalfigures[location=default]
 
-\hyphenation{Comp-Cert}
-\hyphenation{Veri-cert}
-\hyphenation{Poly-Bench}
-\hyphenation{Leg-Up}
+\hyphenation{comp-cert}
+\hyphenation{veri-cert}
+\hyphenation{poly-bench}
+\hyphenation{leg-up}
 \hyphenation{straight-for-ward}
 \hyphenation{cor-re-la-tion}
 \hyphenation{gram-schmi-dt}
 \hyphenation{de-riche}
 
 \definedescription[desc][
-  headstyle=bold, style=normal, align=flushleft, alternative=hanging,
+  headstyle=bold, style=normal, align={yes,tolerant}, alternative=hanging,
   width=broad, margin=1cm]
 
 \definesynonyms[abbreviation][abbreviations][\infull]
@@ -329,7 +348,68 @@
 \abbreviation{DFG}{data-flow graph}
 \abbreviation{CFG}{control-flow graph}
 \abbreviation{CDFG}{control- and data-flow graph}
+\abbreviation{SDC}{system of difference constraints}
+\abbreviation{CNF}{conjunctive normal form}
+\abbreviation{SAT}{satisfiability}
+\abbreviation{SMT}{satisfiability modulo scheduling}
 
 \usemodule[gantt-s-tikz]
 
+\setupenumerations
+[ before={\blank[big]},
+  after={\blank[big]},
+  alternative=serried,
+  width=broad,
+  distance=0.5cm,
+  headstyle=bold,
+  titlestyle=bold,
+  way=bychapter,
+  conversion=numbers]
+
+\defineenumeration
+[thesis]
+[ text=Thesis,
+  number=no,
+  headalign=center,
+  alternative=top,
+  style=italic]
+
+\defineenumeration
+[theorem]
+[ text=Theorem,
+  title=yes,
+  style=italic,
+  list=all,
+  listtext={Theorem }]
+
+\defineenumeration
+[proof]
+[ text=Proof.,
+  number=no,
+  headstyle=italic,
+  title=no,
+  closesymbol={\mathematics{\square}},
+  style=normal]
+
+\defineenumeration
+[corollary]
+[ text=Corollary,
+  number=theorem,
+  list=all,
+  listtext={Corollary }]
+
+\defineenumeration
+[lemma]
+[ text=Corollary,
+  number=theorem,
+  list=all,
+  listtext={Lemma }]
+
+\definestartstop
+  [abstract]
+  [before={\midaligned{\bf Abstract}
+           \startnarrower[2*middle]},
+   after={\stopnarrower
+          \blank[big]}]
+
 \stopenvironment