From 5e7ed3f53bdf940ec6dc2327ccf586cd540aa9b9 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 15 Nov 2022 03:01:17 +0000 Subject: CTAN sync 202211150301 --- macros/latex/contrib/photobook/Makefile | 19 +++-- macros/latex/contrib/photobook/photobook.cls | 77 +++++++++++++++------ macros/latex/contrib/photobook/photobook.pdf | Bin 135441 -> 137550 bytes .../latex/contrib/photobook/scripts/make-images.sh | 0 macros/texinfo/latest/texinfo.tex | 25 ++++--- 5 files changed, 81 insertions(+), 40 deletions(-) mode change 100755 => 100644 macros/latex/contrib/photobook/scripts/make-images.sh (limited to 'macros') diff --git a/macros/latex/contrib/photobook/Makefile b/macros/latex/contrib/photobook/Makefile index 24fa243a4f..ef68ad54bf 100644 --- a/macros/latex/contrib/photobook/Makefile +++ b/macros/latex/contrib/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/macros/latex/contrib/photobook/photobook.cls b/macros/latex/contrib/photobook/photobook.cls index 408acee173..f2d75270ad 100644 --- a/macros/latex/contrib/photobook/photobook.cls +++ b/macros/latex/contrib/photobook/photobook.cls @@ -58,8 +58,8 @@ %%% NOTE: \def\@[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=} %% \DescribeMacro{\jacketflap=} @@ -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=} %% \DescribeMacro{\blockheight=} @@ -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}% diff --git a/macros/latex/contrib/photobook/photobook.pdf b/macros/latex/contrib/photobook/photobook.pdf index 505e80f057..a01a74485a 100644 Binary files a/macros/latex/contrib/photobook/photobook.pdf and b/macros/latex/contrib/photobook/photobook.pdf differ diff --git a/macros/latex/contrib/photobook/scripts/make-images.sh b/macros/latex/contrib/photobook/scripts/make-images.sh old mode 100755 new mode 100644 diff --git a/macros/texinfo/latest/texinfo.tex b/macros/texinfo/latest/texinfo.tex index b1bf41ff56..fbdfab8a8f 100644 --- a/macros/texinfo/latest/texinfo.tex +++ b/macros/texinfo/latest/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2022-11-07.17} +\def\texinfoversion{2022-11-12.22} % % Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc. % @@ -3691,7 +3691,10 @@ $$% % @textdegree - the normal degrees sign. % -\def\textdegree{$^\circ$} +\def\textdegree{% + \ifmmode ^\circ + \else {\tcfont \char 176}% + \fi} % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 @@ -8428,21 +8431,21 @@ might help (with 'rm \jobname.?? \jobname.??s')% \ifcase\paramno % 0 \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup + \begingroup \noexpand\spaceisspace \noexpand\endlineisspace \noexpand\expandafter % skip any whitespace after the macro name. \expandafter\noexpand\csname\the\macname @@@\endcsname}% \expandafter\xdef\csname\the\macname @@@\endcsname{% - \egroup + \endgroup \noexpand\scanmacro{\macrobody}}% \or % 1 \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup + \begingroup \noexpand\braceorline \expandafter\noexpand\csname\the\macname @@@\endcsname}% \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \egroup + \endgroup \noexpand\scanmacro{\macrobody}% }% \else % at most 9 @@ -8453,7 +8456,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% % @MACNAME@@@ removes braces surrounding the argument list. % @MACNAME@@@@ scans the macro body with arguments substituted. \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup + \begingroup \noexpand\expandafter % This \expandafter skip any spaces after the \noexpand\macroargctxt % macro before we change the catcode of space. \noexpand\expandafter @@ -8467,7 +8470,7 @@ might help (with 'rm \jobname.?? \jobname.??s')% \expandafter\xdef \expandafter\expandafter \csname\the\macname @@@@\endcsname\paramlist{% - \egroup\noexpand\scanmacro{\macrobody}}% + \endgroup\noexpand\scanmacro{\macrobody}}% \else % 10 or more: \expandafter\xdef\csname\the\macname\endcsname{% \noexpand\getargvals@{\the\macname}{\argl}% @@ -10063,7 +10066,7 @@ directory should work if nowhere else does.} \gdefchar^^ae{\v Z} \gdefchar^^af{\dotaccent Z} % - \gdefchar^^b0{\textdegree{}} + \gdefchar^^b0{\textdegree} \gdefchar^^b1{\ogonek{a}} \gdefchar^^b2{\ogonek{ }} \gdefchar^^b3{\l} @@ -10486,7 +10489,7 @@ directory should work if nowhere else does.} \DeclareUnicodeCharacter{00AE}{\registeredsymbol{}}% \DeclareUnicodeCharacter{00AF}{\={ }}% % - \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}% + \DeclareUnicodeCharacter{00B0}{\textdegree} \DeclareUnicodeCharacter{00B1}{\ensuremath\pm}% \DeclareUnicodeCharacter{00B2}{$^2$}% \DeclareUnicodeCharacter{00B3}{$^3$}% @@ -10990,7 +10993,7 @@ directory should work if nowhere else does.} % \DeclareUnicodeCharacter{20AC}{\euro{}}% % - \DeclareUnicodeCharacter{2192}{\expansion{}}% + \DeclareUnicodeCharacter{2192}{\arrow}% \DeclareUnicodeCharacter{21D2}{\result{}}% % % Mathematical symbols -- cgit v1.2.3