refactoring and tweaking... still not done...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2021-09-28 12:00:08 +03:00
parent 2546a36524
commit bf818002ff

View File

@ -2868,6 +2868,33 @@
% -- fold direction with panel widths % -- fold direction with panel widths
\edef\photobook@foldout@prevfold{}% \edef\photobook@foldout@prevfold{}%
\edef\foldoutspec{2} \edef\foldoutspec{2}
\newcommand\photobook@foldout@foldcompensation[1]{
% XXX of cur and last fold are the same add \clearfoldoutblock
\ifthenelse{\equal{#1}{\photobook@foldout@prevfold}}{%
% XXX
}{%
% XXX
}
}
% XXX revise numbers...
\newlength\foldoutmaxpanelwidth
\newcommand\photobook@foldout@pushpanel[2]{%
\ifdim #1 = 0pt%
\setlength\foldoutcellwidth{%
\foldoutmaxpanelwidth
+ \photobook@foldout@foldcompensation{#2}}\fi%
\else%
\setlength\foldoutcellwidth{%
#1 + \photobook@foldout@foldcompensation{#2}}\fi%
% XXX if cur and last folds are the same set max panel length to \foldoutcellwidth...
\ifthenelse{\equal{#2}{\photobook@foldout@prevfold}}{%
\setlength\foldoutmaxpanelwidth{\foldoutcellwidth}}{}
\setlength\foldoutwidth{
\foldoutwidth
+ \foldoutcellwidth}%
\edef\foldoutcellwidths{%
\foldoutcellwidths, \the\foldoutcellwidth}}
\newenvironment{foldoutA}[1][\foldoutspec]{% \newenvironment{foldoutA}[1][\foldoutspec]{%
\begingroup% \begingroup%
\setsepchar{ }% \setsepchar{ }%
@ -2878,60 +2905,41 @@
% XXX % XXX
% fold spec... % fold spec...
\else% \else%
% XXX need to maintain a max panel width and use it as default... \setlength\foldoutmaxpanelwidth{%
% XXX \blockwidth}
\edef\photobook@foldout@prevfold{}% \edef\photobook@foldout@prevfold{}%
\foreachitem \photobook@foldout@opt \in \photobook@foldout@args{% \foreachitem \photobook@foldout@opt \in \photobook@foldout@args{%
% in fold... % in fold...
\ifthenelse{\equal{\photobook@foldout@opt}{in}}{% \ifthenelse{\equal{\photobook@foldout@opt}{in}}{%
% XXX revise numbers... \photobook@foldout@pushpanel{%
\setlength\foldoutcellwidth{% \foldoutcellwidth}{\photobook@foldout@opt}
\foldoutcellwidth % prep for next panel...
+ \getFoldCompensation{% \edef\photobook@foldout@prevfold{%
\photobook@foldout@opt}}% \photobook@foldout@opt}%
\setlength\foldoutwidth{
\foldoutwidth
+ \foldoutcellwidthx}%
\edef\foldoutcellwidths{%
\foldoutcellwidths, \the\foldoutcellwidth}%
%
\edef\photobook@foldout@prevfold{\photobook@foldout@opt}%
\setlength\foldoutcellwidth{0pt}% \setlength\foldoutcellwidth{0pt}%
% out fold... % out fold...
}{\ifthenelse{\equal{\photobook@foldout@opt}{out}}{% }{\ifthenelse{\equal{\photobook@foldout@opt}{out}}{%
% XXX this is the same as for in... \photobook@foldout@pushpanel{%
% XXX \foldoutcellwidth}{\photobook@foldout@opt}
% prep for next panel...
\edef\photobook@foldout@prevfold{%
\photobook@foldout@opt}%
\setlength\foldoutcellwidth{0pt}%
% explicit size... % explicit size...
}{% }{%
% finalize prev panel... % finalize prev panel...
\ifdim \foldoutcellwidth = 0pt% \ifdim \foldoutcellwidth > 0pt%
% XXX revise numbers... \photobook@foldout@pushpanel{%
\setlength\foldoutcellwidth{% \foldoutcellwidth}{\photobook@foldout@prevfold}\fi
\blockwidth
+ \getFoldCompensation{
\photobook@foldout@prevfold}}%
\setlength\foldoutwidth{
\foldoutwidth
+ \foldoutcellwidthx}%
\edef\foldoutcellwidths{%
\foldoutcellwidths, \the\foldoutcellwidth}\fi
% %
\setlength\foldoutcellwidth{\photobook@foldout@opt}% \setlength\foldoutcellwidth{\photobook@foldout@opt}}}}%
}}%
}%
% we ended by a fold -> add trailing panel... % we ended by a fold -> add trailing panel...
\ifdim \foldoutcellwidth = 0pt% \ifdim \foldoutcellwidth = 0pt%
% XXX revise numbers... \photobook@foldout@pushpanel{%
\setlength\foldoutcellwidth{% 0pt}{\photobook@foldout@prevfold}
\blockwidth \else%
+ \getFoldCompensation{ \photobook@foldout@pushpanel{%
\photobook@foldout@prevfold}}\fi% \foldoutcellwidth}{\photobook@foldout@prevfold}\fi%
% push last panel...
\setlength\foldoutwidth{
\foldoutwidth
+ \foldoutcellwidthx}%
\edef\foldoutcellwidths{%
\foldoutcellwidths, \the\foldoutcellwidth}\fi%
\fi% \fi%
}{% }{%
\endgroup} \endgroup}