leaflet (4jun12)

git-svn-id: svn://tug.org/texlive/trunk@27126 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 62 insertions, 27 deletions

diff --git a/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.pdf b/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.pdf
index 492cd461c63..d9822e52bcc 100644
--- a/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.pdf
+++ b/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.pdf
diff --git a/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.tex b/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.tex
index 5102048031d..39d0849707c 100644
--- a/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.tex
+++ b/Master/texmf-dist/doc/latex/leaflet/leaflet-manual.tex
@@ -21,9 +21,9 @@
 %% This work has the LPPL maintenance status "author-maintained".
 %% 
 \def\filename{leaflet-manual.tex}
-\def\fileversion{v1.0c}   % change this when leaflet-manual changed, too.
-\def\filedate{2004/12/22}
-\def\docdate {2004/08/12} % change this when leaflet-manual changed, too.
+\def\fileversion{v1.0d}   % change this when leaflet-manual changed, too.
+\def\filedate{2012/06/04}
+\def\docdate {2012/06/04} % change this when leaflet-manual changed, too.
 \listfiles
 \errorcontextlines=99
 \documentclass[
@@ -296,6 +296,10 @@ Default options are marked with an asterisk:
   will be gobbled.
   Otherwise (\Lopt{nocombine}), just a warning will be issued;
   shortening the text appropriately is left to the user.
+\item[\Lopt{twopart}, \Lopt{notwopart}{\defaultmarker}]
+  Allows the typesetting of a four page leaflet (first part) and a two page
+  detachable form (second part), for fill-in forms, questionnaires, applications,
+  etc.
 \end{description}
 
 Other options are passed to the \Lclass{article} class.
diff --git a/Master/texmf-dist/doc/latex/leaflet/leaflet.pdf b/Master/texmf-dist/doc/latex/leaflet/leaflet.pdf
index f490d458012..3ef240750d9 100644
--- a/Master/texmf-dist/doc/latex/leaflet/leaflet.pdf
+++ b/Master/texmf-dist/doc/latex/leaflet/leaflet.pdf
diff --git a/Master/texmf-dist/source/latex/leaflet/leaflet.dtx b/Master/texmf-dist/source/latex/leaflet/leaflet.dtx
index c1f7175905a..af3abebebcd 100644
--- a/Master/texmf-dist/source/latex/leaflet/leaflet.dtx
+++ b/Master/texmf-dist/source/latex/leaflet/leaflet.dtx
@@ -1,11 +1,11 @@
 % \iffalse meta-comment
 %
-% Time-stamp: "leaflet.dtx 2004-08-08 10:58:24 CEST Friday hubertjg"
 %
 %  (c) 1998 J\"urgen Schlegelmilch    <schlegel@informatik.uni-rostock.de>
 %  (c) 2000 Walter Schmidt            <w.a.schmidt@gmx.net>
 %  (c) 2002/2004 Rolf Niepraschk      <Rolf.Niepraschk@ptb.de> and
 %                Hubert G\"a\ss{}lein <HubertJG@open.mind.de>
+%  (c) 2012 Rolf Niepraschk           <Rolf.Niepraschk@gmx.de>
 %
 % This file may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -22,14 +22,14 @@
 % \iffalse
 %<class>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<class>\ProvidesClass{leaflet}
-%<class>  [2004/12/22 v1.0d LaTeX document class (JS,WaS,RN,HjG)]
+%<class>  [2012/06/04 v1.0d LaTeX document class (JS,WaS,RN,HjG)]
 %
 %<*driver|manual>
 %<driver>\def\filename{leaflet.dtx}
 %<manual>\def\filename{leaflet-manual.tex}
-\def\fileversion{v1.0c}   % change this when leaflet-manual changed, too.
-\def\filedate{2004/12/22}
-\def\docdate {2004/08/12} % change this when leaflet-manual changed, too.
+\def\fileversion{v1.0d}   % change this when leaflet-manual changed, too.
+\def\filedate{2012/06/04}
+\def\docdate {2012/06/04} % change this when leaflet-manual changed, too.
 %</driver|manual>
 %<*driver>
 \listfiles
@@ -52,7 +52,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{0}
+% \CheckSum{1205}
 %
 % \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
@@ -82,7 +82,10 @@
 % \changes{v1.0pre2}{2004/06/26}{eTeX support. (RN)}
 % \changes{v1.0pre3}{2004/07/07}{Options `landscape' and `portait'. (RN)}
 % \changes{v1.0}{2004/08/06}{CTAN release. (RN/HjG)}
-% \changes{v1.0a}{2004/08/08}{Add option `debug'. (RN)}
+% \changes{v1.0a}{2004/08/08}{Option `debug'. (RN)}
+% \changes{v1.0d}{2012/06/04}{Options `twopart/notwopart' suggested 
+%   by Luis Rivera. No more `final' in \cmd{\ExecuteOptions} suggested 
+%   by Axel Berger (RN)}
 %
 % \DoNotIndex{\newcommand,\renewcommand,\newenvironment,\renewenvironment}
 % \DoNotIndex{\providecommand,\def,\edef,\let,\gdef,\xdef,\global,\newtoks}
@@ -154,6 +157,7 @@
 %    \begin{macrocode}
 \@ifundefined{iflandscape}{\newif\iflandscape}{}%
 \@ifundefined{iftumble}{\newif\iftumble}{}%
+\@ifundefined{iftwopart}{\newif\iftwopart}{}%
 \newcommand\LL@debug@info[1]{}%
 \DeclareOption{dvips}{\PassOptionsToPackage{\CurrentOption}{graphics}}
 \DeclareOption{pdftex}{\PassOptionsToPackage{\CurrentOption}{graphics}}
@@ -164,6 +168,8 @@
 \DeclareOption{landscape}{\landscapetrue}
 \DeclareOption{portrait}{\landscapefalse}
 \DeclareOption{debug}{\let\LL@debug@info\typeout}
+\DeclareOption{twopart}{\twoparttrue}
+\DeclareOption{notwopart}{\twopartfalse}
 \DeclareOption{nospecialtricks}{%
   \AtEndOfClass{%
     \ifLL@combine
@@ -239,7 +245,7 @@
 }
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 \PassOptionsToClass{landscape,a4paper}{article}
-\ExecuteOptions{tumble,foldmark,bothsides,combine,landscape,final}
+\ExecuteOptions{tumble,foldmark,bothsides,combine,landscape,notwopart}
 \ProcessOptions\relax
 \ifLL@combine
 %    \end{macrocode}
@@ -974,14 +980,24 @@
 %  \end{macro}
 %  \end{macro}
 %  \end{macro}
-% Combine and output the frontside and the backside.
-%    \begin{macrocode}
-    \LL@selectOutput
-      {\setcounter{page}{1}%
-       \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{5}{6}{1}}}}%
-      {\setcounter{page}{2}%
-       \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{4}}}}%
-    \LL@@end
+% Combine and output the frontside and the backside. 
+% The option two part arranges the pages in a different than the ``natural''
+% order, to allow the typesetting of a 4 page leaflet and a detachable 2 page 
+% form, for summaries, fill-in forms, applications, questionnaires, etc.
+%    \begin{macrocode}
+      \LL@selectOutput
+    \iftwopart
+        {\setcounter{page}{1}%
+         \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{6}{4}{1}}}}%
+        {\setcounter{page}{2}%
+         \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{5}}}}%
+    \else
+        {\setcounter{page}{1}%
+         \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{5}{6}{1}}}}%
+        {\setcounter{page}{2}%
+         \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{4}}}}%
+    \fi
+      \LL@@end
   }%
 %    \end{macrocode}
 % End of the redefinition of \cmd{\@@end}.
