summaryrefslogtreecommitdiffstats
path: root/lsr_env.tex
diff options
context:
space:
mode:
Diffstat (limited to 'lsr_env.tex')
-rw-r--r--lsr_env.tex27
1 files changed, 21 insertions, 6 deletions
diff --git a/lsr_env.tex b/lsr_env.tex
index 0f6c356..bb83171 100644
--- a/lsr_env.tex
+++ b/lsr_env.tex
@@ -217,24 +217,39 @@
%\writetolist[headers]{}{Chapter \hfill Title \hfill Page}
% @see https://tex.stackexchange.com/a/243726
-\setupcaptions[table][location=top]
+\setupcaptions[table][location=top,default=top]
% ==========================================================================
% Figure
% ==========================================================================
-\setupcaptions[figure][location={high,rightmargin},width=5cm,align={yes, tolerant},style=\rmx]
+\setupcaptions[figure][
+ location={high,rightmargin},
+ width=\rightmarginwidth,
+ align={yes, tolerant},
+ style=\rmx,
+]
+\setupfloat[figure][default=top,location=middle]
\definefloat[subfigure][local=yes]
-\setupcaption[subfigure][numbercommand=\groupedcommand{(}{)},numberconversion=a,prefix=no,way=bytext]
+\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]
+\definefloat[marginfigure][marginfigures][figure]
+\setupfloat[marginfigure][location=inner,default=top,width=\TextAreaSize]
+\setupcaptions[marginfigure][
+ leftmargin=\dimexpr \LeftMarginSize / 2 \relax,
+ location=bottom,
+ width=\textwidth,
+]
\setuplabeltext[marginfigure=Figure~]
%\definereferenceformat[sfig][left={\determineheadnumber[figure]\currentheadnumber.}]