summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/upmethodology
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-26 23:20:24 +0000
committerKarl Berry <karl@freefriends.org>2013-12-26 23:20:24 +0000
commit5406241703f490e61300636739ae7294e7edd1ce (patch)
treeb62d5d8f1abd43ddd2fabffe6e097eecff12bb55 /Master/texmf-dist/tex/latex/upmethodology
parent407b969501bb500853f34eb44afffd3db568c9a8 (diff)
upmethodology (26dec13)
git-svn-id: svn://tug.org/texlive/trunk@32493 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/upmethodology')
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def2
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty13
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls123
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty144
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty40
5 files changed, 219 insertions, 103 deletions
diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
index 4d43eaf7d5f..18ca08df2d9 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
+++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
@@ -1 +1 @@
-\def\UPMVERSION{20130929}
+\def\UPMVERSION{20131214}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty
index cb92463ed2d..32df29b7fc6 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-backpage.sty
@@ -1,6 +1,6 @@
% Back page for Unified Process Methodology
%
-% Copyright (c) 2009 Stephane GALLAND <galland@arakhne.org>
+% Copyright (c) 2009-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
@@ -16,14 +16,8 @@
% 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}
+\global\edef\upm@package@bp@ver{2013/12/14}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-backpage}[\upm@package@bp@ver]
@@ -76,7 +70,8 @@
\ifupmarticleformat\clearpage%
\else
\cleardoublepage%
- \if@twoside\thispagestyle{empty}\mbox{}\clearpage\fi
+ \if@twoside\thispagestyle{empty}\mbox{}%
+ \vfill{\Get{backcovermessage}}\clearpage\fi
\fi
\thispagestyle{empty}\Get{backpage}
}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
index 94372cf9632..c5105d720ec 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{2013/09/29}
+\global\edef\upm@package@docclazz@ver{2013/10/09}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver]
@@ -76,7 +76,7 @@
\global\upmarticleformatfalse
\global\upm@package@docclazz@nopubpagefalse%
\global\upm@package@docclazz@nodocinfofalse%
- \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,twoside}%
+ \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,twoside,openright}%
}
\DeclareOption{report}{%
\global\upmbookformatfalse
@@ -113,7 +113,6 @@
\fi\fi
\RequirePackage{a4wide}
-\RequirePackage{fancyhdr}
\RequirePackage{upmethodology-document}
\RequirePackage{upmethodology-extension}
@@ -124,23 +123,39 @@
\RequirePackage{upmethodology-spec}
\RequirePackage{url}
-\RequirePackage[pdftex,
- 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}
+\ifpdf
+ \RequirePackage[pdftex,
+ 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}
+\else
+ \RequirePackage[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
+ ]{hyperref}
+\fi
\urlstyle{same}
-\pdfpageheight=29.7cm
-\pdfpagewidth=21.0cm
+\ifpdf
+ \pdfpageheight=29.7cm
+ \pdfpagewidth=21.0cm
+\fi
%----------------------------------------
% HEADERS AND FOOTERS
@@ -149,46 +164,42 @@
\def\upm@header@fmt#1{\textsc{\scriptsize #1}}
\def\upm@copyright@fmt#1{\textsc{\tiny #1}}
-\pagestyle{fancyplain}
+\global\let\upm@package@docclazz@old@pagestyle\pagestyle
+\gdef\pagestyle#1{%
+ \gdef\upm@package@docclazz@saved@pagestyle{#1}%
+ \upm@package@docclazz@old@pagestyle{#1}%
+}
+\gdef\upm@package@docclazz@saved@pagestyle{headings}%
+\upm@package@docclazz@old@pagestyle{headings}
\newdimen{\upm@smalllogo@height}
\upm@smalllogo@height=1cm
-\if@twoside
-
-\lhead[]{\fancyplain{}{\upm@header@fmt{\theupmfulldocname}}}
-\chead{}
-\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~\theupmformattedcopyrighter}]{\upm@header@fmt{\ifthenelse{\thepage>0}{\thepage}{}}}
-
-\else
-
-\lhead{\fancyplain{}{\upm@header@fmt{\theupmfulldocname}}}
-\chead{}
-\rhead{\Ifdefined{smalllogo}{\expandafter\includegraphics[height=\upm@smalllogo@height]{\theupmsmalldoclogo}}}
-\lfoot{\upm@copyright@fmt{\tiny\theupmdocref~\copyright~\upmcopyrightdate~\theupmformattedcopyrighter}}
-\cfoot{}
-\rfoot{\upm@header@fmt{\ifthenelse{\thepage>0}{\thepage}{}}}
-
-\fi
-
%----------------------------------------
% FRONT, MAIN AND BACK MATTERS
%----------------------------------------
\global\let\upm@package@docclazz@frontmatter\frontmatter
-\gdef\frontmatter{\pagestyle{headings}\pagenumbering{roman}\global\let\frontmatter\relax}
+\gdef\frontmatter{%
+ \upm@package@docclazz@old@pagestyle{headings}%
+ \pagenumbering{roman}%
+ \global\let\frontmatter\relax%
+}
\global\let\upm@package@docclazz@mainmatter\mainmatter
-\gdef\mainmatter{\cleardoublepage\pagestyle{fancyplain}\upm@package@docclazz@mainmatter}
+\gdef\mainmatter{%
+ \upm@package@docclazz@mainmatter%
+ \global\let\frontmatter\relax%
+ \global\let\mainmatter\relax%
+}
-%\global\let\upm@package@docclazz@backmatter\backmatter
-%\gdef\backmatter{%
-% \pagestyle{plain}
-% \upm@package@docclazz@backmatter%
-%}
+\global\let\upm@package@docclazz@backmatter\backmatter
+\gdef\backmatter{%
+ \upm@package@docclazz@backmatter%
+ \global\let\frontmatter\relax%
+ \global\let\mainmatter\relax%
+ \global\let\backmatter\relax%
+}
%----------------------------------------
% AUTO-GENERATED DOCUMENT
@@ -210,16 +221,18 @@
% 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
+\ifpdf
+ \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
+ }
}
-}
+\fi
%----------------------------------------
% SET FORBIDDEN SECTIONNING FUNCTIONS
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index 0e56a9a08d4..43e7b695903 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm@package@fmt@ver{2013/09/26}
+\global\edef\upm@package@fmt@ver{2013/10/16}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -147,7 +147,11 @@
% DEFAULT GRAPHICX CONFIGURATION
%----------------------------------------
-\DeclareGraphicsExtensions{.pdf,.png,.jpg,.jpeg,.tiff,.gif}
+\ifpdf
+ \DeclareGraphicsExtensions{.pdf,.png,.jpg,.jpeg,.gif}
+\else
+ \DeclareGraphicsExtensions{.eps,.png,.jpg,.jpeg,.gif}
+\fi
\graphicspath{{./}}
%----------------------------------------
@@ -250,7 +254,11 @@
\providecommand{\DeclareGraphicsExtensionsWtex}[1]{%
\xdef\@autolatex@wtfig@extensions{\zap@space#1 \@empty}%
}
-\DeclareGraphicsExtensionsWtex{.pdftex_t,.pstex_t,.pdf_tex,.ps_tex}
+\ifpdf
+ \DeclareGraphicsExtensionsWtex{.pdftex_t,.pdf_tex}
+\else
+ \DeclareGraphicsExtensionsWtex{.pstex_t,.ps_tex}
+\fi
\providecommand{\@autolatex@wtfig@searchinpath}[1]{%
\IfFileExists{#1}{%
@@ -675,16 +683,20 @@
\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{\@ifnextchar[%
+ {\upm@format@newsection@chapter@a}%
+ {\upm@format@newsection@chapter@b}%
}
-\def\upm@format@newsection@chapter@nopt#1{%
- \@schapter{#1\addcontentsline{toc}{chapter}{\upm@format@newsection@alignment{#1}}}%
- \chaptermark{#1}%
+
+\def\upm@format@newsection@chapter@a[#1]#2{%
+ \expandafter\chapter*[#1]{#2}%
+ \addcontentsline{toc}{chapter}{\upm@format@newsection@alignment{#1}}%
+}
+
+\def\upm@format@newsection@chapter@b#1{%
+ \expandafter\chapter*{#1}%
+ \addcontentsline{toc}{chapter}{\upm@format@newsection@alignment{#1}}%
}
%-----
@@ -738,6 +750,54 @@
\subsubsection*{#1\addcontentsline{toc}{subsubsection}{\upm@format@newsection@alignment{#1}}}%
}
+%-----
+% Chapter with different titles for in the TOC, the headers and on the pages
+%\chapterfull[in toc]{on page}{in header} % with number
+%\chapterfull*[in toc]{on page}{in header} % without number
+\def\chapterfull{\@ifstar%
+ {\gdef\upm@format@newsection@thesectionmacro{\chapter*}\upm@format@newsection@chapterfull}%
+ {\gdef\upm@format@newsection@thesectionmacro{\chapter}\upm@format@newsection@chapterfull}%
+}
+
+\def\upm@format@newsection@chapterfull{\@ifnextchar[%
+ \upm@format@newsection@chapterfull@a%
+ \upm@format@newsection@chapterfull@b%
+}
+
+\def\upm@format@newsection@chapterfull@a[#1]#2#3{%
+ \upm@format@newsection@thesectionmacro[#1]{#2}%
+ \chaptermark{#3}%
+}
+
+\def\upm@format@newsection@chapterfull@b#1#2{%
+ \upm@format@newsection@thesectionmacro{#1}%
+ \chaptermark{#2}%
+}
+
+%-----
+% Section with different titles for in the TOC, the headers and on the pages
+%\sectionfull[in toc]{on page}{in header} % with number
+%\sectionfull*[in toc]{on page}{in header} % without number
+\def\sectionfull{\@ifstar%
+ {\gdef\upm@format@newsection@thesectionmacro{\section*}\upm@format@newsection@sectionfull}%
+ {\gdef\upm@format@newsection@thesectionmacro{\section}\upm@format@newsection@sectionfull}%
+}
+
+\def\upm@format@newsection@sectionfull{\@ifnextchar[%
+ \upm@format@newsection@sectionfull@a%
+ \upm@format@newsection@sectionfull@b%
+}
+
+\def\upm@format@newsection@sectionfull@a[#1]#2#3{%
+ \upm@format@newsection@thesectionmacro[#1]{#2}%
+ \global\sectionmark{#3}%
+}
+
+\def\upm@format@newsection@sectionfull@b#1#2{%
+ \upm@format@newsection@thesectionmacro{#1}%
+ \global\sectionmark{#2}%
+}
+
%----------------------------------------
% BIBLIOGRAPHY
%----------------------------------------
@@ -854,21 +914,31 @@
% PEOPLE NAME
%----------------------------------------
-\newcommand{\makenamespacing}[1]{%
- \expandafter\upm@foreach.\in#1\do{%
+\def\makenamespacing#1{%
+ \upm@format@makenamespacing{#1}\xspace%
+}
+
+\def\upm@format@makenamespacing#1{%
+ \upm@foreach.\in#1\do{%
\ignorespaces\upm@foreach@term.\,%
}{%
- \ignorespaces\upm@foreach@term\xspace%
+ \ignorespaces\upm@foreach@term%
}%
- \ignorespaces
}
+\gdef\upm@format@people@title#1{\textsc{#1}}
+\def\upm@format@firstname@format#1{%
+ {\smaller\textsc{\upm@format@makenamespacing{#1}}}%
+}
+\def\upm@format@von@format#1{\mbox{\smaller\ignorespaces#1}}
+\def\upm@format@lastname@format#1{\textsc{\ignorespaces#1}}
+
%\upmmakename[von]{firstname}{lastname}{separator}
\newcommand{\upmmakename}[4][\relax]{%
\ifx#1\relax%
- {\mbox{\smaller \makenamespacing{#2}}#4\textsc{\ignorespaces#3}}%
+ {\upm@format@firstname@format{#2}#4\upm@format@lastname@format{#3}}%
\else%
- {\mbox{\smaller \makenamespacing{#2}}#4\mbox{\smaller #1}#4\textsc{\ignorespaces#3}}%
+ {\upm@format@firstname@format{#2}#4\upm@format@von@format{#1}#4\upm@format@lastname@format{#3}}%
\fi%
\xspace%
}
@@ -879,15 +949,25 @@
}
%\makelastname[von]{lastname}
-\newcommand{\makelastname}[2][\relax]{\mbox{\smaller#1} \textsc{\ignorespaces#2}\xspace}
+\newcommand{\makelastname}[2][\relax]{%
+ \ifx#1\relax%
+ \upm@format@lastname@format{#2}%
+ \else%
+ \upm@format@von@format{#1}\ \upm@format@lastname@format{#2}%
+ \fi%
+ \xspace%
+}
-\gdef\upm@format@people@title#1{\textsc{#1}}
+%\makefirstname{firstname}
+\newcommand{\makefirstname}[1]{%
+ \upm@format@firstname@format{#1}\xspace%
+}
%\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}{\ }%
+ \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}%
@@ -897,7 +977,7 @@
%\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}{\ }%
+ \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}%
@@ -907,7 +987,7 @@
%\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}{\ }%
+ \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}%
@@ -917,7 +997,7 @@
%\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}{\ }%
+ \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}%
@@ -927,7 +1007,7 @@
%\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}{\ }%
+ \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}%
@@ -937,7 +1017,7 @@
%\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}{\ }%
+ \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}%
@@ -947,7 +1027,7 @@
%\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}{\ }%
+ \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}%
@@ -1006,18 +1086,18 @@
%----------------------------------------
% DESCRIPTION LIST WITH BULLETS
%----------------------------------------
-\gdef\upm@fmt@itemizeddescription@separator{\iflanguage{french}{ :}{:}}
+\gdef\upm@fmt@itemizeddescription@separator{\iflanguage{french}{ :}{:}\ }
\newcommand{\upm@fmt@itemizeddescription@formatdescription}[1]{\textbf{#1}}
-\newcommand{\upm@fmt@itemizeddescription@desc}[1]{%
- \upm@fmt@itemizeddescription@formatdescription{#1\upm@fmt@itemizeddescription@separator}\ %
+\newcommand{\upm@fmt@itemizeddescription@desc}[2]{%
+ \upm@fmt@itemizeddescription@formatdescription{#1#2}%
}
\let\upm@fmt@olditem\item
\let\upm@item@param\upm@fmt@olditem
\let\upm@item@noparam\upm@fmt@olditem
\def\item{\@ifnextchar[\upm@item@param\upm@item@noparam}
-\renewenvironment{description}[1][]{%
+\renewenvironment{description}[1][\upm@fmt@itemizeddescription@separator]{%
\begin{itemize}%
- \renewcommand{\upm@item@param}[1][]{\upm@fmt@olditem \upm@fmt@itemizeddescription@desc{##1}}%
+ \renewcommand{\upm@item@param}[1][]{\upm@fmt@olditem \upm@fmt@itemizeddescription@desc{##1}{#1}}%
\renewcommand{\upm@item@noparam}{\upm@fmt@olditem }%
}{%
\end{itemize}%
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
index 119e4e320d7..e28af917933 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
@@ -16,7 +16,7 @@
% 330, Boston, MA 02111-1307, USA.
%
-\global\edef\upm@package@private@doctype@ver{2013/09/29}
+\global\edef\upm@package@private@doctype@ver{2013/10/14}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-p-common}[\upm@package@private@doctype@ver]
@@ -24,6 +24,7 @@
\RequirePackage{ifthen}
\RequirePackage{xspace}
\RequirePackage{xcolor}
+\RequirePackage{ifpdf}
%----------------------------------------
% UPMVERSION MACRO
@@ -58,6 +59,11 @@
\long\def\Ifelseempty#1#2#3{\ifthenelse{\equal{#1}{\@empty}}{#2}{#3}}
%----------------------------------------
+% TOC MACROS
+%----------------------------------------
+\newcommand{\newpageintoc}{\addtocontents{toc}{\protect\newpage}}
+
+%----------------------------------------
% DOCUMENT TYPE
%----------------------------------------
\newif\ifupmbookformat
@@ -158,10 +164,10 @@
\let\upm@foreach@end\relax
-\def\upm@foreach@rec#1#2{%
- {\upm@foreach@searchseparator#2\upm@foreach@end\@nil}%
+\def\upm@foreach@rec#1{%
+ {\upm@foreach@searchseparator#1\upm@foreach@end\@nil}%
\ifupm@foreach@hasseparator%
- \protected@xdef\upm@foreach@continue{\protect\upm@foreach@rec{#1}{\upm@foreach@rest}}%
+ \protected@xdef\upm@foreach@continue{\protect\upm@foreach@rec{\upm@foreach@rest}}%
\upm@foreach@body%
\upm@foreach@continue%
\else%
@@ -188,10 +194,32 @@
\global\upm@foreach@hasseparatortrue%
\global\upm@foreach@oneseparatortrue%
\fi%
- }
+ }%
\gdef\upm@foreach@body{#3}%
\gdef\upm@foreach@lastbody{#4}%
- \upm@foreach@rec{#1}{#2#1}%
+ \upm@foreach@rec{#2#1}%
+}
+
+%-----------------------------------------
+% Option parameters
+\newif\ifupm@common@optlist@needdefault
+\gdef\upm@common@optlist@parseparams#1=#2\@nil{%
+ \ifthenelse{\equal{#2}{===}}{%
+ \global\upm@common@optlist@needdefaulttrue%
+ }{%
+ \global\upm@common@optlist@needdefaultfalse%
+ }%
+}
+\DeclareRobustCommand{\upm@common@optlist}[1]{%
+ {\upm@common@optlist@parseparams #1====\@nil}%
+}
+\newcommand{\upm@setkeys}[3]{%
+ \upm@common@optlist{#3}%
+ \ifupm@common@optlist@needdefault%
+ \expandafter\setkeys{#1}{#2=#3}%
+ \else%
+ \expandafter\setkeys{#1}{#3}%
+ \fi%
}
\endinput