diff options
author | Karl Berry <karl@freefriends.org> | 2022-11-15 20:52:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-11-15 20:52:12 +0000 |
commit | fa5332412836ea771b73c85c930c0ae6dec0878d (patch) | |
tree | 9f48ca68b5dd87feb3e66c06c1f805f1c0901ed5 | |
parent | 3a5d045d6e980ce4b01e54bd1e4cb57eb7dab511 (diff) |
photobook (15nov22)
git-svn-id: svn://tug.org/texlive/trunk@65022 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/photobook/Makefile | 19 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/photobook/photobook.pdf | bin | 135441 -> 137550 bytes | |||
-rw-r--r-- | Master/texmf-dist/tex/latex/photobook/photobook.cls | 77 |
3 files changed, 67 insertions, 29 deletions
diff --git a/Master/texmf-dist/doc/latex/photobook/Makefile b/Master/texmf-dist/doc/latex/photobook/Makefile index 24fa243a4fa..ef68ad54bfd 100644 --- a/Master/texmf-dist/doc/latex/photobook/Makefile +++ b/Master/texmf-dist/doc/latex/photobook/Makefile @@ -119,13 +119,19 @@ BUILD_DIR := build #DIST_NAME := $(MODULE)-$(VERSION) DIST_NAME := $(MODULE)-$(VERSION)-$(DATE) DIST_DIR := dist -DIST_FILES = \ +DIST_SCRIPTS = \ + $(wildcard scripts/*) +# NOTE: these are separate to unset the x bit... +DIST_NORMAL_FILES = \ README.md \ LICENSE \ Makefile \ - $(wildcard scripts/*) \ $(MODULE).cls \ $(MODULE).pdf +DIST_FILES = \ + $(DIST_SCRIPTS) \ + $(DIST_NORMAL_FILES) \ + # Add these when ready... # $(wildcard examples/*) \ # $(wildcard manual/*) \ @@ -270,6 +276,7 @@ manual: .PHONY: dist dist: $(DIST_FILES) $(MD) $(DIST_DIR) + chmod 644 $(DIST_NORMAL_FILES) zip -Drq $(DIST_DIR)/$(DIST_NAME).zip $(DIST_FILES) # Place everything in the module dir as per CTAN spec... zipnote $(DIST_DIR)/$(DIST_NAME).zip \ @@ -287,15 +294,15 @@ ctan-dist: dist .PHONY: tag tag: @echo "Will create and publish git tag:" - @echo " $(VERSION)" + @echo " v$(VERSION)" @echo "Last 5 tags:" - @git tag -l '[0-9]*'\ + @git tag -l 'v[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)" + git tag "v$(VERSION)" + git push origin "v$(VERSION)" #.PHONY: publish diff --git a/Master/texmf-dist/doc/latex/photobook/photobook.pdf b/Master/texmf-dist/doc/latex/photobook/photobook.pdf Binary files differindex 505e80f0579..a01a74485ae 100644 --- a/Master/texmf-dist/doc/latex/photobook/photobook.pdf +++ b/Master/texmf-dist/doc/latex/photobook/photobook.pdf diff --git a/Master/texmf-dist/tex/latex/photobook/photobook.cls b/Master/texmf-dist/tex/latex/photobook/photobook.cls index 408acee1739..f2d75270ade 100644 --- a/Master/texmf-dist/tex/latex/photobook/photobook.cls +++ b/Master/texmf-dist/tex/latex/photobook/photobook.cls @@ -58,8 +58,8 @@ %%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the %%% code and the generated docs... -\edef\photobook@FILEVERSION{v0.1.3} -\edef\photobook@FILEDATE{2021-07-28} +\edef\photobook@FILEVERSION{v0.1.5} +\edef\photobook@FILEDATE{2022-11-14} %% \documentclass{ltxdoc} @@ -404,6 +404,10 @@ %% \end{verbatim} %% \end{minipage} %% +%% Note that for |cover|, |endpaper|, and |jacket|, +%% \href{https://ctan.org/pkg/fancyhdr}{fancyhdr}'s |\pagestyle{..}| is +%% set to |empty| by default. +%% % % XXX in cover layout setup pdf boxes in a way to use \bleed as foldover... % ...see hyperref docs to set pdf view/print area (???) @@ -550,46 +554,82 @@ %---------------------------------------------------------------------- -% Packages... +%%%% Packages +% +%% |photobook| adds and uses internally the following packages: % -% NOTE: imports are after \LoadClass{ .. } to avoid figting over macro +% NOTE: imports are after \LoadClass{ .. } to avoid fighting over macro % names... +%% \href{https://ctan.org/pkg/geometry}{geometry}, +%% \href{https://ctan.org/pkg/kvoptions}{kvoptions}, + +%% \href{https://ctan.org/pkg/calc}{calc}, \RequirePackage{calc} +%% \href{https://ctan.org/pkg/xargs}{xargs}, \RequirePackage{xargs} +%% \href{https://ctan.org/pkg/ifthen}{ifthen}, \RequirePackage{ifthen} +%% \href{https://ctan.org/pkg/iftex}{iftex}, \RequirePackage{iftex} +%% \href{https://ctan.org/pkg/pgffor}{pgffor}, \RequirePackage{pgffor} +%% \href{https://ctan.org/pkg/xint}{xint}, \RequirePackage{xint} +%% \href{https://ctan.org/pkg/xinttools}{xinttools}, \RequirePackage{xinttools} +%% \href{https://ctan.org/pkg/listofitems}{listofitems}, \RequirePackage{listofitems} +%% \href{https://ctan.org/pkg/xkeyval}{xkeyval}, \RequirePackage{xkeyval} +%% \href{https://ctan.org/pkg/etoolbox}{etoolbox}, \RequirePackage{etoolbox} +%% \href{https://ctan.org/pkg/atbegshi}{atbegshi}, \RequirePackage{atbegshi} %\RequirePackage{afterpage} %\RequirePackage{changepage} +%% \href{https://ctan.org/pkg/hyperref}{hyperref}, \RequirePackage[unicode]{hyperref} %\RequirePackage{pdfcomment} +%% \href{https://ctan.org/pkg/eso-pic}{eso-pic}, \RequirePackage{eso-pic} +%% \href{https://ctan.org/pkg/environ}{environ}, \RequirePackage{environ} +%% \href{https://ctan.org/pkg/numprint}{numprint}, \RequirePackage{numprint} +%% \href{https://ctan.org/pkg/trimclip}{trimclip}, \RequirePackage{trimclip} +%% \href{https://ctan.org/pkg/xcolor}{xcolor}, \RequirePackage{xcolor} +%% \href{https://ctan.org/pkg/colorspace}{colorspace}, \RequirePackage{colorspace} +%% \href{https://ctan.org/pkg/graphicx}{graphicx}, \RequirePackage{graphicx} +%% \href{https://ctan.org/pkg/adjustbox}{adjustbox}, \RequirePackage{adjustbox} +%% \href{https://ctan.org/pkg/adjustbox}{adjustbox}, \RequirePackage[absolute]{textpos} +%% \href{https://ctan.org/pkg/fancyvrb}{fancyvrb}, \RequirePackage{fancyvrb} +%% \href{https://ctan.org/pkg/tikz}{tikz}, \RequirePackage{tikz} %\RequirePackage[linewidth=1pt]{mdframed} % XXX flow text frames... % XXX this messes with geometry.... %\RequirePackage{flowfram} +%% \href{https://ctan.org/pkg/rotating}{rotating}, \RequirePackage{rotating} +%% \href{https://ctan.org/pkg/fancyhdr}{fancyhdr}, and \RequirePackage{fancyhdr} +%% \href{https://ctan.org/pkg/pdfpages}{pdfpages}. \RequirePackage{pdfpages} +%% \newline +%% Most of these packages can be used by the book author without explicitly +%% importing them. +%% + %---------------------------------------------------------------------- %%%% Globals @@ -646,6 +686,7 @@ %% Cover flap %% \newlength\coverflap +\setlength\coverflap{\photobook@coverflap} %% \DescribeMacro{\jacketwrap=<len>} %% \DescribeMacro{\jacketflap=<len>} @@ -655,9 +696,13 @@ %% Jacker configuration %% \newlength\jacketwrap +\setlength\jacketwrap{\photobook@jacketwrap} \newlength\jacketflap +\setlength\jacketflap{\photobook@jacketflap} \newlength\jacketflapfront +\setlength\jacketflapfront{\photobook@jacketflapfront} \newlength\jacketflapback +\setlength\jacketflapback{\photobook@jacketflapback} %% \DescribeMacro{\blockwidth=<len>} %% \DescribeMacro{\blockheight=<len>} @@ -926,26 +971,9 @@ \else \def\pdfpagelayout{\photobook@pdfpagelayout}\fi % items to ignore in different layouts... - \ifcoverlayout - \setlength\coverflap{ - \ifx\coverflap\empty - \photobook@coverflap - \else - \coverflap \fi} - \else + \ifcoverlayout\else \setlength\coverflap{0pt}\fi - \ifjacketlayout - \setlength\jacketwrap{ - \ifx\jacketwrap\empty - \photobook@jacketwrap - \else - \jacketwrap \fi} - \setlength\jacketflap{ - \ifx\jacketflap\empty - \photobook@jacketflap - \else - \jacketflap \fi} - \else + \ifjacketlayout\else \setlength\jacketwrap{0pt} \setlength\jacketflap{0pt}\fi % flaps... @@ -966,6 +994,7 @@ \setlength\pageblockwidth{\blockwidth} % layout: cover... \ifcoverlayout + \pagestyle{empty}% \setsepchar{,}% \readlist*\pagefoldpanels{% \the\coverflap, @@ -992,6 +1021,7 @@ % layout: jacket... % XXX this seems to be about 6mm off -- what are we missing here??? \ifjacketlayout + \pagestyle{empty}% \setsepchar{,}% \readlist*\pagefoldpanels{% \the\jacketflapback, @@ -1019,6 +1049,7 @@ + \jacketflapback \relax}\fi % layout: endpaper... \ifendpaperlayout + \pagestyle{empty}% \readlist*\pagefoldpanels{% \the\pageblockwidth, \the\pageblockwidth}% |