diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/upmethodology')
11 files changed, 1266 insertions, 387 deletions
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty new file mode 100644 index 00000000000..754b7a0dae5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty @@ -0,0 +1,86 @@ +% Back page for Unified Process Methodology +% +% Copyright (c) 2009 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 +% published by the Free Software Foundation; either version 3 of the +% License, or any later version. +% +% This library is distributed in the hope that it will be useful, but +% WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +% Lesser General Public License for more details. +% +% You should have received a copy of the GNU Lesser General Public +% License along with this library; see the file COPYING. If not, +% write to the Free Software Foundation, Inc., 59 Temple Place - Suite +% 330, Boston, MA 02111-1307, USA. +% +% Creation date: 2009-10-22 +% Modifications: +% 2009-10-30 Rename \setbacklayout to \setbackcover. +% Add \makebackcover. +% + +\global\edef\upm@package@bp@ver{2009/10/30} + +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{upmethodology-backpage}[\upm@package@bp@ver] + +\RequirePackage{upmethodology-p-common} + +%----- +% Locales +\def\upm@back@lang@english{ + \gdef\upm@lang@@{\message{**** upmethodology-backpage is using English language ****}}% +} +\def\upm@back@lang@french{ + \gdef\upm@lang@@{\message{**** upmethodology-backpage is using French language ****}}% +} +%---------------------------------------- +% OPTIONS +%---------------------------------------- +\DeclareOption{french}{% + \upm@back@lang@french +} +\DeclareOption{francais}{% + \upm@back@lang@french +} +\DeclareOption{english}{% + \upm@back@lang@english +} +\ExecuteOptions{english}
+\ProcessOptions +\upm@lang@@ + +\RequirePackage{upmethodology-extension} + +%---- +% Set the back page layout as the classic layout theme +%\setbackcover{layout_name} +\newcommand{\setbackcover}[1]{% + \ifthenelse{\equal{#1}{none}}{% + \global\let\makebackcover\relax% + }{% + \errmessage{invalid back layout theme: #1}% + }% +} +\newcommand{\setbacklayout}[1]{\errmessage{\string\setbacklayout\ is deprecated. Use \string\setbackcover}} + +\setbackcover{none} + +\AtEndDocument{ + \Ifdefined{backpage}{ + \gdef\makebackcover{ + \ifupmarticleformat\clearpage% + \else + \cleardoublepage% + \if@twoside\thispagestyle{empty}\mbox{}\clearpage\fi + \fi + \thispagestyle{empty}\Get{backpage} + } + } +} + +\endinput diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-code.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-code.sty index 548d402c973..470a1d3d598 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-code.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-code.sty @@ -19,15 +19,15 @@ % % Creation date: 2006-04-27 % Modifications: +% 2009-10-30 Clean code. % -\global\edef\upm@package@code@ver{2006/04/27} +\global\edef\upm@package@code@ver{2009/10/30} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-code}[\upm@package@code@ver] -\RequirePackage{ifthen} -\RequirePackage{xspace} +\RequirePackage{upmethodology-p-common} \def\upm@code@eat@spaces#1{#1} \def\upm@code@makemul#1{\upm@code@eat@spaces{#1}\bgroup\textbf{s}\egroup\xspace} diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls index 3860f56c895..484e45af230 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-2007 Stephane GALLAND <galland@arakhne.org> +% Copyright (c) 2006-2009 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,11 @@ % % Creation date: 2006-04-06 % Modifications: +% 2009-10-30 Add "book", "report" and "article" options. +% 2009-10-28 Add hyperref declarations. +% 2009-10-27 Add publication page. +% 2009-10-22 Add back page. +% 2009-10-09 Add option to hide the document informations % 2007-07-03 Force the height of the small logo in headers. % Remove the copyright date building function. % 2007-03-19 Add localization. @@ -28,43 +33,119 @@ % 2006-04-22 Remove task and specification packages. % -\global\edef\upm@package@docclazz@ver{2007/07/03} +\global\edef\upm@package@docclazz@ver{2009/10/30} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver] +\RequirePackage{upmethodology-p-common} + +\newif\ifupm@package@docclazz@nodocinfo +\upm@package@docclazz@nodocinfofalse +\newif\ifupm@package@docclazz@nopubpage +\upm@package@docclazz@nopubpagefalse + +\gdef\upm@package@docclazz@optionstopass{a4paper,11pt} + \DeclareOption{twoside}{% - \PassOptionsToClass{twoside,openright}{book} + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,twoside,openright}% } \DeclareOption{oneside}{% - \PassOptionsToClass{oneside}{book} + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,oneside}% } \DeclareOption{french}{% - \PassOptionsToClass{french}{book} + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,french}% \PassOptionsToPackage{french}{upmethodology-document} } \DeclareOption{francais}{% - \PassOptionsToClass{french}{book} + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,french}% \PassOptionsToPackage{french}{upmethodology-document} } \DeclareOption{english}{% - \PassOptionsToClass{english}{book} + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,english}% \PassOptionsToPackage{english}{upmethodology-document} } +\DeclareOption{nodocumentinfo}{% + \upm@package@docclazz@nodocinfotrue% +} +\DeclareOption{documentinfo}{% + \upm@package@docclazz@nodocinfofalse% +} +\DeclareOption{nopubpage}{% + \upm@package@docclazz@nopubpagetrue% +} +\DeclareOption{pubpage}{% + \upm@package@docclazz@nopubpagefalse% +} +\DeclareOption{book}{% + \upmbookformattrue + \upmreportformatfalse + \upmarticleformatfalse + \upm@package@docclazz@nopubpagefalse% + \upm@package@docclazz@nodocinfofalse% + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,twoside}% +} +\DeclareOption{report}{% + \upmbookformatfalse + \upmreportformattrue + \upmarticleformatfalse + \upm@package@docclazz@nopubpagetrue% + \upm@package@docclazz@nodocinfofalse% + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,oneside}% +} +\DeclareOption{article}{% + \upmbookformatfalse + \upmreportformatfalse + \upmarticleformattrue + \upm@package@docclazz@nopubpagetrue% + \upm@package@docclazz@nodocinfotrue% + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,oneside}% +} -\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}} -\ExecuteOptions{oneside} +\DeclareOption*{% + \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,\CurrentOption}% + } +\ExecuteOptions{report} \ProcessOptions -\PassOptionsToClass{a4paper,11pt}{book} -\LoadClass{book} +\ifupmbookformat + \message{*********** UPMETHODOLOGY BOOK CLASS (WITH PART AND CHAPTER)} + \expandafter\LoadClass[\upm@package@docclazz@optionstopass]{book} +\else\ifupmreportformat + \message{*********** UPMETHODOLOGY REPORT CLASS (WITHOUT PART, WITH CHAPTER)} + \expandafter\LoadClass[\upm@package@docclazz@optionstopass]{report} +\else + \message{*********** UPMETHODOLOGY ARTICLE CLASS (WITHOUT PART AND CHAPTER)} + \expandafter\LoadClass[\upm@package@docclazz@optionstopass]{article} +\fi\fi \RequirePackage{a4wide} \RequirePackage{fancyhdr} \RequirePackage{upmethodology-document} +\RequirePackage{upmethodology-extension} \RequirePackage{upmethodology-frontpage} +\RequirePackage{upmethodology-backpage} +\RequirePackage{upmethodology-task} +\RequirePackage{upmethodology-code} +\RequirePackage{upmethodology-spec} + +\RequirePackage{url} +\RequirePackage[pdftex=true, + breaklinks, %make links breakable on several lines + pageanchor=true, %put implicit anchor on each page (required for \printindex) + bookmarks=false, %hide bookmarks + hyperfigures=true, %not documented + hyperindex=true, %the page numbers in the index are links + linktocpage=true, %page numbers are used for links in TOC, LOF... + bookmarks=true, %open the bookmarks + bookmarksopen=true, %open all the bookmark's nodes by default + bookmarksnumbered=true, %section number in bookmarks + colorlinks=false, % Use a frame around links + pdfproducer={upmethodology \upm@package@docclazz@ver}, + ]{hyperref} +\urlstyle{same} \pdfpageheight=29.7cm \pdfpagewidth=21.0cm @@ -83,23 +164,21 @@ \if@twoside - - -\lhead[\includegraphics[height=\upm@smalllogo@height]{\theupmsmalldoclogo}]{\fancyplain{}{\upm@header@fmt{\theupmfulldocname}}} +\lhead[]{\fancyplain{}{\upm@header@fmt{\theupmfulldocname}}} \chead{} -\rhead[\fancyplain{}{\upm@header@fmt{\theupmfulldocname}}]{\includegraphics[height=\upm@smalllogo@height]{\theupmsmalldoclogo}} -\lfoot[\upm@header@fmt{\thepage}]{\upm@copyright@fmt{\theupmdocref~\copyright~\upmcopyrightdate~\theupmpublisher}} +\rhead{\Ifdefined{smalllogo}{\expandafter\includegraphics[height=\upm@smalllogo@height]{\theupmsmalldoclogo}}} +\lfoot[\upm@header@fmt{\ifthenelse{\thepage>0}{\thepage}{}}]{\upm@copyright@fmt{\tiny\theupmdocref~\copyright~\upmcopyrightdate~\theupmformattedcopyrighter}} \cfoot{} -\rfoot[\upm@copyright@fmt{\tiny\theupmdocref~\copyright~\upmcopyrightdate~\theupmpublisher}]{\upm@header@fmt{\thepage}} +\rfoot[\upm@copyright@fmt{\tiny\theupmdocref~\copyright~\upmcopyrightdate~\theupmformattedcopyrighter}]{\upm@header@fmt{\ifthenelse{\thepage>0}{\thepage}{}}} \else \lhead{\fancyplain{}{\upm@header@fmt{\theupmfulldocname}}} \chead{} -\rhead{\includegraphics[height=\upm@smalllogo@height]{\theupmsmalldoclogo}} -\lfoot{\upm@copyright@fmt{\tiny\theupmdocref~\copyright~\upmcopyrightdate~\theupmpublisher}} +\rhead{\Ifdefined{smalllogo}{\expandafter\includegraphics[height=\upm@smalllogo@height]{\theupmsmalldoclogo}}} +\lfoot{\upm@copyright@fmt{\tiny\theupmdocref~\copyright~\upmcopyrightdate~\theupmformattedcopyrighter}} \cfoot{} -\rfoot{\upm@header@fmt{\thepage}} +\rfoot{\upm@header@fmt{\ifthenelse{\thepage>0}{\thepage}{}}} \fi @@ -108,9 +187,54 @@ %---------------------------------------- \AtBeginDocument{ - \maketitle - \thispagestyle{plain}\upmdocumentsummary\upmdocumentauthors\upmdocumentvalidators\upmdocumentinformedpeople\vfill\upmhistory\cleardoublepage + \makefrontcover + \ifupm@package@docclazz@nopubpage\else\upmpublicationpage\fi + \ifupm@package@docclazz@nodocinfo\else\upmdocinfopage\fi \sloppy } +\AtEndDocument{ + \makebackcover +} + +%---------------------------------------- +% PDF COLORS +%---------------------------------------- +\gdef\upm@package@getcolor#1,#2,#3{#1 #2 #3} +\renewcommand{\setpdfcolor}[1]{ + \hypersetup{ + filebordercolor={\upm@package@getcolor #1}, % frame color + linkbordercolor={\upm@package@getcolor #1}, % frame color + citebordercolor={\upm@package@getcolor #1}, % frame color + menubordercolor={\upm@package@getcolor #1}, % frame color + urlbordercolor={\upm@package@getcolor #1}, % frame color + runbordercolor={\upm@package@getcolor #1}, % frame color + } +} + +%---------------------------------------- +% SET FORBIDDEN SECTIONNING FUNCTIONS +%---------------------------------------- +\ifupmbookformat\else + \gdef\upm@package@docclazz@hidesec@a#1{% + \@ifnextchar*{\upm@package@docclazz@hidesec@d{#1}}{% + \@ifnextchar[{\upm@package@docclazz@hidesec@b{#1}}{\upm@package@docclazz@hidesec@c{#1}}% + }} + \gdef\upm@package@docclazz@hidesec@d#1#2{% + \@ifnextchar[{\upm@package@docclazz@hidesec@b{#1}}{\upm@package@docclazz@hidesec@c{#1}}} + \gdef\upm@package@docclazz@hidesec@b#1[#2]#3{\@warning{"#1" macro is skipped. Title: "#3"}} + \gdef\upm@package@docclazz@hidesec@c#1#2{\@warning{"#1" macro is skipped. Title: "#2"}} + + \gdef\part{\upm@package@docclazz@hidesec@a{\string\part}} + \gdef\partstar{\upm@package@docclazz@hidesec@a{\string\part*}} + \gdef\parttoc{\upm@package@docclazz@hidesec@a{\string\parttoc}} + +\ifupmreportformat\else + + \gdef\chapter{\upm@package@docclazz@hidesec@a{\string\part}} + \gdef\chapterstar{\upm@package@docclazz@hidesec@a{\string\part*}} + \gdef\chaptertoc{\upm@package@docclazz@hidesec@a{\string\parttoc}} + +\fi\fi + \endinput diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty index ed3e10d6d51..11a2a30eb7b 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-2007 Stephane GALLAND <galland@arakhne.org> +% Copyright (c) 2006-2009 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,20 @@ % % Creation date: 2006-04-20 % Modifications: +% 2009-11-03 Add star-ed macros for author, informed people +% and validator addition macros. +% 2009-10-30 Add "book", "report" and "article" support. +% Allow to override the default document font. +% 2009-10-28 Configure hyperref: add \setpdfcolor. +% 2009-10-27 Clean the extension API. +% Fixing document synoptic. +% 2009-10-25 Add abstract and keywords. +% 2009-10-25 Add abstract and keywords. +% 2009-10-24 Move extensions inside a dedicated package. +% 2009-10-23 Add front/back pages in extensions. +% Add \if commands on the extension's values. +% 2008-06-24 Add automatic watermarks. +% 2007-07-05 Add people name formatting function. % 2007-07-05 Add people name formatting function. % 2007-07-03 Add extension feature. % 2007-03-19 Add localization. @@ -28,17 +42,19 @@ % Add sectioning commands. % -\global\edef\upm@package@doc@ver{2007/07/03} +\global\edef\upm@package@doc@ver{2009/11/03} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-document}[\upm@package@doc@ver] +\RequirePackage{upmethodology-p-common} + %---------------------------------------- % LOCALES %---------------------------------------- \def\upm@document@lang@english{% \gdef\upm@lang@@{\message{**** upmethodology-document is using English language ****}}% - \gdef\upm@lang@@lang@{english}% + \gdef\upmcurrentlang{english}% \gdef\upm@lang@project{Project}% \gdef\upm@lang@document{Document}% \gdef\upm@lang@docref{Reference}% @@ -50,12 +66,21 @@ \gdef\upm@lang@document@informed{Informed People}% \gdef\upm@lang@document@validators{Validators}% \gdef\upm@lang@document@names{Names}% + \gdef\upm@lang@document@comments{Comments}% \gdef\upm@lang@document@emails{Emails}% \gdef\upm@lang@document@initials{Initials}% + \gdef\upm@lang@document@abstract{Abstract}% + \gdef\upm@lang@document@keywords{Key-words}% + \gdef\upm@lang@document@copyright@purpose{This document describes the \theupmproject\ project\Ifnotempty{\theupmsubproject}{ and its \theupmsubproject\ subproject}.}% + \gdef\upm@lang@document@copyright@tex{\TeX\ is a trademark of the American Mathematical Society.}% + \gdef\upm@lang@document@copyright@upmethodology{\texttt{tex-upmethodology} is owned by St\'ephane Galland, \arakhneorg, France.}% + \gdef\upm@lang@document@copyright@madewith{This document was realised with \LaTeX\ and \texttt{tex-upmethodology}.}% + \gdef\upm@lang@document@copyright@trademarks{This document is published by the \theupmformattedpublisher. All right reserved. No part of this publication may be reproduced, stored in a retreival system, or transmitted, in any form or by any means, electronic, mechanical, photocopying, recording, or otherwise, without the prior written permission of the publishers.} + \gdef\upm@lang@document@copyright@printedin{Printed in \theupmprintedin.} } \def\upm@document@lang@french{% \gdef\upm@lang@@{\message{**** upmethodology-document is using French language ****}}% - \gdef\upm@lang@@lang@{french}% + \gdef\upmcurrentlang{french}% \gdef\upm@lang@project{Projet}% \gdef\upm@lang@document{Document}% \gdef\upm@lang@docref{R\'ef\'erence}% @@ -64,24 +89,30 @@ \gdef\upm@lang@document@summary{Synoptique}% \gdef\upm@lang@status{Statut}% \gdef\upm@lang@document@authors{Auteurs}% + \gdef\upm@lang@document@comments{Commentaires}% \gdef\upm@lang@document@informed{Pour information}% \gdef\upm@lang@document@validators{Validateurs}% \gdef\upm@lang@document@names{Noms}% \gdef\upm@lang@document@emails{Emails}% \gdef\upm@lang@document@initials{Initiales}% + \gdef\upm@lang@document@abstract{R\'esum\'e}% + \gdef\upm@lang@document@keywords{Mots-cl\'es}% + \gdef\upm@lang@document@copyright@purpose{Ce document d\'ecrit le projet \theupmproject\Ifnotempty{\theupmsubproject}{ et son sous-projet \theupmsubproject}.}% + \gdef\upm@lang@document@copyright@tex{\TeX\ et \LaTeX\ sont des marques de la Soci\'et\'e Am\'ericaine de Math\'ematiques.}% + \gdef\upm@lang@document@copyright@upmethodology{\texttt{tex-upmethodology} est la propri\'et\'e de St\'ephane Galland, \arakhneorg, France.}% + \gdef\upm@lang@document@copyright@madewith{Ce document a \'et\'e r\'ealis\'e avec \LaTeX\ et \texttt{tex-upmethodology}.}% + \gdef\upm@lang@document@copyright@trademarks{Ce document est publi\'e par \theupmformattedpublisher. Tous droits r\'eserv\'es. \par Le Code de la propri\'et\'e intellectuelle n'autorisant, aux termes de l'article L.122-5, 2\textdegree et 3\textdegree a), d'une part, que les ``copies ou reproductions strictement r\'eserv\'ees \`a l'usage priv\'e du copiste et non destin\'ees \`a une utilisation collective'' et, d'autre part, que les analyses et les courtes citations dans un but d'exemple et d'illustation, ``toute repr\'esentation ou reproduction int\'egrale ou partielle faite sans le consentement de l'auteur ou de ses ayants droit ou ayants cause est illicite'' (art. L.122-4). \par Cette repr\'esentation ou reproduction, par quelque proc\'ed\'e que ce soit, constiturait donc une contrefa\c{c}on sanctionn\'ee par les articles L.335-2 et suivants du Code de la propri\'et\'e intellectuelle.} + \gdef\upm@lang@document@copyright@printedin{Imprim\'e en \theupmprintedin.} } %---------------------------------------- % OPTIONS %---------------------------------------- -\newif\ifupm@document@langset\upm@document@langsetfalse \DeclareOption{french}{% \upm@document@lang@french - \upm@document@langsettrue } \DeclareOption{francais}{% \upm@document@lang@french - \upm@document@langsettrue } \DeclareOption{english}{% \upm@document@lang@english @@ -91,36 +122,13 @@ \upm@lang@@ -\ifupm@document@langset\else\PassOptionsToPackage{english}{babel}\fi -\RequirePackage{babel} -\RequirePackage{ifthen} -\RequirePackage{xspace} -\RequirePackage{graphicx} +\RequirePackage[\upmcurrentlang]{babel} \RequirePackage{vmargin} -\RequirePackage{url} -\RequirePackage[pdftex]{thumbpdf} % PDF thumbail -\RequirePackage[pdftex=true, - pdfpagelayout = useoutlines, - bookmarks, - bookmarksopen = true, - bookmarksnumbered = true, - breaklinks = true, - linktocpage, - %backref, % Ecrit le lieu citation (lien) ds la biblio - linkcolor = blue, - urlcolor = blue, - citecolor = blue, - anchorcolor = blue, - hyperindex = true, - hyperfigures - ]{hyperref} -\urlstyle{sf} +\RequirePackage{upmethodology-extension} \RequirePackage{upmethodology-fmt} \RequirePackage{upmethodology-version} -\def\upm@ifnotempty#1{\ifthenelse{\equal{#1}{\@empty}}{}} - %---------------------------------------- % DOCUMENT MANAGEMENT %---------------------------------------- @@ -149,16 +157,74 @@ % Display the summary of the document %\upmdocumentsummary[width] \newcommand{\upmdocumentsummary}[1][\linewidth]{% - \noindent\begin{mtabular}[#1]{5}{|X|X|c|c|c|}% + \noindent\begin{mtabular}[#1]{2}{|l|X|}% \tabulartitle{\upm@lang@document@summary}% - \tabularheader{\upm@lang@project}{\upm@lang@document}{\upm@lang@docref}{\upm@lang@version}{\upm@lang@lastupdate}% - \hline - \theupmproject\upm@ifnotempty{\theupmsubproject}{ -- \theupmsubproject} & \theupmdocname & \theupmdocref & \theupmversion & \theupmdate \\ + \upm@lang@project & \theupmproject\Ifnotempty{\theupmsubproject}{ -- \theupmsubproject} \\ + \upm@lang@document & \theupmdocname \\ + \upm@lang@docref & \theupmdocref \\ + \upm@lang@version & \theupmversion \\ + \upm@lang@lastupdate & \theupmdate \\ \hline \end{mtabular}\par\vspace{.5cm}% } %----- +% Display the the document information on a page +%\upmpublicationpage +\newcommand{\upmdocinfopage}{ + \if@twoside% + \ifodd\thepage% + \setcounter{page}{-1}% + \else% + \setcounter{page}{0}% + \fi% + \else% + \setcounter{page}{0}% + \fi% + \thispagestyle{plain} + \upmdocumentsummary\upmdocumentauthors\upmdocumentvalidators\upmdocumentinformedpeople\vfill\upmhistory\clearpage% +} + +%----- +% Display the publication pag for the document +%\upmpublicationpage +\newcommand{\upmpublicationpage}{ + \setcounter{page}{0}% + \thispagestyle{empty}% + \upmpublicationminipage% +} +\newcommand{\upmpublicationminipage}{ + \if@twoside\ifodd\c@page\clearpage\fi\fi% + \mbox{}\vfill\small% + \par\noindent + \upm@lang@document@copyright@purpose + \vspace{.5cm} + \par\noindent + \upm@lang@document@copyright@tex + \par\noindent + \upm@lang@document@copyright@upmethodology + \vspace{.5cm} + \par\noindent + \Get{trademarks} + \vspace{4cm} + \par\noindent + \upm@lang@document@copyright@madewith + \vspace{.15cm} + \par\noindent + Copyright~\copyright~\upmcopyrightdate~\theupmformattedcopyrighter. + \vspace{.15cm} + \par\noindent + \upm@lang@document@copyright@trademarks \Ifdefined{printed}{\upm@lang@document@copyright@printedin} + \vspace{.25cm} + \par\noindent + \upm@lang@docref~: \theupmdocref \\ + \Ifnotempty{\theupmisbn}{ISBN~:~\theupmisbn\\} + \Ifnotempty{\theupmissn}{ISSN~:~\theupmissn\\} + \Ifnotempty{\theupmdoi}{DOI~:~\theupmdoi\\} + \clearpage% +} + +%----- %Name of the project for which this document was written \def\theupmproject{Arakhn\^e Project} @@ -177,27 +243,56 @@ %----- %Name of the logo -\def\theupmsmalldoclogo{smalllogo} -\def\theupmdoclogo{logo} +\newcommand{\theupmsmalldoclogo}{\Get{smalllogo}} +\newcommand{\theupmdoclogo}{\Get{logo}} %----- % Define the name of the logo picture to use -\newcommand{\defupmsmalllogo}[1]{\global\edef\theupmsmalldoclogo{#1}} -\newcommand{\defupmlogo}[1]{\global\edef\theupmdoclogo{#1}} +\newcommand{\defupmsmalllogo}[1]{\Set{smalllogo}{#1}} +\newcommand{\defupmlogo}[1]{\Set{logo}{#1}} %----- %Full name of the document \def\theupmfulldocname{% \theupmproject% - \upm@ifnotempty{\theupmsubproject}{/\theupmsubproject}% - \upm@ifnotempty{\theupmdocname}{ -- \theupmdocname}% + \Ifnotempty{\theupmsubproject}{/\theupmsubproject}% + \Ifnotempty{\theupmdocname}{ -- \theupmdocname}% +} + +%----- +% Declare a document's abstract +%\setdocabstract[lang]{text} +\newcommand{\setdocabstract}[2][\upmcurrentlang]{% + \ifthenelse{\equal{#1}{\upmcurrentlang}}{ + \gdef\theupmdocabstract{#2}}{}% + \global\@namedef{theupmdocabstract#1}{#2}% +} + +%----- +% Declare a document's key-words +%\setdockeywords[lang]{words} +\newcommand{\setdockeywords}[2][\upmcurrentlang]{% + \ifthenelse{\equal{#1}{\upmcurrentlang}}{ + \gdef\theupmdockeywords{#2}}{}% + \global\@namedef{theupmdockeywords#1}{#2}% } +%----- +%Abstract of the document +\def\theupmdocabstract{} + +%----- +%Key-words of the document +\def\theupmdockeywords{} + %---------------------------------------- % AUTHOR MANAGEMENT %---------------------------------------- +\newif\ifupm@document@author@tab@hascomment +\upm@document@author@tab@hascommentfalse \def\upm@document@author@tab{} +\def\upm@document@author@tab@commented{} %----- \def\theauthorlist{} @@ -205,30 +300,61 @@ %----- %Add an author %\addauthor[email]{firstname}{name} -\newcommand{\addauthor}[3][]{% - \global\protected@edef\theauthorlist{\theauthorlist\protect\upm@ifnotempty{\theauthorlist}{,} \protect\upmmakename{#2}{#3}{~}} - \global\protected@edef\upm@document@author@tab{\upm@document@author@tab \protect\upmmakename{#2}{#3}{~} & - \protect\upm@ifnotempty{#1}{\protect\href{mailto:#1}{#1}} \protect\\} +%\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}{~}} + + \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\\} + + \ifupm@document@author@tab@hascomment\else + \global\protected@edef\upm@document@author@tab{\upm@document@author@tab \protect\upmmakename{#2}{#3}{~} & + \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} \protect\\} + \fi +} +\newcommand{\upm@document@addauthorstar}[4][]{% + \global\protected@edef\theauthorlist{\theauthorlist\protect\Ifnotempty{\theauthorlist}{,} \protect\upmmakename{#2}{#3}{~}} + + \global\let\upm@document@author@tab\relax + + \global\protected@edef\upm@document@author@tab@commented{\upm@document@author@tab@commented \protect\upmmakename{#2}{#3}{~} & + #4 & \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} \protect\\} + + \upm@document@author@tab@hascommenttrue } %----- % Display the summary of the authors %\upmdocumentauthors[width] \newcommand{\upmdocumentauthors}[1][\linewidth]{% - \upm@ifnotempty{\upm@document@author@tab}{% - \noindent\expandafter\begin{mtabular}[#1]{2}{|X|c|}% - \tabulartitle{\upm@lang@document@authors}% - \tabularheader{\upm@lang@document@names}{\upm@lang@document@emails}% - \upm@document@author@tab - \hline% - \expandafter\end{mtabular}\par\vspace{.5cm}}% + \ifupm@document@author@tab@hascomment% + \Ifnotempty{\upm@document@author@tab@commented}{% + \noindent\expandafter\begin{mtabular}[#1]{3}{|X|l|c|}% + \tabulartitle{\upm@lang@document@authors}% + \tabularheader{\upm@lang@document@names}{\upm@lang@document@comments}{\upm@lang@document@emails}% + \upm@document@author@tab@commented + \hline% + \expandafter\end{mtabular}\par\vspace{.5cm}}% + \else% + \Ifnotempty{\upm@document@author@tab}{% + \noindent\expandafter\begin{mtabular}[#1]{2}{|X|c|}% + \tabulartitle{\upm@lang@document@authors}% + \tabularheader{\upm@lang@document@names}{\upm@lang@document@emails}% + \upm@document@author@tab + \hline% + \expandafter\end{mtabular}\par\vspace{.5cm}}% + \fi% } %---------------------------------------- % VALIDATOR MANAGEMENT %---------------------------------------- +\newif\ifupm@document@validator@tab@hascomment +\upm@document@validator@tab@hascommentfalse \def\upm@document@validator@tab{} +\def\upm@document@validator@tab@commented{} %----- \def\thevalidatorlist{} @@ -236,38 +362,74 @@ %----- %Add a validator %\addvalidator[email]{firstname}{name} -\newcommand{\addvalidator}[3][]{% - \global\protected@edef\thevalidatorlist{\thevalidatorlist\protect\upm@ifnotempty{\thevalidatorlist}{,} \protect\upmmakename{#2}{#3}{~}} - \global\protected@edef\upm@document@validator@tab{\upm@document@validator@tab \protect\upmmakename{#2}{#3}{~} & - \protect\upm@ifnotempty{#1}{\protect\href{mailto:#1}{#1}} & \protect\\} +%\addvalidator*[email]{firstname}{name}{comment} +\def\addvalidator{\@ifstar\upm@document@addvalidatorstar\upm@document@addvalidator} +\newcommand{\upm@document@addvalidator}[3][]{% + \global\protected@edef\thevalidatorlist{\thevalidatorlist\protect\Ifnotempty{\thevalidatorlist}{,} \protect\upmmakename{#2}{#3}{~}} + + \global\protected@edef\upm@document@validator@tab@commented{\upm@document@validator@tab@commented \protect\upmmakename{#2}{#3}{~} & + & \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} & \protect\\} + + \ifupm@document@validator@tab@hascomment\else + \global\protected@edef\upm@document@validator@tab{\upm@document@validator@tab \protect\upmmakename{#2}{#3}{~} & + \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} & \protect\\} + \fi +} +\newcommand{\upm@document@addvalidatorstar}[4][]{% + \global\protected@edef\thevalidatorlist{\thevalidatorlist\protect\Ifnotempty{\thevalidatorlist}{,} \protect\upmmakename{#2}{#3}{~}} + + \global\let\upm@document@validator@tab\relax + + \global\protected@edef\upm@document@validator@tab@commented{\upm@document@validator@tab@commented \protect\upmmakename{#2}{#3}{~} & + #4 & \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} & \protect\\} + + \upm@document@validator@tab@hascommenttrue } %----- % Display the summary of the validators %\upmdocumentvalidators[width] \newcommand{\upmdocumentvalidators}[1][\linewidth]{% - \upm@ifnotempty{\upm@document@validator@tab}{% - \noindent\expandafter\begin{mtabular}[#1]{3}{|X|c|p{3cm}|}% - \tabulartitle{\upm@lang@document@validators}% - \tabularheader{\upm@lang@document@names}{\upm@lang@document@emails}{\upm@lang@document@initials}% - \upm@document@validator@tab - \hline% - \expandafter\end{mtabular}\par\vspace{.5cm}}% + \ifupm@document@validator@tab@hascomment% + \Ifnotempty{\upm@document@validator@tab@commented}{% + \noindent\expandafter\begin{mtabular}[#1]{4}{|X|l|c|p{3cm}|}% + \tabulartitle{\upm@lang@document@validators}% + \tabularheader{\upm@lang@document@names}{\upm@lang@document@comments}{\upm@lang@document@emails}{\upm@lang@document@initials}% + \upm@document@validator@tab@commented + \hline% + \expandafter\end{mtabular}\par\vspace{.5cm}}% + \else% + \Ifnotempty{\upm@document@validator@tab}{% + \noindent\expandafter\begin{mtabular}[#1]{3}{|X|c|p{3cm}|}% + \tabulartitle{\upm@lang@document@validators}% + \tabularheader{\upm@lang@document@names}{\upm@lang@document@emails}{\upm@lang@document@initials}% + \upm@document@validator@tab + \hline% + \expandafter\end{mtabular}\par\vspace{.5cm}}% + \fi% } %----- %Add an author/validator -%\addvalidator[email]{firstname}{name} -\newcommand{\addauthorvalidator}[3][]{% +%\addauthorvalidator[email]{firstname}{name} +%\addauthorvalidator*[email]{firstname}{name}{comment} +\def\addauthorvalidator{\@ifstar\upm@document@addauthorvalidatorstar\upm@document@addauthorvalidator} +\newcommand{\upm@document@addauthorvalidator}[3][]{% \addauthor[#1]{#2}{#3}\addvalidator[#1]{#2}{#3}% } +\newcommand{\upm@document@addauthorvalidatorstar}[4][]{% + \addauthor*[#1]{#2}{#3}{#4}\addvalidator*[#1]{#2}{#3}{#4}% +} %---------------------------------------- % INFORMED MANAGEMENT %---------------------------------------- +\newif\ifupm@document@informed@tab@hascomment +\upm@document@informed@tab@hascommentfalse \def\upm@document@informed@tab{} +\def\upm@document@informed@tab@commented{} %----- \def\theinformedlist{} @@ -275,161 +437,115 @@ %----- %Add an informed %\addinformed[email]{firstname}{name} -\newcommand{\addinformed}[3][]{% - \global\protected@edef\theinformedlist{\theinformedlist\protect\upm@ifnotempty{\theinformedlist}{,} \protect\upmmakename{#2}{#3}{~}} - \global\protected@edef\upm@document@informed@tab{\upm@document@informed@tab \protect\upmmakename{#2}{#3}{~} & - \protect\upm@ifnotempty{#1}{\protect\href{mailto:#1}{#1}} \protect\\} +%\addinformed*[email]{firstname}{name}{comment} +\def\addinformed{\@ifstar\upm@document@addinformedstar\upm@document@addinformed} +\newcommand{\upm@document@addinformed}[3][]{% + \global\protected@edef\theinformedlist{\theinformedlist\protect\Ifnotempty{\theinformedlist}{,} \protect\upmmakename{#2}{#3}{~}} + + \global\protected@edef\upm@document@informed@tab@commented{\upm@document@informed@tab@commented \protect\upmmakename{#2}{#3}{~} & + & \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} \protect\\} + + \ifupm@document@informed@tab@hascomment\else + \global\protected@edef\upm@document@informed@tab{\upm@document@informed@tab \protect\upmmakename{#2}{#3}{~} & + \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} \protect\\} + \fi +} +\newcommand{\upm@document@addinformedstar}[4][]{% + \global\protected@edef\theinformedlist{\theinformedlist\protect\Ifnotempty{\theinformedlist}{,} \protect\upmmakename{#2}{#3}{~}} + + \global\let\upm@document@informed@tab\relax + + \global\protected@edef\upm@document@informed@tab@commented{\upm@document@informed@tab@commented \protect\upmmakename{#2}{#3}{~} & + #4 & \protect\Ifnotempty{#1}{\protect\href{mailto:#1}{#1}} \protect\\} + + \upm@document@informed@tab@hascommenttrue } %----- % Display the summary of the informed people %\upmdocumentinformedpeople[width] \newcommand{\upmdocumentinformedpeople}[1][\linewidth]{% - \upm@ifnotempty{\upm@document@informed@tab}{% - \noindent\expandafter\begin{mtabular}[#1]{2}{|X|c|}% - \tabulartitle{\upm@lang@document@informed}% - \tabularheader{\upm@lang@document@names}{\upm@lang@document@emails}% - \upm@document@informed@tab - \hline% - \expandafter\end{mtabular}\par\vspace{.5cm}}% + \ifupm@document@validator@tab@hascomment% + \Ifnotempty{\upm@document@informed@tab@commented}{% + \noindent\expandafter\begin{mtabular}[#1]{3}{|X|l|c|}% + \tabulartitle{\upm@lang@document@informed}% + \tabularheader{\upm@lang@document@names}{\upm@lang@document@comments}{\upm@lang@document@emails}% + \upm@document@informed@tab@commented + \hline% + \expandafter\end{mtabular}\par\vspace{.5cm}}% + \else% + \Ifnotempty{\upm@document@informed@tab}{% + \noindent\expandafter\begin{mtabular}[#1]{2}{|X|c|}% + \tabulartitle{\upm@lang@document@informed}% + \tabularheader{\upm@lang@document@names}{\upm@lang@document@emails}% + \upm@document@informed@tab + \hline% + \expandafter\end{mtabular}\par\vspace{.5cm}}% + \fi% } %---------------------------------------- -% PUBLISHER +% PUBLISHER, COPYRIGHT, PRINTING... %---------------------------------------- -\gdef\theupmpublisher{Arakhn\^e.org Group} +\gdef\theupmcopyrighter{\Get{copyrighter}} +\gdef\theupmpublisher{\Get{publisher}} +\gdef\theupmprintedin{\Get{printedin}} +\gdef\theupmisbn{} +\gdef\theupmissn{} +\gdef\theupmdoi{} \gdef\theupmpublishingdate{} +\newcommand{\theupmformattedpublisher}{\Ifelsedefined{publisher}{\theupmpublisher}{\textcolor{red}{???}}} +\newcommand{\theupmformattedcopyrighter}{\Ifelsedefined{copyrighter}{\theupmcopyrighter}{\textcolor{red}{???}}} + %----- %Set the publisher identity %\setpublisher{name} -\newcommand{\setpublisher}[1]{% - \gdef\theupmpublisher{#1}% -} +\newcommand{\setpublisher}[1]{\Set{publisher}{#1}} -%---------------------------------------- -% DOCUMENT SECTIONS -%---------------------------------------- - -\gdef\upm@document@section@alignment{} - -%----- -% Part without number but inside the TOC -%\parttoc [toctitle]{title} % left-alignment inside TOC -%\parttoc*[toctitle]{title} % right-alignment inside TOC -\def\parttoc{\@ifstar% - {\gdef\upm@document@section@alignment{\protect\numberline{}}\expandafter\upm@document@section@part}% - {\gdef\upm@document@section@alignment{}\expandafter\upm@document@section@part}} -\def\upm@document@section@part{\@ifnextchar [% - {\expandafter\upm@document@section@part@opt}% - {\expandafter\upm@document@section@part@nopt}} -\def\upm@document@section@part@opt[#1]#2{% - \part*{#2\addcontentsline{toc}{part}{\upm@document@section@alignment{#1}}}% - \chaptermark{}% -} -\def\upm@document@section@part@nopt#1{% - \part*{#1\addcontentsline{toc}{part}{\upm@document@section@alignment{#1}}}% - \chaptermark{}% -} +%----- +%Set the copyrighter identity +%\setcopyrighter{name} +\newcommand{\setcopyrighter}[1]{\Set{copyrighter}{#1}} %----- -% Chapter without number but inside the TOC -%\chaptertoc [toctitle]{title} % left-alignment inside TOC -%\chaptertoc*[toctitle]{title} % right-alignment inside TOC -\def\chaptertoc{\@ifstar% - {\gdef\upm@document@section@alignment{\protect\numberline{}}\expandafter\upm@document@section@chapter}% - {\gdef\upm@document@section@alignment{}\expandafter\upm@document@section@chapter}} -\def\upm@document@section@chapter{\@ifnextchar [% - {\expandafter\upm@document@section@chapter@opt}% - {\expandafter\upm@document@section@chapter@nopt}} -\def\upm@document@section@chapter@opt[#1]#2{% - \@schapter{#2\addcontentsline{toc}{chapter}{\upm@document@section@alignment{#1}}}% - \chaptermark{#1}% -} -\def\upm@document@section@chapter@nopt#1{% - \@schapter{#1\addcontentsline{toc}{chapter}{\upm@document@section@alignment{#1}}}% - \chaptermark{#1}% -} +%Set the address where this document is printed +%\setprintingaddress{address} +\newcommand{\setprintingaddress}[1]{\Set{printedin}{#1}} %----- -% Section without number but inside the TOC -%\sectiontoc [toctitle]{title} % left-alignment inside TOC -%\sectiontoc*[toctitle]{title} % right-alignment inside TOC -\def\sectiontoc{\@ifstar% - {\gdef\upm@document@section@alignment{\protect\numberline{}}\expandafter\upm@document@section@section}% - {\gdef\upm@document@section@alignment{}\expandafter\upm@document@section@section}} -\def\upm@document@section@section{\@ifnextchar [% - {\expandafter\upm@document@section@section@opt}% - {\expandafter\upm@document@section@section@nopt}} -\def\upm@document@section@section@opt[#1]#2{% - \section*{#2\addcontentsline{toc}{section}{\upm@document@section@alignment{#1}}}% -} -\def\upm@document@section@section@nopt#1{% - \section*{#1\addcontentsline{toc}{section}{\upm@document@section@alignment{#1}}}% +%Set the ISBN +%\setisbn{isbn} +\newcommand{\setisbn}[1]{% + \gdef\theupmisbn{#1}% } %----- -% Subsection without number but inside the TOC -%\subsectiontoc [toctitle]{title} % left-alignment inside TOC -%\subsectiontoc*[toctitle]{title} % right-alignment inside TOC -\def\subsectiontoc{\@ifstar% - {\gdef\upm@document@section@alignment{\protect\numberline{}}\expandafter\upm@document@section@subsection}% - {\gdef\upm@document@section@alignment{}\expandafter\upm@document@section@subsection}} -\def\upm@document@section@subsection{\@ifnextchar [% - {\expandafter\upm@document@section@subsection@opt}% - {\expandafter\upm@document@section@subsection@nopt}} -\def\upm@document@section@subsection@opt[#1]#2{% - \subsection*{#2\addcontentsline{toc}{subsection}{\upm@document@section@alignment{#1}}}% -} -\def\upm@document@section@subsection@nopt#1{% - \subsection*{#1\addcontentsline{toc}{subsection}{\upm@document@section@alignment{#1}}}% +%Set the ISSN +%\setisbn{issn} +\newcommand{\setissn}[1]{% + \gdef\theupmissn{#1}% } %----- -% Subsubsection without number but inside the TOC -%\subsubsectiontoc [toctitle]{title} % left-alignment inside TOC -%\subsubsectiontoc*[toctitle]{title} % right-alignment inside TOC -\def\subsubsectiontoc{\@ifstar% - {\gdef\upm@document@section@alignment{\protect\numberline{}}\expandafter\upm@document@section@subsubsection}% - {\gdef\upm@document@section@alignment{}\expandafter\upm@document@section@subsubsection}} -\def\upm@document@section@subsubsection{\@ifnextchar [% - {\expandafter\upm@document@section@subsubsection@opt}% - {\expandafter\upm@document@section@subsubsection@nopt}} -\def\upm@document@section@subsubsection@opt[#1]#2{% - \subsubsection*{#2\addcontentsline{toc}{subsubsection}{\upm@document@section@alignment{#1}}}% -} -\def\upm@document@section@subsubsection@nopt#1{% - \subsubsection*{#1\addcontentsline{toc}{subsubsection}{\upm@document@section@alignment{#1}}}% +%Set the DOI +%\setdoi{doi} +\newcommand{\setdoi}[1]{% + \gdef\theupmdoi{#1}% } %---------------------------------------- -% EXTENSION MANAGEMENT +% WATERMARK %---------------------------------------- -%----- -% Use the specified extension -%\upmuse{extension_name} -\newcommand{\upmuse}[1]{% - \message{**** including upm extension #1 (upmext-#1.cfg) ****}% - {\begingroup% - \newcommand{\set}[3][\upm@lang@@lang@]{% - % NORMAL LOGO - \ifthenelse{\equal{##2}{logo}}{\defupmlogo{##3}}{% - % SMALL LOGO - \ifthenelse{\equal{##2}{smalllogo}}{\defupmsmalllogo{##3}}{% - % PUBLISHER - \ifthenelse{\equal{##2}{publisher}}{% - \ifthenelse{\equal{\upm@lang@@lang@}{##1}}{% - \setpublisher{##3}% - }{}% - % ERROR ON ATTRIBUTE - }{% - \errmessage{extension's value '##2' is not supported.}% - }}}% - }% - \input{upmext-#1.cfg}% - \endgroup}% +\AtBeginDocument{ + \ifthenelse{\equal{\theupmstatus}{\upmrestricted}}{ + \edef\upm@doc@tmp@watermark{\uppercase{\upm@lang@restricted}} + \RequirePackage{draftwatermark} + \SetWatermarkText{\upm@doc@tmp@watermark} + \SetWatermarkScale{\Get{watermarksize}} + }{} } \endinput diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty new file mode 100644 index 00000000000..9424f2d2ed3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty @@ -0,0 +1,112 @@ +% Package for Unified Process Methodology's extensions +% +% Copyright (c) 2006-2009 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 +% published by the Free Software Foundation; either version 3 of the +% License, or any later version. +% +% This library is distributed in the hope that it will be useful, but +% WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +% Lesser General Public License for more details. +% +% You should have received a copy of the GNU Lesser General Public +% License along with this library; see the file COPYING. If not, +% write to the Free Software Foundation, Inc., 59 Temple Place - Suite +% 330, Boston, MA 02111-1307, USA. +% +% Creation date: 2006-10-24 +% Modifications: +% 2009-11-03 \If* are marked as \long. +% 2006-10-30 Bug fix: provides "upmethodology-extension" insteed of "upmethodology-document". +% 2006-10-29 Allow to override the default font. +% 2006-10-27 Clean the API +% + +\global\edef\upm@package@ext@ver{2009/11/03} + +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{upmethodology-extension}[\upm@package@ext@ver] + +\RequirePackage{upmethodology-p-common} + +%---------------------------------------- +% TEST MACROS +%---------------------------------------- +\long\def\Ifdefined#1#2{\@ifundefined{upmext@extension@value@#1}{}{#2}} +\long\def\Ifelsedefined#1#2#3{\@ifundefined{upmext@extension@value@#1}{#3}{#2}} +\long\def\Ifundefined#1#2{\@ifundefined{upmext@extension@value@#1}{#2}{}} +\long\def\Ifelseundefined#1#2#3{\@ifundefined{upmext@extension@value@#1}{#2}{#3}} + +%---------------------------------------- +% EXTENSION MANAGEMENT +%---------------------------------------- + +\newcommand{\Get}[1]{\@nameuse{upmext@extension@value@#1}} + +\newcommand{\Set}[3][\upmcurrentlang]{% + % PREDEFINED FRONT PAGE + \ifthenelse{\equal{#2}{frontpage}}{% + \gdef\upmext@extension@value@frontpage{#3}% + \global\let\upmext@extension@value@frontpage@custom\relax% + }{% + % CUSTOM BACK PAGE + \ifthenelse{\equal{#2}{backpage}}{% + \ifthenelse{\equal{\upmcurrentlang}{#1}}{% + \gdef\upmext@extension@value@backpage{#3}% + }{}% + }{% + % CUSTOM FRONT PAGE + \ifthenelse{\equal{#2}{cfrontpage}}{% + \ifthenelse{\equal{\upmcurrentlang}{#1}}{% + \gdef\upmext@extension@value@frontpage{custom}% + \gdef\upmext@extension@value@frontpage@custom{#3}% + }{}% + }{% + \ifthenelse{\equal{\upmcurrentlang}{#1}}{% + \message{*** define extension value #2 ****}% + \global\@namedef{upmext@extension@value@#2}{#3}% + }{}% + }}}% +} + +\newcommand{\Unset}[2][\upmcurrentlang]{% + \ifthenelse{\equal{\upmcurrentlang}{#1}}{% + \message{*** undefine extension value #2 ****}% + \global\expandafter\let\csname upmext@extension@value@#2\endcsname\@undefined% + }{}% +} + +\newcommand{\DeclareCopyright}[5][\upmcurrentlang]{% + \ifthenelse{\equal{\upmcurrentlang}{#1}}{% + \Set{copyright}{Copyright (c) #3 #4.}% + \message{*** style extension #2, \Get{copyright} ****}% + \Set{trademarks}{#5}% + }{}% +} + +\newlength{\upmext@tmp@putx} +\def\Put(#1,#2){% + \setlength{\upmext@tmp@putx}{#1\unitlength}% + \if@twoside\ifodd\c@page\else\addtolength{\upmext@tmp@putx}{28\unitlength}\fi\fi% + \put(\strip@pt\upmext@tmp@putx,#2)} + +%----- +% Use the specified extension +%\UseExtension{extension_name} +\newcommand{\UseExtension}[1]{% + \message{**** including upm extension #1 (upmext-#1.cfg) ****}% + \input{upmext-#1.cfg}% +} + +%------------ +% Default declarations +\Set{frontillustrationsize}{1} +\Set{watermarksize}{1} +\Unset{publisher} +\Unset{copyrighter} +\Unset{printedin} + +\endinput diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty index bef85f869ed..823ad0eee69 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty @@ -18,7 +18,19 @@ % 330, Boston, MA 02111-1307, USA. % % Creation date: 2006-04-06 -% Modifications: +% Modifications (lastest first): +% 2009-11-02 Bug fix: footnote macros are fixed. +% Add macros: \prname, \drname, \phdname, \scdname, +% \mdname, \pename, \iename. +% 2009-10-30 Add support for book and report classes. +% 2009-10-28 Add \parskip. +% Rename macros to avoid conflicts: \st->\ust, \nd->\und, +% \rd->\urd, \th->\uth +% 2009-10-27 Add framedminipage environment. +% 2009-06-25 Add \tablenote in mtable environment. +% 2009-06-23 Add upmcaution, upminfo and upmquestion environments. +% 2009-05-08 Remove CR character +% Add \arakhneorg command % 2009-04-29 Include package pifont (texlive distribution) % 2007-07-07 Override the bibliography functions. % 2007-07-06 Bug fix: use varioref for the footnote references. @@ -33,11 +45,13 @@ % Bug fix: centering table's headers. % -\global\edef\upm@package@fmt@ver{2009/04/29} +\global\edef\upm@package@fmt@ver{2009/11/01} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver] +\RequirePackage{upmethodology-p-common} + \gdef\upm@fmt@force@single@spacing#1{{\begin{singlespace}#1\end{singlespace}}} \gdef\upm@date@head#1/#2\@nil{#1} \gdef\upm@date@tail#1/#2\@nil{#2} @@ -53,6 +67,13 @@ \global\renewcommand{\upm@format@lang@makedate}[3]{##3\string/\two@digits{##2}\string/\two@digits{##1}}% \global\let\upm@format@lang@extractyear\upm@date@first% \global\let\upm@format@lang@extractmonth\upm@date@second% + \gdef\upm@format@lang@professor{Pr.}% + \gdef\upm@format@lang@doctor{Dr.}% + \gdef\upm@format@lang@phdoctor{Ph.D.}% + \gdef\upm@format@lang@scdoctor{Sc.D.}% + \gdef\upm@format@lang@mdoctor{M.D.}% + \gdef\upm@format@lang@professionalengineer{CEng.}% + \gdef\upm@format@lang@incorporatedengineer{IEng.}% } \global\let\upm@format@lang@extractyear\upm@date@first% \def\upm@format@lang@french{% @@ -61,6 +82,13 @@ \global\let\upm@format@lang@extractyear\upm@date@third% \global\let\upm@format@lang@extractmonth\upm@date@second% \global\let\upm@format@lang@extractday\upm@date@first% + \gdef\upm@format@lang@professor{Pr.}% + \gdef\upm@format@lang@doctor{Dr.}% + \gdef\upm@format@lang@phdoctor{Ph.D.}% + \gdef\upm@format@lang@scdoctor{Sc.D.}% + \gdef\upm@format@lang@mdoctor{M.D.}% + \gdef\upm@format@lang@professionalengineer{Ing.}% + \gdef\upm@format@lang@incorporatedengineer{Ing.}% } \global\providecommand{\upm@format@lang@makedate}[3]{}% @@ -84,9 +112,7 @@ \upm@lang@@ -\RequirePackage{xspace} -\RequirePackage{ifthen} -\RequirePackage{graphicx} +\RequirePackage[final]{graphicx} \RequirePackage{subfigure} \RequirePackage{tabularx} \RequirePackage{multicol} @@ -96,14 +122,17 @@ \RequirePackage{pifont} \RequirePackage{setspace} \RequirePackage{varioref} +\RequirePackage{txfonts} %---------------------------------------- % Exponent and indice %---------------------------------------- % Exponent -\newcommand{\textsup}[1]{\ensuremath{^{\text{#1}}}\xspace} +%\newcommand{\textsup}[1]{\ensuremath{^{\text{#1}}}\xspace} +\newcommand{\textsup}[1]{\upm@textsuperscript{#1}\xspace} % Indice -\newcommand{\textsub}[1]{\ensuremath{_{\text{#1}}}\xspace} +%\newcommand{\textsub}[1]{\ensuremath{_{\text{#1}}}\xspace} +\newcommand{\textsub}[1]{\upm@textsubscript{#1}\xspace} %---------------------------------------- % SYMBOLS @@ -115,10 +144,10 @@ \newcommand{\smalltrade}{{\tiny\trademark}\xspace} \newcommand{\smallreg}{{\tiny\regmark}\xspace} \newcommand{\smallcopy}{{\tiny\copyright}\xspace} -\gdef\st{\textsup{st}} -\gdef\nd{\textsup{nd}} -\gdef\rd{\textsup{rd}} -\gdef\th{\textsup{th}} +\newcommand{\ust}{\textsup{st}} +\newcommand{\und}{\textsup{nd}} +\newcommand{\urd}{\textsup{rd}} +\newcommand{\uth}{\textsup{th}} %---------------------------------------- @@ -317,15 +346,20 @@ \table[#1]\center% \global\protected@edef\upm@table@caption{#5}% \global\protected@edef\upm@table@label{tab:#6}% + \gdef\upm@table@note{}% \newcommand{\captionastitle}{\tabulartitle{\upm@table@caption}}% + \newcommand{\tablenote}[1]{\gdef\upm@table@note{##1}}% \mtabular[#2]{#3}{#4}% }{% \endmtabular% \caption{\upm@table@caption}% \label{\upm@table@label}% - \endcenter\endtable% + \endcenter% + {\upm@table@note}% + \endtable% \let\upm@table@caption\relax% \let\upm@table@label\relax% + \let\upm@table@note\relax% } %----- @@ -339,83 +373,215 @@ % PARAGRAPHS %---------------------------------------- \setlength{\parindent}{0pt} +\setlength{\parskip}{.2cm} %---------------------------------------- % COLORIZED SECTION'S TITLES %---------------------------------------- -\definecolor{titlecolor}{rgb}{0.93,0.41,0} -\definecolor{maintitlecolor}{rgb}{0.24,0.33,0.48} - -\gdef\upm@format@chapternum#1{\textcolor{maintitlecolor}{\huge \scshape #1}} -\gdef\upm@format@chaptertitle#1{\textcolor{maintitlecolor}{ - \Huge\scshape {#1}}} -\gdef\upm@format@sectionnum#1{\textcolor{titlecolor}{#1}} -\gdef\upm@format@sectiontitle#1{\textcolor{titlecolor}{#1}} - -\gdef\@makechapterhead#1{% - \vspace*{50\p@}% - {\parindent \z@ \raggedright \normalfont - \ifnum \c@secnumdepth >\m@ne - \if@mainmatter - \upm@format@chapternum{\@chapapp\space \thechapter} - \par\nobreak - \vskip 20\p@ - \fi - \fi - \interlinepenalty\@M - \doublespacing - \upm@format@chaptertitle{#1}\par\nobreak - \vskip 40\p@ - } -} -\gdef\@makeschapterhead#1{% - \vspace*{50\p@}% - {\parindent \z@ \raggedright - \normalfont - \interlinepenalty\@M - \doublespacing - \upm@format@chaptertitle{#1}\par\nobreak - \vskip 40\p@ - } -} -\renewcommand{\section}{\@startsection{section}{1}{\z@}{-3.5ex \@plus -1ex \@minus -.2ex}{2.3ex \@plus.2ex}{\normalfont\Large\scshape}} -\renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}{-3.25ex\@plus -1ex \@minus -.2ex}{1.5ex \@plus .2ex}{\normalfont\large\scshape}} -\renewcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}{-3.25ex\@plus -1ex \@minus -.2ex}{1.5ex \@plus .2ex}{\normalfont\normalsize\scshape}} + +% PRIVATE COLORS +\definecolor{sectiontitlecolor}{rgb}{0.93,0.41,0} +\definecolor{chaptertitlecolor}{rgb}{0.24,0.33,0.48} +\definecolor{parttitlecolor}{rgb}{0.24,0.33,0.48} + +% PRIVATE FORMATTING MACROS +\newcounter{upm@format@section@sectionlevel} +\setcounter{upm@format@section@sectionlevel}{0} + +\gdef\upm@format@partnum#1{\textcolor{parttitlecolor}{\expandafter\fontsize{40pt}{60pt}\selectfont#1\normalfont}} +\gdef\upm@format@parttitle#1{\textcolor{parttitlecolor}{\huge\scshape #1}} +\gdef\upm@format@chapternum#1{\textcolor{chaptertitlecolor}{\expandafter\fontsize{40pt}{60pt}\selectfont#1\normalfont}} +\gdef\upm@format@chaptertitle#1{\textcolor{chaptertitlecolor}{\Huge\scshape #1}} +\gdef\upm@format@sectionnum#1#2{\textcolor{sectiontitlecolor}{#2}} +\gdef\upm@format@sectiontitle#1#2{\textcolor{sectiontitlecolor}{#2}} + +% PART +\ifupmbookformat + \gdef\@part[#1]#2{% + \ifnum \c@secnumdepth >-2\relax + \refstepcounter{part}% + \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}% + \else + \addcontentsline{toc}{part}{#1}% + \fi + \markboth{}{}% + {\centering + \interlinepenalty \@M + \normalfont + \ifnum \c@secnumdepth >-2\relax + \upm@format@partnum{\thepart} + \par + \vskip 20\p@ + \fi + \upm@format@parttitle{#2}\par}% + \@endpart} + \gdef\@spart#1{% + {\centering + \interlinepenalty \@M + \normalfont + \upm@format@parttitle{#1}\par}% + \@endpart} +\fi + +% CHAPTER +\ifupmarticleformat\else + \newcommand{\upm@format@makechapterhead}[2]{% + %\vspace*{50\p@}% + {\parindent \z@ \raggedleft \normalfont + \ifx\@empty#1\ifnum \c@secnumdepth >\m@ne + \upm@format@chapternum{\thechapter} + \par\nobreak + \vskip 20\p@ + \fi\fi + \interlinepenalty\@M + \ifupmbookformat\doublespacing\fi + \upm@format@chaptertitle{#2}\par\nobreak + \vskip 80\p@ + } + } + %internal implementation of \chapter + \gdef\@makechapterhead#1{\upm@format@makechapterhead{\@empty}{#1}} + %internal implementation of \chapter* + \gdef\@makeschapterhead#1{\upm@format@makechapterhead{\relax}{#1}} +\fi + +% SECTIONS \let\upm@format@sect@old\@sect -\gdef\@sect#1#2#3#4#5#6[#7]#8{\upm@format@sect@old{#1}{#2}{#3}{#4}{#5}{#6}[#7]{\upm@format@sectiontitle{#8}}} \let\upm@format@ssect@old\@ssect -\gdef\@ssect#1#2#3#4#5{\upm@format@ssect@old{#1}{#2}{#3}{#4}{\upm@format@sectiontitle{#5}}} -\gdef\@seccntformat#1{\upm@format@sectionnum{\csname the#1\endcsname/}\quad} + +% public implementation of sections. +\renewcommand{\section}{\setcounter{upm@format@section@sectionlevel}{1}\@startsection{section}{1}{\z@}{-3.5ex \@plus -1ex \@minus -.2ex}{2.3ex \@plus.2ex}{\normalfont\Large\scshape}} +\renewcommand{\subsection}{\setcounter{upm@format@section@sectionlevel}{2}\@startsection{subsection}{2}{\z@}{-3.25ex\@plus -1ex \@minus -.2ex}{1.5ex \@plus .2ex}{\normalfont\large\scshape}} +\renewcommand{\subsubsection}{\setcounter{upm@format@section@sectionlevel}{3}\@startsection{subsubsection}{3}{\z@}{-3.25ex\@plus -1ex \@minus -.2ex}{1.5ex \@plus .2ex}{\normalfont\normalsize\scshape}} + +% internal implementations for sections. +\gdef\@sect#1#2#3#4#5#6[#7]#8{\upm@format@sect@old{#1}{#2}{#3}{#4}{#5}{#6}[#7]{\upm@format@sectiontitle{\theupm@format@section@sectionlevel}{#8}}} +\gdef\@ssect#1#2#3#4#5{\upm@format@ssect@old{#1}{#2}{#3}{#4}{\upm@format@sectiontitle{\theupm@format@section@sectionlevel}{#5}}} +\gdef\@seccntformat#1{\upm@format@sectionnum{\theupm@format@section@sectionlevel}{\csname the#1\endcsname/}\quad} %---------------------------------------- % PAGE LAYOUT %---------------------------------------- -% Update the formatof the saved pages and sections -\AtBeginDocument{ - \renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{}} - \renewcommand{\sectionmark}[1]{\markright{\thesection\ \textsc{#1}}} - \renewcommand{\@mkboth}[2]{% + +% Update the format of the saved pages and sections +\renewcommand{\sectionmark}[1]{\markright{\thesection\ \textsc{#1}}} +\ifupmarticleformat\else +\renewcommand{\chaptermark}[1]{\markboth{\textsc{#1}}{}} +\renewcommand{\@mkboth}[2]{% \let\upm@doc@MakeUppercase\MakeUppercase% \gdef\MakeUppercase##1{##1}% \chaptermark{#1}% \let\MakeUppercase\upm@doc@MakeUppercase% \let\upm@doc@MakeUppercase\relax% - } } +\fi % Make sure that the page before a part or % a chapter title was empty -\AtBeginDocument{% - \renewcommand{\cleardoublepage}{% - \clearpage% - \if@twoside\ifodd\c@page% - \else% - \thispagestyle{facingtochapter}% - \hbox{}\newpage% - \if@twocolumn\hbox{}\newpage% - \fi\fi\fi% - } - \newcommand{\ps@facingtochapter}{\ps@empty} - } +\renewcommand{\cleardoublepage}{% + \clearpage% + \if@twoside\ifodd\c@page% + \else% + \thispagestyle{facingtochapter}% + \hbox{}\newpage% + \if@twocolumn\hbox{}\newpage% + \fi\fi\fi% +} +\newcommand{\ps@facingtochapter}{\ps@empty} + +%---------------------------------------- +% ADDITIONAL SECTIONS +%---------------------------------------- + +\gdef\upm@format@newsection@alignment{} + +%----- +% Part without number but inside the TOC +%\parttoc [toctitle]{title} % left-alignment inside TOC +%\parttoc*[toctitle]{title} % right-alignment inside TOC +\def\parttoc{\@ifstar% + {\gdef\upm@format@newsection@alignment{\protect\numberline{}}\expandafter\upm@format@newsection@part}% + {\gdef\upm@format@newsection@alignment{}\expandafter\upm@format@newsection@part}} +\def\upm@format@newsection@part{\@ifnextchar [% + {\expandafter\upm@format@newsection@part@opt}% + {\expandafter\upm@format@newsection@part@nopt}} +\def\upm@format@newsection@part@opt[#1]#2{% + \part*{#2\addcontentsline{toc}{part}{\upm@format@newsection@alignment{#1}}}% + \chaptermark{}% +} +\def\upm@format@newsection@part@nopt#1{% + \part*{#1\addcontentsline{toc}{part}{\upm@format@newsection@alignment{#1}}}% + \chaptermark{}% +} + +%----- +% Chapter without number but inside the TOC +%\chaptertoc [toctitle]{title} % left-alignment inside TOC +%\chaptertoc*[toctitle]{title} % right-alignment inside TOC +\def\chaptertoc{\@ifstar% + {\gdef\upm@format@newsection@alignment{\protect\numberline{}}\expandafter\upm@format@newsection@chapter}% + {\gdef\upm@format@newsection@alignment{}\expandafter\upm@format@newsection@chapter}} +\def\upm@format@newsection@chapter{\@ifnextchar [% + {\expandafter\upm@format@newsection@chapter@opt}% + {\expandafter\upm@format@newsection@chapter@nopt}} +\def\upm@format@newsection@chapter@opt[#1]#2{% + \@schapter{#2\addcontentsline{toc}{chapter}{\upm@format@newsection@alignment{#1}}}% + \chaptermark{#1}% +} +\def\upm@format@newsection@chapter@nopt#1{% + \@schapter{#1\addcontentsline{toc}{chapter}{\upm@format@newsection@alignment{#1}}}% + \chaptermark{#1}% +} + +%----- +% Section without number but inside the TOC +%\sectiontoc [toctitle]{title} % left-alignment inside TOC +%\sectiontoc*[toctitle]{title} % right-alignment inside TOC +\def\sectiontoc{\@ifstar% + {\gdef\upm@format@newsection@alignment{\protect\numberline{}}\expandafter\upm@format@newsection@section}% + {\gdef\upm@format@newsection@alignment{}\expandafter\upm@format@newsection@section}} +\def\upm@format@newsection@section{\@ifnextchar [% + {\expandafter\upm@format@newsection@section@opt}% + {\expandafter\upm@format@newsection@section@nopt}} +\def\upm@format@newsection@section@opt[#1]#2{% + \section*{#2\addcontentsline{toc}{section}{\upm@format@newsection@alignment{#1}}}% +} +\def\upm@format@newsection@section@nopt#1{% + \section*{#1\addcontentsline{toc}{section}{\upm@format@newsection@alignment{#1}}}% +} + +%----- +% Subsection without number but inside the TOC +%\subsectiontoc [toctitle]{title} % left-alignment inside TOC +%\subsectiontoc*[toctitle]{title} % right-alignment inside TOC +\def\subsectiontoc{\@ifstar% + {\gdef\upm@format@newsection@alignment{\protect\numberline{}}\expandafter\upm@format@newsection@subsection}% + {\gdef\upm@format@newsection@alignment{}\expandafter\upm@format@newsection@subsection}} +\def\upm@format@newsection@subsection{\@ifnextchar [% + {\expandafter\upm@format@newsection@subsection@opt}% + {\expandafter\upm@format@newsection@subsection@nopt}} +\def\upm@format@newsection@subsection@opt[#1]#2{% + \subsection*{#2\addcontentsline{toc}{subsection}{\upm@format@newsection@alignment{#1}}}% +} +\def\upm@format@newsection@subsection@nopt#1{% + \subsection*{#1\addcontentsline{toc}{subsection}{\upm@format@newsection@alignment{#1}}}% +} + +%----- +% Subsubsection without number but inside the TOC +%\subsubsectiontoc [toctitle]{title} % left-alignment inside TOC +%\subsubsectiontoc*[toctitle]{title} % right-alignment inside TOC +\def\subsubsectiontoc{\@ifstar% + {\gdef\upm@format@newsection@alignment{\protect\numberline{}}\expandafter\upm@format@newsection@subsubsection}% + {\gdef\upm@format@newsection@alignment{}\expandafter\upm@format@newsection@subsubsection}} +\def\upm@format@newsection@subsubsection{\@ifnextchar [% + {\expandafter\upm@format@newsection@subsubsection@opt}% + {\expandafter\upm@format@newsection@subsubsection@nopt}} +\def\upm@format@newsection@subsubsection@opt[#1]#2{% + \subsubsection*{#2\addcontentsline{toc}{subsubsection}{\upm@format@newsection@alignment{#1}}}% +} +\def\upm@format@newsection@subsubsection@nopt#1{% + \subsubsection*{#1\addcontentsline{toc}{subsubsection}{\upm@format@newsection@alignment{#1}}}% +} %---------------------------------------- % BIBLIOGRAPHY @@ -471,38 +637,37 @@ % FOOTNOTE %---------------------------------------- -\newcommand{\upm@footnoteref}[1]{\mbox{\ensuremath{^{\text{\ref{footnote:#1}}}}}} -\newcommand{\upm@footnotepageref}[1]{\mbox{\ensuremath{^{\text{\ref{footnote:#1}}}_{\text{\tiny \vpageref[]{footnote:#1}}}}}} -\newcommand{\@namelet}[1]{\expandafter\let\csname #1\endcsname} +\gdef\upm@footnoteref#1{\upm@textsuperscript{#1}} +\gdef\upm@footnotepageref#1#2{\upm@textsuperscript{{#1\tiny(#2)}}} -\newcommand{\upm@savefootnote}[2]{% - \footnote{#1\label{footnote:#2}}% - \global\@namelet{footnote:#2:cmd}\relax% +\def\upm@savefootnote#1#2{% + \footnote{#1\label{\upm@protect{footnote:#2}}}% + \upm@nameundef{footnote:#2:cmd}% } -\newcommand{\upm@savefootnotestar}[2]{% - \global\@namedef{footnote:#2:cmd}{% - \upm@savefootnote{#1}{#2}% - }% +\def\upm@savefootnotestar#1#2{% + \upm@namedef{footnote:#2:cmd}{\upm@savefootnote{#1}{#2}}% } -\gdef\savefootnote{\@ifstar\upm@savefootnotestar\upm@savefootnote} +\DeclareRobustCommand\savefootnote{\@ifstar\upm@savefootnotestar\upm@savefootnote} -\newcommand{\upm@reffootnote}[1]{% - \expandafter\ifx\csname footnote:#1:cmd\endcsname\relax% - \upm@footnoteref{#1}% - \else% - \@nameuse{footnote:#1:cmd}% - \fi\xspace% +\def\upm@reffootnote#1{% + \upm@ifdefinedname{footnote:#1:cmd}{% + \upm@nameuse{footnote:#1:cmd}}{% + \upm@footnoteref{\upm@getref{\upm@protect{footnote:#1}}}% + }% + \xspace% } -\newcommand{\upm@reffootnotestar}[1]{% - \expandafter\ifx\csname footnote:#1:cmd\endcsname\relax% - \upm@footnotepageref{#1}% - \else% - \@nameuse{footnote:#1:cmd}% - \fi\xspace% +\def\upm@reffootnotestar#1{% + \upm@ifdefinedname{footnote:#1:cmd}{% + \upm@nameuse{footnote:#1:cmd}}{% + \xdef\upm@tmp@tmp{\upm@protect{footnote:#1}}% + \upm@footnotepageref{\expandafter\upm@getref{\upm@tmp@tmp}}{\expandafter\upm@getpageref{\upm@tmp@tmp}}% + \global\let\upm@tmp@tmp\relax% + }% + \xspace% } -\gdef\reffootnote{\@ifstar\upm@reffootnotestar\upm@reffootnote} +\DeclareRobustCommand\reffootnote{\@ifstar\upm@reffootnotestar\upm@reffootnote} %---------------------------------------- % IMAGES IN PARAGRAPHS @@ -550,12 +715,83 @@ \else% {\mbox{\small #2}#4\mbox{\small #1}#4\textsc{#3}}% \fi% - \xspace% } %\makename[von]{firstname}{lastname} \newcommand{\makename}[3][\relax]{% - \upmmakename[#1]{#2}{#3}{\ } + \upmmakename[#1]{#2}{#3}{\ }% +} + +\gdef\upm@format@people@title#1{\textsc{#1}} + +%\prname[von]{firstname}{lastname} +%\prname*[von]{firstname}{lastname} +\def\prname{\@ifstar\upm@prnamestar\upm@prname} +\newcommand{\upm@prname}[3][\relax]{% + \upm@format@people@title{\upm@format@lang@professor}~\upmmakename[#1]{#2}{#3}{\ }% +} +\newcommand{\upm@prnamestar}[3][\relax]{% + \upmmakename[#1]{#2}{#3}{\ }, \upm@format@people@title{\upm@format@lang@professor}% +} + +%\drname[von]{firstname}{lastname} +%\drname*[von]{firstname}{lastname} +\def\drname{\@ifstar\upm@drnamestar\upm@drname} +\newcommand{\upm@drname}[3][\relax]{% + \upm@format@people@title{\upm@format@lang@doctor}~\upmmakename[#1]{#2}{#3}{\ }% +} +\newcommand{\upm@drnamestar}[3][\relax]{% + \upmmakename[#1]{#2}{#3}{\ }, \upm@format@people@title{\upm@format@lang@doctor}% +} + +%\phdname[von]{firstname}{lastname} +%\phdname*[von]{firstname}{lastname} +\def\phdname{\@ifstar\upm@phdnamestar\upm@phdname} +\newcommand{\upm@phdname}[3][\relax]{% + \upm@format@people@title{\upm@format@lang@phdoctor}~\upmmakename[#1]{#2}{#3}{\ }% +} +\newcommand{\upm@phdnamestar}[3][\relax]{% + \upmmakename[#1]{#2}{#3}{\ }, \upm@format@people@title{\upm@format@lang@phdoctor}% +} + +%\scdname[von]{firstname}{lastname} +%\scdname*[von]{firstname}{lastname} +\def\scdname{\@ifstar\upm@scdnamestar\upm@scdname} +\newcommand{\upm@scdname}[3][\relax]{% + \upm@format@people@title{\upm@format@lang@scdoctor}~\upmmakename[#1]{#2}{#3}{\ }% +} +\newcommand{\upm@scdnamestar}[3][\relax]{% + \upmmakename[#1]{#2}{#3}{\ }, \upm@format@people@title{\upm@format@lang@scdoctor}% +} + +%\mdname[von]{firstname}{lastname} +%\mdname*[von]{firstname}{lastname} +\def\mdname{\@ifstar\upm@mdnamestar\upm@mdname} +\newcommand{\upm@mdname}[3][\relax]{% + \upm@format@people@title{\upm@format@lang@mdoctor}~\upmmakename[#1]{#2}{#3}{\ }% +} +\newcommand{\upm@mdnamestar}[3][\relax]{% + \upmmakename[#1]{#2}{#3}{\ }, \upm@format@people@title{\upm@format@lang@mdoctor}% +} + +%\pengname[von]{firstname}{lastname} +%\pengname*[von]{firstname}{lastname} +\def\pengname{\@ifstar\upm@pengnamestar\upm@pengname} +\newcommand{\upm@pengname}[3][\relax]{% + \upm@format@people@title{\upm@format@lang@professionalengineer}~\upmmakename[#1]{#2}{#3}{\ }% +} +\newcommand{\upm@pengnamestar}[3][\relax]{% + \upmmakename[#1]{#2}{#3}{\ }, \upm@format@people@title{\upm@format@lang@professionalengineer}% +} + +%\iengname[von]{firstname}{lastname} +%\iengname*[von]{firstname}{lastname} +\def\iengname{\@ifstar\upm@iengnamestar\upm@iengname} +\newcommand{\upm@iengname}[3][\relax]{% + \upm@format@people@title{\upm@format@lang@incorporatedengineer}~\upmmakename[#1]{#2}{#3}{\ }% +} +\newcommand{\upm@iengnamestar}[3][\relax]{% + \upmmakename[#1]{#2}{#3}{\ }, \upm@format@people@title{\upm@format@lang@incorporatedengineer}% } %---------------------------------------- @@ -633,4 +869,59 @@ #1% }{\endgroup} +%---------------------------------------- +% FRAMED MINIPAGE +%---------------------------------------- + +\newsavebox{\upm@framed@minipage} +%\begin{framedminipage}{width}...\end{frameedminipage} +\newenvironment{framedminipage}[1]{% + \begin{lrbox}{\upm@framed@minipage}\begin{minipage}{#1}% + }{% + \end{minipage}\end{lrbox}\fbox{\usebox{\upm@framed@minipage}}} + +%---------------------------------------- +% HIGHLIGH BOXES +%---------------------------------------- + +\newsavebox{\upm@highlight@box@save} + +\newenvironment{upm@highligh@box}[2]{% + \par + \vspace{.5cm} + \begin{tabular}{|p{#1}|} + \hline + \begin{window}[0,l,{\mbox{\includegraphics[width=1cm]{#2}}},{}] +}{% + \end{window}\\ \hline \end{tabular} + \vspace{.5cm} + \par +} + +\newenvironment{upmcaution}[1][\linewidth]{% + \upm@highligh@box{#1}{caution.png}% +}{% + \endupm@highligh@box% +} + +\newenvironment{upminfo}[1][\linewidth]{% + \upm@highligh@box{#1}{info.png}% +}{% + \endupm@highligh@box% +} + +\newenvironment{upmquestion}[1][\linewidth]{% + \upm@highligh@box{#1}{question.png}% +}{% + \endupm@highligh@box% +} + +%---------------------------------------- +% PROVIDE URL MACROS, WHICH WILL BE +% OVERRIDDEN BY THE DOCUMENT CLASS +%---------------------------------------- + +\newcommand{\url}[2][]{\texttt{#2}} +\newcommand{\href}[3][]{\texttt{#3}} + \endinput diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty index 0f35ac7e19d..ded8bcfa8fe 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty @@ -1,6 +1,6 @@ % Front page for Unified Process Methodology % -% Copyright (c) 2006-2007 Stephane GALLAND <galland@arakhne.org> +% Copyright (c) 2006-2009 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,17 +19,23 @@ % % Creation date: 2006-04-11 % Modifications: +% 2009-10-30 Clean code. +% 2009-10-29 Major bug fix: invert order of the \setfrontillustration parameters. +% 2009-10-27 Clean the extension API. +% 2009-10-22 Add support for front page from UPM extensions. % 2007-07-05 Add people name formatting function. % 2007-07-03 Force single spacing inside the title. % 2007-03-19 Add localization. % 2006-04-19 Add version number. % -\global\edef\upm@package@fp@ver{2007/07/04} +\global\edef\upm@package@fp@ver{2009/10/30} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-frontpage}[\upm@package@fp@ver] +\RequirePackage{upmethodology-p-common} + %----- % Locales \def\upm@front@lang@english{ @@ -56,11 +62,7 @@ \ProcessOptions \upm@lang@@ -\RequirePackage{xspace} -\RequirePackage{tabularx} -\RequirePackage{graphicx} -\RequirePackage{setspace} - +\RequirePackage{upmethodology-extension} \RequirePackage{upmethodology-document} % Declare the temporary dimensions @@ -82,15 +84,16 @@ %----- % Define the command to put the title with a classic layout \newcommand{\upm@front@layout@classic}{% + \message{************ USE CLASSIC FRONT COVER} \begin{titlepage}% \begin{center} % Illustration picture - \ifx\upm@front@illustration\relax - \noindent\vfill\includegraphics[width=.4\linewidth]{\theupmdoclogo} - \else - \noindent\expandafter\includegraphics[width=\upm@front@illustration@size\expandafter\linewidth]{\upm@front@illustration} - \fi + \Ifelsedefined{frontillustration}{% + \noindent\expandafter\includegraphics[width=\Get{frontillustrationsize}\expandafter\linewidth]{\Get{frontillustration}} + }{% + \Ifdefined{logo}{\noindent\vfill\expandafter\includegraphics[width=.4\linewidth]{\Get{logo}}}% + }% % Project name \vspace{1cm} @@ -100,7 +103,7 @@ % Document title \noindent\rule{\linewidth}{1mm} \\ \noindent\raggedleft\upm@front@project@fmt{\theupmproject} \\ - \upm@ifnotempty{\theupmsubproject}{\noindent\raggedleft\upm@front@subproject@fmt{\theupmsubproject}\\} + \Ifnotempty{\theupmsubproject}{\noindent\raggedleft\upm@front@subproject@fmt{\theupmsubproject}\\} \vspace{.5cm} \noindent\raggedleft\upm@front@document@fmt{\theupmdocname} \\ \noindent\rule{\linewidth}{1mm} \\ @@ -116,14 +119,18 @@ \end{tabular} \vfill - \ifx\upm@front@illustration\relax - \noindent\raggedleft\upm@front@author@fmt{\upm@lang@front@authors:~\theauthorlist} \\ - \else - \noindent\begin{tabularx}{\linewidth}{l>{\raggedleft}X} - \includegraphics[width=.3\linewidth]{\theupmdoclogo} & - \upm@front@author@fmt{\upm@lang@front@authors:~\theauthorlist} \\ - \end{tabularx} - \fi + \Ifelsedefined{frontillustration}{% + \Ifelsedefined{logo}{% + \noindent\begin{tabularx}{\linewidth}{l>{\raggedleft}X}% + \expandafter\includegraphics[width=.3\linewidth]{\Get{logo}} & % + \upm@front@author@fmt{\upm@lang@front@authors:~\theauthorlist} \\% + \end{tabularx}% + }{% + \noindent\raggedleft\upm@front@author@fmt{\upm@lang@front@authors:~\theauthorlist} \\% + }% + }{% + \noindent\raggedleft\upm@front@author@fmt{\upm@lang@front@authors:~\theauthorlist} \\% + }% \end{center} \end{titlepage} @@ -133,13 +140,14 @@ %----- % Define the command to put the title with a classic layout \newcommand{\upm@front@layout@modern}{% + \message{************ USE MODERN FRONT COVER} \begin{titlepage}% % Project name \upm@front@maintitle@fmt{\theupmproject} \\ \noindent\rule{\linewidth}{.5mm} \\ % Document title - \upm@ifnotempty{\theupmsubproject}{\noindent\raggedright\upm@front@subproject@fmt{\theupmsubproject}\\} + \Ifnotempty{\theupmsubproject}{\noindent\raggedright\upm@front@subproject@fmt{\theupmsubproject}\\} \vspace{.5cm} \noindent\raggedright\upm@front@force@single@spacing{\upm@front@document@fmt{\theupmdocname}} @@ -147,12 +155,12 @@ \vbox{ \begin{picture}(0,0) - \ifx\upm@front@illustration\relax - \else - \put(-110,-100){ - \includegraphics[width=\upm@front@illustration@size\expandafter\linewidth]{\upm@front@illustration} + \Ifelsedefined{frontillustration}{% + \put(-110,-100){% + \includegraphics[width=\Get{frontillustrationsize}\expandafter\linewidth]{\Get{frontillustration}}% + }% + }{% } - \fi \upm@front@tmpa=\linewidth \advance\upm@front@tmpa-.4\linewidth \put(\strip@pt\upm@front@tmpa,75){ @@ -165,8 +173,10 @@ } \upm@front@tmpa=\linewidth \advance\upm@front@tmpa-.3\linewidth - \put(\strip@pt\upm@front@tmpa,-50){ - \includegraphics[width=.3\linewidth]{\theupmdoclogo}% + \Ifdefined{logo}{ + \put(\strip@pt\upm@front@tmpa,-50){ + \expandafter\includegraphics[width=.3\linewidth]{\Get{logo}}% + } } \end{picture} @@ -174,37 +184,58 @@ \end{titlepage} } -%---- -% Set the front page layout as the classic layout theme -%\setfrontlayout{layout_name} -\newcommand{\setfrontlayout}[1]{% +\newcommand{\upm@front@setfrontlayout}[2]{% \ifthenelse{\equal{#1}{classic}}{% - \gdef\upm@front@illustration@size{.6} + \Set{frontillustrationsize}{.6}% \global\let\upm@front@layout\upm@front@layout@classic% }{% \ifthenelse{\equal{#1}{modern}}{% - \gdef\upm@front@illustration@size{1} + \Set{frontillustrationsize}{1} \global\let\upm@front@layout\upm@front@layout@modern% }{% - \errmessage{invalid front layout theme: #1}% + \ifthenelse{\equal{#1}{custom}}{#2}{\errmessage{invalid front layout theme: #1}}% }% }% } -\setfrontlayout{classic} - -\AtBeginDocument{% - \renewcommand{\maketitle}{\upm@front@layout}% +%---- +% Set the front page layout as the classic layout theme +%\setfrontcover{layout_name} +\newcommand{\setfrontcover}[1]{% + \upm@front@setfrontlayout{#1}{\errmessage{invalid front layout theme: #1}}% } - -\let\upm@front@illustration\relax +\newcommand{\setfrontlayout}[1]{\errmessage{"\string\setfrontlayout" is deprecated. Use "\string\setfrontcover" insteed}} + +\setfrontcover{classic} + +\renewcommand{\maketitle}{% + \Ifdefined{frontpage}{ + \upm@front@setfrontlayout{\Get{frontpage}}{% + \message{************ USE CUSTOM FRONT COVER} + \gdef\upm@front@layout{% + \begin{titlepage}% + \Get{frontpage@custom}% + \end{titlepage}% + }% + }% + }% + \upm@front@layout}% +\newcommand{\makefrontcover}{\maketitle} %---- % Set the illustration figure on the front page %\setfrontillustration[size_factor]{filename} \newcommand{\setfrontillustration}[2][1]{% - \gdef\upm@front@illustration{#2}% - \gdef\upm@front@illustration@size{#1}% + \Set{frontillustrationsize}{#1}% + \Set{frontillustration}{#2}% +} + +%---- +% Clear the illustration figure on the front page +%\clearfrontillustration +\newcommand{\clearfrontillustration}{% + \Set{frontillustrationsize}{1}% + \Unset{frontillustration}% } \endinput diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty new file mode 100644 index 00000000000..3768fc94363 --- /dev/null +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty @@ -0,0 +1,137 @@ +% Copyright (c) 2009 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 +% published by the Free Software Foundation; either version 3 of the +% License, or any later version. +% +% This library is distributed in the hope that it will be useful, but +% WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +% Lesser General Public License for more details. +% +% You should have received a copy of the GNU Lesser General Public +% License along with this library; see the file COPYING. If not, +% write to the Free Software Foundation, Inc., 59 Temple Place - Suite +% 330, Boston, MA 02111-1307, USA. +% +% Creation date: 2009-10-30 +% Modifications (lastest first): +% 2009-11-03 \If* macros are marked with \long +% 2009-11-02 Add internal commands for footnotes. +% + +\global\edef\upm@package@private@doctype@ver{2009/11/03} + +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\ProvidesPackage{upmethodology-p-doctype}[\upm@package@private@doctype@ver] + +\RequirePackage{ifthen} +\RequirePackage{xspace} +\RequirePackage{color} + +%---------------------------------------- +% ARAKHNE.ORG MACRO +%---------------------------------------- +\providecommand{\arakhneorg}{{\begingroup% + {\usefont{T1}{pzc}{m}{it}\selectfont Arakhn\^e}% + {\usefont{T1}{phv}{bc}{sc}\selectfont\tiny.org}\endgroup}\xspace} + +%---------------------------------------- +% CURRENT LANGUAGE +%---------------------------------------- +\def\upmcurrentlang{english} + +%---------------------------------------- +% TEST MACROS +%---------------------------------------- +\long\def\Ifnotempty#1{\ifthenelse{\equal{#1}{\@empty}}{}} +\long\def\Ifempty#1#2{\ifthenelse{\equal{#1}{\@empty}}{#2}{}} +\long\def\Ifelseempty#1#2#3{\ifthenelse{\equal{#1}{\@empty}}{#2}{#3}} + +%---------------------------------------- +% DOCUMENT TYPE +%---------------------------------------- +\newif\ifupmbookformat +\newif\ifupmreportformat +\newif\ifupmarticleformat + +\upmbookformatfalse +\upmreportformattrue +\upmarticleformatfalse + +%---------------------------------------- +% PDF COLORS +%---------------------------------------- +\newcommand{\setpdfcolor}[1]{} + +%---------------------------------------- +% CREATE COMMAND WITH ID AS NAME +%---------------------------------------- +\def\upm@protect#1{\upm@p@protect #1\relax} +\def\upm@p@protect#1#2\relax{% + \ifx\relax #1% + \relax + \else% + \string #1% + \ifx\relax #2% + \relax + \else + \upm@p@protect #2\relax% + \fi + \fi} + +\def\upm@namedef#1#2{% + \@namedef{\upm@protect{#1}}{#2}% +} + +\def\upm@nameuse#1{% + \@nameuse{\upm@protect{#1}}% +} + +\def\upm@nameundef#1{% + \expandafter\let\csname\upm@protect{#1}\endcsname\relax% +} + +\def\upm@ifdefinedname#1#2#3{% + \expandafter\ifx\csname\upm@protect{#1}\endcsname\relax% + #3% + \else% + #2% + \fi% +} + +%---------------------------------------- +% GET THE REFERENCE ID WITHOUT \REF +%---------------------------------------- +\gdef\upm@getref#1{% + \expandafter\ifx\csname r@#1\endcsname\relax + \nfss@text{\reset@font\bfseries ??}% + \else + \expandafter\expandafter\expandafter\@car\csname r@#1\endcsname\@nil + \fi +} + +\gdef\upm@getpageref@filter#1#2#3#4#5{#2} + +\gdef\upm@getpageref#1{% + \expandafter\ifx\csname r@#1\endcsname\relax + \nfss@text{\reset@font\bfseries ??}% + \else% + \protected@xdef\upm@p@tmp@tmp{\protect\upm@getpageref@filter\csname r@#1\endcsname}% + \upm@p@tmp@tmp% + \global\let\upm@p@tmp@tmp\relax% + \fi +} + +%---------------------------------------- +% INTERNAL COMMAND FOR TEXT SUPPER/SUB SCRIPT +%---------------------------------------- + +\let\upm@textsuperscript\textsuperscript + +\def\upm@textsubscript#1{% + {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}} + + +\endinput diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty index 4249e7b44a7..0ad41328ee0 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-spec.sty @@ -19,16 +19,18 @@ % % Creation date: 2006-04-27 % Modifications: +% 2009-10-30 Clean code. % 2007-03-19 Add localization. % -\global\edef\upm@package@spec@ver{2007/03/19} +\global\edef\upm@package@spec@ver{2009/10/30} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-spec}[\upm@package@spec@ver] +\RequirePackage{upmethodology-p-common} + \RequirePackage[normalem]{ulem} -\RequirePackage{tabularx} \RequirePackage{upmethodology-fmt} \RequirePackage{upmethodology-code} @@ -378,33 +380,6 @@ \upm@spec@showparamstrue% }% -% \global\let\upm@arraycr\@arraycr -% \gdef\@arraycr{(\the\pagetotal)\upm@arraycr} -% \newdimen\upm@spec@total\upm@spec@total\pagetotal -% \newdimen\upm@spec@left -% \upm@spec@left=\@colroom -% \gdef\@arraycr{ -% \upm@arraycr -% } -% \newdimen\upm@spec@pagesize -% \upm@spec@pagesize=\@colroom - -% \def\upm@spec@arraycr{{\ifnum0=`}\fi\@ifstar{\upm@spec@xarraycr}{\upm@spec@xarraycr}} -% \def\upm@spec@xarraycr{\@ifnextchar[{\upm@spec@argarraycr}{\ifnum0=`{\fi}\cr\upm@spec@cr}} -% \def\upm@spec@argarraycr[#1]{% -% \ifnum0=`{\fi}% -% \ifdim #1>\z@ -% \unskip\ST@xargarraycr{#1} -% \else -% \ST@yargarraycr{#1}% -% \fi} -% \def\ST@xargarraycr#1{% -% \@tempdima #1\advance\@tempdima \dp \@arstrutbox -% \vrule \@height\z@ \@depth\@tempdima \@width\z@ \cr -% \noalign{\global\ST@toadd=#1}\ST@cr} -% \def\ST@yargarraycr#1{% -% \cr\noalign{\vskip #1\global\ST@toadd=#1}\ST@cr} - \vspace{.5cm}\noindent\begin{tabularx}{\the\upm@spec@detailspec@width}{|clr@{}>{\raggedright\arraybackslash}X|} \upm@spec@reserved@c% \upm@detailspec@start@hline% diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-task.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-task.sty index 90468a7b81a..fdc90a712ac 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-task.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-task.sty @@ -19,14 +19,17 @@ % % Creation date: 2006-04-20 % Modifications: +% 2009-10-30 Clean code. % 2007-03-19 Add localization. % -\global\edef\upm@package@task@ver{2007/03/19} +\global\edef\upm@package@task@ver{2009/10/30} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-task}[\upm@package@task@ver] +\RequirePackage{upmethodology-p-common} + %----- LOCALIZATION \def\upm@task@lang@english{ \gdef\upm@lang@@{\message{**** upmethodology-task is using English language ****}}% diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty index 0b5eed82617..c2ed1da2355 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty @@ -19,17 +19,21 @@ % % Creation date: 2006-04-06 % Modifications: +% 2009-10-30 Clean code. +% 2008-06-24 Update English words. % 2007-07-03 Add the copyright date building function. % 2007-03-19 Add localization. % Move date functions into fmt package. % 2006-04-19 Add version number % -\global\edef\upm@package@version@ver{2007/07/03} +\global\edef\upm@package@version@ver{2009/10/30} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-version}[\upm@package@version@ver] +\RequirePackage{upmethodology-p-common} + %locales \def\upm@version@lang@english{ \gdef\upm@lang@@{\message{**** upmethodology-version is using English language ****}}% @@ -37,7 +41,7 @@ \gdef\upm@lang@updates{Updates} \gdef\upm@lang@version{Version} \gdef\upm@lang@version@history{Version History} - \gdef\upm@lang@restricted{Restricted} + \gdef\upm@lang@restricted{Confidential} \gdef\upm@lang@validable{Validable} \gdef\upm@lang@validated{Validated} \gdef\upm@lang@public{Public} |