diff options
author | Norbert Preining <norbert@preining.info> | 2022-11-14 03:04:08 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-11-14 03:04:08 +0000 |
commit | 1638c7bf59f91caa61849a5c5d73be504d07a49a (patch) | |
tree | 1000754f2cc885bb216b9b4173cb101c13159785 /macros/latex/contrib/photobook | |
parent | 1b59c3c45170420996d629b296e2214933ee1add (diff) |
CTAN sync 202211140304
Diffstat (limited to 'macros/latex/contrib/photobook')
-rw-r--r-- | macros/latex/contrib/photobook/Makefile | 34 | ||||
-rw-r--r-- | macros/latex/contrib/photobook/README.md | 7 | ||||
-rw-r--r-- | macros/latex/contrib/photobook/photobook.cls | 29 | ||||
-rw-r--r-- | macros/latex/contrib/photobook/photobook.pdf | bin | 134431 -> 135441 bytes | |||
-rwxr-xr-x[-rw-r--r--] | macros/latex/contrib/photobook/scripts/make-images.sh | 0 |
5 files changed, 54 insertions, 16 deletions
diff --git a/macros/latex/contrib/photobook/Makefile b/macros/latex/contrib/photobook/Makefile index fd760d0352..24fa243a4f 100644 --- a/macros/latex/contrib/photobook/Makefile +++ b/macros/latex/contrib/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/macros/latex/contrib/photobook/README.md b/macros/latex/contrib/photobook/README.md index cbab31c280..8a1aea8caa 100644 --- a/macros/latex/contrib/photobook/README.md +++ b/macros/latex/contrib/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/macros/latex/contrib/photobook/photobook.cls b/macros/latex/contrib/photobook/photobook.cls index c4f2d56c05..408acee173 100644 --- a/macros/latex/contrib/photobook/photobook.cls +++ b/macros/latex/contrib/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 diff --git a/macros/latex/contrib/photobook/photobook.pdf b/macros/latex/contrib/photobook/photobook.pdf Binary files differindex 42b6a53eb4..505e80f057 100644 --- a/macros/latex/contrib/photobook/photobook.pdf +++ b/macros/latex/contrib/photobook/photobook.pdf diff --git a/macros/latex/contrib/photobook/scripts/make-images.sh b/macros/latex/contrib/photobook/scripts/make-images.sh index 7be3a53cf8..7be3a53cf8 100644..100755 --- a/macros/latex/contrib/photobook/scripts/make-images.sh +++ b/macros/latex/contrib/photobook/scripts/make-images.sh |