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

This commit is contained in:
Alex A. Naanou 2021-10-10 00:55:07 +03:00
commit 55119c4d38

View File

@ -181,7 +181,7 @@
%%
%% + - - - - - - - - - - - - - - - - - - - - - + - + ^
%% . . . | bleed
%% . +--------------------------------------+----- v . . ---
%% . +---------------------------------------+----- v . . ---
%% . | ^ . = .
%% . | . . . . . . | . . = . ^
%% . |<-- blockwidth ----------------------->= . |
@ -2712,11 +2712,13 @@
\end{inlinecell*}}
% XXX EXPERIMENTAL
%% \DescribeEnv{foldout}
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
%%%%% Foldout page cells
%
%% \EXPERIMENTAL
%%
%% \DescribeEnv{foldout}
%
%% Create 2 or more pages in foldout mode.
%
%% >> \begin{foldout}[<fold-spec>] ... \end{foldout}
@ -2747,7 +2749,7 @@
%% paperfoldwidth
%% v v
%%
%% - --+----------------++---------------++--------------+
%% - --=----------------++---------------++--------------+
%% = .. .. |
%% = .. .. |
%% = .. .. |
@ -2758,9 +2760,9 @@
%% = .. .. |
%% = .. .. |
%% = (1) .. (2) .. (3) |
%% - --+----------------++---------------++--------------+
%% - --=----------------++---------------++--------------+
%%
%% +--------------++---------------++----------------+-- -
%% +--------------++---------------++----------------=-- -
%% | .. .. =
%% | .. .. =
%% | .. .. =
@ -2771,7 +2773,7 @@
%% | .. .. =
%% | .. .. =
%% | (1) .. (2) .. (3) =
%% +--------------++---------------++----------------+-- -
%% +--------------++---------------++----------------=-- -
%%
%% ^ ^
%% paperfoldwidth
@ -2795,18 +2797,18 @@
%% \begin{verbatim}
%%
%% right page
%% - --+-------+-------+- --+-------+-------+
%% - --=-------+-------+- --+-------+-------+
%% = | | | | |
%% = (1) | (2) | ... | (n-1) | (n) |
%% = | | | | |
%% - --+-------+-------+-- -+-------+-------+
%% - --=-------+-------+-- -+-------+-------+
%%
%% left page
%% +-------+-------+- --+-------+-------+-- -
%% +-------+-------+- --+-------+-------=-- -
%% | | | | | =
%% | (1) | (2) | ... | (n-1) | (n) =
%% | | | | | =
%% +-------+-------+-- -+-------+-------+-- -
%% +-------+-------+-- -+-------+-------=-- -
%%
%% \end{verbatim}
%% \end{minipage}
@ -3302,6 +3304,9 @@
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
%%%%% Multi-page cells
%
%% \DescribeEnv{spreadtopages}
%% \DescribeEnv{spreadtopages*}
%% \DescribeMacro{\usespreadpage\{..\}}
@ -4189,17 +4194,17 @@
%% \begin{verbatim}
%%
%% . . . . . . . . . . . . .
%% . +-----------------+
%% . | . |
%% . | . |
%% . | . |
%% . | . |
%% . +-----------------=
%% . | . =
%% . | . =
%% . | . =
%% . | . =
%% . | image
%% . | . |
%% . | . |
%% . | . |
%% . | . c |
%% . +-----------------+
%% . | . =
%% . | . =
%% . | . =
%% . | . c =
%% . +-----------------=
%% . . . . . . . . . . . . .
%%
%% \end{verbatim}
@ -4240,17 +4245,17 @@
%% \begin{verbatim}
%%
%% . . . . . . . . . . . . .
%% +-----------------+ .
%% | . | .
%% | . | .
%% | . | .
%% | . | .
%% =-----------------+ .
%% = . | .
%% = . | .
%% = . | .
%% = . | .
%% image | .
%% | . | .
%% | . | .
%% | . | .
%% | . c | .
%% +-----------------+ .
%% = . | .
%% = . | .
%% = . | .
%% = . c | .
%% =-----------------+ .
%% . . . . . . . . . . . . .
%%
%% \end{verbatim}
@ -4298,17 +4303,17 @@
%% \begin{minipage}{\textwidth}
%% \begin{verbatim}
%%
%% +---------------+---------------+
%% | +-------------+-------------+ |
%% | | . . . | |
%% | | . . . | |
%% | | . . . | |
%% +---------------=---------------+
%% | +-------------=-------------+ |
%% | | . = . | |
%% | | . = . | |
%% | | . = . | |
%% | | image | |
%% | | . . . | |
%% | | . . . | |
%% | | . . . | |
%% | +-------------+-------------+ |
%% +---------------+---------------+
%% | | . = . | |
%% | | . = . | |
%% | | . = . | |
%% | +-------------=-------------+ |
%% +---------------=---------------+
%%
%% \end{verbatim}
%% \end{minipage}
@ -4343,29 +4348,29 @@
%% \begin{minipage}{\textwidth}
%% \begin{verbatim}
%%
%% +---------------+---------------+ +---------------+---------------+
%% | +-------------+-------------+ | | . |
%% | | . . . | | | c . |
%% | | . . . | | | +-------------+-------------+ |
%% | | image | | | | . . . | |
%% | | . (T) . | | | | . . . | |
%% | | . . . | | | | image | |
%% | +-------------+-------------+ | | | . (B) . | |
%% | . c | | | . . . | |
%% | . | | +-------------+-------------+ |
%% +---------------+---------------+ +---------------+---------------+
%% +---------------=---------------+ +---------------=---------------+
%% | +-------------=-------------+ | | = |
%% | | . = . | | | c = |
%% | | . = . | | | +-------------=-------------+ |
%% | | image | | | | . = . | |
%% | | . (T) . | | | | . = . | |
%% | | . = . | | | | image | |
%% | +-------------=-------------+ | | | . (B) . | |
%% | = c | | | . = . | |
%% | = | | +-------------=-------------+ |
%% +---------------=---------------+ +---------------=---------------+
%%
%% +---------------+---------------+ +---------------+---------------+
%% | +-------------+---------+ | | +---------+-------------+ |
%% | | . . . | | | | . . . | |
%% | | . . . | | | | . . . | |
%% | | . .. | | | | .. . | |
%% +---------------=---------------+ +---------------=---------------+
%% | +-------------=---------+ | | +---------=-------------+ |
%% | | . = . | | | | . = . | |
%% | | . = . | | | | . = . | |
%% | | . =. | | | | .= . | |
%% | | image | | | | image | |
%% | | . (L).. | | | | ..(R) . | |
%% | | . . . | | | | . . . | |
%% | | . . . | | | | . . . | |
%% | +-------------+---------+ c | | c +---------+-------------+ |
%% +---------------+---------------+ +---------------+---------------+
%% | | . (L)=. | | | | .=(R) . | |
%% | | . = . | | | | . = . | |
%% | | . = . | | | | . = . | |
%% | +-------------=---------+ c | | c +---------=-------------+ |
%% +---------------=---------------+ +---------------=---------------+
%%
%% \end{verbatim}
%% \end{minipage}
@ -4416,17 +4421,17 @@
%% \begin{verbatim}
%%
%% . . . . . . . . . . .
%% +---------------+---------------+ +---------------+---------------+
%% | . | | |. . .|. |
%% . |-------------------------------| . | | . . . | |
%% . | . . . | . | | . . . | |
%% . | . . . | . | | . . . | |
%% +---------------=---------------+ +---------------=---------------+
%% | = | | |. = .|. |
%% . |---------------=---------------| . | | . = . | |
%% . | . = . | . | | . = . | |
%% . | . = . | . | | . = . | |
%% . | image | . | | image | |
%% . | . . . | . | | . . . | |
%% . | . . . | . | | . . . | |
%% . |-------------------------------| . | | . . . | |
%% | . c | | |. . .| c |
%% +---------------+---------------+ +---------------+---------------+
%% . | . = . | . | | . = . | |
%% . | . = . | . | | . = . | |
%% . |---------------=---------------| . | | . = . | |
%% | = c | | |. = .| c |
%% +---------------=---------------+ +---------------=---------------+
%% . . . . . . . . . . .
%%
%% \end{verbatim}
@ -4464,31 +4469,31 @@
%% \begin{verbatim}
%%
%% . . . . . . . . . . . . . . . . . . .
%% . +---------------+---------------+ . +---------------+---------------+
%% . | . . . | . | c . |
%% . | . . . | . . |-------------------------------| .
%% . | . . . | . . | . . . | .
%% . | image | . . | . . . | .
%% . | . (T) . | . . | . . . | .
%% . | . . . | . . | image | .
%% . | . . . | . . | . (B) . | .
%% . |-------------------------------| . . | . . . | .
%% | . c | . | . . . | .
%% +---------------+---------------+ . +---------------+---------------+ .
%% . +---------------=---------------+ . +---------------=---------------+
%% . | . = . | . | c = |
%% . | . = . | . . |---------------=---------------| .
%% . | . = . | . . | . = . | .
%% . | image | . . | . = . | .
%% . | . (T) . | . . | . = . | .
%% . | . = . | . . | image | .
%% . | . = . | . . | . (B) . | .
%% . |---------------=---------------| . . | . = . | .
%% | = c | . | . = . | .
%% +---------------=---------------+ . +---------------=---------------+ .
%% . . . . . . . . . . . . . . . . . . .
%%
%% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
%% . +---------------+---------------+ +---------------+---------------+ .
%% . | . . . | | | | . . . | .
%% . | . . . | | | | . . . | .
%% . | . . . | | | | . . . | .
%% . | . .. | | | | .. . | .
%% . +---------------=---------------+ +---------------=---------------+ .
%% . | . = . | | | | . = . | .
%% . | . = . | | | | . = . | .
%% . | . = . | | | | . = . | .
%% . | . =. | | | | .= . | .
%% . | image | | | | image | .
%% . | . (L).. | | | | .(R) . | .
%% . | . . . | | | | . . . | .
%% . | . . . | | | | . . . | .
%% . | . . . | c | | c | . . . | .
%% . +---------------+---------------+ +---------------+---------------+ .
%% . | . (L)=. | | | | .(R) . | .
%% . | . = . | | | | . = . | .
%% . | . = . | | | | . = . | .
%% . | . = . | c | | c | . = . | .
%% . +---------------=---------------+ +---------------=---------------+ .
%% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
%%
%% \end{verbatim}
@ -4538,17 +4543,17 @@
%% \begin{verbatim}
%%
%% . . . . . . . . . . . . . . . . . . .
%% . +---------------+---------------+ .
%% . | . . . | .
%% . | . . . | .
%% . | . . . | .
%% . | . . . | .
%% . +---------------=---------------+ .
%% . | . = . | .
%% . | . = . | .
%% . | . = . | .
%% . | . = . | .
%% . | image | .
%% . | . . . | .
%% . | . . . | .
%% . | . . . | .
%% . | . . . c | .
%% . +---------------+---------------+ .
%% . | . = . | .
%% . | . = . | .
%% . | . = . | .
%% . | . = . c | .
%% . +---------------=---------------+ .
%% . . . . . . . . . . . . . . . . . . .
%%
%% \end{verbatim}