summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-03-01 21:04:14 +0000
committerKarl Berry <karl@freefriends.org>2023-03-01 21:04:14 +0000
commit5aec57c3e31a5a6c5d35cd0866e54c246ade01e5 (patch)
treef7bcdb2df8bba00fffb35947a1c110a60b0e2323 /Master
parentb47028e3b0ef4b459fee767a65c311de5b264641 (diff)
photobook (1mar23)
git-svn-id: svn://tug.org/texlive/trunk@66275 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/photobook/Makefile6
-rw-r--r--Master/texmf-dist/doc/latex/photobook/README.md19
-rw-r--r--Master/texmf-dist/doc/latex/photobook/photobook.pdfbin138003 -> 140502 bytes
-rw-r--r--Master/texmf-dist/tex/latex/photobook/photobook.cls194
4 files changed, 212 insertions, 7 deletions
diff --git a/Master/texmf-dist/doc/latex/photobook/Makefile b/Master/texmf-dist/doc/latex/photobook/Makefile
index ef68ad54bfd..39b57fa353c 100644
--- a/Master/texmf-dist/doc/latex/photobook/Makefile
+++ b/Master/texmf-dist/doc/latex/photobook/Makefile
@@ -93,11 +93,8 @@ MD_FORMAT ?= markdown_github
# debug output...
#
# $DEBUG can either be empty or anything else...
-DEBUG ?=
ifeq ($(DEBUG),)
STDERR := > /dev/null
-else
- STDERR :=
endif
@@ -298,7 +295,8 @@ tag:
@echo "Last 5 tags:"
@git tag -l 'v[0-9]*'\
| tail -n 5 \
- | sed 's/^/ /'
+ | sed 's/^/ /' \
+ | tac
@echo "Note that this must be done after a commit."
@read -p "(press any key to continue or ctrl-c to cancel)"
git tag "v$(VERSION)"
diff --git a/Master/texmf-dist/doc/latex/photobook/README.md b/Master/texmf-dist/doc/latex/photobook/README.md
index e2fd8800081..bb1379915d8 100644
--- a/Master/texmf-dist/doc/latex/photobook/README.md
+++ b/Master/texmf-dist/doc/latex/photobook/README.md
@@ -1,4 +1,5 @@
-# photobook
+photobook
+=========
[LaTeX](https://www.latex-project.org/) document class for making photo books.
@@ -41,6 +42,22 @@ $ make pdf
For more info on `make` targets see the: [./Makefile](./Makefile)
+## Notes
+
+- There is a bug in default captions not being typeset correctly if too
+ long, a workaround is to place them in a `minipage` like this:
+ ```latex
+ \imagecell{%
+ \begin{minipage}{\cellwidth}%
+ long caption text...
+ \end{minipage}%
+ }{some-image}
+ ```
+ (still working on a solution for this).
+- `photobook` is mostly used with `lualatex`, other engines are mostly
+ supported but some features may misbehave.
+
+
## Authors
[Alex A. Naanou](https://github.com/flynx)
diff --git a/Master/texmf-dist/doc/latex/photobook/photobook.pdf b/Master/texmf-dist/doc/latex/photobook/photobook.pdf
index 13803938350..44c848ff5c4 100644
--- a/Master/texmf-dist/doc/latex/photobook/photobook.pdf
+++ b/Master/texmf-dist/doc/latex/photobook/photobook.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/photobook/photobook.cls b/Master/texmf-dist/tex/latex/photobook/photobook.cls
index 06f00aa4bbe..202090fc278 100644
--- a/Master/texmf-dist/tex/latex/photobook/photobook.cls
+++ b/Master/texmf-dist/tex/latex/photobook/photobook.cls
@@ -54,14 +54,25 @@
% - pre-print
% - customizing
% - extending
+% XXX add basic page templates:
+% - acknowledgements
+% Fields
+% - \Title
+% - \Authors
+% - \Thanks
+% - \ISBN
+% - \Edition / \Issue
+% - \CopyrightNotice
+% - ...
+% - info
%
%
%----------------------------------------------------------------------
%%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the
%%% code and the generated docs...
-\edef\photobook@FILEVERSION{v0.1.7}
-\edef\photobook@FILEDATE{2023-02-27}
+\edef\photobook@FILEVERSION{v0.1.8}
+\edef\photobook@FILEDATE{2023-03-01}
%% \documentclass{ltxdoc}
@@ -3908,6 +3919,178 @@
%%
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+%%%%% Basic book information
+
+% XXX Document metadata -- move to globals...
+% XXX Use LaTeX generic metadata...
+%% \DescribeMacro{BookTitle=<text>}
+\def\BookTitle{}
+%% \DescribeMacro{BookVersion=<text>}
+\def\BookVersion{}
+%% \DescribeMacro{BookAuthors=<text>}
+\def\BookAuthors{}
+%% \DescribeMacro{BookYear=<text>}
+\def\BookYear{%
+ \the\year}
+%% \DescribeMacro{ByNotice=<text>}
+\def\ByNotice{}
+%% \DescribeMacro{ThanksTo=<text>}
+\def\ThanksTo{}
+%% \DescribeMacro{ISBN=<text>}
+\def\ISBN{}
+%% \DescribeMacro{BookEdition=<text>}
+\def\BookEdition{}
+%% \DescribeMacro{License=<text>}
+\def\License{}
+%% \DescribeMacro{CopyrightNotice=<text>}
+\def\CopyrightNotice{%
+ Copyright \textcopyright \ \BookYear \ \BookAuthors; All Rights Reserved.
+
+ \ifx \License \empty%
+ No part of this book may be reproduced in any form without written permission
+ of the author except for use for brief quotation in a book review.
+ \else%
+ \License\fi}
+
+%% \DescribeMacro{OtherSoftware=<text>}
+\def\OtherSoftware{}
+%% \DescribeMacro{BookFonts=<text>}
+\def\BookFonts{}
+%% \DescribeMacro{SoftwareNotice=<text>}
+\def\SoftwareNotice{%
+ This book was designed and laid out using open source
+ \ifx \BookFonts \empty\else
+ fonts and\fi
+ software including:
+ \ifx \BookFonts \empty\else%
+ \BookFonts, \fi
+ \ifx \OtherSoftware \empty\else%
+ \OtherSoftware, \fi
+ \href{https://ctan.org/pkg/photobook}{photobook} and
+ \href{https://www.latex-project.org/}{\LATEX.}}
+
+%% These provide the default information used by the |\BookInfoPage| and
+%% |\BookSoftwareInfoPage|.
+%%
+
+%% \DescribeMacro{\BookInfoPage}
+%
+%% Generate book information page.
+%%
+%% \begin{minipage}{\textwidth}
+%% \begin{verbatim}
+%%
+%% +---------------+
+%% | |
+%% | |
+%% | |
+%% | copyright |
+%% | ISBN |
+%% | info |
+%% +---------------+
+%%
+%% \end{verbatim}
+%% \end{minipage}
+%%
+%% This page is {\it usually} included near the start of the book, before
+%% any of the logical sections of the book start, {\it usually} just after
+%% the title pages but before any of the epigraphs, forewords, TOCs and
+%% prefaces. This can also in some cases be pushed to the rear of the book.
+%%
+% XXX add option to combine this with software info...
+\def\BookInfo{%
+ \ifx \CopyrightNotice \empty\else%
+ {\setlength{\parskip}{0.5em}%
+ \CopyrightNotice} \\
+ \vspace{1em}
+ \fi
+ \ifx \ByNotice \empty\else%
+ \ByNotice
+
+ \fi
+ \ifx \ThanksTo \empty\else%
+ Special thanks to: \ThanksTo \\ \fi
+ \vspace{1em}
+ \ifx \ISBN \empty\else%
+ ISBN: \ISBN \\
+ \vspace{1em}\fi
+ \ifx \Edition \empty\else%
+ Edition: \Edition
+
+ \fi
+ \ifx \BookVersion \empty\else%
+ Version: \BookVersion
+
+ \fi}
+\newcommand\BookInfoPage[1][]{%
+ \begin{page}%
+ \vfill
+ \begin{flushleft}%
+ \footnotesize
+ #1
+
+ \BookInfo
+ \end{flushleft}%
+ \end{page}}
+
+
+%% \DescribeMacro{\BookSoftwareInfoPage}
+%
+%% Generate software info page.
+%%
+%% \begin{minipage}{\textwidth}
+%% \begin{verbatim}
+%%
+%% +---------------+
+%% | |
+%% | |
+%% | |
+%% | |
+%% | |
+%% | notice |
+%% +---------------+
+%%
+%% \end{verbatim}
+%% \end{minipage}
+%%
+%% This page if present is usually placed at the very rear of the book.
+%%
+\def\SoftwareInfo{%
+ \ifx \SoftwareNotice \empty\else%
+ \SoftwareNotice\fi}
+\newcommand\BookSoftwareInfoPage[1][]{%
+ \begin{page}%
+ \vfill
+ \begin{flushleft}%
+ \footnotesize
+ #1
+
+ \SoftwareInfo
+ \end{flushleft}%
+ \end{page}}
+
+
+%% \DescribeMacro{\BookFullInfoPage}
+%
+%% This page combines the |\BookInfoPage| and |\BookSoftwareInfoPage|
+%% information into a single page.
+%%
+\newcommand\BookFullInfoPage[1][]{%
+ \begin{page}%
+ \vfill
+ \begin{flushleft}%
+ \footnotesize
+ #1
+
+ \BookInfo
+ \vspace{1em}
+ \SoftwareInfo
+ \end{flushleft}%
+ \end{page}}
+
+
+
+% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
%%%%% Tweaking
%
%% Most page/spread templates provide an ability to externally "tweak"
@@ -4890,6 +5073,7 @@
%----------------------------------------------------------------------
%%%% Miscellaneous
+
%% \DescribeMacro{\PageInfo}
%
%% Display basic paper / page / cell geometry.
@@ -5089,6 +5273,12 @@
+ ((#2 mm) * 2)
\relax}}
+% XXX DOC...
+\def\TEX{%
+ {\fontfamily{lmr}\selectfont \TeX}}
+\def\LATEX{%
+ {\fontfamily{lmr}\selectfont \LaTeX}}
+
%----------------------------------------------------------------------