From 68d7784f18db56a9cae1530fddf2c191e5e3402f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 17 Sep 2019 21:11:19 +0000 Subject: upmethodology (17sep19) git-svn-id: svn://tug.org/texlive/trunk@52111 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/upmethodology/UPMVERSION.def | 2 +- .../latex/upmethodology/upmethodology-document.cls | 30 +++++++++++++++++--- .../tex/latex/upmethodology/upmethodology-spec.sty | 33 +++++++++++----------- 3 files changed, 43 insertions(+), 22 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 02b668610db..fbd7b4b22f6 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def +++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def @@ -1 +1 @@ -\def\UPMVERSION{20190804} +\def\UPMVERSION{20190917} diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls index 4385aca329b..735ffbae2a6 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls @@ -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/09/11} +\global\edef\upm@package@docclazz@ver{2019/09/17} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver] @@ -35,6 +35,13 @@ \newif\ifupm@package@docclazz@addbackcover \upm@package@docclazz@addbackcovertrue +\newif\ifupm@package@docclazz@taskpackage +\upm@package@docclazz@taskpackagefalse +\newif\ifupm@package@docclazz@specpackage +\upm@package@docclazz@specpackagefalse +\newif\ifupm@package@docclazz@codepackage +\upm@package@docclazz@codepackagefalse + \gdef\upm@package@docclazz@optionstopass{a4paper,11pt} \DeclareOption{twoside}{% @@ -91,6 +98,15 @@ \DeclareOption{backcover}{% \global\upm@package@docclazz@addbackcovertrue% } +\DeclareOption{taskpackage}{% + \global\upm@package@docclazz@taskpackagetrue% +} +\DeclareOption{specpackage}{% + \global\upm@package@docclazz@specpackagetrue% +} +\DeclareOption{codepackage}{% + \global\upm@package@docclazz@codepackagetrue% +} \DeclareOption{book}{% \global\upmbookformattrue \global\upmreportformatfalse @@ -139,9 +155,15 @@ \RequirePackage{upmethodology-extension} \RequirePackage{upmethodology-frontpage} \RequirePackage{upmethodology-backpage} -\RequirePackage{upmethodology-task} -\RequirePackage{upmethodology-code} -\RequirePackage{upmethodology-spec} +\ifupm@package@docclazz@taskpackage + \RequirePackage{upmethodology-task} +\fi +\ifupm@package@docclazz@codepackage + \RequirePackage{upmethodology-code} +\fi +\ifupm@package@docclazz@specpackage + \RequirePackage{upmethodology-spec} +\fi \RequirePackage{url} \ifpdf diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty index 0ad41328ee0..bc96076ab4a 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty @@ -23,7 +23,7 @@ % 2007-03-19 Add localization. % -\global\edef\upm@package@spec@ver{2009/10/30} +\global\edef\upm@package@spec@ver{2019/09/17} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-spec}[\upm@package@spec@ver] @@ -133,7 +133,7 @@ \upm@spec@func@modifiers@scan{#1}% } \newcommand{\upm@spec@func@modifiers@scan}[1]{% - \upm@ifnotempty{#1}{% + \Ifnotempty{#1}{% \edef\upm@reserved@a{\upm@spec@head #1\@empty\@empty}% \edef\upm@reserved@b{\upm@spec@tail #1\@empty\@empty}% \ifthenelse{\equal{\upm@reserved@a}{+}}{% @@ -187,7 +187,7 @@ %----- %\upm@spec@param@modifiers{modifiers} \newcommand{\upm@spec@param@modifiers}[1]{% - \upm@ifnotempty{#1}{% + \Ifnotempty{#1}{% \ifthenelse{\equal{#1}{out}}{% %out \upm@spec@lang@modifier@out% @@ -205,7 +205,7 @@ %----- \def\upm@spec@trim#1{#1} \newcommand{\upm@spec@splitparams}[1]{% - \upm@ifnotempty{#1}{% + \Ifnotempty{#1}{% \upm@spec@firstparamtrue \@for\reserved@a:=#1\do{% \ifupm@spec@firstparam\upm@spec@firstparamfalse\else, \fi% @@ -247,7 +247,7 @@ \addtocounter{upm@detailspec@function@counter}{1}% \protected@xdef\upm@spec@reserved@a{\protect\csname upm@detailspec@return@ptr@\theupm@detailspec@function@counter\endcsname}% \gdef\upm@spec@reserved@b{} - \upm@ifnotempty{##2}{\gdef\upm@spec@reserved@b{\string:\ }} + \Ifnotempty{##2}{\gdef\upm@spec@reserved@b{\string:\ }} \gdef\upm@spec@reserved@c{}% \upm@spec@func@modifiers{##1}% @@ -271,17 +271,17 @@ \gdef\upm@spec@reserved@e{\upm@spec@lang@modifier@const}% \fi \ifupm@spec@modifier@has@final% - \upm@ifnotempty{\upm@spec@reserved@e}{% + \Ifnotempty{\upm@spec@reserved@e}{% \xdef\upm@spec@reserved@e{\upm@spec@reserved@e,}}% \protected@xdef\upm@spec@reserved@e{\upm@spec@reserved@e\protect\upm@spec@lang@modifier@final}% \fi \ifupm@spec@modifier@has@abstract% - \upm@ifnotempty{\upm@spec@reserved@e}{% + \Ifnotempty{\upm@spec@reserved@e}{% \xdef\upm@spec@reserved@e{\upm@spec@reserved@e,}}% \protected@xdef\upm@spec@reserved@e{\upm@spec@reserved@e\protect\upm@spec@lang@modifier@abstract}% \fi \ifupm@spec@modifier@has@root% - \upm@ifnotempty{\upm@spec@reserved@e}{% + \Ifnotempty{\upm@spec@reserved@e}{% \xdef\upm@spec@reserved@e{\upm@spec@reserved@e,}}% \protected@xdef\upm@spec@reserved@e{\upm@spec@reserved@e\protect\upm@spec@lang@modifier@root}% \fi @@ -343,13 +343,13 @@ \ifthenelse{\equal{\upm@spec@global@return}{\@empty}}{% \gdef\upm@detailspec@return@section{} - \upm@ifnotempty{\upm@spec@local@return}{ + \Ifnotempty{\upm@spec@local@return}{ \gdef\upm@detailspec@separator{ & & & \\} \protected@xdef\upm@detailspec@return@section{\upm@spec@local@return}% \upm@spec@showreturnstrue% }% }{% - \upm@ifnotempty{\upm@spec@local@return}{% + \Ifnotempty{\upm@spec@local@return}{% \gdef\upm@detailspec@separator{ & & & \\} \gdef\upm@spec@reserved@a{ \upm@spec@lang@except@for:\protect\upm@spec@local@return}}% \protected@xdef\upm@detailspec@return@section{% @@ -358,9 +358,8 @@ \upm@spec@showreturnstrue% } - \ifthenelse{\equal{\upm@spec@detailspec@title}{\@empty}}{ - \gdef\upm@spec@reserved@c{} - }{ + \gdef\upm@spec@reserved@c{} + \Ifnotempty{\upm@spec@detailspec@title}{ \gdef\upm@spec@reserved@c{\hline% \multicolumn{4}{>{\columncolor{backtableheader}}l}{\color{fronttableheader}{\large\textsc{\upm@spec@detailspec@title}}} \\% } @@ -370,11 +369,11 @@ \upm@spec@showparamsfalse% - \upm@ifnotempty{\upm@spec@parameters}{% + \Ifnotempty{\upm@spec@parameters}{% \ifupm@spec@showdescription% \gdef\upm@detailspec@separator{ & & & \\}% \fi% - \upm@ifnotempty{\upm@spec@functions}{% + \Ifnotempty{\upm@spec@functions}{% \gdef\upm@detailspec@separator{ & & & \\}% }% \upm@spec@showparamstrue% @@ -429,7 +428,7 @@ } %----- -%\begin{detailspec}}[width]{title}...\end{detailspec}.... +%\begin{detailspec}[width]{title}...\end{detailspec}.... \newenvironment{detailspec}[2][\linewidth] {% \upm@spec@showdescriptiontrue% @@ -442,7 +441,7 @@ } %----- -%\begin{detailspec}}[width]{title}...\end{detailspec}.... +%\begin{detailspec*}[width]{title}...\end{detailspec*}.... \newenvironment{detailspec*}[2][\linewidth] {% \upm@spec@showdescriptionfalse% -- cgit v1.2.3