diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
3 files changed, 21 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty index 9424f2d2ed3..5525c18d045 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty @@ -44,9 +44,12 @@ % EXTENSION MANAGEMENT %---------------------------------------- +\newif\ifupm@extension@savealllang\upm@extension@savealllangfalse + \newcommand{\Get}[1]{\@nameuse{upmext@extension@value@#1}} +\newcommand{\GetLang}[2]{\@nameuse{upmext@extension@value@#1@#2}} -\newcommand{\Set}[3][\upmcurrentlang]{% +\newcommand{\upm@extension@Set}[3][\upmcurrentlang]{% % PREDEFINED FRONT PAGE \ifthenelse{\equal{#2}{frontpage}}{% \gdef\upmext@extension@value@frontpage{#3}% @@ -69,13 +72,20 @@ \message{*** define extension value #2 ****}% \global\@namedef{upmext@extension@value@#2}{#3}% }{}% + \ifupm@extension@savealllang% + \global\@namedef{upmext@extension@value@#2@#1}{#3}% + \fi }}}% } +\let\Set\upm@extension@Set \newcommand{\Unset}[2][\upmcurrentlang]{% \ifthenelse{\equal{\upmcurrentlang}{#1}}{% \message{*** undefine extension value #2 ****}% \global\expandafter\let\csname upmext@extension@value@#2\endcsname\@undefined% + \ifupm@extension@savealllang% + \global\expandafter\let\csname upmext@extension@value@#2@#1\endcsname\@undefined% + \fi% }{}% } diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty index 823ad0eee69..bf7a2adfbd2 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty @@ -799,10 +799,16 @@ %---------------------------------------- \newcounter{@@upm@fmt@inlineenumeration} +\newcommand{\inlineenumerationlabel}[1]{(#1)} +\let\upm@fmt@inlineenum@numberformat\roman \newenvironment{inlineenumeration}{% - \renewcommand{\item}{{(\roman{@@upm@fmt@inlineenumeration}){\addtocounter{@@upm@fmt@inlineenumeration}{1}}}~}% + \begingroup% + \let\upm@fmt@inlineenum@currentlabel\@currentlabel% + \renewcommand{\item}{\xdef\@currentlabel{\upm@fmt@inlineenum@numberformat{@@upm@fmt@inlineenumeration}}{\inlineenumerationlabel{\@currentlabel}{\addtocounter{@@upm@fmt@inlineenumeration}{1}}}~}% \setcounter{@@upm@fmt@inlineenumeration}{1}% }{% + \global\let\@currentlabel\upm@fmt@inlineenum@currentlabel% + \endgroup% } %---------------------------------------- diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty index c2ed1da2355..f5ea7d90f44 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-version.sty @@ -19,6 +19,7 @@ % % 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. @@ -27,7 +28,7 @@ % 2006-04-19 Add version number % -\global\edef\upm@package@version@ver{2009/10/30} +\global\edef\upm@package@version@ver{2009/12/30} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-version}[\upm@package@version@ver] @@ -87,7 +88,7 @@ %increment major part of version number \def\upm@incmajorversion#1.#2{% \upm@tmp@a=#1\advance\upm@tmp@a + 1% - \global\edef\theupmversion{\the\upm@tmp@a.#2}% + \global\edef\theupmversion{\the\upm@tmp@a.0}% } %increment minor part of version number |