diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/upmethodology')
| -rw-r--r-- | Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty | 25 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty | 19 |
2 files changed, 39 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty index 11a2a30eb7b..37a16b49ae0 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty @@ -1,6 +1,6 @@ % Package for Unified Process Methodology's documents % -% Copyright (c) 2006-2009 Stephane GALLAND <galland@arakhne.org> +% Copyright (c) 2006-2013 Stephane GALLAND <galland@arakhne.org> % % This program is free library; you can redistribute it and/or modify % it under the terms of the GNU Lesser General Public License as @@ -19,6 +19,7 @@ % % Creation date: 2006-04-20 % Modifications: +% 2013-07-06 Add the macro ifdocumentauthor % 2009-11-03 Add star-ed macros for author, informed people % and validator addition macros. % 2009-10-30 Add "book", "report" and "article" support. @@ -42,7 +43,7 @@ % Add sectioning commands. % -\global\edef\upm@package@doc@ver{2009/11/03} +\global\edef\upm@package@doc@ver{2013/05/06} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-document}[\upm@package@doc@ver] @@ -298,12 +299,29 @@ \def\theauthorlist{} %----- +\newif\ifupm@document@author@isauthor +\gdef\upm@document@author@authornames{} +\newcommand{\ifdocumentauthor}[3]{% + \upm@document@author@isauthorfalse% + \@for\upm@document@author@isauthor@tmp:=\upm@document@author@authornames\do{% + \ifupm@document@author@isauthor% + \else% + \ifthenelse{\equal{#1}{\upm@document@author@isauthor@tmp}}{% + \upm@document@author@isauthortrue% + }{}% + \fi% + }% + \ifupm@document@author@isauthor{#2}\else{#3}\fi% +} + +%----- %Add an author %\addauthor[email]{firstname}{name} %\addauthor*[email]{firstname}{name}{comment} \def\addauthor{\@ifstar\upm@document@addauthorstar\upm@document@addauthor} \newcommand{\upm@document@addauthor}[3][]{% - \global\protected@edef\theauthorlist{\theauthorlist\protect\Ifnotempty{\theauthorlist}{,} \protect\upmmakename{#2}{#3}{~}} + \lowercase{\xdef\upm@document@author@authornames{#3,\upm@document@author@authornames}}% + \protected@xdef\theauthorlist{\theauthorlist\protect\Ifnotempty{\theauthorlist}{,} \protect\upmmakename{#2}{#3}{~}} \global\protected@edef\upm@document@author@tab@commented{\upm@document@author@tab@commented \protect\upmmakename{#2}{#3}{~} & & \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} \protect\\} @@ -314,6 +332,7 @@ \fi } \newcommand{\upm@document@addauthorstar}[4][]{% + \lowercase{\xdef\upm@document@author@authornames{#3,\upm@document@author@authornames}}% \global\protected@edef\theauthorlist{\theauthorlist\protect\Ifnotempty{\theauthorlist}{,} \protect\upmmakename{#2}{#3}{~}} \global\let\upm@document@author@tab\relax diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty index ebcd85c226e..1b92c130f44 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty @@ -19,6 +19,9 @@ % % Creation date: 2006-04-06 % Modifications (lastest first): +% 2013-07-06 Redefine the \underline macro. +% 2013-05-31 Add the extensions 'pdf_tex' and 'ps_tex' in the default list of extensions +% for \includegraphicswtex. % 2013-05-30 Add macro \includegraphicswtex, which is supporting 'pdftex_t' and 'pstex_t'. % 2013-05-18 Replace the image extension 'pstex_t' by 'pdftex_t'. % 2013-05-17 Define the default graphic extensions: pdf, png, jpg, jpeg, tiff, gif. @@ -53,7 +56,7 @@ % Bug fix: centering table's headers. % -\global\edef\upm@package@fmt@ver{2013/05/30} +\global\edef\upm@package@fmt@ver{2013/05/31} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver] @@ -255,6 +258,11 @@ % IMAGES INCLUDING TeX EXPRESSIONS %---------------------------------------- +% +% This section is copied from the AutoLaTeX package +% http://www.arakhne.org/autolatex +% + % Private macros for \includegraphicswtex \providecommand{\upm@figtex@includewtex@extensions}{} \define@key{upmethodologyincludewtex}{width}{% @@ -284,7 +292,7 @@ \providecommand{\DeclareGraphicsExtensionsWtex}[1]{% \xdef\upm@figtex@includewtex@extensions{\zap@space#1 \@empty}% } -\DeclareGraphicsExtensionsWtex{.pdftex_t,.pstex_t} +\DeclareGraphicsExtensionsWtex{.pdftex_t,.pstex_t,.pdf_tex,.ps_tex} %----- %\includefigurewtex{width=xx,height=yy}{filename} @@ -999,4 +1007,11 @@ \newcommand{\url}[2][]{\texttt{#2}} \newcommand{\href}[3][]{\texttt{#3}} +%---------------------------------------- +% UNDERLINE +%---------------------------------------- + +\let\upm@oldunderline\underline +\renewcommand{\underline}[1]{\upm@oldunderline{\smash{#1}}} + \endinput |