Merge branch 'main' of github.com:flynx/photobook

This commit is contained in:
Alex A. Naanou 2023-04-27 01:30:34 +03:00
commit f094d073b5
3 changed files with 40 additions and 23 deletions

View File

@ -23,7 +23,11 @@
\begin{page} \begin{page}
\begin{frontcover} \begin{frontcover}
\begin{cliptocell}[0mm \coverflap] % NOTE: in the real world there is no need to extend the bleeds
% all the way to the end of the flaps, they need to go
% only 2-4 millimeters under the endpaper to account for
% cut and alignment errors...
\begin{cliptocell}[0mm {\coverflap} {\coverflap} {\coverflap}]
\imagecell[fill, clearance=-\coverflap]{}{DSC00403-2} \imagecell[fill, clearance=-\coverflap]{}{DSC00403-2}
% title... % title...
\begin{zinlinecell} \begin{zinlinecell}
@ -42,7 +46,7 @@
\end{cliptocell} \end{cliptocell}
\end{spine} \end{spine}
\begin{backcover} \begin{backcover}
\begin{cliptocell}[0mm \coverflap] \begin{cliptocell}[{\coverflap} {\coverflap} 0mm {\coverflap}]
\imagecell[fill, clearance=-\coverflap]{}{DSC00403-2} \imagecell[fill, clearance=-\coverflap]{}{DSC00403-2}
\end{cliptocell} \end{cliptocell}
\end{backcover} \end{backcover}

View File

@ -24,18 +24,18 @@
\begin{page} \begin{page}
\begin{frontcover} \begin{frontcover}
\begin{cliptocell} \begin{cliptocell}[0mm \bleed]
\imagecell[fill]{}{DSC00403-2} \imagecell[fill, clearance=-\bleed]{}{DSC00403-2}
\end{cliptocell} \end{cliptocell}
\end{frontcover} \end{frontcover}
\begin{backcover} \begin{backcover}
\begin{cliptocell} \begin{cliptocell}[0mm \bleed]
\imagecell[fill]{}{DSC00403-2} \imagecell[fill, clearance=-\bleed]{}{DSC00403-2}
\end{cliptocell} \end{cliptocell}
\end{backcover} \end{backcover}
\begin{spine} \begin{spine}
\begin{cliptocell} \begin{cliptocell}[0mm \bleed]
\imagecell[fill]{}{DSC00403-2} \imagecell[fill, clearance=-\bleed]{}{DSC00403-2}
\end{cliptocell} \end{cliptocell}
\end{spine} \end{spine}
\begin{frontflap} \begin{frontflap}

View File

