summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/upmethodology
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-24 22:26:11 +0000
committerKarl Berry <karl@freefriends.org>2013-09-24 22:26:11 +0000
commit8524fde36458c91ae6261e04a9ab4093514adff9 (patch)
treed6175ec64b16092a74968abe31df1067d616c937 /Master/texmf-dist/tex/latex/upmethodology
parent8f3ce97709cf2f405b02c0b2a75f9ce9484394bf (diff)
upmethodology (24sep13)
git-svn-id: svn://tug.org/texlive/trunk@31742 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/upmethodology')
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls15
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty308
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty48
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty14
4 files changed, 307 insertions, 78 deletions
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
index 3ff04be2020..4e993264da1 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/08/15}
+\global\edef\upm@package@docclazz@ver{2013/09/05}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver]
@@ -221,4 +221,17 @@
\fi\fi
+
+\global\let\upm@package@docclazz@frontmatter\frontmatter
+\gdef\frontmatter{\pagestyle{headings}\pagenumbering{roman}}
+
+\global\let\upm@package@docclazz@mainmatter\mainmatter
+\gdef\mainmatter{\cleardoublepage\pagestyle{fancyplain}\upm@package@docclazz@mainmatter}
+
+%\global\let\upm@package@docclazz@backmatter\backmatter
+%\gdef\backmatter{%
+% \pagestyle{plain}
+% \upm@package@docclazz@backmatter%
+%}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index 9e5c1ca4c24..b37b3727a10 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/08/17}
+\global\edef\upm@package@fmt@ver{2013/09/19}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -91,6 +91,8 @@
\RequirePackage{colortbl}
\RequirePackage{picinpar}
\RequirePackage{amsmath}
+\RequirePackage{amsthm}
+\RequirePackage{thmtools}
\RequirePackage{pifont}
\RequirePackage{setspace}
\RequirePackage{varioref}
@@ -98,6 +100,7 @@
\RequirePackage{relsize}
\RequirePackage{xkeyval}
\RequirePackage{hyphenat}
+\RequirePackage{bbm}
%----------------------------------------
% Exponent and indice
@@ -129,6 +132,18 @@
\newcommand{\uth}{\textsup{th}}
%----------------------------------------
+% MATH SYMBOLS
+%----------------------------------------
+\newcommand{\R}{\ensuremath{\mathbb{R}}}
+\newcommand{\N}{\ensuremath{\mathbb{N}}}
+\newcommand{\Z}{\ensuremath{\mathbb{Z}}}
+\newcommand{\C}{\ensuremath{\mathbb{C}}}
+\newcommand{\Q}{\ensuremath{\mathbb{Q}}}
+\newcommand{\powerset}{\ensuremath{\mathcal{P}}}
+
+\DeclareMathOperator{\sgn}{sgn}
+
+%----------------------------------------
% DEFAULT GRAPHICX CONFIGURATION
%----------------------------------------
@@ -279,7 +294,7 @@
\fi%
%
\ifx\@autolatex@wtfig@tmp\relax%
- \errmessage{Package autolatex: File not found '#2', needed for figure inclusion.}%
+ \errmessage{Package upmethodology-fmt: File not found '#2', needed for figure inclusion}%
\else%
\@autolatex@wtfig@tmp%
\fi%
@@ -363,76 +378,134 @@
% TABLES
%----------------------------------------
-%title of a table
-\def\upm@fmt@table@title#1{\color{fronttableheader}{\bfseries #1}}
-%title of columns
-\def\upm@fmt@table@column@title#1{\mbox{}\hfil{\itshape \mbox{\color{fronttableheader}{#1}}}\hfil\mbox{}}
%table's colors
\definecolor{backtableheader}{rgb}{0.92,0.94,1}
\definecolor{fronttableheader}{rgb}{0.23,0.33,0.48}
+%title of a table
+\def\upm@fmt@table@title#1{\color{fronttableheader} \cellcolor{backtableheader} {\bfseries #1}}
+%title of columns
+\def\upm@fmt@table@column@title#1{\hfil{\color{fronttableheader} \cellcolor{backtableheader} {\itshape#1}}\hfil}
-%List of functions able to build an header
-\newif\ifupm@havetitle
-\def\upm@hline{\\\hline}
-\expandafter\def\csname upm@tableheader@b@1\endcsname#1{\protect\upm@fmt@table@column@title{#1} \protect\\}
-\expandafter\protected@edef\csname upm@tableheader@b@2\endcsname#1#2{%
- \protect\upm@fmt@table@column@title{#1} & \csname upm@tableheader@b@1\endcsname{#2}}
-\expandafter\protected@edef\csname upm@tableheader@b@3\endcsname#1#2#3{%
- \protect\upm@fmt@table@column@title{#1} & \csname upm@tableheader@b@2\endcsname{#2}{#3}}
-\expandafter\protected@edef\csname upm@tableheader@b@4\endcsname#1#2#3#4{%
- \protect\upm@fmt@table@column@title{#1} & \csname upm@tableheader@b@3\endcsname{#2}{#3}{#4}}
-\expandafter\protected@edef\csname upm@tableheader@b@5\endcsname#1#2#3#4#5{%
- \protect\upm@fmt@table@column@title{#1} & \csname upm@tableheader@b@4\endcsname{#2}{#3}{#4}{#5}}
-\expandafter\protected@edef\csname upm@tableheader@b@6\endcsname#1#2#3#4#5#6{%
- \protect\upm@fmt@table@column@title{#1} & \csname upm@tableheader@b@5\endcsname{#2}{#3}{#4}{#5}{#6}}
-\expandafter\protected@edef\csname upm@tableheader@b@7\endcsname#1#2#3#4#5#6#7{%
- \protect\upm@fmt@table@column@title{#1} & \csname upm@tableheader@b@6\endcsname{#2}{#3}{#4}{#5}{#6}{#7}}
-\expandafter\protected@edef\csname upm@tableheader@b@8\endcsname#1#2#3#4#5#6#7#8{%
- \protect\upm@fmt@table@column@title{#1} & \csname upm@tableheader@b@7\endcsname{#2}{#3}{#4}{#5}{#6}{#7}{#8}}
-\expandafter\protected@edef\csname upm@tableheader@b@9\endcsname#1#2#3#4#5#6#7#8#9{%
- \protect\upm@fmt@table@column@title{#1} & \csname upm@tableheader@b@8\endcsname{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}}
-
-\expandafter\def\csname upm@tableheader@c@1\endcsname#1{\ifupm@havetitle\else\hline\fi\rowcolor{backtableheader}\csname upm@tableheader@b@1\endcsname{#1}}
-\expandafter\def\csname upm@tableheader@c@2\endcsname#1#2{\ifupm@havetitle\else\hline\fi\rowcolor{backtableheader}\csname upm@tableheader@b@2\endcsname{#1}{#2}}
-\expandafter\def\csname upm@tableheader@c@3\endcsname#1#2#3{\ifupm@havetitle\else\hline\fi\rowcolor{backtableheader}\csname upm@tableheader@b@3\endcsname{#1}{#2}{#3}}
-\expandafter\def\csname upm@tableheader@c@4\endcsname#1#2#3#4{\ifupm@havetitle\else\hline\fi\rowcolor{backtableheader}\csname upm@tableheader@b@4\endcsname{#1}{#2}{#3}{#4}}
-\expandafter\def\csname upm@tableheader@c@5\endcsname#1#2#3#4#5{\ifupm@havetitle\else\hline\fi\rowcolor{backtableheader}\csname upm@tableheader@b@5\endcsname{#1}{#2}{#3}{#4}{#5}}
-\expandafter\def\csname upm@tableheader@c@6\endcsname#1#2#3#4#5#6{\ifupm@havetitle\else\hline\fi\rowcolor{backtableheader}\csname upm@tableheader@b@6\endcsname{#1}{#2}{#3}{#4}{#5}{#6}}
-\expandafter\def\csname upm@tableheader@c@7\endcsname#1#2#3#4#5#6#7{\ifupm@havetitle\else\hline\fi\csname upm@tableheader@b@7\endcsname{#1}{#2}{#3}{#4}{#5}{#6}{#7}}
-\expandafter\def\csname upm@tableheader@c@8\endcsname#1#2#3#4#5#6#7#8{\ifupm@havetitle\else\hline\fi\csname upm@tableheader@b@8\endcsname{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}}
-\expandafter\def\csname upm@tableheader@c@9\endcsname#1#2#3#4#5#6#7#8#9{\ifupm@havetitle\else\hline\fi\rowcolor{backtableheader}\csname upm@tableheader@b@9\endcsname{#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8}{#9}}
+% Utility functions for mtabular
+\newcounter{upm@fmt@mtabular@columnnumber}
+
+\gdef\upm@fmt@mtabular@expandtitle#1#2{%
+ \multicolumn{#1}{|c|}{\upm@fmt@table@title{\ignorespaces#2\ignorespaces}}%
+}
+
+\newcommand{\tabulartitlespec}[1]{%
+ \gdef\upm@fmt@mtabular@expandtitle##1##2{%
+ \multicolumn{##1}{#1}{\upm@fmt@table@title{\ignorespaces##2\ignorespaces}}%
+ }
+}
%-----
%\mtabular[width]{ncolumns}{columns}
\newenvironment{mtabular}[3][\linewidth]{%
- \upm@havetitlefalse
- \newcommand{\tabulartitle}[1]{\hline\multicolumn{#2}{>{\columncolor{backtableheader}}c}{\upm@fmt@table@title{##1}}\upm@havetitletrue \upm@hline}%
- \expandafter\let\expandafter\tabularheader\csname upm@tableheader@c@#2\endcsname%
- \tabularx{#1}{#3}%
+ \newcommand{\tabulartitle}[1]{%
+ \hline%
+ \upm@fmt@mtabular@expandtitle{#2}{##1} \\%
+ \hline%
+ }%
+ \newcommand{\tabulartitleinside}[1]{%
+ \hline\hline%
+ \upm@fmt@mtabular@expandtitle{#2}{##1} \\%
+ \hline%
+ }%
+ \newcommand*{\upm@fmt@mtabular@column@next}[1]{%
+ & \upm@fmt@table@column@title{\ignorespaces##1\ignorespaces}%
+ \addtocounter{upm@fmt@mtabular@columnnumber}{-1}%
+ \ifnum0<\value{upm@fmt@mtabular@columnnumber}%
+ \let\upm@fmt@mtabular@column@continue\upm@fmt@mtabular@column@next%
+ \else%
+ \\ \hline \let\upm@fmt@mtabular@column@continue\relax%
+ \fi%
+ \upm@fmt@mtabular@column@continue%
+ }
+ \newcommand*{\upm@fmt@mtabular@column@first}[1]{%
+ \upm@fmt@table@column@title{\ignorespaces##1\ignorespaces}%
+ \addtocounter{upm@fmt@mtabular@columnnumber}{-1}%
+ \ifnum0<\value{upm@fmt@mtabular@columnnumber}%
+ \let\upm@fmt@mtabular@column@continue\upm@fmt@mtabular@column@next%
+ \else%
+ \\ \hline \let\upm@fmt@mtabular@column@continue\relax%
+ \fi%
+ \upm@fmt@mtabular@column@continue%
+ }
+ \newcommand{\tabularheader}{%
+ \setcounter{upm@fmt@mtabular@columnnumber}{#2}%
+ \upm@fmt@mtabular@column@first%
+ }%
+ \newcommand{\tabularrowheader}[1]{%
+ \centering\upm@fmt@table@column@title{\ignorespaces##1}%
+ }%
+ \begingroup\tabularx{#1}{#3}%
}{%
- \endtabularx%
+ \endtabularx\endgroup%
}
%-----
-%\mtable[position]{width}{ncolumns}{columns}{caption}{label}
+%\mtable[options]{width}{ncolumns}{columns}{caption}{label}
+\define@key[autolatex]{mtable}{size}{\gdef\@autolatex@mtable@size{#1}}
+%
+\define@key[autolatex]{mtable}{t}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position t}}
+\define@key[autolatex]{mtable}{b}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position b}}
+\define@key[autolatex]{mtable}{h}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position h}}
+\define@key[autolatex]{mtable}{H}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position H}}
+%
+\define@key[autolatex]{mtable}{tb}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position tb}}
+\define@key[autolatex]{mtable}{th}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position th}}
+\define@key[autolatex]{mtable}{tH}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position tH}}
+%
+\define@key[autolatex]{mtable}{bt}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position bt}}
+\define@key[autolatex]{mtable}{bh}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position bh}}
+\define@key[autolatex]{mtable}{bH}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position bH}}
+%
+\define@key[autolatex]{mtable}{ht}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position ht}}
+\define@key[autolatex]{mtable}{hb}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position hb}}
+%
+\define@key[autolatex]{mtable}{tbh}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position tbh}}
+\define@key[autolatex]{mtable}{tbH}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position tbH}}
+\define@key[autolatex]{mtable}{thb}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position thb}}
+\define@key[autolatex]{mtable}{tHb}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position tHb}}
+%
+\define@key[autolatex]{mtable}{bth}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position bth}}
+\define@key[autolatex]{mtable}{btH}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position btH}}
+\define@key[autolatex]{mtable}{bht}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position bht}}
+\define@key[autolatex]{mtable}{bHt}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position bHt}}
+%
+\define@key[autolatex]{mtable}{htb}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position htb}}
+\define@key[autolatex]{mtable}{hbt}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position hbt}}
+%
+\define@key[autolatex]{mtable}{Htb}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position Htb}}
+\define@key[autolatex]{mtable}{Hbt}[\relax]{\xdef\@autolatex@mtable@position{\@autolatex@mtable@position Hbt}}
+%
\newenvironment{mtable}[6][ht]{%
- \table[#1]\center%
- \global\protected@edef\upm@table@caption{#5}%
- \global\protected@edef\upm@table@label{tab:#6}%
+ \global\let\@autolatex@mtable@position\relax%
+ \gdef\@autolatex@mtable@size{\normalsize}%
+ \setkeys[autolatex]{mtable}{#1}%
+ \ifx\@autolatex@mtable@position\relax%
+ \gdef\@autolatex@mtable@position{ht}%
+ \fi
+ %
+ \gdef\upm@table@caption{#5}%
+ \xdef\upm@table@label{tab:#6}%
\gdef\upm@table@note{}%
\newcommand{\captionastitle}{\tabulartitle{\upm@table@caption}}%
- \newcommand{\tablenote}[1]{\gdef\upm@table@note{##1}}%
+ \newcommand{\tablenote}[1]{\gdef\upm@table@note{\bgroup ##1\egroup}}%
+ \expandafter\table[\@autolatex@mtable@position]%
+ \center\@autolatex@mtable@size%
\mtabular[#2]{#3}{#4}%
}{%
- \endmtabular%
+ \endmtabular\relax%
\caption{\upm@table@caption}%
\label{\upm@table@label}%
\endcenter%
- {\upm@table@note}%
+ \upm@table@note%
\endtable%
- \let\upm@table@caption\relax%
- \let\upm@table@label\relax%
- \let\upm@table@note\relax%
+ \global\let\upm@table@caption\relax%
+ \global\let\upm@table@label\relax%
+ \global\let\upm@table@note\relax%
}
%-----
@@ -507,7 +580,7 @@
\vskip 20\p@
\fi\fi
\interlinepenalty\@M
- \ifupmbookformat\doublespacing\fi
+ %\ifupmbookformat\doublespacing\fi
\upm@format@chaptertitle{\nohyphens{#2}}\par\nobreak
\vskip 80\p@
}
@@ -772,13 +845,23 @@
% PEOPLE NAME
%----------------------------------------
+\newcommand{\makenamespacing}[1]{%
+ \expandafter\upm@foreach.\in#1\do{%
+ \ignorespaces\upm@foreach@term.\,%
+ }{%
+ \ignorespaces\upm@foreach@term\xspace%
+ }%
+ \ignorespaces
+}
+
%\upmmakename[von]{firstname}{lastname}{separator}
\newcommand{\upmmakename}[4][\relax]{%
\ifx#1\relax%
- {\mbox{\smaller #2}#4\textsc{#3}}%
+ {\mbox{\smaller \makenamespacing{#2}}#4\textsc{\ignorespaces#3}}%
\else%
- {\mbox{\smaller #2}#4\mbox{\smaller #1}#4\textsc{#3}}%
+ {\mbox{\smaller \makenamespacing{#2}}#4\mbox{\smaller #1}#4\textsc{\ignorespaces#3}}%
\fi%
+ \xspace%
}
%\makename[von]{firstname}{lastname}
@@ -786,6 +869,9 @@
\upmmakename[#1]{#2}{#3}{\ }%
}
+%\makelastname[von]{lastname}
+\newcommand{\makelastname}[2][\relax]{\mbox{\smaller#1} \textsc{\ignorespaces#2}\xspace}
+
\gdef\upm@format@people@title#1{\textsc{#1}}
%\prname[von]{firstname}{lastname}
@@ -876,7 +962,7 @@
}
%----------------------------------------
-% DESCRIPTION LIST WITH BULLETS
+% DESCRIPTION LIST WITH NUMBERS
%----------------------------------------
\newcounter{@upm@fmt@enumdescription@cnt@}
@@ -911,17 +997,21 @@
%----------------------------------------
% DESCRIPTION LIST WITH BULLETS
%----------------------------------------
-\let\upm@fmt@itemizeddescription@olditem\item
+\gdef\upm@fmt@itemizeddescription@separator{\iflanguage{french}{ :}{:}}
\newcommand{\upm@fmt@itemizeddescription@formatdescription}[1]{\textbf{#1}}
-\newcommand{\upm@fmt@itemizeddescription@desc}[1][]{\ifthenelse{\equal{a#1}{a}}{}{\upm@fmt@itemizeddescription@formatdescription{#1 :}\xspace}}%
+\newcommand{\upm@fmt@itemizeddescription@desc}[1]{%
+ \upm@fmt@itemizeddescription@formatdescription{#1\upm@fmt@itemizeddescription@separator}\ %
+}
+\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][]{%
- \bgroup%
- \itemize
- \global\let\upm@fmt@itemizeddescription@olditem\item%
- \renewcommand{\item}{\upm@fmt@itemizeddescription@olditem\relax\upm@fmt@itemizeddescription@desc}%
+ \begin{itemize}%
+ \renewcommand{\upm@item@param}[1][]{\upm@fmt@olditem \upm@fmt@itemizeddescription@desc{##1}}%
+ \renewcommand{\upm@item@noparam}{\upm@fmt@olditem }%
}{%
- \enditemize%
- \egroup%
+ \end{itemize}%
}
%----------------------------------------
@@ -993,12 +1083,20 @@
%----------------------------------------
\newsavebox{\upm@framed@minipage}
-%\begin{framedminipage}{width}...\end{frameedminipage}
+%\begin{framedminipage}{width}...\end{framedminipage}
\newenvironment{framedminipage}[1]{%
\begin{lrbox}{\upm@framed@minipage}\begin{minipage}{#1}%
}{%
\end{minipage}\end{lrbox}\fbox{\usebox{\upm@framed@minipage}}}
+%\begin{framedcolorminipage}{width}{border}{background}...\end{framedcolorminipage}
+\newenvironment{framedcolorminipage}[3]{%
+ \newcommand{\upm@framed@minipage@border}{#2}%
+ \newcommand{\upm@framed@minipage@background}{#3}%
+ \begin{lrbox}{\upm@framed@minipage}\begin{minipage}{#1}%
+ }{%
+ \end{minipage}\end{lrbox}\fcolorbox{\upm@framed@minipage@border}{\upm@framed@minipage@background}{\usebox{\upm@framed@minipage}}}
+
%----------------------------------------
% HIGHLIGH BOXES
%----------------------------------------
@@ -1060,4 +1158,86 @@
\let\upm@oldunderline\underline
\renewcommand{\underline}[1]{\upm@oldunderline{\smash{#1}}}
+%----------------------------------------
+% ENVIRONMENT FOR DEFINITIONS
+%----------------------------------------
+
+%-----
+% Defining the style for the definitions
+\colorlet{definitionbackground}{backtableheader}
+\colorlet{definitionheaderforeground}{fronttableheader}
+\colorlet{definitionborder}{fronttableheader}
+\colorlet{definitiontextforeground}{fronttableheader}
+
+\iflanguage{french}{
+ \gdef\definitionname{D\'efinition}
+ \gdef\listdefinitionname{Liste des d\'efinitions}
+}{
+ \gdef\definitionname{Definition}
+ \gdef\listdefinitionname{List of Definitions}
+}
+
+\gdef\upm@definition@width{.9\linewidth}
+\gdef\upm@definition@rule@width{\linewidth}
+\gdef\upm@definition@rule@height{0.4pt}
+
+\newtheoremstyle{upmdefinition}% name of the style to be used
+ {}% measure of space to leave above the theorem. E.g.: 3pt
+ {}% measure of space to leave below the theorem. E.g.: 3pt
+ {\normalfont}% name of font to use in the body of the theorem
+ {}% measure of space to indent the head
+ {\normalfont\bfseries}% name of head font
+ {\\[-1em]{\textcolor{definitionborder}{\rule{\upm@definition@rule@width}{\upm@definition@rule@height}}}}% punctuation between head and body
+ {\newline}% space after theorem head
+ {\textcolor{definitionheaderforeground}{\thmname{#1}\thmnumber{~#2}\upm@column@char\thmnote{ #3}}\vspace{.25em}}% Manually specify head
+
+%-----
+% Declare a theorem with the standard UPM style
+% \declareupmtheorem[theorem_style]{name}{label}{list_label}
+\newcommand{\declareupmtheorem}[4][upmdefinition]{%
+ \global\declaretheorem[name={#3},style=#1]{upm#2}%
+ \global\newenvironment{#2}[1][]{%
+ \par\vspace{\parsep}\centering\begin{framedcolorminipage}{\upm@definition@width}{definitionborder}{definitionbackground}%
+ \color{definitiontextforeground}%
+ \begin{upm#2}[##1]%
+ }{%
+ \end{upm#2}%
+ \end{framedcolorminipage}\vspace{\parsep}\par%
+ }%
+ % Check the version of the thmtools because the TeXLive distribution
+ % gives a too old version.
+ \@ifpackagelater{thm-listof}{2012/05/03}{%
+ \global\@namedef{listof#2s}{%
+ \global\let\upm@definition@old@listtheoremname\listtheoremname%
+ \global\let\upm@definition@old@upmtheoremopt\upm@definition@upmtheoremopt%
+ \gdef\listtheoremname{#4}%
+ \renewcommand{\upm@definition@upmtheoremopt}[1]{}%
+ \expandafter\listoftheorems[ignoreall,show={upm#2}]%
+ \global\let\listtheoremname\upm@definition@old@listtheoremname%
+ \global\let\upm@definition@upmtheoremopt\upm@definition@old@upmtheoremopt%
+ }%
+ }{%
+ \@latex@warning{Your version of the thmtools is too old. I recommend you to install the version 2012/05/04, or later.}
+ \global\@namedef{listof#2s}{%
+ \global\let\upm@tmp\listtheoremname%
+ \gdef\listtheoremname{#4}%
+ \listoftheorems%
+ \global\let\listtheoremname\upm@tmp%
+ }%
+ }
+}
+\@onlypreamble\declareupmtheorem
+
+\gdef\thmtformatoptarg#1{\upm@column@char\ #1}%
+
+% Permits to define an part of the definition's name that is
+% rendered only in core part of the document, not in the
+% list of theorems
+\gdef\upm@definition@upmtheoremopt#1{#1}
+\gdef\upmtheoremopt#1{\protect\upm@definition@upmtheoremopt{#1}}
+
+%-----
+% Declare the definition environment
+\declareupmtheorem{definition}{\definitionname}{\listdefinitionname}
+
\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
index 9bf6eede16a..f3a977fcd56 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/08/15}
+\global\edef\upm@package@private@doctype@ver{2013/09/19}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-p-common}[\upm@package@private@doctype@ver]
@@ -88,6 +88,11 @@
\expandafter\let\csname\upm@protect{#1}\endcsname\relax%
}
+\def\upm@namelet@ext#1#2{%
+ \expandafter\expandafter\let\expandafter\upm@tmp\csname#2\endcsname%
+ \global\expandafter\let\csname#1\endcsname\upm@tmp%
+}
+
\def\upm@ifdefinedname#1#2#3{%
\expandafter\ifx\csname\upm@protect{#1}\endcsname\relax%
#3%
@@ -96,6 +101,8 @@
\fi%
}
+\newcommand{\upm@column@char}{\iflanguage{french}{ :}{:}}
+
%----------------------------------------
% GET THE REFERENCE ID WITHOUT \REF
%----------------------------------------
@@ -129,4 +136,43 @@
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+%----------------------------------------
+% MACRO THAT PERMITS TO LOOP ON A SEPARATOR
+%----------------------------------------
+
+\newif\ifupm@foreach@hasseparator
+\newif\ifupm@foreach@oneseparator
+
+\let\upm@foreach@end\relax
+
+\def\upm@foreach@rec#1#2{%
+ {\upm@foreach@searchseparator#2\upm@foreach@end\@nil}%
+ \ifupm@foreach@hasseparator%
+ \protected@xdef\upm@foreach@continue{\protect\upm@foreach@rec{#1}{\upm@foreach@rest}}%
+ \upm@foreach@body%
+ \upm@foreach@continue%
+ \else%
+ \ifupm@foreach@oneseparator\else%
+ \upm@foreach@lastbody%
+ \fi%
+ \fi%
+}
+
+\def\upm@foreach#1\in#2\do#3#4{%
+ \global\upm@foreach@oneseparatorfalse%
+ \gdef\upm@foreach@searchseparator##1#1##2\@nil{%
+ \gdef\upm@foreach@term{##1}%
+ \ifx\upm@foreach@end##2%
+ \global\upm@foreach@hasseparatorfalse%
+ \else%
+ \gdef\upm@foreach@rest{##2}%
+ \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}%
+}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty
index f5ea7d90f44..6d3538ababa 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty
@@ -1,6 +1,7 @@
% Version management for Unified Process Methodology
%
% Copyright (c) 2006-2007 Stephane GALLAND <galland@arakhne.org>
+% Copyright (c) 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
@@ -17,18 +18,8 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
%
-% Creation date: 2006-04-06
-% Modifications:
-% 2009-12-30 Bug fix: incversion may reset subversion number.
-% 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{2009/12/30}
+\global\edef\upm@package@version@ver{2013/08/26}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-version}[\upm@package@version@ver]
@@ -183,7 +174,6 @@
\noindent\expandafter\begin{mtabular}[#1]{3}{|c|c|X|}
\tabulartitle{\upm@lang@version@history}%
\tabularheader{\upm@lang@version}{\upm@lang@date}{\upm@lang@updates}%
- \hline
\upm@update@list
\hline
\expandafter\end{mtabular}\par\vspace{.5cm}%