@@ -1290,6 +1306,10 @@ Default options are marked with an asterisk:
   will be gobbled.
   Otherwise (\Lopt{nocombine}), just a warning will be issued;
   shortening the text appropriately is left to the user.
+\item[\Lopt{twopart}, \Lopt{notwopart}{\defaultmarker}]
+  Allows the typesetting of a four page leaflet (first part) and a two page 
+  detachable form (second part), for fill-in forms, questionnaires, applications,
+  etc.
 \end{description}
 
 Other options are passed to the \Lclass{article} class.
@@ -1322,3 +1342,4 @@ this document class.
 \end{document}
 %</manual>
 \endinput
+
diff --git a/Master/texmf-dist/tex/latex/leaflet/leaflet.cls b/Master/texmf-dist/tex/latex/leaflet/leaflet.cls
index f4111b5edd9..77dd3dbf3cc 100644
--- a/Master/texmf-dist/tex/latex/leaflet/leaflet.cls
+++ b/Master/texmf-dist/tex/latex/leaflet/leaflet.cls
@@ -22,11 +22,12 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{leaflet}
-  [2004/12/22 v1.0d LaTeX document class (JS,WaS,RN,HjG)]
+  [2012/06/04 v1.0d LaTeX document class (JS,WaS,RN,HjG)]
 \let\LL@shipout\shipout \let\LL@outputpage\@outputpage
 \let\LL@begindvi\@begindvi \let\LL@@end\@@end
 \@ifundefined{iflandscape}{\newif\iflandscape}{}%
 \@ifundefined{iftumble}{\newif\iftumble}{}%
