tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2021-10-01 05:00:46 +03:00
parent 467a3b9724
commit 03d9f155a7
2 changed files with 50 additions and 24 deletions

View File

@ -33,23 +33,24 @@
\begin{document} \begin{document}
\edef\foldmarkoffset{-2mm} \edef\foldmarkoffset{-10mm}
%\foldmarksfalse %\foldmarksfalse
\begin{foldout}[10cm 10cm 10cm] \begin{foldout}[10cm 10cm 10cm]
explicit widths\\ %explicit widths
\ImagePageFill{\PageInfo}{\TestImage}
\end{foldout} \end{foldout}
\begin{foldout}[in in] \begin{foldout}[in out]
auto-calculate\\ auto-calculate
\end{foldout} \end{foldout}
\begin{foldout}[3] \begin{foldout}[3]
count\\ count
\end{foldout} \end{foldout}
\begin{foldout}[in] \begin{foldout}[in]
in\\ in
\end{foldout} \end{foldout}
% %
%\ImagePageFill{\PageInfo}{\TestImage} %\ImagePageFill{\PageInfo}{\TestImage}

View File

@ -1107,7 +1107,7 @@
% XXX needs more digging... % XXX needs more digging...
% XXX do this at beginshipout/beginpage... (???) % XXX do this at beginshipout/beginpage... (???)
%\null% %\null%
\hbox{}% %\hbox{}%
}{% }{%
\endgroup% \endgroup%
% reset... % reset...
@ -2858,8 +2858,12 @@
\newlength\foldoutwidth \newlength\foldoutwidth
\setlength\foldoutwidth{\blockwidth} \setlength\foldoutwidth{\blockwidth}
% default fold setup...
\edef\foldoutspec{2} \edef\foldoutspec{2}
% default fold...
\edef\foldoutfold{in}
\newlength\clearfoldoutclearblock \newlength\clearfoldoutclearblock
\setlength\clearfoldoutclearblock{0.5mm} \setlength\clearfoldoutclearblock{0.5mm}
@ -2879,34 +2883,46 @@
% XXX make this a box... (???) % XXX make this a box... (???)
\newcommand\photobook@foldmark[2]{% \newcommand\photobook@foldmark[3][\foldoutfold]{%
\begin{textblock*}{0pt}(#2)% \begin{textblock*}{0pt}(#3)%
\setlength{\unitlength}{1mm}% \setlength{\unitlength}{1mm}%
\begin{picture}(0, 0)(0,0)% \begin{picture}(0, 0)(0,0)%
\thicklines \thicklines
\color{white} \color{white}
\put(0,0){\line(1,#1){1}} \put(0,0){\line(0,#2){4}}
\put(0,0){\line(-1,#1){1}} \ifnumodd{\thepage}{%
\put(0, \numexpr #2 / 2 \relax){%
\ifthenelse{\equal{#1}{in}}{%
\circle{1.5}
}{%
\circle*{1.5}}}
\put(1.5, \numexpr #2 / 2 - 1 \relax){#1}}{}
\thinlines \thinlines
\color{black} \color{black}
\put(0,0){\line(1,#1){1}} \put(0,0){\line(0,#2){4}}
\put(0,0){\line(-1,#1){1}} \ifnumodd{\thepage}{%
\put(0, \numexpr #2 / 2 \relax){%
\ifthenelse{\equal{#1}{in}}{%
\circle{1.5}
}{%
\circle*{1.5}}}
\put(1.5,\numexpr #2 / 2 - 1 \relax){#1}}{}
\end{picture} \end{picture}
\end{textblock*}} \end{textblock*}}
\newcommand\photobook@topfoldmark[1]{% \newcommand\photobook@topfoldmark[2][in]{%
\photobook@foldmark{4}{#1}} \photobook@foldmark[#1]{3}{#2}}
\newcommand\photobook@bottomfoldmark[1]{% \newcommand\photobook@bottomfoldmark[2][in]{%
\photobook@foldmark{-4}{#1}} \photobook@foldmark[#1]{-3}{#2}}
% XXX also add this to jacket/cover... % XXX also add this to jacket/cover...
% XXX test position correctness... % XXX test position correctness...
% >> \photobook@markfold[<fold>]{<offset>} % >> \photobook@markfold[<fold>]{<offset>}
\newcommand\photobook@markfold[2][in]{% \newcommand\photobook@markfold[2][in]{%
\iffoldmarks% \iffoldmarks%
\photobook@topfoldmark{ \photobook@topfoldmark[#1]{
#2, #2,
\bleed \bleed
- \foldmarkoffset}% - \foldmarkoffset}%
\photobook@bottomfoldmark{ \photobook@bottomfoldmark[#1]{
#2, #2,
\blockheight \blockheight
+ \bleed + \bleed
@ -2969,9 +2985,14 @@
\edef\foldoutcellwidths{% \edef\foldoutcellwidths{%
\foldoutcellwidths, \the\photobook@foldout@panelwidth}} \foldoutcellwidths, \the\photobook@foldout@panelwidth}}
\edef\foldoutfold{in} %\edef\photobook@foldout@showmarks{}
%\newcommand\photobook@foldout@mark[1]{
% \edef\photobook@foldout@showmarks{%
% \photobook@foldout@showmarks%
% \photobook@markfold[\photobook@foldout@prevfold]{#1}}}
% XXX mark folds on every page... % XXX mark folds on every page...
% XXX need to set marks at end of page...
% XXX in/out branches are identical -- unify... % XXX in/out branches are identical -- unify...
\newenvironment{foldout}[1][\foldoutspec]{% \newenvironment{foldout}[1][\foldoutspec]{%
\begingroup% \begingroup%
@ -3003,7 +3024,8 @@
0pt}{\photobook@foldout@prevfold}% 0pt}{\photobook@foldout@prevfold}%
% skip for last panel... % skip for last panel...
\ifnum \photobook@foldout@count = ##1 \else% \ifnum \photobook@foldout@count = ##1 \else%
\photobook@markfold{\foldoutwidth}\fi}% %\photobook@foldout@mark{\foldoutwidth}\fi}%
\photobook@markfold[\photobook@foldout@prevfold]{\foldoutwidth}\fi}%
% fold spec... % fold spec...
\else% \else%
\foreachitem \photobook@foldout@opt \in \photobook@foldout@args{% \foreachitem \photobook@foldout@opt \in \photobook@foldout@args{%
@ -3011,27 +3033,30 @@
\ifthenelse{\equal{\photobook@foldout@opt}{in}}{% \ifthenelse{\equal{\photobook@foldout@opt}{in}}{%
\photobook@foldout@pushpanel{% \photobook@foldout@pushpanel{%
\photobook@foldout@panelwidth}{\photobook@foldout@opt}% \photobook@foldout@panelwidth}{\photobook@foldout@opt}%
\photobook@markfold{\foldoutwidth}%
% prep for next panel... % prep for next panel...
\edef\photobook@foldout@prevfold{% \edef\photobook@foldout@prevfold{%
\photobook@foldout@opt}% \photobook@foldout@opt}%
\setlength\photobook@foldout@panelwidth{0pt}% \setlength\photobook@foldout@panelwidth{0pt}%
%\photobook@foldout@mark{\foldoutwidth}%
\photobook@markfold[\photobook@foldout@prevfold]{\foldoutwidth}%
% out... % out...
}{\ifthenelse{\equal{\photobook@foldout@opt}{out}}{% }{\ifthenelse{\equal{\photobook@foldout@opt}{out}}{%
\photobook@foldout@pushpanel{% \photobook@foldout@pushpanel{%
\photobook@foldout@panelwidth}{\photobook@foldout@opt} \photobook@foldout@panelwidth}{\photobook@foldout@opt}
\photobook@markfold{\foldoutwidth}%
% prep for next panel... % prep for next panel...
\edef\photobook@foldout@prevfold{% \edef\photobook@foldout@prevfold{%
\photobook@foldout@opt}% \photobook@foldout@opt}%
\setlength\photobook@foldout@panelwidth{0pt}% \setlength\photobook@foldout@panelwidth{0pt}%
%\photobook@foldout@mark{\foldoutwidth}%
\photobook@markfold[\photobook@foldout@prevfold]{\foldoutwidth}%
% explicit size... % explicit size...
}{% }{%
% finalize prev panel... % finalize prev panel...
\ifdim \photobook@foldout@panelwidth > 0pt% \ifdim \photobook@foldout@panelwidth > 0pt%
\photobook@foldout@pushpanel{% \photobook@foldout@pushpanel{%
\photobook@foldout@panelwidth}{\photobook@foldout@prevfold}% \photobook@foldout@panelwidth}{\photobook@foldout@prevfold}%
\photobook@markfold{\foldoutwidth}\fi %\photobook@foldout@mark{\foldoutwidth}\fi%
\photobook@markfold[\photobook@foldout@prevfold]{\foldoutwidth}\fi%
% %
% XXX need to disable clearences here... % XXX need to disable clearences here...
\setlength\photobook@foldout@panelwidth{\photobook@foldout@opt}}}}% \setlength\photobook@foldout@panelwidth{\photobook@foldout@opt}}}}%