@ -85,7 +85,7 @@
%%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the %%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the
%%% code and the generated docs... %%% code and the generated docs...
\edef\photobook@FILEVERSION{v0.1.20} \edef\photobook@FILEVERSION{v0.1.21}
\edef\photobook@FILEDATE{2023-04-22} \edef\photobook@FILEDATE{2023-04-22}
@ -383,9 +383,10 @@
%% %%
%% blockwidth blockwidth %% blockwidth blockwidth
%% <---------------> <---------------> %% <---------------> <--------------->
%% <-> coverboardgrow <-> coverboardgrow %% <-> coverboardgrow. . <-> coverboardgrow
%% <-> coverflap . <-> coverflap %% <-> coverflap . . . <-> coverflap
%% . . . . . . %% . . . . . . . .
%% .xx . xx xx . xx. ] fold marks
%% +-------------------++---++-------------------+ --- %% +-------------------++---++-------------------+ ---
%% | + - - - - - - - - ++ - ++ - - - - - - - - + | --^ coverflap %% | + - - - - - - - - ++ - ++ - - - - - - - - + | --^ coverflap
%% | . + - - - - - - - ++ - ++ - - - - - - - + . | --^ coverboardgrow %% | . + - - - - - - - ++ - ++ - - - - - - - + . | --^ coverboardgrow
@ -397,6 +398,7 @@
%% | . + - - - - - - - ++ - ++ - - - - - - - + . | --v coverboardgrow %% | . + - - - - - - - ++ - ++ - - - - - - - + . | --v coverboardgrow
%% | + - - - - - - - - ++ - ++ - - - - - - - - + | --v coverflap %% | + - - - - - - - - ++ - ++ - - - - - - - - + | --v coverflap
%% +-------------------++---++-------------------+ --- %% +-------------------++---++-------------------+ ---
%% xx xx xx xx ] fold marks
%% . . %% . .
%% ^. .^ spinefold %% ^. .^ spinefold
%% . . %% . .
@ -422,8 +424,9 @@
%% . . . . %% . . . .
%% . . blockwidth blockwidth . . %% . . blockwidth blockwidth . .
%% . . <---------------> <---------------> . . %% . . <---------------> <---------------> . .
%% . .<-> coverboardgrow <-> coverboardgrow %% . .<-> coverboardgrow. . <-> coverboardgrow
%% . . . . . . %% . . . . . . . .
%% . xx . .x x. . xx . ] fold marks
%% +---++-----------------++---++-----------------++---+ --- %% +---++-----------------++---++-----------------++---+ ---
%% | .. + - - - - - - - ++ - ++ - - - - - - - + .. | --^ coverboardgrow %% | .. + - - - - - - - ++ - ++ - - - - - - - + .. | --^ coverboardgrow
%% | .. . .. .. . .. | ^ %% | .. . .. .. . .. | ^
@ -433,6 +436,7 @@
%% | .. . .. .. . .. | v %% | .. . .. .. . .. | v
%% | .. + - - - - - - - ++ - ++ - - - - - - - + .. | --v coverboardgrow %% | .. + - - - - - - - ++ - ++ - - - - - - - + .. | --v coverboardgrow
%% +---++-----------------++---++-----------------++---+ --- %% +---++-----------------++---++-----------------++---+ ---
%% xx x x xx ] fold marks
%% .. . . .. %% .. . . ..
%% ^ jacketwrap . . ^ jacketwrap %% ^ jacketwrap . . ^ jacketwrap
%% ^. .^ spinefold %% ^. .^ spinefold
@ -1075,6 +1079,7 @@
% layout: cover... % layout: cover...
\ifcoverlayout \ifcoverlayout
\pagestyle{empty}% \pagestyle{empty}%
% XXX should spinefolds be panels???
\setsepchar{,}% \setsepchar{,}%
\readlist*\pagefoldpanels{% \readlist*\pagefoldpanels{%
\the\coverflap, \the\coverflap,
@ -1108,12 +1113,12 @@
\the\jacketwrap, \the\jacketwrap,
\the\dimexpr \the\dimexpr
\coverboardgrow \coverboardgrow
+ \spinefold
+ \pageblockwidth \relax, + \pageblockwidth \relax,
\the\spinefold,
\the\spinewidth, \the\spinewidth,
\the\spinefold,
\the\dimexpr \the\dimexpr
\coverboardgrow \coverboardgrow
+ \spinefold
+ \pageblockwidth \relax, + \pageblockwidth \relax,
\the\jacketwrap, \the\jacketwrap,
\the\photobook@jacketflapfront@active}% \the\photobook@jacketflapfront@active}%
@ -1130,6 +1135,7 @@
% layout: spread/endpaper... % layout: spread/endpaper...
\ifspreadlayout \ifspreadlayout
\pagestyle{empty}% \pagestyle{empty}%
\setsepchar{,}%
\readlist*\pagefoldpanels{% \readlist*\pagefoldpanels{%
\the\pageblockwidth, \the\pageblockwidth,
\the\pageblockwidth}% \the\pageblockwidth}%
@ -1970,6 +1976,7 @@
%% \DescribeEnv{cliptocell} %% \DescribeEnv{cliptocell}
%% \DescribeEnv{cliptocellbleeds}
% %
%% Clip content to parent cell. %% Clip content to parent cell.
%% %%
@ -2003,12 +2010,19 @@
\newlength\photobook@cliptocell@bottom \newlength\photobook@cliptocell@bottom
\setlength\photobook@cliptocell@bottom{0mm}% \setlength\photobook@cliptocell@bottom{0mm}%
% XXX EXPERIMENTAL %% Set the default bleeds for |cliptocell| environments
% XXX should this set the setsepchar back to default??? %%
% XXX should this be public??? %% >> \cliptocellbleeds{<size>}
%% >> \cliptocellbleeds{<horizontal> <vertical>}
%% >> \cliptocellbleeds{<left> <bottom> <right> <top>}
%%
%% This will only affect |cliptocell| environments on the same level,
%% without affecting the nested |cliptocell|s.
%%
\newcommand\cliptocellbleeds[1]{ \newcommand\cliptocellbleeds[1]{
\setsepchar{ }% \setsepchar{ }%
\readlist*\photobook@cliptocell@bleeds{#1}% \readlist*\photobook@cliptocell@bleeds{#1}%
\setsepchar{,}%
% args: size % args: size
\ifnum \photobook@cliptocell@bleedslen = 1% \ifnum \photobook@cliptocell@bleedslen = 1%
\setlength\photobook@cliptocell@left{% \setlength\photobook@cliptocell@left{%
@ -2053,10 +2067,7 @@
{\cellwidth + \photobook@cliptocell@right} % {\cellwidth + \photobook@cliptocell@right} %
{\height + \photobook@cliptocell@top}}% {\height + \photobook@cliptocell@top}}%
% set defaults for nested cells... % set defaults for nested cells...
\setlength\photobook@cliptocell@left{0mm}% \cliptocellbleeds{0mm}%
\setlength\photobook@cliptocell@top{0mm}%
\setlength\photobook@cliptocell@right{0mm}%
\setlength\photobook@cliptocell@bottom{0mm}%
\begin{minipage}[t][\cellheight][t]{\cellwidth}% \begin{minipage}[t][\cellheight][t]{\cellwidth}%
\ignorespaces% \ignorespaces%
}{% }{%
@ -3562,6 +3573,7 @@
\begingroup% \begingroup%
\setsepchar{ }% \setsepchar{ }%
\readlist*\photobook@foldout@args{#1}% \readlist*\photobook@foldout@args{#1}%
\setsepchar{,}%
% %
% defaults... % defaults...
\setcounter{photobook@foldoutpanel}{1} \setcounter{photobook@foldoutpanel}{1}
@ -3700,6 +3712,7 @@
% parse args... % parse args...
\setsepchar{-}% \setsepchar{-}%
\readlist*\photobook@foldoutcell@panels{#1}% \readlist*\photobook@foldoutcell@panels{#1}%
\setsepchar{,}%
% %
% auto advance panel... % auto advance panel...
\ifnum \photobook@foldoutcell@panels[1] = 0% \ifnum \photobook@foldoutcell@panels[1] = 0%