From f1bc346e73a06c5be494cb6717d5e4a4f631613e Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 14 Nov 2022 20:12:32 +0000
Subject: photobook (14nov22)

git-svn-id: svn://tug.org/texlive/trunk@65015 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/doc/latex/photobook/Makefile     |  34 ++++++++++++++++-----
 Master/texmf-dist/doc/latex/photobook/README.md    |   7 ++++-
 .../texmf-dist/doc/latex/photobook/photobook.pdf   | Bin 134431 -> 135441 bytes
 .../texmf-dist/tex/latex/photobook/photobook.cls   |  29 +++++++++++++-----
 4 files changed, 54 insertions(+), 16 deletions(-)

(limited to 'Master')

diff --git a/Master/texmf-dist/doc/latex/photobook/Makefile b/Master/texmf-dist/doc/latex/photobook/Makefile
index fd760d03529..24fa243a4fa 100644
--- a/Master/texmf-dist/doc/latex/photobook/Makefile
+++ b/Master/texmf-dist/doc/latex/photobook/Makefile
@@ -58,7 +58,8 @@ MODULE := photobook
 VERSION = $(strip $(shell \
 	cat $(MODULE).cls \
 		| grep 'VERSION{' \
-	 	| sed 's/.*{\(.*\)}.*/\1/'))
+	 	| sed 's/.*{\(.*\)}.*/\1/' \
+		| sed 's/v//'))
 DATE = $(strip $(shell date "+%Y%m%d%H%M"))
 COMMIT = $(strip $(shell git rev-parse HEAD))
 
@@ -266,10 +267,6 @@ manual:
 	mv manual/*.pdf .
 
 
-%.zipnote: %.zip
-	zipnote $< > $@
-
-
 .PHONY: dist
 dist: $(DIST_FILES)
 	$(MD) $(DIST_DIR)
@@ -279,9 +276,30 @@ dist: $(DIST_FILES)
 		| sed 's/^\@ \([^(].*\)$$/@ \1\n@=$(MODULE)\/\1/' \
 		| zipnote -w $(DIST_DIR)/$(DIST_NAME).zip
 
-CTAN: dist
-	$(MD) $(DIST_DIR)/CTAN
-	cp $(DIST_DIR)/$(DIST_NAME).zip $(DIST_DIR)/CTAN/$(MODULE).zip
+
+# this is used to create a CTAN-compatible dist archive...
+.PHONY: ctan-dist
+ctan-dist: dist
+	cp -f $(DIST_DIR)/$(DIST_NAME).zip $(DIST_DIR)/$(MODULE).zip
+
+
+
+.PHONY: tag
+tag:
+	@echo "Will create and publish git tag:"
+	@echo "    $(VERSION)"
+	@echo "Last 5 tags:"
+	@git tag -l '[0-9]*'\
+		| tail -n 5 \
+		| sed 's/^/    /'
+	@echo "Note that this must be done after a commit."
+	@read -p "(press any key to continue or ctrl-c to cancel)"
+	git tag "$(VERSION)"
+	git commit origin "$(VERSION)"
+
+
+#.PHONY: publish
+#publish: dist
 
 
 .PHONY: all
diff --git a/Master/texmf-dist/doc/latex/photobook/README.md b/Master/texmf-dist/doc/latex/photobook/README.md
index cbab31c2801..8a1aea8caaa 100644
--- a/Master/texmf-dist/doc/latex/photobook/README.md
+++ b/Master/texmf-dist/doc/latex/photobook/README.md
@@ -18,6 +18,12 @@
 
 ## Build / Install
 
+The package is available on: 
+- CTAN: https://ctan.org/pkg/photobook
+- GitHub: https://github.com/flynx/photobook
+
+
+To install from source:
 ```shell
 # get the source...
 $ git clone https://github.com/flynx/photobook.git
@@ -35,7 +41,6 @@ $ make pdf
 For more info on `make` targets see the: [./Makefile](./Makefile)
 
 
-
 ## 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 42b6a53eb4a..505e80f0579 100644
Binary files a/Master/texmf-dist/doc/latex/photobook/photobook.pdf and b/Master/texmf-dist/doc/latex/photobook/photobook.pdf differ
diff --git a/Master/texmf-dist/tex/latex/photobook/photobook.cls b/Master/texmf-dist/tex/latex/photobook/photobook.cls
index c4f2d56c050..408acee1739 100644
--- a/Master/texmf-dist/tex/latex/photobook/photobook.cls
+++ b/Master/texmf-dist/tex/latex/photobook/photobook.cls
@@ -58,7 +58,7 @@
 
 %%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the 
 %%%		code and the generated docs...
-\edef\photobook@FILEVERSION{v0.1}
+\edef\photobook@FILEVERSION{v0.1.3}
 \edef\photobook@FILEDATE{2021-07-28}
 
 
@@ -926,14 +926,25 @@
 	\else
 		\def\pdfpagelayout{\photobook@pdfpagelayout}\fi
 	% items to ignore in different layouts...
-	% XXX is this the correct way to go???
 	\ifcoverlayout
-		\setlength\coverflap{\photobook@coverflap}
+		\setlength\coverflap{
+			\ifx\coverflap\empty
+				\photobook@coverflap
+			\else
+				\coverflap \fi}
 	\else
 		\setlength\coverflap{0pt}\fi
 	\ifjacketlayout
-		\setlength\jacketwrap{\photobook@jacketwrap}
-		\setlength\jacketflap{\photobook@jacketflap}
+		\setlength\jacketwrap{
+			\ifx\jacketwrap\empty
+				\photobook@jacketwrap
+			\else
+				\jacketwrap \fi}
+		\setlength\jacketflap{
+			\ifx\jacketflap\empty
+				\photobook@jacketflap
+			\else
+				\jacketflap \fi}
 	\else
 		\setlength\jacketwrap{0pt}
 		\setlength\jacketflap{0pt}\fi
@@ -1803,7 +1814,6 @@
 	\end{inlinecell*}%
 	\end{turn}}
 
-
 %% \DescribeEnv{cliptocell}
 %
 %% Clip content to parent cell.
@@ -3697,7 +3707,7 @@
 %% \begin{minipage}{\textwidth}
 %% \begin{verbatim}
 %%
-%%   backflap        spline/vspine           frontflap
+%%   backflap         spine/vspine           frontflap
 %%     .    backcover      .   frontcover      .
 %%     v     v             v     v             v
 %%   +---+---------------+---+---------------+---+               
@@ -3711,6 +3721,11 @@
 %% \end{verbatim}
 %% \end{minipage}
 %%
+%% Note that when typesetting a spine with both top-down and bottom-up 
+%% text it is recommended to use |topdown|/|bottomup| in |zinlinecell|'s 
+%% in a normal |spine| rather than using a |vspine| and trying to rotate 
+%% part of the content.
+%%
 \newenvironment{frontcover}{%
 	\begin{cell*}{
 				\bleed 
-- 
cgit v1.2.3