upmethodology (16aug13)

git-svn-id: svn://tug.org/texlive/trunk@31435 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 103 insertions, 109 deletions

diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
index b3958467a0d..e6c94c2816a 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls
@@ -16,24 +16,6 @@
 % 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-04-06
-% Modifications:
-%   2013-05-17   Replace the option 'pdftex=true' by 'pdftex' for hyperref package.
-%   2012-10-02   Process the class options in the order given by the caller.
-%   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.
-%   2006-04-19   Add version number.
-%   2006-04-20   Add task package.
-%   2006-04-21   Add specification package.
-%   2006-04-22   Remove task and specification packages.
-%
 
 \global\edef\upm@package@docclazz@ver{2013/05/17}
 
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
index 37a16b49ae0..5878e98b2f2 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
@@ -16,34 +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: 2006-04-20
-% Modifications:
-%   2013-07-06   Add the macro ifdocumentauthor
-%   2009-11-03   Add star-ed macros for author, informed people
-%                and validator addition macros.
-%   2009-10-30   Add "book", "report" and "article" support.
-%                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.
-%   2006-04-19   Add version number.
-%                Add mtabular and mtable.
-%   2006-04-20   Reformat validator list.
-%                Add sectioning commands.
-%
 
-\global\edef\upm@package@doc@ver{2013/05/06}
+\global\edef\upm@package@doc@ver{2013/08/15}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-document}[\upm@package@doc@ver]
@@ -56,6 +30,7 @@
 \def\upm@document@lang@english{%
   \gdef\upm@lang@@{\message{**** upmethodology-document is using English language ****}}%
   \gdef\upmcurrentlang{english}%
+  \gdef\upmcurrentlangforbabel{english}%
   \gdef\upm@lang@project{Project}%
   \gdef\upm@lang@document{Document}%
   \gdef\upm@lang@docref{Reference}%
@@ -82,6 +57,7 @@
 \def\upm@document@lang@french{%
   \gdef\upm@lang@@{\message{**** upmethodology-document is using French language ****}}%
   \gdef\upmcurrentlang{french}%
+  \gdef\upmcurrentlangforbabel{frenchb}%
   \gdef\upm@lang@project{Projet}%
   \gdef\upm@lang@document{Document}%
   \gdef\upm@lang@docref{R\'ef\'erence}%
@@ -104,6 +80,7 @@
   \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.}
+  
 }
 
 %----------------------------------------
@@ -121,9 +98,9 @@
 \ExecuteOptions{english}
 \ProcessOptions
 
-\upm@lang@@
+{\upm@lang@@}
 
-\RequirePackage[\upmcurrentlang]{babel}
+\RequirePackage[\upmcurrentlangforbabel]{babel}
 \RequirePackage{vmargin}
 
 \RequirePackage{upmethodology-extension}
@@ -131,6 +108,29 @@
 \RequirePackage{upmethodology-version}
 
 %----------------------------------------
+% Ensure that frenchb (included by babel)
+% does not use compact versions of lists 
+% in french mode.
+%----------------------------------------
+
+\newlength\listendskip
+\listendskip=\parskip
+\iflanguage{french}{%
+	\addto\extrasfrench{%
+		\let\upm@document@enditemizeFB\enditemizeFB%
+		\def\enditemizeFB{\upm@document@enditemizeFB\vspace{\listendskip}}%
+		\let\upm@document@enditemizeORI\enditemizeORI%
+		\def\enditemizeFB{\upm@document@enditemizeORI\vspace{\listendskip}}%
+	}%
+	\addto\noextrasfrench{%
+		\let\upm@document@enditemizeFB\enditemizeFB%
+		\def\enditemizeFB{\upm@document@enditemizeFB\vspace{\listendskip}}%
+		\let\upm@document@enditemizeORI\enditemizeORI%
+		\def\enditemizeFB{\upm@document@enditemizeORI\vspace{\listendskip}}%
+	}%
+}
+
+%----------------------------------------
 % DOCUMENT MANAGEMENT
 %----------------------------------------
 
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index 1b92c130f44..db7d1e20c61 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
@@ -16,47 +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: 2006-04-06
-% Modifications (lastest first):
-%   2013-07-06   Redefine the \underline macro.
-%   2013-05-31   Add the extensions 'pdf_tex' and 'ps_tex' in the default list of extensions
-%                for \includegraphicswtex.
-%   2013-05-30   Add macro \includegraphicswtex, which is supporting 'pdftex_t' and 'pstex_t'.
-%   2013-05-18   Replace the image extension 'pstex_t' by 'pdftex_t'.
-%   2013-05-17   Define the default graphic extensions: pdf, png, jpg, jpeg, tiff, gif.
-%                Define the default graphic search path to the current directory.
-%   2013-04-01   Do not put the default bibliography style if it was already provided.
-%   2012-09-21   Move \copyright into upmethodology-fmt.sty
-%   2012-09-17   Bug fix: \makename and \upmmakename have invalid first name size
-%                when the macro is used inside a font-size change context.
-%   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.
-%   2007-07-05   Add people name formatting function.
-%   2007-07-02   Add exponent/indice commands and st/nd/rd/th symbols.
-%   2007-06-27   Add inline enumeration.
-%   2007-03-19   Add date fonctions.
-%                Add localization.
-%   2006-04-19   Add version number.
-%                Add mtabular and mtable.
-%   2006-04-20   Bug fix: invalid position of the tables.
-%                Bug fix: centering table's headers.
-%
 
-\global\edef\upm@package@fmt@ver{2013/05/31}
+\global\edef\upm@package@fmt@ver{2013/08/15}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -73,6 +34,7 @@
 %----------------------------------------
 % LOCALES
 %----------------------------------------
+\global\let\upm@format@lang@extractyear\upm@date@first%
 \def\upm@format@lang@english{%
   \gdef\upm@lang@@{\message{**** upmethodology-fmt is using English language ****}}%
   \global\renewcommand{\upm@format@lang@makedate}[3]{##3\string/\two@digits{##2}\string/\two@digits{##1}}%
@@ -86,7 +48,6 @@
   \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{%
   \gdef\upm@lang@@{\message{**** upmethodology-fmt is using French language ****}}%
   \global\renewcommand{\upm@format@lang@makedate}[3]{\two@digits{##1}\string/\two@digits{##2}\string/##3}%
@@ -136,6 +97,7 @@
 \RequirePackage{txfonts}
 \RequirePackage{relsize}
 \RequirePackage{keyval}
+\RequirePackage{hyphenat}
 
 %----------------------------------------
 % Exponent and indice
@@ -148,8 +110,14 @@
 \newcommand{\textsub}[1]{\upm@textsubscript{#1}\xspace}
 
 %----------------------------------------
+% Major Emphazing
+%----------------------------------------
+\newcommand{\Emph}[1]{\textbf{#1}\xspace}
+
+%----------------------------------------
 % SYMBOLS
 %----------------------------------------
+\renewcommand{\copyright}{\Pisymbol{psy}{211}\xspace}
 \newcommand{\trademark}{\Pisymbol{psy}{228}\xspace}
 \newcommand{\regmark}{\Pisymbol{psy}{226}\xspace}
 \newcommand{\smalltrade}{{\tiny\trademark}\xspace}
@@ -160,7 +128,6 @@
 \newcommand{\urd}{\textsup{rd}}
 \newcommand{\uth}{\textsup{th}}
 
-
 %----------------------------------------
 % DEFAULT GRAPHICX CONFIGURATION
 %----------------------------------------
@@ -491,7 +458,7 @@
 	      \addcontentsline{toc}{part}{#1}%
 	    \fi
 	    \markboth{}{}%
-	    {\centering
+	    {\huge\centering
 	     \interlinepenalty \@M
 	     \normalfont
 	     \ifnum \c@secnumdepth >-2\relax
@@ -499,13 +466,13 @@
 	       \par
 	       \vskip 20\p@
 	     \fi
-	     \upm@format@parttitle{#2}\par}%
+	     \upm@format@parttitle{\nohyphens{#2}}\par}%
 	    \@endpart}
 	\gdef\@spart#1{%
 	    {\centering
 	     \interlinepenalty \@M
 	     \normalfont
-	     \upm@format@parttitle{#1}\par}%
+	     \upm@format@parttitle{\nohyphens{#1}}\par}%
 	    \@endpart}
 \fi
 
@@ -513,7 +480,7 @@
 \ifupmarticleformat\else
 	\newcommand{\upm@format@makechapterhead}[2]{%
 		  %\vspace*{50\p@}%
-		  {\parindent \z@ \raggedleft \normalfont
+		  {\parindent \z@ \Huge \raggedleft \normalfont
 		    \ifx\@empty#1\ifnum \c@secnumdepth >\m@ne
 			\upm@format@chapternum{\thechapter}
 			\par\nobreak
@@ -521,7 +488,7 @@
 		    \fi\fi
 		    \interlinepenalty\@M
 		    \ifupmbookformat\doublespacing\fi
-		    \upm@format@chaptertitle{#2}\par\nobreak
+		    \upm@format@chaptertitle{\nohyphens{#2}}\par\nobreak
 		    \vskip 80\p@
 		  }
 	}
@@ -889,6 +856,55 @@
 }
 
 %----------------------------------------
+% DESCRIPTION LIST WITH BULLETS
+%----------------------------------------
+
+\newcounter{@upm@fmt@enumdescription@cnt@}
+\newcommand{\upm@fmt@enumdescription@fmt@}[1]{}
+\newcommand{\enumdescriptionlabel}[1]{\textbf{#1}}
+\newenvironment{enumdescriptionx}[3][i]{%
+	\begingroup\setcounter{@upm@fmt@enumdescription@cnt@}{1}%
+	\let\upm@fmt@enumdescription@savedlabel\@currentlabel%
+	\ifthenelse{\equal{#1}{a}}{%
+		\renewcommand{\upm@fmt@enumdescription@fmt@}[1]{#2\alph{##1}#3}%
+	}{%
+		\ifthenelse{\equal{#1}{i}}{%
+			\renewcommand{\upm@fmt@enumdescription@fmt@}[1]{#2\roman{##1}#3}%
+		}{%
+			\renewcommand{\upm@fmt@enumdescription@fmt@}[1]{#2\expandafter{\csname the##1\endcsname}#3}%
+		}%
+	}%
+	\begin{list}{}{%
+		\renewcommand{\makelabel}[1]{\xdef\@currentlabel{\upm@fmt@enumdescription@fmt@{@upm@fmt@enumdescription@cnt@}}\enumdescriptionlabel{\@currentlabel~-~##1}:~{\addtocounter{@upm@fmt@enumdescription@cnt@}{1}}}%
+		\settowidth{\labelwidth}{iii)~}%
+	}
+}{%
+	\global\let\@currentlabel\upm@fmt@enumdescription@savedlabel%
+	\end{list}\endgroup%
+}
+\newenvironment{enumdescription}[1][i]{%
+	\begin{enumdescriptionx}[#1]{}{}%
+}{%
+	\end{enumdescriptionx}%
+}
+
+%----------------------------------------
+% DESCRIPTION LIST WITH BULLETS
+%----------------------------------------
+\let\upm@fmt@itemizeddescription@olditem\item
+\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}}%
+\renewenvironment{description}[1][]{%
+	\bgroup%
+	\itemize
+	\global\let\upm@fmt@itemizeddescription@olditem\item%
+	\renewcommand{\item}{\upm@fmt@itemizeddescription@olditem\relax\upm@fmt@itemizeddescription@desc}%
+}{%
+	\enditemize%
+	\egroup%
+}
+
+%----------------------------------------
 % SIZE MANAGEMENT
 %----------------------------------------
 \newenvironment{upmfontsize}[1]{%
@@ -1008,6 +1024,16 @@
 \newcommand{\href}[3][]{\texttt{#3}}
 
 %----------------------------------------
+% Exponents and Indices
+%----------------------------------------
+\renewcommand{\textup}[1]{\textsuperscript{#1}\xspace}
+\def\@textsubscript#1{%
+  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+\newcommand{\textsubscript}[1]{\@textsubscript{\selectfont#1}}
+\newcommand{\textdown}[1]{\textsubscript{#1}\xspace}
+
+
+%----------------------------------------
 % UNDERLINE
 %----------------------------------------
 
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 af8194d421c..9bf6eede16a 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty
@@ -15,16 +15,8 @@
 % 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):
-%    2013-05-17   Fixing the name of the provided package.
-%    2013-04-28   Include xcolor.sty in place of color.sty.
-%    2012-09-21   Move \copyright from upmethodology-fmt.sty
-%    2009-11-03   \If* macros are marked with \long
-%    2009-11-02   Add internal commands for footnotes.
-%
 
-\global\edef\upm@package@private@doctype@ver{2013/05/17}
+\global\edef\upm@package@private@doctype@ver{2013/08/15}
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
 \ProvidesPackage{upmethodology-p-common}[\upm@package@private@doctype@ver]
@@ -137,10 +129,4 @@
   {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
 
 
-%----------------------------------------
-% SYMBOLS
-%----------------------------------------
-\let\upm@format@copyright\copyright
-\renewcommand{\copyright}{\upm@format@copyright\xspace}
-
 \endinput