Add changes

1 files changed, 77 insertions, 22 deletions

diff --git a/lsr_env.tex b/lsr_env.tex
index e27681a..4ce5761 100644
--- a/lsr_env.tex
+++ b/lsr_env.tex
@@ -30,27 +30,28 @@
 %\setupalign[hz,hanging,nothyphenated]
 \setupalign[hz,hanging]
 \setuptolerance[stretch,tolerant]
+
 \setuplayout[
-  edgedistance=1cm,
-  backspace=2cm,
-  rightmargin=5cm,
-  leftmargin=0cm,
-  topspace=0cm,
-  header=2cm,
-  headerdistance=0.5cm,
-  width=fit,
-  height=fit,
+  backspace=3cm,
+  margin=2cm,
+  topspace=1.25cm,
+  header=1.25cm,
+  footer=1.25cm,
+  height=middle,
+  width=middle,
 ]
 
-%\setuplayout[
-%  backspace=3cm,
-%  margin=2cm,
-%  topspace=1.25cm,
-%  header=1.25cm,
-%  footer=1.25cm,
-%  height=middle,
-%  width=middle,
-%]
+\startsectionblockenvironment [backpart]
+\setuplayout[
+  backspace=3cm,
+  margin=2cm,
+  topspace=1.25cm,
+  header=1.25cm,
+  footer=1.25cm,
+  height=middle,
+  width=middle,
+]
+\stopsectionblockenvironment
 
 \startsectionblockenvironment [frontpart]
 \setuppagenumbering[location={footer,middle}]
@@ -67,17 +68,71 @@
   header=empty,
 ]
 
-\define[1]\marginhead{\margintitle[location=right]{\switchtobodyfont[36pt] #1}}
+\startMPinclusions
+  numeric ChapterPageDone[];
+\stopMPinclusions
+
+\startuseMPgraphic{chapterbackground}
+  StartPage;
+  n := \somenamedheadnumber{chapter}{current};
+
+  x := PaperWidth - BackSpace - RightMarginWidth - RightMarginDistance/2;
+  x2 := PaperWidth - BackSpace - 20;
+
+  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;;
+        ChapterPageDone[n] := 1 ;
+    else :
+      draw (x2,PaperHeight) -- (x2,PaperHeight-TopSpace+Header)
+    fi;
+  fi;
+  StopPage;
+\stopuseMPgraphic
+
+\define\PlaceFootnote
+  {\inrightmargin{\vtop{\placelocalnotes[footnote][before=,after=]}}}
+
+\setupnote
+  [footnote]
+  [location=text,
+   textstyle={\rmxx},
+   align={yes,tolerant},
+   next=\PlaceFootnote]
+
+\setupnotation
+  [footnote]
+  [alternative=serried]
+
+\defineoverlay[chapterbackground][\useMPgraphic{chapterbackground}]
+\setupbackgrounds[page][background=chapterbackground]
+
+\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]}]
 
 \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[{\someheadnumber[section][current] \getmarking[section]}][pagenumber]
-  \setupheader[text][style=smallcaps,after=\hrule]
+  \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,
@@ -153,7 +208,7 @@
 % ==========================================================================
 % Figure
 % ==========================================================================
-\setupcaptions[figure][location=bottom]
+\setupcaptions[figure][location={high,rightmargin},width=5cm,align={yes, tolerant},style=\rmx]
 
 \definefloat[subfigure][local=yes]
 \setupcaption[subfigure][numbercommand=\groupedcommand{(}{)},numberconversion=a,prefix=no,way=bytext]