From 0f77752d377a5492ac8d36d73cb08ef7098dee64 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 14 Oct 2014 22:23:13 +0000 Subject: upmethodology (14oct14) git-svn-id: svn://tug.org/texlive/trunk@35372 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/upmethodology/UPMVERSION.def | 2 +- .../latex/upmethodology/upmethodology-document.cls | 24 ++++++++++++++++++---- .../tex/latex/upmethodology/upmethodology-fmt.sty | 6 ++++-- 3 files changed, 25 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/upmethodology') diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def index ae95bd7db53..582113ce694 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def +++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def @@ -1 +1 @@ -\def\UPMVERSION{20140910} +\def\UPMVERSION{20141013} diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls index 8bd15cbb02b..4385aca329b 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls @@ -1,6 +1,6 @@ % Document class for Unified Process Methodology % -% Copyright (c) 2006-2014 Stephane GALLAND +% Copyright (c) 2014 Stephane GALLAND % % This program is free library; you can redistribute it and/or modify % it under the terms of the GNU Lesser General Public License as @@ -17,7 +17,7 @@ % write to the Free Software Foundation, Inc., 59 Temple Place - Suite % 330, Boston, MA 02111-1307, USA. -\global\edef\upm@package@docclazz@ver{2014/06/23} +\global\edef\upm@package@docclazz@ver{2014/09/11} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver] @@ -30,6 +30,10 @@ \upm@package@docclazz@nopubpagefalse \newif\ifupm@package@docclazz@autofrontmatter \upm@package@docclazz@autofrontmatterfalse +\newif\ifupm@package@docclazz@addfrontcover +\upm@package@docclazz@addfrontcovertrue +\newif\ifupm@package@docclazz@addbackcover +\upm@package@docclazz@addbackcovertrue \gdef\upm@package@docclazz@optionstopass{a4paper,11pt} @@ -75,6 +79,18 @@ \DeclareOption{frontmatter}{% \global\upm@package@docclazz@autofrontmattertrue% } +\DeclareOption{nofrontcover}{% + \global\upm@package@docclazz@addfrontcoverfalse% +} +\DeclareOption{frontcover}{% + \global\upm@package@docclazz@addfrontcovertrue% +} +\DeclareOption{nobackcover}{% + \global\upm@package@docclazz@addbackcoverfalse% +} +\DeclareOption{backcover}{% + \global\upm@package@docclazz@addbackcovertrue% +} \DeclareOption{book}{% \global\upmbookformattrue \global\upmreportformatfalse @@ -217,14 +233,14 @@ \AtBeginDocument{% \ifupm@package@docclazz@autofrontmatter\frontmatter\fi% - \makefrontcover% + \ifupm@package@docclazz@addfrontcover\makefrontcover\fi% \ifupm@package@docclazz@nopubpage\else\upmpublicationpage\fi% \ifupm@package@docclazz@nodocinfo\else\upmdocinfopage\fi% \sloppy% } \AtEndDocument{% - \makebackcover% + \ifupm@package@docclazz@addbackcover\makebackcover\fi% } %---------------------------------------- diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty index 635a30e0607..1b4e2070ed2 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty @@ -17,7 +17,7 @@ % write to the Free Software Foundation, Inc., 59 Temple Place - Suite % 330, Boston, MA 02111-1307, USA. -\global\edef\upm@package@fmt@ver{2014/09/10} +\global\edef\upm@package@fmt@ver{2014/10/13} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver] @@ -1142,7 +1142,9 @@ }% }% }% - \renewcommand{\makelabel}[1]{\edef\@currentlabel{\upm@fmt@enumdescription@fmt@{@upm@fmt@enumdescription@cnt@}}\enumdescriptionlabel{\@currentlabel#4##1\ifthenelse{\equal{a##1}{a}}{#6}{#5}}{\addtocounter{@upm@fmt@enumdescription@cnt@}{1}}}% + \renewcommand{\makelabel}[1]{% + \xdef\@currentlabel{\upm@fmt@enumdescription@fmt@{@upm@fmt@enumdescription@cnt@}}% + \enumdescriptionlabel{\@currentlabel#4##1\ifthenelse{\equal{a##1}{a}}{#6}{#5}}{\addtocounter{@upm@fmt@enumdescription@cnt@}{1}}}% \expandafter\settowidth{\labelwidth}{#2iii#3}% } }{% -- cgit v1.2.3