summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/upmethodology
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-24 23:20:11 +0000
committerKarl Berry <karl@freefriends.org>2015-04-24 23:20:11 +0000
commitd0540495f0f6a2577e34a6887285b8e0c03ca78d (patch)
tree91d0b3f0bb9b16d0567795b046a2ffc4d04427e3 /Master/texmf-dist/tex/latex/upmethodology
parent488699dbaca6ce3920fabfdb7ec64d4d3ba0bc59 (diff)
upmethodology (24apr15)
git-svn-id: svn://tug.org/texlive/trunk@37038 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-document.sty6
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty6
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty5
4 files changed, 10 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
index 53e7f8a14e9..17c4a36b3f7 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
+++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def
@@ -1 +1 @@
-\def\UPMVERSION{20150227}
+\def\UPMVERSION{20150424}
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
index 9c47c8b77af..2d2365971cf 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.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@doc@ver{2013/09/29}
+\global\edef\upm@package@doc@ver{2015/04/24}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-document}[\upm@package@doc@ver]
@@ -96,7 +96,7 @@
\upm@document@lang@english
}
\ExecuteOptions{english}
-\ProcessOptions
+\ProcessOptions*
{\upm@lang@@}
@@ -115,7 +115,7 @@
\newlength\listendskip
\listendskip=\parskip
-\iflanguage{french}{%
+\ifupmlang{french}{%
\addto\extrasfrench{%
\let\upm@document@enditemizeFB\enditemizeFB%
\def\enditemizeFB{\upm@document@enditemizeFB\vspace{\listendskip}}%
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index 98d34aa0f4d..6428c71296a 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{2015/02/27}
+\global\edef\upm@package@fmt@ver{2015/04/24}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -1230,7 +1230,7 @@
% DESCRIPTION LIST WITH BULLETS
%----------------------------------------
\ifupm@use@override@standard@lists
- \gdef\upm@fmt@itemizeddescription@separator{\iflanguage{french}{ :}{:}\ }
+ \gdef\upm@fmt@itemizeddescription@separator{\upm@column@char\ }
\newcommand{\upm@fmt@itemizeddescription@formatdescription}[1]{\textbf{#1}}
\newcommand{\upm@fmt@itemizeddescription@desc}[2]{%
\upm@fmt@itemizeddescription@formatdescription{#1#2}%
@@ -1408,7 +1408,7 @@
\colorlet{definitionborder}{fronttableheader}
\colorlet{definitiontextforeground}{fronttableheader}
-\iflanguage{french}{
+\ifupmlang{french}{
\gdef\definitionname{D\'efinition}
\gdef\listdefinitionname{Liste des d\'efinitions}
}{
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 28391dfb326..166c2e0f090 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{2014/03/03}
+\global\edef\upm@package@private@doctype@ver{2015/04/24}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-p-common}[\upm@package@private@doctype@ver]
@@ -50,6 +50,7 @@
% CURRENT LANGUAGE
%----------------------------------------
\def\upmcurrentlang{english}
+\def\ifupmlang#1{\ifthenelse{\equal{#1}{\upmcurrentlang}}}
%----------------------------------------
% TEST MACROS
@@ -120,7 +121,7 @@
\fi%
}
-\newcommand{\upm@column@char}{\iflanguage{french}{ :}{:}}
+\newcommand{\upm@column@char}{\ifupmlang{french}{ :}{:}}
%----------------------------------------
% GET THE REFERENCE ID WITHOUT \REF