moved marks to savebox...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2021-10-25 02:17:31 +03:00
parent 2dbfd8eeab
commit c8d33d2bea

View File

@ -470,7 +470,7 @@
% %
%% Sets the fold mark size (default: 6mm). %% Sets the fold mark size (default: 6mm).
%% %%
\DeclareBoolOption{foldmarksize}[6mm] \DeclareStringOption[6mm]{foldmarksize}
%% \DescribeMacro{geometrynodefaults} %% \DescribeMacro{geometrynodefaults}
% %
@ -1031,12 +1031,13 @@
% %
%% Reset and re-initialize page dimentions. %% Reset and re-initialize page dimentions.
%% %%
\newcommand\ReInitPages{ \newcommand\ReInitPages{%
\setlength\blockwidth{0mm} \setlength\blockwidth{0mm}%
\setlength\blockheight{0mm} \setlength\blockheight{0mm}%
\edef\pdfpagelayout{} \edef\pdfpagelayout{}%
% %
\InitPages} \InitPages%
\ResetFoldMarks}
@ -3054,77 +3055,74 @@
% fold mark gets messed up... % fold mark gets messed up...
% XXX do we need to make centering block size dependant on \foldmarksize % XXX do we need to make centering block size dependant on \foldmarksize
% or are the two independent??? (test) % or are the two independent??? (test)
% XXX doc: \ResetFoldMarks...
% XXX doc... % XXX doc...
% XXX this is only affected by the initial \foldmarksize...
% ...should this be live or should we simply make this a class option???
% XXX rename \foldmarksize if we stick with boxes... % XXX rename \foldmarksize if we stick with boxes...
\newsavebox\photobook@foldinmark \newsavebox\photobook@foldinmark
\sbox{\photobook@foldinmark}{% \newsavebox\photobook@foldoutmark
\smash{\makebox[0pt][l]{%
% size-agnostic centering... \newcommand\ResetFoldMarks{%
\hspace{-5mm}{\makebox[1cm][c]{% \sbox{\photobook@foldinmark}{%
\begin{tikzpicture}% % XXX MARKOFFSET
\draw[white, ultra thick] %\vspace{0.5\foldmarksize}%
(-0.3333\foldmarksize,0.3333\foldmarksize) \smash{\makebox[0pt][l]{%
-- (0,0) % size-agnostic centering...
-- (0.3333\foldmarksize,0.3333\foldmarksize); \hspace{-5mm}{\makebox[1cm][c]{%
\draw[white, ultra thick] \begin{tikzpicture}%
(0,0.6666\foldmarksize) \draw[white, ultra thick]
-- (0,-0.3333\foldmarksize); (-0.3333\foldmarksize,0.3333\foldmarksize)
\draw[black, thin] -- (0,0)
(-0.3333\foldmarksize,0.3333\foldmarksize) -- (0.3333\foldmarksize,0.3333\foldmarksize);
-- (0,0) \draw[white, ultra thick]
-- (0.3333\foldmarksize,0.3333\foldmarksize); (0,0.6666\foldmarksize)
\draw[black, thin] -- (0,-0.3333\foldmarksize);
(0,0.6666\foldmarksize) \draw[black, thin]
-- (0,-0.3333\foldmarksize); (-0.3333\foldmarksize,0.3333\foldmarksize)
\end{tikzpicture}}}}}} -- (0,0)
-- (0.3333\foldmarksize,0.3333\foldmarksize);
\draw[black, thin]
(0,0.6666\foldmarksize)
-- (0,-0.3333\foldmarksize);
\end{tikzpicture}}}}}}
\sbox{\photobook@foldoutmark}{%
% XXX MARKOFFSET
%\vspace{0.5\foldmarksize}%
\smash{\makebox[0pt][l]{%
% size-agnostic centering...
\hspace{-5mm}{\makebox[1cm][c]{%
\begin{tikzpicture}%
\draw[white, ultra thick]
(-0.3333\foldmarksize,0)
-- (0,0.3333\foldmarksize)
-- (0.3333\foldmarksize,0);
\draw[white, ultra thick]
(0,0.6666\foldmarksize)
-- (0,-0.3333\foldmarksize);
\draw[black, thin]
(-0.3333\foldmarksize,0)
-- (0,0.3333\foldmarksize)
-- (0.3333\foldmarksize,0);
\draw[black, thin]
(0,0.6666\foldmarksize)
-- (0,-0.3333\foldmarksize);
\end{tikzpicture}}}}}}}
\ResetFoldMarks
% >> \foldinmark[<baseline>]
\newcommand\foldinmark[1][0pt]{% \newcommand\foldinmark[1][0pt]{%
%\vspace{#1}%
% XXX MARKOFFSET for some reason splitting this (# kept here while \foldmarksize
% is in foldinmark) breaks alignment...
\vspace{\dimexpr 0.5\foldmarksize + #1 \relax}% \vspace{\dimexpr 0.5\foldmarksize + #1 \relax}%
\usebox\photobook@foldinmark} \usebox\photobook@foldinmark}
%\newcommand\foldinmark[1][0pt]{ % >> \foldoutmark[<baseline>]
% \vspace{\dimexpr 0.5\foldmarksize + #1 \relax}%
% \smash{\makebox[0pt][l]{%
% % size-agnostic centering...
% \hspace{-5mm}{\makebox[1cm][c]{%
% \begin{tikzpicture}%
% \draw[white, ultra thick]
% (-0.3333\foldmarksize,0.3333\foldmarksize)
% -- (0,0)
% -- (0.3333\foldmarksize,0.3333\foldmarksize);
% \draw[white, ultra thick]
% (0,0.6666\foldmarksize)
% -- (0,-0.3333\foldmarksize);
% \draw[black, thin]
% (-0.3333\foldmarksize,0.3333\foldmarksize)
% -- (0,0)
% -- (0.3333\foldmarksize,0.3333\foldmarksize);
% \draw[black, thin]
% (0,0.6666\foldmarksize)
% -- (0,-0.3333\foldmarksize);
% \end{tikzpicture}}}}}}
\newcommand\foldoutmark[1][0pt]{ \newcommand\foldoutmark[1][0pt]{
%\vspace{#1}%
% XXX MARKOFFSET for some reason splitting this (# kept here while \foldmarksize
% is in foldinmark) breaks alignment...
\vspace{\dimexpr 0.5\foldmarksize + #1 \relax}% \vspace{\dimexpr 0.5\foldmarksize + #1 \relax}%
\smash{\makebox[0pt][l]{% \usebox\photobook@foldoutmark}
% size-agnostic centering...
\hspace{-5mm}{\makebox[1cm][c]{%
\begin{tikzpicture}%
\draw[white, ultra thick]
(-0.3333\foldmarksize,0)
-- (0,0.3333\foldmarksize)
-- (0.3333\foldmarksize,0);
\draw[white, ultra thick]
(0,0.6666\foldmarksize)
-- (0,-0.3333\foldmarksize);
\draw[black, thin]
(-0.3333\foldmarksize,0)
-- (0,0.3333\foldmarksize)
-- (0.3333\foldmarksize,0);
\draw[black, thin]
(0,0.6666\foldmarksize)
-- (0,-0.3333\foldmarksize);
\end{tikzpicture}}}}}}
% >> \photobook@foldmark[<baseline>]{<type>}{<left>, <top>} % >> \photobook@foldmark[<baseline>]{<type>}{<left>, <top>}
\newif\ifphotobook@foldmark@in \newif\ifphotobook@foldmark@in