From 555796a9dcf50f8997d2d26611609cb60d1dee7c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 20 Oct 2020 20:40:07 +0000 Subject: leaflet (20oct20) git-svn-id: svn://tug.org/texlive/trunk@56716 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/leaflet/leaflet-manual.pdf | Bin 92279 -> 92279 bytes .../doc/latex/leaflet/leaflet-manual.tex | 18 ++++++++----- Master/texmf-dist/doc/latex/leaflet/leaflet.pdf | Bin 246694 -> 246849 bytes Master/texmf-dist/source/latex/leaflet/leaflet.dtx | 27 ++++++++++--------- Master/texmf-dist/source/latex/leaflet/leaflet.ins | 16 +++++++----- Master/texmf-dist/tex/latex/leaflet/leaflet.cls | 29 ++++++++++++--------- Master/tlpkg/libexec/ctan2tds | 1 + 7 files changed, 54 insertions(+), 37 deletions(-) diff --git a/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.pdf b/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.pdf index 07cf61a3f2c..ef8311bfb97 100644 Binary files a/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.pdf and b/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.pdf differ diff --git a/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.tex b/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.tex index a7bfda1184e..c88f6daa5fa 100644 --- a/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.tex +++ b/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.tex @@ -6,22 +6,26 @@ %% %% leaflet.dtx (with options: `manual') %% -%% Copyright (C) 2003, 2004, ... -%% Rolf Niepraschk, Rolf.Niepraschk@gmx.de -%% Hubert Gaesslein, hubertjg@gmx.de +%% (c) 1998 J{\accent "7F u}rgen Schlegelmilch +%% (c) 2000 Walter Schmidt +%% (c) 2002-2004 Rolf Niepraschk and +%% Hubert G{\accent "7F a}\ss {}lein +%% (c) 2012-2020 Rolf Niepraschk %% -%% This work may be distributed and/or modified under the +%% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt +%% The latest version of this license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% %% and version 1.3 or later is part of all distributions of LaTeX %% version 2003/12/01 or later. %% %% This work has the LPPL maintenance status "author-maintained". %% \def\filename{leaflet-manual.tex} -\def\fileversion{v2.0b} % change this when leaflet-manual changed, too. +\def\fileversion{v2.0c} % change this when leaflet-manual changed, too. \def\filedate{2020/10/14} \def\docdate {2020/10/14} % change this when leaflet-manual changed, too. \listfiles diff --git a/Master/texmf-dist/doc/latex/leaflet/leaflet.pdf b/Master/texmf-dist/doc/latex/leaflet/leaflet.pdf index 7f2ae799141..052a8071e93 100644 Binary files a/Master/texmf-dist/doc/latex/leaflet/leaflet.pdf and b/Master/texmf-dist/doc/latex/leaflet/leaflet.pdf differ diff --git a/Master/texmf-dist/source/latex/leaflet/leaflet.dtx b/Master/texmf-dist/source/latex/leaflet/leaflet.dtx index 1acc4424c7a..9a1ed13b26d 100644 --- a/Master/texmf-dist/source/latex/leaflet/leaflet.dtx +++ b/Master/texmf-dist/source/latex/leaflet/leaflet.dtx @@ -3,9 +3,9 @@ % % (c) 1998 J\"urgen Schlegelmilch % (c) 2000 Walter Schmidt -% (c) 2002/2004 Rolf Niepraschk and +% (c) 2002-2004 Rolf Niepraschk and % Hubert G\"a\ss{}lein -% (c) 2012,... Rolf Niepraschk +% (c) 2012-2020 Rolf Niepraschk % % This file may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -20,14 +20,13 @@ % \fi % % \iffalse -%\NeedsTeXFormat{LaTeX2e}[2020-10-01] %\ProvidesClass{leaflet} -% [2020/10/14 v2.0b LaTeX document class (JS,WaS,RN,HjG)] +% [2020/10/14 v2.0c LaTeX document class (JS,WaS,RN,HjG)] % %<*driver|manual> %\def\filename{leaflet.dtx} %\def\filename{leaflet-manual.tex} -\def\fileversion{v2.0b} % change this when leaflet-manual changed, too. +\def\fileversion{v2.0c} % change this when leaflet-manual changed, too. \def\filedate{2020/10/14} \def\docdate {2020/10/14} % change this when leaflet-manual changed, too. % @@ -52,7 +51,7 @@ % % \fi % -% \CheckSum{1272} +% \CheckSum{1277} % % \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 @@ -147,14 +146,15 @@ % \subsection{Test whether the LaTeX format is new enough} % We use the 'shipout/before' hook. % \begin{macrocode} -\@ifundefined{DiscardShipoutBox}{% +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} +\IfFormatAtLeastTF{2020/10/01}{}{% \ClassError{leaflet}{% LaTeX version equal to or newer \MessageBreak - than '2020-10-01' is required% + than '2020/10/01' is required% }{% Renew your TeX installation.% - }% -}{} + }% +} % \end{macrocode} % \subsection{Saving some internal macros\dots} % @@ -437,6 +437,7 @@ % remaining commands must still wait until the next output page is % ready. It works only for output commands in the main text which moved to % the next page but not for floating output commands. +% \changes{v2.0c}{2020/10/14}{Missing \cmd{\set@display@protect} (RN)} % \begin{macrocode} \newcommand*\@@@exec@outs{% \begingroup @@ -467,6 +468,7 @@ Too early to execute! <<<}% \fi \@tempcnta\z@ \def\reserved@b{}% + \set@display@protect \@for\reserved@a :=\@@@pending@outs\do{% \ifx\reserved@a\@empty\else \ifnum\@tempcnta<\@tempcntb% @@ -886,10 +888,11 @@ % The \cmd{\ShipoutBox} with the page content must be a bit moved to get a % ``normal-sized'' box. In ``nocombine'' mode only put the background picture. % \changes{v1.1a}{2015/12/27}{Additions for new option `foldcorr'. (RN)} -% \changes{v2.0a}{2020/10/13}{Do not call \cmd{\@@@exec@outs} temporarily. (RN)} +% \changes{v2.0a}{2020/10/13}{Temporarily do not call \cmd{\@@@exec@outs}. (RN)} % \changes{v2.0a}{2020/10/13}{Using \LaTeX's new 'shipout/before' hook. (RN)} % \changes{v2.0b}{2020/10/14}{Renamed \cmd{\LL@savePage} to % \cmd{\LL@processPage}. (RN)} +% \changes{v2.0c}{2020/10/14}{Activated \cmd{\@@@exec@outs} again. (RN)} % \begin{macrocode} \newcommand*\LL@processPage{% \ifLL@combine\DiscardShipoutBox\fi @@ -908,7 +911,7 @@ \if@tempswa\LL@tempdima=0.9797979798\paperwidth \else\LL@tempdima=1.0101010101\paperwidth \fi \fi - %%%\@@@exec@outs + \@@@exec@outs \expandafter\newsavebox\csname LL@box\Roman{LL@page}\endcsname% \setbox\ShipoutBox=\vbox{\vskip1in\unvbox\ShipoutBox}% \setbox\ShipoutBox=\vbox{\moveright1in\box\ShipoutBox}% diff --git a/Master/texmf-dist/source/latex/leaflet/leaflet.ins b/Master/texmf-dist/source/latex/leaflet/leaflet.ins index af980d0555d..08598b54412 100644 --- a/Master/texmf-dist/source/latex/leaflet/leaflet.ins +++ b/Master/texmf-dist/source/latex/leaflet/leaflet.ins @@ -3,15 +3,19 @@ \preamble -Copyright (C) 2003, 2004, ... -Rolf Niepraschk, Rolf.Niepraschk@gmx.de -Hubert Gaesslein, hubertjg@gmx.de +(c) 1998 J\"urgen Schlegelmilch +(c) 2000 Walter Schmidt +(c) 2002-2004 Rolf Niepraschk and + Hubert G\"a\ss{}lein +(c) 2012-2020 Rolf Niepraschk -This work may be distributed and/or modified under the +This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. -The latest version of this license is in - http://www.latex-project.org/lppl.txt +The latest version of this license is in: + + http://www.latex-project.org/lppl.txt + and version 1.3 or later is part of all distributions of LaTeX version 2003/12/01 or later. diff --git a/Master/texmf-dist/tex/latex/leaflet/leaflet.cls b/Master/texmf-dist/tex/latex/leaflet/leaflet.cls index 38eb4fcb81d..8fc5e81940b 100644 --- a/Master/texmf-dist/tex/latex/leaflet/leaflet.cls +++ b/Master/texmf-dist/tex/latex/leaflet/leaflet.cls @@ -6,31 +6,35 @@ %% %% leaflet.dtx (with options: `class') %% -%% Copyright (C) 2003, 2004, ... -%% Rolf Niepraschk, Rolf.Niepraschk@gmx.de -%% Hubert Gaesslein, hubertjg@gmx.de +%% (c) 1998 J{\accent "7F u}rgen Schlegelmilch +%% (c) 2000 Walter Schmidt +%% (c) 2002-2004 Rolf Niepraschk and +%% Hubert G{\accent "7F a}\ss {}lein +%% (c) 2012-2020 Rolf Niepraschk %% -%% This work may be distributed and/or modified under the +%% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt +%% The latest version of this license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% %% and version 1.3 or later is part of all distributions of LaTeX %% version 2003/12/01 or later. %% %% This work has the LPPL maintenance status "author-maintained". %% -\NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{leaflet} - [2020/10/14 v2.0b LaTeX document class (JS,WaS,RN,HjG)] -\@ifundefined{DiscardShipoutBox}{% + [2020/10/14 v2.0c LaTeX document class (JS,WaS,RN,HjG)] +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} +\IfFormatAtLeastTF{2020/10/01}{}{% \ClassError{leaflet}{% LaTeX version equal to or newer \MessageBreak - than '2020-10-01' is required% + than '2020/10/01' is required% }{% Renew your TeX installation.% }% -}{} +} \let\LL@begindvi\@begindvi \@ifundefined{iflandscape}{\newif\iflandscape}{}% \@ifundefined{iftumble}{\newif\iftumble}{}% @@ -207,6 +211,7 @@ Too early to execute! <<<}% \fi \@tempcnta\z@ \def\reserved@b{}% + \set@display@protect \@for\reserved@a :=\@@@pending@outs\do{% \ifx\reserved@a\@empty\else \ifnum\@tempcnta<\@tempcntb% @@ -463,7 +468,7 @@ \if@tempswa\LL@tempdima=0.9797979798\paperwidth \else\LL@tempdima=1.0101010101\paperwidth \fi \fi - %%%\@@@exec@outs + \@@@exec@outs \expandafter\newsavebox\csname LL@box\Roman{LL@page}\endcsname% \setbox\ShipoutBox=\vbox{\vskip1in\unvbox\ShipoutBox}% \setbox\ShipoutBox=\vbox{\moveright1in\box\ShipoutBox}% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 6fd85e92f79..68429c4e005 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -2868,6 +2868,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'lastpage' => 'tex', 'latex-veryshortguide' => 'latex', # requires interaction 'lcd' => 'latex -translate-file=empty.tcx', # no 8-bit + 'leaflet' => 'etex', 'letterswitharrows' => 'tex', 'listings' => 'latex', # requires interaction 'lmake' => 'latex', # requires interaction -- cgit v1.2.3