From f569b5dc84d8ea85a85d7e92a9bd54142e0b778e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 4 Sep 2021 03:00:51 +0000 Subject: CTAN sync 202109040300 --- macros/latex/contrib/apxproof/apxproof.dtx | 60 ++- macros/latex/contrib/apxproof/apxproof.pdf | Bin 566581 -> 569226 bytes macros/latex/contrib/dccpaper/dccpaper-by.eps | 506 +-------------------- macros/latex/contrib/dccpaper/dccpaper.dtx | 208 +-------- macros/latex/contrib/dccpaper/dccpaper.pdf | Bin 305770 -> 336603 bytes macros/latex/contrib/lastpage/README | 16 +- macros/latex/contrib/lastpage/lastpage-example.pdf | Bin 115183 -> 118155 bytes macros/latex/contrib/lastpage/lastpage.dtx | 242 +++++++--- macros/latex/contrib/lastpage/lastpage.pdf | Bin 430557 -> 436318 bytes 9 files changed, 264 insertions(+), 768 deletions(-) (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/apxproof/apxproof.dtx b/macros/latex/contrib/apxproof/apxproof.dtx index 307934752d..0225d20e77 100644 --- a/macros/latex/contrib/apxproof/apxproof.dtx +++ b/macros/latex/contrib/apxproof/apxproof.dtx @@ -24,7 +24,7 @@ % \iffalse %\NeedsTeXFormat{LaTeX2e}[2005/12/01] %\ProvidesPackage{apxproof} -% [2021/06/23 v1.2.2 Automatic proofs in appendix] +% [2021/09/03 v1.2.3 Automatic proofs in appendix] % %<*driver> \documentclass{ltxdoc} @@ -45,7 +45,7 @@ % % \fi % -% \CheckSum{828} +% \CheckSum{864} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -400,6 +400,15 @@ This is a citation in the appendix~\cite{proofsAreHard}. % |\ref{|\meta{counter}|-apx}| references the counter in the appendix % (except in |inline| mode, where both have the same effect). % +% \DescribeOption{forwardlinking} +% Another customization option concerns hyperlinking. +% Usually, when \textsf{hyperref} is loaded, |foobarrep| +% environments in the main text have their number link to their repetition in the +% appendix. To suppress this behavior and have |foobarrep| environments +% treated as if \textsf{hyperref} were not loaded, one can specify the +% value |no| to the |forwardlinking| option when loading the package. (By +% default this option is set to |yes|.) +% % \subsection{Advanced Features} % We now describe a few advanced macros and environments, the usage of % which is limited to special cases: @@ -489,7 +498,8 @@ This is a citation in the appendix~\cite{proofsAreHard}. % \section{Acknowledgments} % Thanks to Antoine Amarilli for feedback and proofreading. Thanks to K.~D. % Bauer for the implementation of the forward-linking mechanism, and -% for various bugfixes. +% for various bugfixes. Thanks to Leonid Kostrykin for an initial +% implementation of the |forwardlinking| option. % % \StopEventually{ % \PrintChanges @@ -596,6 +606,12 @@ This is a citation in the appendix~\cite{proofsAreHard}. \DeclareStringOption[same]{repeqn} % \end{macrocode} % \end{macro} +% \begin{macro}{\axp@forwardlinking} +% \changes{v1.2.3}{2021/07/12}{\texttt{forwardlinking} option} +% \begin{macrocode} +\DeclareStringOption[yes]{forwardlinking} +% \end{macrocode} +% \end{macro} % \begin{macrocode} \ProcessLocalKeyvalOptions* % \end{macrocode} @@ -636,6 +652,19 @@ This is a citation in the appendix~\cite{proofsAreHard}. package apxproof} }} % \end{macrocode} +% \begin{macro}{\axp@forward@suppress} +% \begin{macrocode} +\newbool{axp@forward@suppress} +\ifthenelse{\equal{\axp@forwardlinking}{yes}}{ +}{\ifthenelse{\equal{\axp@forwardlinking}{no}}{ + \message{apxproof: Disable forward linking} + \global\booltrue{axp@forward@suppress}% +}{ + \errmessage{Error: unsupported option forwardlinking=\axp@repeqn\ for + package apxproof} +}} +% \end{macrocode} +% \end{macro} % \subsection{Macros Common to All Compilation Modes} % \begin{macro}{\axp@newtheoremrep@definetheorem} % \changes{v1.2.0}{2019/10/01}{Restore predefined theorem counters} @@ -1094,6 +1123,11 @@ This is a citation in the appendix~\cite{proofsAreHard}. \noexpand\setcounter{equation}{\theaxp@equation}% }% }{}% + \ifbool{axp@forward@suppress}{% + \global\def\axp@refstar{\ref*} + }{% + \global\def\axp@refstar{\ref} + } \immediate\write\axp@proofsfile{{% \ifdefined\theopargself \noexpand\theopargself @@ -1107,7 +1141,7 @@ This is a citation in the appendix~\cite{proofsAreHard}. \fi \noexpand\begin{axp@#1rp} [% - \noexpand\ref{axp@r\roman{axp@rpcounter}}% + \noexpand\axp@refstar{axp@r\roman{axp@rpcounter}}% \@ifnotempty{##1}{% \ifdefined\theopargself \else @@ -1203,7 +1237,7 @@ This is a citation in the appendix~\cite{proofsAreHard}. % \begin{macrocode} \newbool{axp@forward} \newcommand{\axp@forward@link}[2]{% - \ifbool{axp@forward}{% + \ifboolexpr{ bool {axp@forward} and not bool {axp@forward@suppress} }{% \ifcsdef{hyperlink}{% \hyperlink{#1}{#2}% }{% @@ -1489,6 +1523,9 @@ This is a citation in the appendix~\cite{proofsAreHard}. % bibliography is called \texttt{\textbackslash bibname}} % \changes{v1.2.1}{2020/02/27}{Ad hoc fix for \textsf{natbib} % package conflict} +% \changes{v1.2.3}{2021/08/03}{More robust redefinition of +% \texttt{thebibliography} environment, for compatibility with +% \textsf{tocbibind}} % \begin{macrocode} \pretocmd{\@enddocumenthook}{% \ifdefined\NAT@testdef @@ -1510,8 +1547,17 @@ This is a citation in the appendix~\cite{proofsAreHard}. \renewcommand{\bibname}{\appendixrefname} \fi\fi \let\axp@oldthebibliography\thebibliography - \renewcommand\thebibliography[1]{% - \ifx\relax#1\relax\else\axp@oldthebibliography{#1}\fi} + \let\endaxp@oldthebibliography\endthebibliography + \renewenvironment{thebibliography}[1]{% + \def\axp@tmp{#1}% + \ifx\axp@tmp\empty + \gdef\axp@noappendixbibliography1\relax + \else + \begin{axp@oldthebibliography}{#1}% + \fi + }{% + \ifdefined\axp@noappendixbibliography\relax\else\end{axp@oldthebibliography}% + \fi} \appendixbibliographyprelim \putbib \end{bibunit} diff --git a/macros/latex/contrib/apxproof/apxproof.pdf b/macros/latex/contrib/apxproof/apxproof.pdf index 48f0d4638e..223f7ebad7 100644 Binary files a/macros/latex/contrib/apxproof/apxproof.pdf and b/macros/latex/contrib/apxproof/apxproof.pdf differ diff --git a/macros/latex/contrib/dccpaper/dccpaper-by.eps b/macros/latex/contrib/dccpaper/dccpaper-by.eps index 5b5c60050a..1a8ba84715 100644 --- a/macros/latex/contrib/dccpaper/dccpaper-by.eps +++ b/macros/latex/contrib/dccpaper/dccpaper-by.eps @@ -1,175 +1,4 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Creator: Adobe Illustrator(R) 8.0 -%%AI8_CreatorVersion: 13.0.1 -%%For: (Alex Roberts) () -%%Title: (by.eps) -%%CreationDate: 3/27/08 4:26 PM -%%BoundingBox: 340 278 461 321 -%%HiResBoundingBox: 340.5 278.5 460.5 320.5 -%%DocumentProcessColors: Cyan Magenta Yellow Black -%%DocumentSuppliedResources: procset Adobe_level2_AI5 1.2 0 -%%+ procset Adobe_ColorImage_AI6 1.3 0 -%%+ procset Adobe_Illustrator_AI5 1.3 0 -%%+ procset Adobe_cshow 2.0 8 -%%+ procset Adobe_shading_AI8 1.0 0 -%AI5_FileFormat 4.0 -%AI3_ColorUsage: Color -%AI3_IncludePlacedImages -%AI7_ImageSettings: 1 -%%CMYKProcessColor: 0.74902 0.678431 0.670588 0.901961 ([Registration]) -%%AI6_ColorSeparationSet: 1 1 (AI6 Default Color Separation Set) -%%+ Options: 1 16 0 1 1 1 0 0 0 0 1 1 1 18 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 2 3 4 -%%+ PPD: 1 21 0 0 60 45 2 2 1 0 0 1 0 0 0 0 0 0 0 0 -1 -1 () -%AI3_Cropmarks: 340.5 278.5 460.5 320.5 -%AI3_TemplateBox: 400.5 299.5 400.5 299.5 -%AI3_TileBox: 112 -56 688 678 -%AI3_DocumentPreview: Macintosh_ColorPic -%AI5_ArtSize: 800 600 -%AI5_RulerUnits: 6 -%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 -%AI5_TargetResolution: 800 -%AI5_NumLayers: 1 -%AI8_OpenToView: -381 756 1 1566 923 26 0 0 73 75 0 0 -%AI5_OpenViewLayers: 7 -%%PageOrigin:0 0 -%AI7_GridSettings: 48 8 48 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 -%AI9_Flatten: 1 -%AI12_CMSettings: 00.MS -%AI7_Thumbnail: 128 48 8 -%%BeginData: 7956 Hex Bytes -%0000330000660000990000CC0033000033330033660033990033CC0033FF -%0066000066330066660066990066CC0066FF009900009933009966009999 -%0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 -%00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 -%3333663333993333CC3333FF3366003366333366663366993366CC3366FF -%3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 -%33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 -%6600666600996600CC6600FF6633006633336633666633996633CC6633FF -%6666006666336666666666996666CC6666FF669900669933669966669999 -%6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 -%66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF -%9933009933339933669933999933CC9933FF996600996633996666996699 -%9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 -%99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF -%CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 -%CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 -%CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF -%CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC -%FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 -%FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 -%FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 -%000011111111220000002200000022222222440000004400000044444444 -%550000005500000055555555770000007700000077777777880000008800 -%000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB -%DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF -%00FF0000FFFFFF0000FF00FFFFFF00FFFFFF -%524C45A8FD7DF827A8F8275258527D5258527D5258527D5258527D525852 -%7D5258527D5258527D5258527D5258527D5258527D5258527D5258527D52 -%58527D5258527D5258527D5258527D5258527D5258527D5258527D525852 -%7D5258527D5258527D5258527D5258527D5258527D5258527D5258527D52 -%58527D5258527D5258527D5258527DF8F8F852A87D837DA87D837DA87D83 -%7DA87D837DA87D847DA87D837DA87D837DA87D837DA87D837DA87D837DA8 -%7D837DA87D837DA87D837DA87D837DA87D837DA87D837DA87D837DA87D83 -%7DA87D837DA883A87DA883A87DA87D837DA87D837DA87D837DA87D837DA8 -%7D837DA87D837DA87D837DA87D837DA87D837DA87D837D7DF8F8FD127D83 -%FD3A7DFD05525858FD297D52F8F852A87D837D837D837D837D837DA87D83 -%5258275227272752527D7DA87D837D837D837D837D837D837D837D837D83 -%7D837D837D837D837D837D837D837D837D837D837D837D837D837DA87D52 -%2727FD05F827277D7DA87D837D837D837D837D837D837D837D837D837D83 -%7D837D837D837D837D837D837D837D837D7DF8F8FD0C7D837D52FD0BF827 -%2DFD2D7D5227FD0BF8275883FD247D52F8F858837D837D7D7D837D7D7DA8 -%5227FD0FF8527DA87D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D -%7D837D7D7D837D7D7D837D7D7D837D7D7DA82DFD04F8527DA8A8A87D52F8 -%F8F82752A87D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D -%837D7D7D837D7D7D837D7DF8F8FD0B7D27FD06F82727525227FD07F82758 -%83FD267D27F8F8F852FD08FFA827F8F8F85283FD227D52F8F858A87D837D -%837D837D7DFD05F8277DFD07FFA87D27FD04F8277DA87D837D837D837D83 -%7D837D837D837D837D837D837D837D837D837D837D837D837D837DA852F8 -%F827A8FD04FF7D27A8FD04FF7DF8F8F852A87D837D837D837D837D837D83 -%7D837D837D837D837D837D837D837D837D837D837D7DF8F8FD097DFD05F8 -%7DFD0CFF7D27F8F8F827FD237D8352F8F8F8A8FD04FF7DF8F8F8A8FD04FF -%7DF8F827FD217D8352F8F852A87D7D7D837D8327F8F8F827FD0FFFA852F8 -%F8F8277D837D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D -%837D7D7D837D7D7D27F8F87DFD05FF52F8F8F8A8FD05FF52F8F8527D837D -%7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83FD047D -%F8F859FD057D8327F8F8F827FD12FF52F8F8F827FD227DF8F827FD07FF27 -%2752FD07FFF8F8F8FD217D52F8F852A87D837DA852F8F8F827FD14FF52F8 -%F8F8587D837D837D837D837D837D837D837D837D837D837D837D837D837D -%837D837DA827F8F8A8FD05FFA8527D527D52FD06FF7DF8F852A87D837D83 -%7D837D837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8 -%FD067D27F8F8F8A8FD14FFA827F8F8F8FD207D27F827FD06FFFD06F827FD -%05FFA8F8F852FD207D52F8F858837D837D58F8F8F87DFD16FF7DF8F8F852 -%A87D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83FD047D -%F8F852FD06FFFD06F827FD06FF27F827837D837D7D7D837D7D7D837D7D7D -%837D7D7D837D7D7D837D7D7D837D7D7D837D7DF8F8FD047D8327F8F827FD -%18FF27F8F827FD1E7D52F8F87DFD06FFFD06F827FD06FF52F827FD207D52 -%F8F858A87DA87D27F8F87DFD05FF7D5227527DFD05FF7D52277DA8FD04FF -%7DF8F8F87D7D837D837D837D837D837D837D837D837D837D837D837D837D -%837D837D7DF8F87DFD06FF27FD05F852FD06FF52F827837D837D837D837D -%837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8FD047D -%52F8F8F8FD05FF27FD05F827FFFFA8FD06F852FFFFFFA8F8F8F852FD1D7D -%52F8F87DFD06FFFD06F827FD06FF52F827FD1F7D8352F8F852A87DA827F8 -%F827FD04FF27F8F8F82727F8F852FFF8F8F82727F8F8F87DFFFFFF27F8F8 -%527D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D -%7DF8F87DFD06FF52FD05F87DFD06FF27F827A87D7D7D837D7D7D837D7D7D -%837D7D7D837D7D7D837D7D7D837D7D7D83FD047DF8F8597D7D7D27F8F852 -%FFFFFFA8F8F8F87DFFA82727A852F8F827A8FF7DF827A8FFFFFF52F8F827 -%83FD1D7D27F852FD07FF52F8F8F87DFD06FFA827F827FD207D52F8F852A8 -%7D8327F8F87DFFFFFF7DF8F827FFFFFFA8FFFF27F8F87DFFFFFFA8FD05FF -%7DF8F8277D837D837D837D837D837D837D837D837D837D837D837D837D83 -%7D837DA827F8F8FD07FF52F8F8F87DFD06FFA8F8F852A87D837D837D837D -%837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8FD047D -%27F8F87DFFFFFF52F8F852FD06FFF8F8F8A8FD09FF7DF8F8F8FD1E7D52F8 -%F852FD06FF52F8F8F87DFD06FF27F8F8FD217D52F8F858837D8327F8F87D -%FFFFFF7DF8F852FD06FF27F8F8A8FD09FF7DF8F8277D837D7D7D837D7D7D -%837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D27F827A8FD05FF52 -%F8F8F87DFD05FF7DF8F8527D7D7D837D7D7D837D7D7D837D7D7D837D7D7D -%837D7D7D837D7D7D837D7D7D837D7DF8F8FD047D27F8F852FFFFFF52F8F8 -%27FFFFFF7D52FF27F8F87DFFFFFF7D7DFD04FF7DF8F827FD1E7D8352F8F8 -%27FD05FF52F8F8F87DFD04FFA8F8F8F852FD217D52F8F858A87DA827F8F8 -%52FD04FFF8F8F852A87DF8F8527DF8F8F87DA852F8F87DFFFFFF52F8F852 -%7D837D837D837D837D837D837D837D837D837D837D837D837D837D837D83 -%7DA827F8F852FD04FF52F8F8F87DFFFFFFA827F8F852A87D837D837D837D -%837D837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8FD -%047D52F8F8F8FD04FF7DFD07F87DFF27FD07F8A8FFFFFF27F8F82D83FD20 -%7DF8F8F8277DFFFFFFA8FFA8FFFFFF7DF8F8F827FD227D8352F8F852A87D -%8352F8F8F8A8FD04FF7DFD05F8A8FFFFFF52FD04F827FD05FFF8F8F8FD04 -%7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83 -%7D7D27F8F8F827A8A8FFFFFFA87D27F8F8F827A87D7D7D837D7D7D837D7D -%7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83FD047DF8F859FD04 -%7DF8F8F852FD06FF7D7D7DFFFFFFA8FFFFA87DA8A8FD05FF52F8F8F859FD -%237D27FD06F827FD06F852FD257D52F8F852A87D837D52F8F8F8FD18FF27 -%F8F827A87D837D837D837D837D837D837D837D837D837D837D837D837D83 -%7D837D837D837D837DA85227FD09F8527DA87D837D837D837D837D837D83 -%7D837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8FD05 -%7D52F8F8F827FD16FF52F8F8F8FD267D837D7D525227272752527D7D83FD -%267D52F8F858837D837DA827F8F8F87DFD14FFA8F8F8F8277D7D7D837D7D -%7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83 -%7D7D7D837D847DA87D847DA87D7D7D837D7D7D837D7D7D837D7D7D837D7D -%7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7DF8F8FD077DFD -%04F87DFD12FFA8FD04F852FD047D837D7D7D837D7D7D837D7D7D837D7D7D -%837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D -%7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D -%837D7D7D837D7D7DA852F8F8527D52587D847D7DFD04F87DFD10FFA8FD04 -%F852A87D7D527D5258527D5258527D5258527D5258527D5258527D525852 -%7D5258527D5258527D5258527D5258527D5258527D5258527D5258527D52 -%58527D5258527D5258527D5258527D5258527D5258527D5258527D525852 -%7D5252FD06F8277D7D7D52FD04F852FD0EFF7DFD04F827837D7DFD60F852 -%7D837D52FD04F827A8FD0AFFA852FD04F827A87DA827FD61F8587D7D7D52 -%FD05F82752A8A8FFA8A87D7D27FD05F8277D7D8352FD63F87D7DA87D7DFD -%09F827FD07F82752A87DA858FD27F852A87DA87D2727A852F8F8527D27FD -%30F8FD057D27FD0EF85258A87D8352FD28F87DFFA8A8FFA8F8A8FFF8F8FF -%FFFD32F87D7D837DA87D522727FD07F827527D7D837DA85227FD28F87DFF -%F8F87DFFF852FF7D7DFF27FD33F8527D837D7D7D83587DFD0552FD077D27 -%FD2AF87DFF7D7DFF52F8F8A8FFFF7DFD35F82758A87DA87D847DA87DA87D -%A87D837DA87D7D27FD2BF87DFF7DA8FFFFF8F827FFFF27FD37F827527D83 -%7D7D7D837D7D7D837D7D5227FD2DF87DFFF8F852FF52F8F8A8A8FD3AF827 -%2752527D587D587D5252FD30F87DFF7D7DA8FF27F8F8FFA8FD75F87DFD04 -%A852F8F8F87DA8FDFCF8FD2EF852FD7F27FD7FFFFF -%%EndData -%%EndComments -%%BeginProlog -%%BeginResource: procset Adobe_level2_AI5 1.2 0 +%!PS-Adobe-3.0 EPSF-3.0 %%Creator: Adobe Illustrator(R) 8.0 %%AI8_CreatorVersion: 13.0.1 %%For: (Alex Roberts) () %%Title: (by.eps) %%CreationDate: 3/27/08 4:26 PM %%BoundingBox: 340 278 461 321 %%HiResBoundingBox: 340.5 278.5 460.5 320.5 %%DocumentProcessColors: Cyan Magenta Yellow Black %%DocumentSuppliedResources: procset Adobe_level2_AI5 1.2 0 %%+ procset Adobe_ColorImage_AI6 1.3 0 %%+ procset Adobe_Illustrator_AI5 1.3 0 %%+ procset Adobe_cshow 2.0 8 %%+ procset Adobe_shading_AI8 1.0 0 %AI5_FileFormat 4.0 %AI3_ColorUsage: Color %AI3_IncludePlacedImages %AI7_ImageSettings: 1 %%CMYKProcessColor: 0.74902 0.678431 0.670588 0.901961 ([Registration]) %%AI6_ColorSeparationSet: 1 1 (AI6 Default Color Separation Set) %%+ Options: 1 16 0 1 1 1 0 0 0 0 1 1 1 18 0 0 0 0 0 0 0 0 -1 -1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 0 1 2 3 4 %%+ PPD: 1 21 0 0 60 45 2 2 1 0 0 1 0 0 0 0 0 0 0 0 -1 -1 () %AI3_Cropmarks: 340.5 278.5 460.5 320.5 %AI3_TemplateBox: 400.5 299.5 400.5 299.5 %AI3_TileBox: 112 -56 688 678 %AI3_DocumentPreview: Macintosh_ColorPic %AI5_ArtSize: 800 600 %AI5_RulerUnits: 6 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 1 %AI8_OpenToView: -381 756 1 1566 923 26 0 0 73 75 0 0 %AI5_OpenViewLayers: 7 %%PageOrigin:0 0 %AI7_GridSettings: 48 8 48 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %AI7_Thumbnail: 128 48 8 %%BeginData: 7956 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45A8FD7DF827A8F8275258527D5258527D5258527D5258527D525852 %7D5258527D5258527D5258527D5258527D5258527D5258527D5258527D52 %58527D5258527D5258527D5258527D5258527D5258527D5258527D525852 %7D5258527D5258527D5258527D5258527D5258527D5258527D5258527D52 %58527D5258527D5258527D5258527DF8F8F852A87D837DA87D837DA87D83 %7DA87D837DA87D847DA87D837DA87D837DA87D837DA87D837DA87D837DA8 %7D837DA87D837DA87D837DA87D837DA87D837DA87D837DA87D837DA87D83 %7DA87D837DA883A87DA883A87DA87D837DA87D837DA87D837DA87D837DA8 %7D837DA87D837DA87D837DA87D837DA87D837DA87D837D7DF8F8FD127D83 %FD3A7DFD05525858FD297D52F8F852A87D837D837D837D837D837DA87D83 %5258275227272752527D7DA87D837D837D837D837D837D837D837D837D83 %7D837D837D837D837D837D837D837D837D837D837D837D837D837DA87D52 %2727FD05F827277D7DA87D837D837D837D837D837D837D837D837D837D83 %7D837D837D837D837D837D837D837D837D7DF8F8FD0C7D837D52FD0BF827 %2DFD2D7D5227FD0BF8275883FD247D52F8F858837D837D7D7D837D7D7DA8 %5227FD0FF8527DA87D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D %7D837D7D7D837D7D7D837D7D7D837D7D7DA82DFD04F8527DA8A8A87D52F8 %F8F82752A87D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D %837D7D7D837D7D7D837D7DF8F8FD0B7D27FD06F82727525227FD07F82758 %83FD267D27F8F8F852FD08FFA827F8F8F85283FD227D52F8F858A87D837D %837D837D7DFD05F8277DFD07FFA87D27FD04F8277DA87D837D837D837D83 %7D837D837D837D837D837D837D837D837D837D837D837D837D837DA852F8 %F827A8FD04FF7D27A8FD04FF7DF8F8F852A87D837D837D837D837D837D83 %7D837D837D837D837D837D837D837D837D837D837D7DF8F8FD097DFD05F8 %7DFD0CFF7D27F8F8F827FD237D8352F8F8F8A8FD04FF7DF8F8F8A8FD04FF %7DF8F827FD217D8352F8F852A87D7D7D837D8327F8F8F827FD0FFFA852F8 %F8F8277D837D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D %837D7D7D837D7D7D27F8F87DFD05FF52F8F8F8A8FD05FF52F8F8527D837D %7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83FD047D %F8F859FD057D8327F8F8F827FD12FF52F8F8F827FD227DF8F827FD07FF27 %2752FD07FFF8F8F8FD217D52F8F852A87D837DA852F8F8F827FD14FF52F8 %F8F8587D837D837D837D837D837D837D837D837D837D837D837D837D837D %837D837DA827F8F8A8FD05FFA8527D527D52FD06FF7DF8F852A87D837D83 %7D837D837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8 %FD067D27F8F8F8A8FD14FFA827F8F8F8FD207D27F827FD06FFFD06F827FD %05FFA8F8F852FD207D52F8F858837D837D58F8F8F87DFD16FF7DF8F8F852 %A87D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83FD047D %F8F852FD06FFFD06F827FD06FF27F827837D837D7D7D837D7D7D837D7D7D %837D7D7D837D7D7D837D7D7D837D7D7D837D7DF8F8FD047D8327F8F827FD %18FF27F8F827FD1E7D52F8F87DFD06FFFD06F827FD06FF52F827FD207D52 %F8F858A87DA87D27F8F87DFD05FF7D5227527DFD05FF7D52277DA8FD04FF %7DF8F8F87D7D837D837D837D837D837D837D837D837D837D837D837D837D %837D837D7DF8F87DFD06FF27FD05F852FD06FF52F827837D837D837D837D %837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8FD047D %52F8F8F8FD05FF27FD05F827FFFFA8FD06F852FFFFFFA8F8F8F852FD1D7D %52F8F87DFD06FFFD06F827FD06FF52F827FD1F7D8352F8F852A87DA827F8 %F827FD04FF27F8F8F82727F8F852FFF8F8F82727F8F8F87DFFFFFF27F8F8 %527D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D %7DF8F87DFD06FF52FD05F87DFD06FF27F827A87D7D7D837D7D7D837D7D7D %837D7D7D837D7D7D837D7D7D837D7D7D83FD047DF8F8597D7D7D27F8F852 %FFFFFFA8F8F8F87DFFA82727A852F8F827A8FF7DF827A8FFFFFF52F8F827 %83FD1D7D27F852FD07FF52F8F8F87DFD06FFA827F827FD207D52F8F852A8 %7D8327F8F87DFFFFFF7DF8F827FFFFFFA8FFFF27F8F87DFFFFFFA8FD05FF %7DF8F8277D837D837D837D837D837D837D837D837D837D837D837D837D83 %7D837DA827F8F8FD07FF52F8F8F87DFD06FFA8F8F852A87D837D837D837D %837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8FD047D %27F8F87DFFFFFF52F8F852FD06FFF8F8F8A8FD09FF7DF8F8F8FD1E7D52F8 %F852FD06FF52F8F8F87DFD06FF27F8F8FD217D52F8F858837D8327F8F87D %FFFFFF7DF8F852FD06FF27F8F8A8FD09FF7DF8F8277D837D7D7D837D7D7D %837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D27F827A8FD05FF52 %F8F8F87DFD05FF7DF8F8527D7D7D837D7D7D837D7D7D837D7D7D837D7D7D %837D7D7D837D7D7D837D7D7D837D7DF8F8FD047D27F8F852FFFFFF52F8F8 %27FFFFFF7D52FF27F8F87DFFFFFF7D7DFD04FF7DF8F827FD1E7D8352F8F8 %27FD05FF52F8F8F87DFD04FFA8F8F8F852FD217D52F8F858A87DA827F8F8 %52FD04FFF8F8F852A87DF8F8527DF8F8F87DA852F8F87DFFFFFF52F8F852 %7D837D837D837D837D837D837D837D837D837D837D837D837D837D837D83 %7DA827F8F852FD04FF52F8F8F87DFFFFFFA827F8F852A87D837D837D837D %837D837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8FD %047D52F8F8F8FD04FF7DFD07F87DFF27FD07F8A8FFFFFF27F8F82D83FD20 %7DF8F8F8277DFFFFFFA8FFA8FFFFFF7DF8F8F827FD227D8352F8F852A87D %8352F8F8F8A8FD04FF7DFD05F8A8FFFFFF52FD04F827FD05FFF8F8F8FD04 %7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83 %7D7D27F8F8F827A8A8FFFFFFA87D27F8F8F827A87D7D7D837D7D7D837D7D %7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83FD047DF8F859FD04 %7DF8F8F852FD06FF7D7D7DFFFFFFA8FFFFA87DA8A8FD05FF52F8F8F859FD %237D27FD06F827FD06F852FD257D52F8F852A87D837D52F8F8F8FD18FF27 %F8F827A87D837D837D837D837D837D837D837D837D837D837D837D837D83 %7D837D837D837D837DA85227FD09F8527DA87D837D837D837D837D837D83 %7D837D837D837D837D837D837D837D837D837D837D837D837D7DF8F8FD05 %7D52F8F8F827FD16FF52F8F8F8FD267D837D7D525227272752527D7D83FD %267D52F8F858837D837DA827F8F8F87DFD14FFA8F8F8F8277D7D7D837D7D %7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D83 %7D7D7D837D847DA87D847DA87D7D7D837D7D7D837D7D7D837D7D7D837D7D %7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7DF8F8FD077DFD %04F87DFD12FFA8FD04F852FD047D837D7D7D837D7D7D837D7D7D837D7D7D %837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D %7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D837D7D7D %837D7D7D837D7D7DA852F8F8527D52587D847D7DFD04F87DFD10FFA8FD04 %F852A87D7D527D5258527D5258527D5258527D5258527D5258527D525852 %7D5258527D5258527D5258527D5258527D5258527D5258527D5258527D52 %58527D5258527D5258527D5258527D5258527D5258527D5258527D525852 %7D5252FD06F8277D7D7D52FD04F852FD0EFF7DFD04F827837D7DFD60F852 %7D837D52FD04F827A8FD0AFFA852FD04F827A87DA827FD61F8587D7D7D52 %FD05F82752A8A8FFA8A87D7D27FD05F8277D7D8352FD63F87D7DA87D7DFD %09F827FD07F82752A87DA858FD27F852A87DA87D2727A852F8F8527D27FD %30F8FD057D27FD0EF85258A87D8352FD28F87DFFA8A8FFA8F8A8FFF8F8FF %FFFD32F87D7D837DA87D522727FD07F827527D7D837DA85227FD28F87DFF %F8F87DFFF852FF7D7DFF27FD33F8527D837D7D7D83587DFD0552FD077D27 %FD2AF87DFF7D7DFF52F8F8A8FFFF7DFD35F82758A87DA87D847DA87DA87D %A87D837DA87D7D27FD2BF87DFF7DA8FFFFF8F827FFFF27FD37F827527D83 %7D7D7D837D7D7D837D7D5227FD2DF87DFFF8F852FF52F8F8A8A8FD3AF827 %2752527D587D587D5252FD30F87DFF7D7DA8FF27F8F8FFA8FD75F87DFD04 %A852F8F8F87DA8FDFCF8FD2EF852FD7F27FD7FFFFF %%EndData %%EndComments %%BeginProlog %%BeginResource: procset Adobe_level2_AI5 1.2 0 %%Title: (Adobe Illustrator (R) Version 5.0 Level 2 Emulation) %%Version: 1.2 0 %%CreationDate: (04/10/93) () @@ -2885,341 +2714,14 @@ end end defaultpacking setpacking %%EndResource -%%EndProlog -%%BeginSetup -userdict /_useSmoothShade false put -userdict /_aicmykps true put -userdict /_forceToCMYK true put -Adobe_level2_AI5 /initialize get exec +%%EndProlog %%BeginSetup userdict /_useSmoothShade false put userdict /_aicmykps true put userdict /_forceToCMYK true put Adobe_level2_AI5 /initialize get exec Adobe_cshow /initialize get exec Adobe_ColorImage_AI6 /initialize get exec Adobe_shading_AI8 /initialize get exec Adobe_Illustrator_AI5 /initialize get exec -%AI3_BeginRider -currentpacking true setpacking -setpacking -%AI3_EndRider -%AI5_Begin_NonPrinting -Np -%AI8_PluginGroupInfo -(Adobe Path Blends) (Adobe Blends Plugin) (LiveBlends.aip) -%AI8_PluginGroupInfo -(Adobe Tracing Object) (Tracing) (TracingSuite.aip) -%AI8_PluginGroupInfo -(Adobe Scatter Brush Tool) (Adobe Scatter Brush Plugin) (ScatterBrushTool.aip) -%AI8_PluginGroupInfo -(Adobe Scatter Brush Tool) (Adobe Scatter Brush Plugin) (ScatterBrushTool.aip) -%AI8_PluginGroupInfo -(Adobe PatternOnPath Brush Tool) (Adobe Pattern Brush Plugin) (ArtBrushTool.aip) -%AI8_PluginGroupInfo -(Adobe PatternOnPath Brush Tool) (Adobe Pattern Brush Plugin) (ArtBrushTool.aip) -%AI8_PluginGroupInfo -(Adobe ArtOnPath Brush Tool) (Adobe Art Brush Plugin) (ArtBrushTool.aip) -%AI8_PluginGroupInfo -(Adobe ArtOnPath Brush Tool) (Adobe Art Brush Plugin) (ArtBrushTool.aip) -%AI8_PluginGroupInfo -(Adobe Calligraphic Brush Tool) (Adobe Calligraphic Brush Plugin) (CalligBrushTool.aip) -%AI8_PluginGroupInfo -(Adobe Flare Plugin) (Flare) (Flare.aip) -%AI8_PluginGroupInfo -(Adobe Symbolism) (Adobe Symbolism) (ParticleSystem.aip) -%AI8_PluginGroupInfo -(Adobe Deform Plugin) (Adobe Envelope Plugin) (Envelope and Warp.aip) -%AI8_PluginGroupInfo -(Pathfinder Suite) (Adobe Compound Shape) (PathFinderS.aip) -%AI8_PluginGroupInfo -(Adobe Planar Group) (Adobe Live Paint Plugin) (Live Paint.aip) -%AI5_End_NonPrinting-- -%AI5_BeginPalette -0 0 Pb -0.74902 0.678431 0.670588 0.901961 ([Registration]) 0 Xs -([Registration]) -Pc -PB -%AI5_EndPalette -%%EndSetup -%AI5_BeginLayer -1 1 1 1 0 0 1 0 79 128 255 0 50 Lb -(svg2759) Ln -0 A -u -U -u -u -0 O -0.34902 0.231373 0.305882 0 0.666667 0.698039 0.670588 Xa -0 J 0 j 1 w 4 M []0 d -0 XR -343.6401 319.9927 m -456.9941 319.791 L -458.5781 319.791 459.9922 320.0259 459.9922 316.6309 C -459.8535 279.3018 L -340.7793 279.3018 L -340.7793 316.7695 L -340.7793 318.4438 340.9414 319.9927 343.6401 319.9927 C -f -*u -1 D -0.74902 0.678431 0.670588 0.901961 0 0 0 Xa -458.252 320.5 m -342.7471 320.5 L -341.5083 320.5 340.5 319.4922 340.5 318.2534 C -340.5 279.0068 L -340.5 278.7266 340.7275 278.5 341.0073 278.5 C -459.9922 278.5 L -460.2725 278.5 460.5 278.7266 460.5 279.0068 C -460.5 318.2534 L -460.5 319.4922 459.4922 320.5 458.252 320.5 C -f -0 D -342.7471 319.4849 m -458.252 319.4849 L -458.9316 319.4849 459.4844 318.9326 459.4844 318.2534 C -459.4844 302.4063 459.4844 290.9775 V -376.6597 290.9775 L -373.6338 285.5068 367.8042 281.792 361.1133 281.792 c -354.4199 281.792 348.5918 285.5039 345.5674 290.9775 C -341.5151 290.9775 L -341.5151 302.4063 341.5151 318.2534 Y -341.5151 318.9326 342.0679 319.4849 342.7471 319.4849 C -f -*U -u -*u -0 0 0 0 1 1 1 Xa -414.3086 287.752 m -414.625 287.752 414.9121 287.7246 415.1738 287.6689 C -415.4336 287.6133 415.6563 287.5225 415.8418 287.3955 C -416.0273 287.2695 416.1719 287.1006 416.2744 286.8906 C -416.376 286.6797 416.4277 286.4219 416.4277 286.1113 c -416.4277 285.7773 416.3516 285.5 416.1992 285.2783 C -416.0479 285.0547 415.8223 284.873 415.5254 284.7305 C -415.9355 284.6133 416.2412 284.4082 416.4434 284.1133 c -416.6445 283.8203 416.7461 283.4648 416.7461 283.0508 c -416.7461 282.7168 416.6807 282.4277 416.5508 282.1836 C -416.4209 281.9395 416.2451 281.7402 416.0254 281.5859 C -415.8057 281.4307 415.5547 281.3164 415.2725 281.2422 C -414.9902 281.168 414.7012 281.1309 414.4033 281.1309 C -411.1875 281.1309 L -411.1875 287.752 L -414.3086 287.752 L -414.3086 287.752 L -f -1 D -414.123 285.0742 m -414.3828 285.0742 414.5957 285.1367 414.7637 285.2598 C -414.9316 285.3828 415.0146 285.583 415.0146 285.8604 c -415.0146 286.0146 414.9863 286.1416 414.9316 286.2402 C -414.875 286.3389 414.8008 286.416 414.708 286.4717 C -414.6152 286.5273 414.5078 286.5664 414.3877 286.5869 c -414.2676 286.6084 414.1406 286.6191 414.0117 286.6191 C -412.6465 286.6191 L -412.6465 285.0742 L -414.123 285.0742 L -f -414.208 282.2637 m -414.3506 282.2637 414.4863 282.2773 414.6172 282.3057 c -414.7461 282.334 414.8613 282.3809 414.9609 282.4443 C -415.0605 282.5098 415.1387 282.5977 415.1973 282.709 C -415.2578 282.8203 415.2861 282.9629 415.2861 283.1357 c -415.2861 283.4746 415.1895 283.7178 414.998 283.8633 C -414.8057 284.0078 414.5518 284.0801 414.2363 284.0801 C -412.6465 284.0801 L -412.6465 282.2637 L -414.208 282.2637 L -f -*U -0 D -417.0029 287.752 m -418.6367 287.752 L -420.1875 285.1367 L -421.7285 287.752 L -423.3516 287.752 L -420.8936 283.6719 L -420.8936 281.1309 L -419.4336 281.1309 L -419.4336 283.709 L -417.0029 287.752 L -f -U -u -374.7539 300.894 m -374.7588 293.3643 368.6577 287.2578 361.1274 287.252 C -353.5977 287.248 347.4888 293.3477 347.4844 300.8774 C -347.4844 300.8828 347.4844 300.8882 347.4844 300.894 C -347.48 308.4238 353.5811 314.5308 361.1108 314.5352 C -368.6421 314.54 374.7495 308.4395 374.7539 300.9102 C -374.7539 300.9053 374.7539 300.8994 374.7539 300.894 C -f -u -*u -0.74902 0.678431 0.670588 0.901961 0 0 0 Xa -372.2031 311.9985 m -375.2266 308.9751 376.7388 305.2729 376.7388 300.894 c -376.7388 296.5137 375.2529 292.8516 372.2813 289.9063 C -369.1279 286.8037 365.4004 285.2529 361.1001 285.2529 c -356.8511 285.2529 353.1885 286.791 350.1133 289.8672 C -347.0371 292.9424 345.4995 296.6182 345.4995 300.894 c -345.4995 305.1689 347.0371 308.8706 350.1133 311.9985 C -353.1104 315.0225 356.7729 316.5347 361.1001 316.5347 c -365.479 316.5347 369.1797 315.0225 372.2031 311.9985 C -f -1 D -352.1484 309.9648 m -349.5923 307.3828 348.3149 304.3589 348.3149 300.8896 c -348.3149 297.4219 349.5801 294.4229 352.1094 291.8945 C -354.6396 289.3643 357.6514 288.0996 361.146 288.0996 c -364.6406 288.0996 367.6782 289.377 370.2603 291.9326 C -372.7119 294.3066 373.938 297.291 373.938 300.8896 c -373.938 304.4614 372.6919 307.4937 370.2012 309.9839 C -367.7109 312.4741 364.6924 313.7197 361.146 313.7197 c -357.5996 313.7197 354.5996 312.4678 352.1484 309.9648 C -f -0 D -358.8755 302.4155 m -358.4849 303.2671 357.9004 303.6929 357.1206 303.6929 c -355.7417 303.6929 355.0527 302.7646 355.0527 300.9092 c -355.0527 299.0537 355.7417 298.127 357.1206 298.127 c -358.0308 298.127 358.6812 298.5781 359.0713 299.4834 C -360.9819 298.4658 L -360.0713 296.8477 358.7046 296.0391 356.8828 296.0391 c -355.4775 296.0391 354.3516 296.4697 353.5063 297.3301 C -352.6597 298.1914 352.2373 299.3799 352.2373 300.894 c -352.2373 302.3813 352.6733 303.5625 353.5454 304.4375 c -354.417 305.312 355.5029 305.749 356.8052 305.749 c -358.731 305.749 360.1099 304.9902 360.9438 303.4741 C -358.8755 302.4155 L -f -367.8657 302.4155 m -367.4746 303.2671 366.9014 303.6929 366.146 303.6929 c -364.7397 303.6929 364.0361 302.7646 364.0361 300.9092 c -364.0361 299.0537 364.7397 298.127 366.146 298.127 c -367.0576 298.127 367.6963 298.5781 368.0605 299.4834 C -370.0142 298.4658 L -369.105 296.8477 367.7402 296.0391 365.9219 296.0391 c -364.5186 296.0391 363.395 296.4697 362.5503 297.3301 C -361.707 298.1914 361.2842 299.3799 361.2842 300.894 c -361.2842 302.3813 361.7134 303.5625 362.5708 304.4375 C -363.4277 305.312 364.5186 305.749 365.8442 305.749 c -367.7666 305.749 369.1436 304.9902 369.9746 303.4741 C -367.8657 302.4155 L -f -*U -U -/AdobeObjectMatrix (1.000000 0.000000 0.000000 1.000000 -289.615692 99.065300) XT -U -/AdobeObjectMatrix (0.872921 0.000000 0.000000 0.872921 50.125359 143.214401) XT -u -0 0 0 0 1 1 1 Xa -416.7676 316.0215 m -422.6982 316.0215 427.5059 311.2139 427.5059 305.2832 c -427.5059 299.353 422.6982 294.5449 416.7676 294.5449 c -410.8359 294.5449 406.0273 299.353 406.0273 305.2832 c -406.0273 311.2139 410.8359 316.0215 416.7676 316.0215 c -f -u -1 D -0.74902 0.678431 0.670588 0.901961 0 0 0 Xa -419.875 308.3901 m -419.875 308.8042 419.5391 309.1392 419.127 309.1392 C -414.3828 309.1392 L -413.9707 309.1392 413.6348 308.8042 413.6348 308.3901 C -413.6348 303.6475 L -414.957 303.6475 L -414.957 298.0313 L -418.5518 298.0313 L -418.5518 303.6475 L -419.875 303.6475 L -419.875 308.3901 L -419.875 308.3901 L -f -0 D -416.7539 313.0083 m -417.6504 313.0083 418.377 312.2817 418.377 311.3857 c -418.377 310.4897 417.6504 309.7632 416.7539 309.7632 c -415.8584 309.7632 415.1318 310.4897 415.1318 311.3857 c -415.1318 312.2817 415.8584 313.0083 416.7539 313.0083 c -f -U -*u -1 D -416.7402 317.1143 m -413.5273 317.1143 410.8086 315.9937 408.583 313.752 C -406.2998 311.4331 405.1582 308.6885 405.1582 305.5195 c -405.1582 302.3511 406.2998 299.6255 408.583 297.3457 C -410.8672 295.0654 413.5859 293.9258 416.7402 293.9258 c -419.9336 293.9258 422.7012 295.0742 425.041 297.375 C -427.248 299.5576 428.3516 302.2729 428.3516 305.5195 c -428.3516 308.7666 427.2285 311.5103 424.9844 313.752 C -422.7383 315.9937 419.9912 317.1143 416.7402 317.1143 c -f -0 D -416.7695 315.0278 m -419.4004 315.0278 421.6367 314.0996 423.4746 312.2446 C -425.332 310.4092 426.2598 308.1675 426.2598 305.5195 c -426.2598 302.853 425.3516 300.6401 423.5322 298.8818 C -421.6152 296.9883 419.3623 296.041 416.7695 296.041 c -414.1748 296.041 411.9395 296.9785 410.0645 298.8525 C -408.1855 300.7275 407.248 302.9497 407.248 305.5195 c -407.248 308.0903 408.1973 310.3315 410.0938 312.2446 C -411.9121 314.0996 414.1367 315.0278 416.7695 315.0278 c -f -*U -U -U -/AdobeObjectMatrix (0.993773 0.000000 0.000000 0.993670 -177.692673 0.000001) XT -U -LB -%AI5_EndLayer-- -%AI3_BeginCrops -userdict /AI3_noCropMarks known not { -0 A -u -u -0 R -0 G -0 J 0 j 0.5 w 4 M []0 d -0 XR -331.5 278.5 m -304.5 278.5 L -S -340.5 269.5 m -340.5 242.5 L -S -U -u -331.5 320.5 m -304.5 320.5 L -S -340.5 329.5 m -340.5 356.5 L -S -U -u -469.5 320.5 m -496.5 320.5 L -S -460.5 329.5 m -460.5 356.5 L -S -U -u -469.5 278.5 m -496.5 278.5 L -S -460.5 269.5 m -460.5 242.5 L -S -U -U -} if -%AI3_EndCrops -%%PageTrailer -gsave annotatepage grestore showpage -%%Trailer -Adobe_Illustrator_AI5 /terminate get exec +%AI3_BeginRider currentpacking true setpacking setpacking %AI3_EndRider %AI5_Begin_NonPrinting Np %AI8_PluginGroupInfo (Adobe Path Blends) (Adobe Blends Plugin) (LiveBlends.aip) %AI8_PluginGroupInfo (Adobe Tracing Object) (Tracing) (TracingSuite.aip) %AI8_PluginGroupInfo (Adobe Scatter Brush Tool) (Adobe Scatter Brush Plugin) (ScatterBrushTool.aip) %AI8_PluginGroupInfo (Adobe Scatter Brush Tool) (Adobe Scatter Brush Plugin) (ScatterBrushTool.aip) %AI8_PluginGroupInfo (Adobe PatternOnPath Brush Tool) (Adobe Pattern Brush Plugin) (ArtBrushTool.aip) %AI8_PluginGroupInfo (Adobe PatternOnPath Brush Tool) (Adobe Pattern Brush Plugin) (ArtBrushTool.aip) %AI8_PluginGroupInfo (Adobe ArtOnPath Brush Tool) (Adobe Art Brush Plugin) (ArtBrushTool.aip) %AI8_PluginGroupInfo (Adobe ArtOnPath Brush Tool) (Adobe Art Brush Plugin) (ArtBrushTool.aip) %AI8_PluginGroupInfo (Adobe Calligraphic Brush Tool) (Adobe Calligraphic Brush Plugin) (CalligBrushTool.aip) %AI8_PluginGroupInfo (Adobe Flare Plugin) (Flare) (Flare.aip) %AI8_PluginGroupInfo (Adobe Symbolism) (Adobe Symbolism) (ParticleSystem.aip) %AI8_PluginGroupInfo (Adobe Deform Plugin) (Adobe Envelope Plugin) (Envelope and Warp.aip) %AI8_PluginGroupInfo (Pathfinder Suite) (Adobe Compound Shape) (PathFinderS.aip) %AI8_PluginGroupInfo (Adobe Planar Group) (Adobe Live Paint Plugin) (Live Paint.aip) %AI5_End_NonPrinting-- %AI5_BeginPalette 0 0 Pb 0.74902 0.678431 0.670588 0.901961 ([Registration]) 0 Xs ([Registration]) Pc PB %AI5_EndPalette %%EndSetup %AI5_BeginLayer 1 1 1 1 0 0 1 0 79 128 255 0 50 Lb (svg2759) Ln 0 A u U u u 0 O 0.34902 0.231373 0.305882 0 0.666667 0.698039 0.670588 Xa 0 J 0 j 1 w 4 M []0 d 0 XR 343.6401 319.9927 m 456.9941 319.791 L 458.5781 319.791 459.9922 320.0259 459.9922 316.6309 C 459.8535 279.3018 L 340.7793 279.3018 L 340.7793 316.7695 L 340.7793 318.4438 340.9414 319.9927 343.6401 319.9927 C f *u 1 D 0.74902 0.678431 0.670588 0.901961 0 0 0 Xa 458.252 320.5 m 342.7471 320.5 L 341.5083 320.5 340.5 319.4922 340.5 318.2534 C 340.5 279.0068 L 340.5 278.7266 340.7275 278.5 341.0073 278.5 C 459.9922 278.5 L 460.2725 278.5 460.5 278.7266 460.5 279.0068 C 460.5 318.2534 L 460.5 319.4922 459.4922 320.5 458.252 320.5 C f 0 D 342.7471 319.4849 m 458.252 319.4849 L 458.9316 319.4849 459.4844 318.9326 459.4844 318.2534 C 459.4844 302.4063 459.4844 290.9775 V 376.6597 290.9775 L 373.6338 285.5068 367.8042 281.792 361.1133 281.792 c 354.4199 281.792 348.5918 285.5039 345.5674 290.9775 C 341.5151 290.9775 L 341.5151 302.4063 341.5151 318.2534 Y 341.5151 318.9326 342.0679 319.4849 342.7471 319.4849 C f *U u *u 0 0 0 0 1 1 1 Xa 414.3086 287.752 m 414.625 287.752 414.9121 287.7246 415.1738 287.6689 C 415.4336 287.6133 415.6563 287.5225 415.8418 287.3955 C 416.0273 287.2695 416.1719 287.1006 416.2744 286.8906 C 416.376 286.6797 416.4277 286.4219 416.4277 286.1113 c 416.4277 285.7773 416.3516 285.5 416.1992 285.2783 C 416.0479 285.0547 415.8223 284.873 415.5254 284.7305 C 415.9355 284.6133 416.2412 284.4082 416.4434 284.1133 c 416.6445 283.8203 416.7461 283.4648 416.7461 283.0508 c 416.7461 282.7168 416.6807 282.4277 416.5508 282.1836 C 416.4209 281.9395 416.2451 281.7402 416.0254 281.5859 C 415.8057 281.4307 415.5547 281.3164 415.2725 281.2422 C 414.9902 281.168 414.7012 281.1309 414.4033 281.1309 C 411.1875 281.1309 L 411.1875 287.752 L 414.3086 287.752 L 414.3086 287.752 L f 1 D 414.123 285.0742 m 414.3828 285.0742 414.5957 285.1367 414.7637 285.2598 C 414.9316 285.3828 415.0146 285.583 415.0146 285.8604 c 415.0146 286.0146 414.9863 286.1416 414.9316 286.2402 C 414.875 286.3389 414.8008 286.416 414.708 286.4717 C 414.6152 286.5273 414.5078 286.5664 414.3877 286.5869 c 414.2676 286.6084 414.1406 286.6191 414.0117 286.6191 C 412.6465 286.6191 L 412.6465 285.0742 L 414.123 285.0742 L f 414.208 282.2637 m 414.3506 282.2637 414.4863 282.2773 414.6172 282.3057 c 414.7461 282.334 414.8613 282.3809 414.9609 282.4443 C 415.0605 282.5098 415.1387 282.5977 415.1973 282.709 C 415.2578 282.8203 415.2861 282.9629 415.2861 283.1357 c 415.2861 283.4746 415.1895 283.7178 414.998 283.8633 C 414.8057 284.0078 414.5518 284.0801 414.2363 284.0801 C 412.6465 284.0801 L 412.6465 282.2637 L 414.208 282.2637 L f *U 0 D 417.0029 287.752 m 418.6367 287.752 L 420.1875 285.1367 L 421.7285 287.752 L 423.3516 287.752 L 420.8936 283.6719 L 420.8936 281.1309 L 419.4336 281.1309 L 419.4336 283.709 L 417.0029 287.752 L f U u 374.7539 300.894 m 374.7588 293.3643 368.6577 287.2578 361.1274 287.252 C 353.5977 287.248 347.4888 293.3477 347.4844 300.8774 C 347.4844 300.8828 347.4844 300.8882 347.4844 300.894 C 347.48 308.4238 353.5811 314.5308 361.1108 314.5352 C 368.6421 314.54 374.7495 308.4395 374.7539 300.9102 C 374.7539 300.9053 374.7539 300.8994 374.7539 300.894 C f u *u 0.74902 0.678431 0.670588 0.901961 0 0 0 Xa 372.2031 311.9985 m 375.2266 308.9751 376.7388 305.2729 376.7388 300.894 c 376.7388 296.5137 375.2529 292.8516 372.2813 289.9063 C 369.1279 286.8037 365.4004 285.2529 361.1001 285.2529 c 356.8511 285.2529 353.1885 286.791 350.1133 289.8672 C 347.0371 292.9424 345.4995 296.6182 345.4995 300.894 c 345.4995 305.1689 347.0371 308.8706 350.1133 311.9985 C 353.1104 315.0225 356.7729 316.5347 361.1001 316.5347 c 365.479 316.5347 369.1797 315.0225 372.2031 311.9985 C f 1 D 352.1484 309.9648 m 349.5923 307.3828 348.3149 304.3589 348.3149 300.8896 c 348.3149 297.4219 349.5801 294.4229 352.1094 291.8945 C 354.6396 289.3643 357.6514 288.0996 361.146 288.0996 c 364.6406 288.0996 367.6782 289.377 370.2603 291.9326 C 372.7119 294.3066 373.938 297.291 373.938 300.8896 c 373.938 304.4614 372.6919 307.4937 370.2012 309.9839 C 367.7109 312.4741 364.6924 313.7197 361.146 313.7197 c 357.5996 313.7197 354.5996 312.4678 352.1484 309.9648 C f 0 D 358.8755 302.4155 m 358.4849 303.2671 357.9004 303.6929 357.1206 303.6929 c 355.7417 303.6929 355.0527 302.7646 355.0527 300.9092 c 355.0527 299.0537 355.7417 298.127 357.1206 298.127 c 358.0308 298.127 358.6812 298.5781 359.0713 299.4834 C 360.9819 298.4658 L 360.0713 296.8477 358.7046 296.0391 356.8828 296.0391 c 355.4775 296.0391 354.3516 296.4697 353.5063 297.3301 C 352.6597 298.1914 352.2373 299.3799 352.2373 300.894 c 352.2373 302.3813 352.6733 303.5625 353.5454 304.4375 c 354.417 305.312 355.5029 305.749 356.8052 305.749 c 358.731 305.749 360.1099 304.9902 360.9438 303.4741 C 358.8755 302.4155 L f 367.8657 302.4155 m 367.4746 303.2671 366.9014 303.6929 366.146 303.6929 c 364.7397 303.6929 364.0361 302.7646 364.0361 300.9092 c 364.0361 299.0537 364.7397 298.127 366.146 298.127 c 367.0576 298.127 367.6963 298.5781 368.0605 299.4834 C 370.0142 298.4658 L 369.105 296.8477 367.7402 296.0391 365.9219 296.0391 c 364.5186 296.0391 363.395 296.4697 362.5503 297.3301 C 361.707 298.1914 361.2842 299.3799 361.2842 300.894 c 361.2842 302.3813 361.7134 303.5625 362.5708 304.4375 C 363.4277 305.312 364.5186 305.749 365.8442 305.749 c 367.7666 305.749 369.1436 304.9902 369.9746 303.4741 C 367.8657 302.4155 L f *U U /AdobeObjectMatrix (1.000000 0.000000 0.000000 1.000000 -289.615692 99.065300) XT U /AdobeObjectMatrix (0.872921 0.000000 0.000000 0.872921 50.125359 143.214401) XT u 0 0 0 0 1 1 1 Xa 416.7676 316.0215 m 422.6982 316.0215 427.5059 311.2139 427.5059 305.2832 c 427.5059 299.353 422.6982 294.5449 416.7676 294.5449 c 410.8359 294.5449 406.0273 299.353 406.0273 305.2832 c 406.0273 311.2139 410.8359 316.0215 416.7676 316.0215 c f u 1 D 0.74902 0.678431 0.670588 0.901961 0 0 0 Xa 419.875 308.3901 m 419.875 308.8042 419.5391 309.1392 419.127 309.1392 C 414.3828 309.1392 L 413.9707 309.1392 413.6348 308.8042 413.6348 308.3901 C 413.6348 303.6475 L 414.957 303.6475 L 414.957 298.0313 L 418.5518 298.0313 L 418.5518 303.6475 L 419.875 303.6475 L 419.875 308.3901 L 419.875 308.3901 L f 0 D 416.7539 313.0083 m 417.6504 313.0083 418.377 312.2817 418.377 311.3857 c 418.377 310.4897 417.6504 309.7632 416.7539 309.7632 c 415.8584 309.7632 415.1318 310.4897 415.1318 311.3857 c 415.1318 312.2817 415.8584 313.0083 416.7539 313.0083 c f U *u 1 D 416.7402 317.1143 m 413.5273 317.1143 410.8086 315.9937 408.583 313.752 C 406.2998 311.4331 405.1582 308.6885 405.1582 305.5195 c 405.1582 302.3511 406.2998 299.6255 408.583 297.3457 C 410.8672 295.0654 413.5859 293.9258 416.7402 293.9258 c 419.9336 293.9258 422.7012 295.0742 425.041 297.375 C 427.248 299.5576 428.3516 302.2729 428.3516 305.5195 c 428.3516 308.7666 427.2285 311.5103 424.9844 313.752 C 422.7383 315.9937 419.9912 317.1143 416.7402 317.1143 c f 0 D 416.7695 315.0278 m 419.4004 315.0278 421.6367 314.0996 423.4746 312.2446 C 425.332 310.4092 426.2598 308.1675 426.2598 305.5195 c 426.2598 302.853 425.3516 300.6401 423.5322 298.8818 C 421.6152 296.9883 419.3623 296.041 416.7695 296.041 c 414.1748 296.041 411.9395 296.9785 410.0645 298.8525 C 408.1855 300.7275 407.248 302.9497 407.248 305.5195 c 407.248 308.0903 408.1973 310.3315 410.0938 312.2446 C 411.9121 314.0996 414.1367 315.0278 416.7695 315.0278 c f *U U U /AdobeObjectMatrix (0.993773 0.000000 0.000000 0.993670 -177.692673 0.000001) XT U LB %AI5_EndLayer-- %AI3_BeginCrops userdict /AI3_noCropMarks known not { 0 A u u 0 R 0 G 0 J 0 j 0.5 w 4 M []0 d 0 XR 331.5 278.5 m 304.5 278.5 L S 340.5 269.5 m 340.5 242.5 L S U u 331.5 320.5 m 304.5 320.5 L S 340.5 329.5 m 340.5 356.5 L S U u 469.5 320.5 m 496.5 320.5 L S 460.5 329.5 m 460.5 356.5 L S U u 469.5 278.5 m 496.5 278.5 L S 460.5 269.5 m 460.5 242.5 L S U U } if %AI3_EndCrops %%PageTrailer gsave annotatepage grestore showpage %%Trailer Adobe_Illustrator_AI5 /terminate get exec Adobe_shading_AI8 /terminate get exec Adobe_ColorImage_AI6 /terminate get exec Adobe_cshow /terminate get exec Adobe_level2_AI5 /terminate get exec -%%EOF +%%EOF \ No newline at end of file diff --git a/macros/latex/contrib/dccpaper/dccpaper.dtx b/macros/latex/contrib/dccpaper/dccpaper.dtx index a1ff536d79..811447f16d 100644 --- a/macros/latex/contrib/dccpaper/dccpaper.dtx +++ b/macros/latex/contrib/dccpaper/dccpaper.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment %<*internal|ijdc9|ijdc14|idcc|base> -\def\Version{2021/01/25 v2.1} +\def\Version{2021/09/03 v2.2} % %<*internal> \iffalse @@ -490,6 +490,7 @@ Certain aspects of the template design have been implemented using third-party p \item\pkg{etoolbox} is used behind the scenes for patching commands. \item\pkg{footmisc} is used to format the footnotes. \item\pkg{titlesec} is used to format the section headings. +\item\pkg{hyperxmp} is used for including an XMP metadata packet. \item\pkg{iftex} is used to test which \TeX\ engine you are using. If you use Lua\LaTeX\ or \XeLaTeX\, you will also need \pkg{fontspec}. \end{itemize} @@ -856,6 +857,8 @@ Any acknowledgements should be placed in a section immediately before the refere \section{Appendix A: Change History} \begin{description} +\item[v2.2] 2021-09-03\\ +Updated procedure for inserting XMP packet into PDF output. \item[v2.1] 2021-01-25\\ Added details of IDCC 2021. \item[v2.0] 2020-01-15\\ @@ -2921,10 +2924,20 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: % \end{macrocode} % % We now embed the Creative Commons licence information in the PDF using an XMP -% packet. To do this, we employ the same technique as Scott Pakin's -% \pkg{hyperxmp} (2014/01/02 v2.4). In order to avoid avoid a bug whereby -% Adobe Acrobat confuses the XMP author information and the regular author -% information, though, we \emph{only} embed the licence information. +% packet. In order to avoid a bug whereby Adobe Acrobat confuses the XMP author +% information and the regular author information, though, we \emph{only} embed +% the licence information. We can use \pkg{hyperxmp} for this, but we have to +% discard the information collected by that package and construct our own +% packet. +% +% \begin{macrocode} +\RequirePackage{hyperxmp} +\hypersetup{keeppdfinfo} +\def\cc@xmp@packet{} +\def\hyxmp@construct@packet{% + \let\hyxmp@xml\cc@xmp@packet +} +% \end{macrocode} % % We need to make sure that any characters to appear verbatim in the XMP packet % are treated as ordinary characters and not active ones. The likely active @@ -2961,7 +2974,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: % % \begin{macrocode} \long\gdef\cc@xmp@packet{% -^^J% +^^J% ^^J% ^^J% \sp^^J% ^^J% ^^J% -^^J% +\hyxmp@padding +^^J% }% } \endgroup % \end{macrocode} -% -% Different workflows require the XMP packet to be embedded in different ways. -% -% \begin{macro}{ccxmp@embed@packet@pdftex} -% Pdf\TeX\ can inject objects into PDFs natively. -% -% \begin{macrocode} -\newcommand*{\ccxmp@embed@packet@pdftex}{% - \bgroup - \pdfcompresslevel=0 - \immediate\pdfobj stream attr {% - /Type /Metadata - /Subtype /XML - }{\cc@xmp@packet}% - \pdfcatalog {/Metadata \the\pdflastobj\space 0 R}% - \egroup -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{ccxmp@embed@packet@pdfmark} -% The \cs{pdfmark} command defined by \pkg{hyperref} is respected by tools such -% as Dvipdf, Dvips, Dvipsone, etc. -% -% \begin{macrocode} -\newcommand*{\ccxmp@embed@packet@pdfmark}{% - \pdfmark{% - pdfmark=/NamespacePush - }% - \pdfmark{% - pdfmark=/OBJ, - Raw={/_objdef \string{ccxmp@packet\string} /type /stream}% - }% - \pdfmark{% - pdfmark=/PUT, - Raw={\string{ccxmp@packet\string} - 2 dict begin - /Type /Metadata def - /Subtype /XML def - currentdict - end - }% - }% - \pdfmark{% - pdfmark=/PUT, - Raw={\string{ccxmp@packet\string} (\cc@xmp@packet)}% - }% - \pdfmark{% - pdfmark=/Metadata, - Raw={\string{Catalog\string} \string{ccxmp@packet\string}}% - }% - \pdfmark{% - pdfmark=/NamespacePop - }% -} -% \end{macrocode} -% \end{macro} -% -% Dvipdfm has its own \cs{special} command for inserting PDF objects, but -% it is a bit basic and requires advance knowledge of how long (in characters) -% the object is. -% -% \begin{macro}{ccxmp@count@spaces} -% The \cs{ccxmp@count@spaces} macro counts the number of spaces in its parameter -% through a process of iteration, adding this figure to \cs{@tempcnta}. -% -% \begin{macrocode} -\def\ccxmp@count@spaces#1 {% - \def\ccxmp@one@token{#1}% - \ifx\ccxmp@one@token\@empty - \advance\@tempcnta by -1 - \else - \advance\@tempcnta by 1 - \expandafter\ccxmp@count@spaces - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{ccxmp@count@non@spaces} -% The \cs{ccxmp@count@non@spaces} command counts the number of non-spaces in its -% argument through a process of iteration, adding this figure to \cs{@tempcnta}. -% -% \begin{macrocode} -\newcommand*{\ccxmp@count@non@spaces}[1]{% - \def\ccxmp@one@token{#1}% - \ifx\ccxmp@one@token\@empty - \else - \advance\@tempcnta by 1 - \expandafter\ccxmp@count@non@spaces - \fi -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{ccxmp@string@len} -% The \cs{ccxmp@string@len} command sets \cs{@tempcnta} to the number of characters -% (spaces + non-spaces) in its argument. -% -% \begin{macrocode} -\newcommand*{\ccxmp@string@len}[1]{% - \@tempcnta=0 - \expandafter\ccxmp@count@spaces#1 {} % - \expandafter\ccxmp@count@non@spaces#1{}% -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{ccxmp@embed@packet@dvipdfm} -% So now, finally, is the command for embedding the packet using Dvipdfm. -% -% \begin{macrocode} -\newcommand*{\ccxmp@embed@packet@dvipdfm}{% - \ccxmp@string@len{\cc@xmp@packet}% - \special{pdf: object @ccxmp@packet - << - /Type /Metadata - /Subtype /XML - /Length \the\@tempcnta - >> - stream^^J\cc@xmp@packet endstream% - }% - \special{pdf: docview - << - /Metadata @ccxmp@packet - >> - }% -} -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{ccxmp@embed@packet@xetex} -% \XeTeX\ creates PDFs with Xdvipdfmx, which supports a simpler \cs{special} for -% inserting objects that does not require us to count characters. -% -% \begin{macrocode} -\newcommand*{\ccxmp@embed@packet@xetex}{% - \special{pdf:stream @ccxmp@packet (\cc@xmp@packet) - << - /Type /Metadata - /Subtype /XML - >> - }% - \special{pdf:put @catalog - << - /Metadata @ccxmp@packet - >> - }% -} -% \end{macrocode} -% \end{macro} -% -% We rely on \pkg{hyperref} to tell us how the PDF will be generated (after -% all, it may not be done in the current pass) and use the respective technique -% to embed the XMP packet. -% -% \begin{macrocode} -\AtBeginDocument{% - \begingroup - \def\ccxmp@driver{hpdftex}% - \ifx\ccxmp@driver\Hy@driver - \ccxmp@embed@packet@pdftex - \else - \def\ccxmp@driver{hdvipdfm}% - \ifx\ccxmp@driver\Hy@driver - \ccxmp@embed@packet@dvipdfm - \else - \def\ccxmp@driver{hxetex}% - \ifx\ccxmp@driver\Hy@driver - \ccxmp@embed@packet@xetex - \else - \@ifundefined{pdfmark}{}{% - \ccxmp@embed@packet@pdfmark - }% - \fi - \fi - \fi - \endgroup -} -% \end{macrocode} % \iffalse % % \fi diff --git a/macros/latex/contrib/dccpaper/dccpaper.pdf b/macros/latex/contrib/dccpaper/dccpaper.pdf index 558cca91fc..bfd2ca433f 100644 Binary files a/macros/latex/contrib/dccpaper/dccpaper.pdf and b/macros/latex/contrib/dccpaper/dccpaper.pdf differ diff --git a/macros/latex/contrib/lastpage/README b/macros/latex/contrib/lastpage/README index d04f4136b6..322cfbb6de 100644 --- a/macros/latex/contrib/lastpage/README +++ b/macros/latex/contrib/lastpage/README @@ -1,4 +1,4 @@ -README for lastpage package, 2015/03/29, v1.2m +README for lastpage package, 2021/09/03, v1.2n TABLE OF CONTENTS @@ -32,9 +32,9 @@ This material is published under the LPPL 1.3c: This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. This version of this license is in -http://www.latex-project.org/lppl/lppl-1-3c.txt +https://www.latex-project.org/lppl/lppl-1-3c.txt and the latest version of this license is in -http://www.latex-project.org/lppl.txt +https://www.latex-project.org/lppl.txt and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. @@ -52,7 +52,7 @@ driver (lastpage.drv), lastpage.dtx, installation file (lastpage.ins), the style files (lastpage.sty, lastpage209.sty), and this README, already sorted in a TDS tree: -http://mirrors.ctan.org/install/macros/latex/contrib/lastpage.tds.zip +https://mirrors.ctan.org/install/macros/latex/contrib/lastpage.tds.zip 3 INSTALLATION @@ -92,7 +92,7 @@ d) Create the documentation, if necessary, e.g. pdflatex undolabl.dtx makeindex -s gind.ist lastpage.idx pdflatex lastpage.dtx -e) Update the databases if necessary, e.g. for teTeX: +e) Update the databases, if necessary, e.g. for teTeX: mktexlsr .../texmf f) Create the lastpage-example.pdf, if necessary, e.g. pdflatex lastpage-example.tex @@ -110,7 +110,7 @@ g) Copy the documentation files to The lastpage package does not depend on other packages, but the lastpage.dtx does (for unpacking and constructing the documentation), see "7.1 Downloads" in the manual -http://mirrors.ctan.org/macros/latex/contrib/lastpage/lastpage.pdf +https://mirrors.ctan.org/macros/latex/contrib/lastpage/lastpage.pdf 5 PACKAGE COMPATIBILITY @@ -127,7 +127,7 @@ https://www.ctan.org/pkg/endfloat * Author of the original main code: Jeffrey P. Goldberg (Thanks!) * Author of the recent package and current maintainer: - H.-Martin Münch + H.-Martin Münch 7 BUG REPORTS @@ -153,7 +153,7 @@ A bug report should contain: Bug address ----------- Bug reports can be send to the maintainer: - H.-Martin Münch + H.-Martin Münch diff --git a/macros/latex/contrib/lastpage/lastpage-example.pdf b/macros/latex/contrib/lastpage/lastpage-example.pdf index 6211243302..a3c7c07477 100644 Binary files a/macros/latex/contrib/lastpage/lastpage-example.pdf and b/macros/latex/contrib/lastpage/lastpage-example.pdf differ diff --git a/macros/latex/contrib/lastpage/lastpage.dtx b/macros/latex/contrib/lastpage/lastpage.dtx index 5738fdc702..099d035a99 100644 --- a/macros/latex/contrib/lastpage/lastpage.dtx +++ b/macros/latex/contrib/lastpage/lastpage.dtx @@ -1,9 +1,9 @@ % \iffalse meta-comment % % File: lastpage.dtx -% Version: 2015/03/29 v1.2m +% Version: 2021/09/03 v1.2n % -% Copyright (C) 2010 - 2015 by +% Copyright (C) 2010 - 2021 by % H.-Martin M"unch % Portions of code copyrighted by other people as marked. % @@ -40,7 +40,7 @@ % % Also a TDS.ZIP file is provided that contains all the files % already sorted in a TDS tree: -% http://mirrors.ctan.org/install/macros/latex/contrib/lastpage.tds.zip +% https://mirrors.ctan.org/install/macros/latex/contrib/lastpage.tds.zip % %<*ignore> \begingroup @@ -57,7 +57,7 @@ \input docstrip.tex \Msg{*********************************************************************} \Msg{* Installation} -\Msg{* Package: lastpage 2015/03/29 v1.2m Refers to last page's name (HMM)} +\Msg{* Package: lastpage 2021/09/03 v1.2n Refers to last page's name (HMM)} \Msg{*********************************************************************} \keepsilent @@ -69,9 +69,9 @@ This is a generated file. Project: lastpage -Version: 2015/03/29 v1.2m +Version: 2021/09/03 v1.2n -Copyright (C) 2010 - 2015 by +Copyright (C) 2010 - 2021 by H.-Martin M"unch Portions of code copyrighted by other people as marked. @@ -84,9 +84,9 @@ This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. This version of this license is in - http://www.latex-project.org/lppl/lppl-1-3c.txt + https://www.latex-project.org/lppl/lppl-1-3c.txt and the latest version of this license is in - http://www.latex-project.org/lppl.txt + https://www.latex-project.org/lppl.txt and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. @@ -170,8 +170,8 @@ In memoriam %<*driver> \NeedsTeXFormat{LaTeX2e}[2014/05/01] \ProvidesFile{lastpage.drv}% - [2015/03/29 v1.2m Refers to last page's name (HMM)] -\documentclass{ltxdoc}[2014/09/29]% v2.0u + [2021/09/03 v1.2n Refers to last page's name (HMM)] +\documentclass{ltxdoc}[2015/03/26]% v2.0w \usepackage{holtxdoc}[2012/03/21]% v0.24 %% lastpage may work with earlier versions of LaTeX2e and those %% class and package, but this was not tested. @@ -207,7 +207,7 @@ In memoriam % % \fi % -% \CheckSum{286} +% \CheckSum{316} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -256,7 +256,7 @@ In memoriam % \DoNotIndex{\lastpage@testa,\lastpage@testb,\lastpage@one} % % \title{The \xpackage{lastpage} package} -% \date{2015/03/29 v1.2m} +% \date{2021/09/03 v1.2n} % \author{H.-Martin M\"{u}nch\\\xemail{Martin.Muench at Uni-Bonn.de}\\ % invented by Jeffrey P. Goldberg\\\xemail{jeffrey+news at goldmark.org}} % @@ -402,7 +402,27 @@ In memoriam % \indent (The \xpackage{pageslts} package solves this problem by using % |\AfterLastShipout| from \textsc{Heiko Oberdiek's} \xpackage{atveryend} % package for the references\\ -% |\lastpageref{VeryLastPage}| and |\lastpageref{LastPages}|.) +% |\lastpageref{VeryLastPage}| and |\lastpageref{LastPages}|.)\\ +% \xpackage{lastpage} uses |\AtEndDocument{|\ldots|\clearpage|\ldots|}|, thus\\ +%|\usepackage{lastpage}|\ldots|\AtEndDocument{|\textit{something}|}| +% will place \textit{something} after the |\clearpage|. To place it earlier, use\\ +% |\AtEndDocument{|\textit{something}|}|\ldots|\usepackage{lastpage}|. +% If the \textit{something} is not known before |\usepackage{lastpage}|, +% you can use for example +% \begin{verbatim} +% ... +% \def\beforeLastpageClearpage{\relax} +% \AtEndDocument{\beforeLastpageClearpage} +% \usepackage{lastpage} +% \begin{document} +% ... +% \def\beforeLastpageClearpage{\textit{something}}% +% ... +% \end{document} +% \end{verbatim} +% (might need a protected and/or expanded |\def|). When |\cleapage| leads +% to some output, |\cleapage\textit{something}| instead of |\textit{something}| +% might be wanted. % % \subsection{Interaction with very old versions of the \xpackage{endfloat} package\label{sec:endfloat}} % @@ -530,8 +550,6 @@ In memoriam % \indent (The \xpackage{pageslts} package with |\lastpageref{lastpage}| and % appropriate package options should cope even with this case.) % -% \newpage -% % \subsection{Page counter overflow\label{ss:overflow}} % % \indent \textquotedblleft The ranges of supported counter values are more or less @@ -698,7 +716,7 @@ In memoriam % because they take over the complete page layout.\textquotedblright (\textsc{Piet van % % Oostrum}: Page layout in \LaTeX{}, March~2, 2004, section~16; fancyhdr.pdf)\\ % \xpackage{nofm} as of 1991/02/25 (without version number), available at\\ -% \url{http://mirror.ctan.org/obsolete/macros/latex209/contrib/misc/nofm.sty},\\ +% \url{https://mirrors.ctan.org/obsolete/macros/latex209/contrib/misc/nofm.sty},\\ % does not work with e.\,g. \xpackage{hyperref}, redefines |\enddocument| % as well as |\@oddhead|, |\@evenhead|, |\@oddfoot|, and |\@evenfoot|.\\ % If you know the (CTAN) location of a \textbf{working}~(!) version, @@ -710,6 +728,29 @@ In memoriam % \item[-] You may want to have a look at the \xpackage{count1to} package. % \end{description} % +% \DescribeMacro{totalcount} +% \begin{description} +% \item[-] The \xpackage{totalcount} package provides |\totalpages|. +% If there are only arabic page numbers consecutively running from 1 to the last page, +% this works. But for example +% +% \begin{quote} +%\begin{verbatim} +%\documentclass{article} +%\usepackage[page]{totalcount} +%\pagenumbering{Roman} +%\begin{document} +%\addtocounter{page}{49} +%Page \thepage{} of \totalpages +%\end{document} +%\end{verbatim} +% \end{quote} +% +% prints \textquotedblleft Page L of 50\textquotedblright, +% where the number of pages is one (and no hyperlink is provided to the +% last page even if \xpackage{hyperref} is used). +% \end{description} +% % \DescribeMacro{zref} % \begin{description} % \item[-] The \xpackage{zref} package of \textsc{Heiko Oberdiek} requires @@ -719,6 +760,12 @@ In memoriam % whatsoever). % \end{description} % +% \DescribeMacro{memoir} +% \begin{description} +% \item[-] The \xpackage{memoir} class provides |\thelastpage| (page number printed +% on last page) and |\thelastsheet| (number of pages). +% \end{description} +% % \bigskip % % \noindent (You programmed or found another alternative, @@ -748,7 +795,7 @@ In memoriam hyperindex=false,% pdflang={en},% pdftitle={lastpage package example},% - pdfauthor={Hans-Martin Muench},% + pdfauthor={H.-Martin Muench},% pdfsubject={Example for the lastpage package},% pdfkeywords={LaTeX, lastpage, H.-Martin Muench},% pdfview=Fit,% @@ -760,7 +807,7 @@ In memoriam %% must be loaded for the \url used in this example: %% \usepackage{url} %% or just use \let\url\texttt for the one used url. -\usepackage{lastpage}[2015/03/29]% v1.2m +\usepackage{lastpage}[2021/09/03]% v1.2n \makeatletter \renewcommand{\@evenfoot}{% \normalsize\slshape \today\hfil \upshape % @@ -776,7 +823,7 @@ In memoriam \markboth{Example for lastpage}{Example for lastpage} This example demonstrates the use of package\newline -\textsf{lastpage}, v1.2m as of 2015/03/29 (HMM; JPG).\newline +\textsf{lastpage}, v1.2n as of 2021/09/03 (HMM; JPG).\newline The package takes no options.\newline For more details please see the documentation!\newline @@ -800,12 +847,10 @@ trademark symbol; they are the property of their respective trademark owner. There is no intention of infringement; the usage is to the benefit of the trademark owner.\newline -\textbf{Tip}: Use \textit{logical page numbers} for -the display of the pdf!\newline -(In Adobe Reader XI (11.0.10): \underline{E}dit $>$ -Prefere\underline{n}ces (Ctrl+k) $>$ Page Display $>$ -Page Content and Information $>$ Use logical page -\nolinebreak{\underline{n}umbers.)}\newline +\textbf{Tip}: Use \textit{logical page numbers} +for the display of the pdf (in Adobe Reader DC 2021.005.20060: +Edit $>$ Preferences $>$ Categories: Page Display $>$ +Page Content and Information: Use logical page numbers)!\newline If you are more ambitious in respect to your aims with this package, you might want to have a look at the \textsf{pageslts} package:\newline @@ -844,6 +889,53 @@ I do NOT think, that it is necessary to print THIS file, really\newline \noindent The page (\verb|\thepage|): \thepage \newline \noindent Last page's name (LastPage): \pageref{LastPage} + +\bigskip + +\noindent There was the question: + +\begin{quote} +\begin{verbatim} +\documentclass{article} +\usepackage{hyperref} +\usepackage{lastpage} +\begin{document} +\ifnum\thepage=\pageref{LastPage} foo \else bar \fi +\end{document} +\end{verbatim} + +producing the error +\textquotedblleft missing number, treated as zero\textquotedblright. +\end{quote} + +\noindent \verb|\pageref| inserts a hyperlink, \verb|\pageref{LastPage}| +is not expandable and the code breaks.\newline +The code does not generally work even without hyperref. + +\begin{quote} +\begin{verbatim} +\documentclass{article} +\usepackage{hyperref} +\usepackage{lastpage} +\pagenumbering{Roman} +\begin{document} +\addtocounter{page}{8} +\edef\here{\thepage} +\makeatletter +\ifx\here\lastpage@lastpage\relax foo \else bar \fi +\makeatother +\end{document} +\end{verbatim} +\end{quote} + +\noindent does work, because \verb|\lastpage@lastpage| contains the name +of the page, example:\newline +\verb|Page \thepage{} is page \makeatletter\lastpage@lastpage\makeatother.|% +\newline +prints:\newline +Page \thepage{} is page \makeatletter\lastpage@lastpage\makeatother.% +\newline +This can be broken for example by \verb|\pagenumbering{fnsymbol}|. \end{document} % % \end{macrocode} @@ -864,7 +956,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[2014/05/01] \ProvidesPackage{lastpage}% - [2015/03/29 v1.2m Refers to last page's name (HMM; JPG)]% + [2021/09/03 v1.2n Refers to last page's name (HMM; JPG)]% %% lastpage may work with earlier versions of LaTeX, %% but this was not tested. Please consider updating @@ -922,12 +1014,13 @@ I do NOT think, that it is necessary to print THIS file, really\newline \def\lastpage@one{1} % \end{macrocode} % -% We define |\lastpage@hyper|, |\lastpage@nameref|, and |\lastpage@LTS| -% to be \textquotedblleft \texttt{0}\textquotedblright{}. +% We define |\lastpage@hyper|, |\lastpage@nameref|, |\lastpage@french|, and +% |\lastpage@LTS| to be \textquotedblleft \texttt{0}\textquotedblright{}. % % \begin{macrocode} \gdef\lastpage@hyper{0} \gdef\lastpage@nameref{0} +\gdef\lastpage@french{0} \gdef\lastpage@LTS{0} % \end{macrocode} % @@ -944,13 +1037,17 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \indent |\AtBeginDocument| it is checked whether various packages are loaded.\\ % (|\@ifpackageloaded| cannot be used later than |\AtBeginDocument|.)\\ % If this is the case, |\lastpage@| is defined as -% \texttt{1} (otherwise it stays \texttt{0}). +% \texttt{1} (otherwise it stays \texttt{0}).\\ +% The \xpackage{ltxcmds} package provides |\ltx@ifpackageloaded|, which can be used +% also after |\AtBeginDocument|, but \xpackage{lastpage} tries to not load other packages. % % \begin{macrocode} \AtBeginDocument{% \@ifpackageloaded{tikz}{\gdef\lastpage@tikz{1}}{}% \@ifpackageloaded{hyperref}{\gdef\lastpage@hyper{1}}{}% \@ifpackageloaded{nameref}{\gdef\lastpage@nameref{1}}{}% + \@ifpackageloaded{french}{\gdef\lastpage@french{1}}{}% + \@ifpackageloaded{frenchle}{\gdef\lastpage@french{1}}{}% \@ifpackageloaded{pageslts}{% \PackageWarning{lastpage}{Package pageslts found.\MessageBreak% Therefore the lastpage package is no longer\MessageBreak% @@ -1252,6 +1349,9 @@ I do NOT think, that it is necessary to print THIS file, really\newline {The lastpage package was not allowed to write to an .aux file.\MessageBreak% This package does not work without access to an .aux file.\MessageBreak% Press Ctrl+Z to exit.\MessageBreak% + But it is OK if the .aux file was already updated\MessageBreak% + by a previouse compiler run\MessageBreak% + and would not have changed anyway.\MessageBreak% }% \fi% \fi% @@ -1281,26 +1381,23 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % \begin{macro}{\AtEndDocument} % \indent |\AtEndDocument| we again (re)define |\lastpage@putlabel| -% to do nothing and define |\lastpage@lastpage| and |\lastpage@lastpageHy|. -% Without this definition there would happen an |undefined| error when -% comparing with |\lastpage@lastpage| and |\lastpage@lastpageHy|. +% to do nothing and check |\lastpage@lastpage| and |\lastpage@lastpageHy|, +% whether they are still unchanged, which is OK for the first run only. % % \begin{macrocode} +\gdef\lastpage@lastpage{\relax}% +\gdef\lastpage@lastpageHy{\relax}% + \AtEndDocument{% \gdef\lastpage@putlabel{\relax}% \ifx\lastpage@LTS\lastpage@one% \else% - \@ifundefined{lastpage@lastpage}% - {\gdef\lastpage@lastpage{LastpagePackageError}% - % If there really is a page numbered (!) "LastpagePackageError", - % you will get the rerun warning whether it is necessary or not. + \ifx\lastpage@lastpage\relax% \PackageWarning{lastpage}{Rerun to get the references right}% - }{% already defined, nothing to be done. - }% - \@ifundefined{lastpage@lastpageHy}% - {\gdef\lastpage@lastpageHy{LastpagePackageError}% - }{% already defined, nothing to be done. - }% + \fi% + \ifx\lastpage@lastpageHy\relax% + \PackageWarning{lastpage}{Rerun to get the references right}% + \fi% \fi% % \end{macrocode} % @@ -1320,9 +1417,15 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % After this we issue a |\clearpage| to put out all floats, % which are still floating, and place the \texttt{LastPage} label. +% Sometimes |\clearpage| might be undefined. % % \begin{macrocode} - \clearpage\lastpage@putl@bel% + \@ifundefined{clearpage}{\relax}{\clearpage}% + \ifx\lastpage@french\lastpage@one% french or frenchle loaded + \addtocounter{page}{+1}\lastpage@putl@bel\addtocounter{page}{-1}% + \else% neither one loaded + \lastpage@putl@bel% + \fi% % \end{macrocode} % % When writing to files is not allowed, nothing can be done. But when @@ -1368,7 +1471,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \begin{description} % \item[-] \TeX Format \LaTeXe{}: \url{https://www.CTAN.org} % -% \item[-] document class \xpackage{ltxdoc}, 2014/09/29, v2.0u,\\ +% \item[-] document class \xclass{ltxdoc}, 2015/03/26, v2.0w,\\ % \url{https://www.ctan.org/pkg/ltxdoc} % % \item[-] package \xpackage{holtxdoc}, 2012/03/21, v0.24,\\ @@ -1384,12 +1487,12 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \begin{description} % \item[-] \TeX Format \LaTeXe{}, \url{https://www.CTAN.org} % -% \item[-] package \xpackage{lastpage}, 2015/03/29, v1.2m,\\ +% \item[-] package \xpackage{lastpage}, 2021/09/03, v1.2n,\\ % \url{https://www.ctan.org/pkg/lastpage} % \end{description} % and can use % \begin{description} -% \item[-] package \xpackage{hyperref}, 2012/11/06, 6.83m,\\ +% \item[-] package \xpackage{hyperref}, 2012/11/06, v6.83m,\\ % \url{https://www.ctan.org/pkg/hyperref} % \end{description} % @@ -1399,16 +1502,16 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \begin{description} % \item[-] \TeX Format \LaTeX{}, v2.09 % -% \item[-] package \xpackage{lastpage209}, 2015/03/29, v1.2m, included in\\ +% \item[-] package \xpackage{lastpage209}, 2021/09/03, v1.2n, included in\\ % \hspace*{-2em}\url{http://mirrors.ctan.org/install/macros/latex/contrib/lastpage.tds.zip}% % \end{description} % and does not work with \xpackage{hyperref}, which needs \LaTeX2e{}.\\ % % \DescribeMacro{lastpage-example.tex} -% The \texttt{lastpage-example.tex} requires the same file as all +% The |lastpage-example.tex| requires the same file as all % documents using the \xpackage{lastpage} package, i.\,e. % \begin{description} -% \item[-] package \xpackage{lastpage}, 2015/03/29, v1.2m,\\ +% \item[-] package \xpackage{lastpage}, 2021/09/03, v1.2n,\\ % \url{https://www.ctan.org/pkg/lastpage}\\ % (Well, it is the example file for this package, and because you are reading the % documentation for the \xpackage{lastpage} package, it can be assumed that you already @@ -1462,8 +1565,11 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \DescribeMacro{nofm} % \DescribeMacro{totpages} % \DescribeMacro{lastpage} +% \DescribeMacro{totalcount} % \DescribeMacro{zref} -% As possible alternatives in section~\ref{sec:Alternatives}, Alternatives, there are listed +% \DescribeMacro{memoir} +% As possible alternatives in section~\ref{sec:Alternatives}, Alternatives, +% there are listed (newer versions might be available): % \begin{description} % \item[-] package \xpackage{pageslts}, 2014/01/19, v1.2c,\\ % \url{https://www.ctan.org/pkg/pageslts} @@ -1476,15 +1582,21 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \url{https://www.ctan.org/pkg/count1to} % % \item[-] package \xpackage{nofm}, 1991/02/25, v?.?,\\ -% \url{http://mirror.ctan.org/obsolete/macros/latex209/contrib/misc/nofm.sty}, +% \url{https://mirrors.ctan.org/obsolete/macros/latex209/contrib/misc/nofm.sty}, % does not work with e.\,g. \xpackage{hyperref} % % \item[-] package \xpackage{totpages}, 2005/09/19, v2.00,\\ % \url{https://www.ctan.org/pkg/totpages} % +% \item[-] package \xpackage{totalcount}, 2018/01/21, v1.0a,\\ +% \url{https://www.ctan.org/pkg/totalcount}. +% % \item[-] package \xpackage{zref}, 2012/04/04, v2.24,\\ % \url{https://www.ctan.org/pkg/zref}, % requires $\varepsilon$-\TeX{}. +% +% \item[-] class \xpackage{memoir}, 2021/06/16, v3.7p,\\ +% \url{https://ctan.org/tex-archive/macros/latex/contrib/memoir/}. % \end{description} % % \DescribeMacro{Oberdiek} @@ -1498,8 +1610,8 @@ I do NOT think, that it is necessary to print THIS file, really\newline % are quite probably both recent and compatible among themselves.\\ % % \DescribeMacro{hyperref} -% \noindent \xpackage{hyperref} is not included in that bundle and needs to be downloaded -% separately,\\ +% \noindent \xpackage{hyperref} is not included in that bundle and needs to be +% downloaded separately,\\ % \url{http://mirrors.ctan.org/install/macros/latex/contrib/hyperref.tds.zip}.\\ % % \DescribeMacro{M\"{u}nch} @@ -1507,7 +1619,6 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \url{https://www.ctan.org/author/muench-hm}.\\ % % \subsection{Package, unpacking TDS} -% % \paragraph{Package.} This package is available on CTAN.org. % \begin{description} % \item[\url{http://mirrors.ctan.org/macros/latex/contrib/lastpage/lastpage.dtx}]\hspace*{0.1cm} \\ @@ -1519,7 +1630,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \item[\url{http://mirrors.ctan.org/macros/latex/contrib/lastpage/README}]\hspace*{0.1cm} \\ % The README file. % \end{description} -% There is also a \texttt{lastpage.tds.zip} available: +% There is also a |lastpage.tds.zip| available: % \begin{description} % \item[\url{http://mirrors.ctan.org/install/macros/latex/contrib/lastpage.tds.zip}]\hspace*{0.1cm} \\ % Everything in TDS compliant, compiled format @@ -1535,11 +1646,11 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % \bigskip % -% \noindent For required other packages, see the preceding subsection. +% \noindent For required other packages see the preceding subsection. % % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting % \docstrip{} archive. The files are extracted by running the -% \xfile{.dtx} through \plainTeX: +% \xext{dtx} through \plainTeX{}: % \begin{quote} % \verb|tex lastpage.dtx| % \end{quote} @@ -1549,7 +1660,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \paragraph{TDS.} Now the different files must be moved into % the different directories in your installation TDS tree % (also known as \xfile{texmf} tree), \textbf{but first you should delete -% the old \xpackage{lastpage} files (which are probably located in other directories).} +% the old \xpackage{lastpage} files (which are probably located in other directories)}. % You can make a backup of the old files before deleting them, of course. % \begin{quote} % \def\t{^^A @@ -1627,8 +1738,8 @@ I do NOT think, that it is necessary to print THIS file, really\newline % % \subsection{Refresh file name databases} % -% If your \TeX~distribution (\teTeX, \mikTeX,\TeX live,\dots) relies on file name -% databases, you must refresh these. For example, \teTeX{} users run +% If your \TeX~distribution (\TeX live, \mikTeX, \teTeX, \dots) relies on +% file name databases, you must refresh these. For example, \teTeX{} users run % \verb|texhash| or \verb|mktexlsr|. % % \subsection{Some details for the interested} @@ -1802,10 +1913,9 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \item Minor details. % \end{Version} % \begin{Version}{2011/07/03 v1.2h} -% \item The \xpackage{holtxdoc} package was fixed (recent: 2011/02/04, v0.21), -% therefore the warning in \xfile{drv} could be removed.~-- Adapted -% the style of this documentation to new \textsc{Oberdiek} \xfile{dtx} -% style. +% \item The \xpackage{holtxdoc} package was fixed, therefore the warning +% in \xfile{drv} could be removed.~-- Adapted the style of this documentation +% to new \textsc{Oberdiek} \xfile{dtx} style. % \item New versions of \xpackage{pagesLTS}, \xpackage{ulem}, \xpackage{hyperref},% % \xpackage{papermas} packages. % \item Corrected references in the README and manual. @@ -1855,6 +1965,10 @@ I do NOT think, that it is necessary to print THIS file, really\newline % \item Updates to a lot (!) of details in the documentation (manual \& README), % very small changes in code. % \end{Version} +% \begin{Version}{2021/09/03 v1.2n} +% \item Updates to the documentation (manual \& README), to the example, and +% several small changes in code. +% \end{Version} % \end{History} % % \bigskip diff --git a/macros/latex/contrib/lastpage/lastpage.pdf b/macros/latex/contrib/lastpage/lastpage.pdf index 2f4be29120..d0bedd4949 100644 Binary files a/macros/latex/contrib/lastpage/lastpage.pdf and b/macros/latex/contrib/lastpage/lastpage.pdf differ -- cgit v1.2.3