+\@ifundefined{iftwopart}{\newif\iftwopart}{}%
 \newcommand\LL@debug@info[1]{}%
 \DeclareOption{dvips}{\PassOptionsToPackage{\CurrentOption}{graphics}}
 \DeclareOption{pdftex}{\PassOptionsToPackage{\CurrentOption}{graphics}}
@@ -37,6 +38,8 @@
 \DeclareOption{landscape}{\landscapetrue}
 \DeclareOption{portrait}{\landscapefalse}
 \DeclareOption{debug}{\let\LL@debug@info\typeout}
+\DeclareOption{twopart}{\twoparttrue}
+\DeclareOption{notwopart}{\twopartfalse}
 \DeclareOption{nospecialtricks}{%
   \AtEndOfClass{%
     \ifLL@combine
@@ -87,7 +90,7 @@
 }
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 \PassOptionsToClass{landscape,a4paper}{article}
-\ExecuteOptions{tumble,foldmark,bothsides,combine,landscape,final}
+\ExecuteOptions{tumble,foldmark,bothsides,combine,landscape,notwopart}
 \ProcessOptions\relax
 \ifLL@combine
   \newcommand*\LL@rotate@I{}\newcommand*\LL@rotate@II{}%
@@ -481,12 +484,19 @@
       \LL@preparePage{##1}\LL@preparePage{##2}\LL@preparePage{##3}}%
     \newcommand*\LL@preparePage[1]{%
       \expandafter\box\csname LL@box\@Roman{##1}\endcsname}%
-    \LL@selectOutput
-      {\setcounter{page}{1}%
-       \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{5}{6}{1}}}}%
-      {\setcounter{page}{2}%
-       \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{4}}}}%
-    \LL@@end
+      \LL@selectOutput
+    \iftwopart
+        {\setcounter{page}{1}%
+         \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{6}{4}{1}}}}%
+        {\setcounter{page}{2}%
+         \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{5}}}}%
+    \else
+        {\setcounter{page}{1}%
+         \LL@shipoutPage{\LL@rotate@I{\LL@preparePages{5}{6}{1}}}}%
+        {\setcounter{page}{2}%
+         \LL@shipoutPage{\LL@rotate@II{\LL@preparePages{2}{3}{4}}}}%
+    \fi
+      \LL@@end
   }%
 \else
   \LL@pagesize@specials{\paperwidth}{\paperheight}%