More work on all chapters

1 files changed, 81 insertions, 46 deletions

diff --git a/lsr_env.tex b/lsr_env.tex
index 86984e3..547f786 100644
--- a/lsr_env.tex
+++ b/lsr_env.tex
@@ -29,8 +29,8 @@
 \setuppapersize[A4][A4]
 \setupbodyfont[ebgaramondlato,11pt]
 %\setupalign[hz,hanging,nothyphenated]
-\setupalign[hz,hanging]
-\setuptolerance[stretch,tolerant]
+\setupalign[hz,hanging,lesshyphenation,verytolerant]
+\setupinterlinespace[big]
 
 \setuppagenumbering[location=none]
 
@@ -62,32 +62,31 @@
 ]
 
 \startsectionblockenvironment [backpart]
-
-\setuplayout[wide]
-\setupheads[chapter][
-  after={\blank[2*big]},
-  before={\blank[big,force]},
-  style={\bfd},
-  header=empty,
-  align=flushleft,
-]
-
-\setupfootertexts[pagenumber]
-
+  \setuplayout[wide]
+  \setupheads[chapter][
+    after={\blank[2*big]},
+    before={\blank[big,force]},
+    style={\bfd},
+    header=empty,
+    align=flushleft,
+  ]
+  \setupheadertexts[margin][][]
+  \setupheadertexts[text][][]
+  \setupfootertexts[pagenumber]
 \stopsectionblockenvironment
 
 \startsectionblockenvironment [frontpart]
-\setuplayout[wide]
-\setupheads[chapter][
-  after={\blank[2*big]},
-  before={\blank[big,force]},
-  style={\bfd},
-  header=empty,
-  align=flushleft,
-]
-
-\setupfootertexts[pagenumber]
-
+  \setuplayout[wide]
+  \setupheads[chapter][
+    after={\blank[2*big]},
+    before={\blank[big,force]},
+    style={\bfd},
+    header=empty,
+    align=flushleft,
+  ]
+  \setupheadertexts[margin][][]
+  \setupheadertexts[text][][]
+  \setupfootertexts[pagenumber]
 \stopsectionblockenvironment
 
 % @see http://wiki.contextgarden.net/Command/setuppagenumbering
@@ -157,12 +156,13 @@
 %  before={\blank[4*big,force]},
 %]
 
-\startsectionblockenvironment [bodypart]
-\setuplayout[reset]
-
 \setupheadertexts[margin][][{{\it \getmarking[chapter]}\wordright{\pagenumber}}]
 \setupheadertexts[text][][{\someheadnumber[chapter][current]}]
 
+\startsectionblockenvironment [bodypart]
+\setuplayout[reset]
+%\setupinterlinespace[3.8ex]
+
 \setcounter[userpage][1]
 \stopsectionblockenvironment
 
@@ -173,7 +173,7 @@
 % @see http://wiki.contextgarden.net/Command/setupindenting
 % @see http://wiki.contextgarden.net/Indentation
 % Indent all paragraph after all section headers.
-\setupindenting[yes,medium,next]
+\setupindenting[yes,medium]
 %\setupheads[section, subsection][
 %    indentnext=yes,
 %    numberwidth=1.27cm,
@@ -244,6 +244,7 @@
 % Abbreviation
 % ==========================================================================
 % @see https://tex.stackexchange.com/a/389791/141902
+
 \definehspace[abbrwidth][1em]
 \definesynonyms[abbreviation][abbreviations][\infull]
 \setupsynonyms[abbreviation][
@@ -254,6 +255,26 @@
     style={--\hspace[abbrwidth]},
     character=normal,
 ]
+\setupsynonyms[abbreviation][alternative=last]
+
+\abbreviation{SSA}{static single assignment}
+\abbreviation{GSA}{gated-SSA}
+\abbreviation{HDL}{hardware description language}
+\abbreviation{HLS}{high-level synthesis}
+\abbreviation{FPGA}{field-programmable gate array}
+\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}
+\abbreviation{DSP}{digital signal processing}
+\abbreviation{ITP}{interactive theorem prover}
+\abbreviation{FSMD}{finite-state machine with data-path}
+\abbreviation{II}{initiation interval}
+\abbreviation{ASAP}{as soon as possible}
+\abbreviation{ALAP}{as late as possible}
 
 % ==========================================================================
 % Appendices
@@ -313,6 +334,7 @@
 \definevimtyping [hlcoq] [syntax=coq]
 \definevimtyping [hlocaml] [syntax=ocaml]
 \definevimtyping [hlverilog] [syntax=verilog]
+\definevimtyping [hlC] [syntax=C]
 
 % ==========================================================================
 % Tikz
@@ -339,24 +361,25 @@
 \hyphenation{de-riche}
 
 \definedescription[desc][
-  headstyle=bold, style=normal, align={yes,tolerant}, alternative=hanging,
-  width=broad, margin=1cm]
+  headstyle=bold,
+  style=normal,
+  align={yes,tolerant},
+  alternative=hanging,
+  width=broad,
+  margin=0.5cm,
+  distance=0.25cm,
+  stretch=0.05,
+  shrink=0.05]
 
-\definesynonyms[abbreviation][abbreviations][\infull]
+\setupmargindata[stack=yes]
 
-\abbreviation{SSA}{single static assignment}
-\abbreviation{GSA}{gated-SSA}
-\abbreviation{HLS}{high-level synthesis}
-\abbreviation{FPGA}{field-programmable gate array}
-\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}
+\definemargindata[inrightm][right][
+  align={yes,verytolerant,stretch},
+  style={\rmx\setupinterlinespace[reset]},
+  width=\rightmarginwidth,
+]
 
-\define[1]\citef{\cite[#1]\footnote{\cite[entry][#1]}}
+\define[1]\citef{\cite[#1]\inrightm{\cite[entry][#1]\blank}}
 
 \usemodule[gantt-s-tikz]
 
@@ -369,14 +392,17 @@
   headstyle=bold,
   titlestyle=bold,
   way=bychapter,
-  conversion=numbers]
+  conversion=numbers,
+  stretch=0,
+  shrink=0]
 
 \defineenumeration
 [thesis]
 [ text=Thesis,
   number=no,
+  before={\blank[big]\startnarrower[middle]},
+  after={\stopnarrower\blank[big]},
   headalign=center,
-  alternative=top,
   style=italic]
 
 \defineenumeration
@@ -420,4 +446,13 @@
    after={\stopnarrower
           \blank[big]}]
 
+\setupnarrower[indentnext=no]
+
+\definestartstop
+  [synopsis]
+  [before={\blank[big]\startnarrower\startstyle[it]},
+   after={\stopstyle\stopnarrower\blank[big]\indenting[next]}]
+
+\setupfootnotes[align={stretch,verytolerant,hz,hanging,hyphenated}]
+
 \stopenvironment