diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2012-10-06 09:26:32 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2012-10-06 09:26:32 +0000 |
commit | 2642cb8f94a8070118c06133cdd27f50abb894a2 (patch) | |
tree | 9347132f421830f35010ae65f81c3e8e487cb0a7 /Master/texmf-dist/tex/latex/upmethodology | |
parent | b3c4f06491e51805bec542709ec7bb8f0a1adb3d (diff) |
upmethodology update
git-svn-id: svn://tug.org/texlive/trunk@27896 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/upmethodology')
4 files changed, 36 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls index 484e45af230..a9e8a526060 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls @@ -19,6 +19,7 @@ % % Creation date: 2006-04-06 % Modifications: +% 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. @@ -33,7 +34,7 @@ % 2006-04-22 Remove task and specification packages. % -\global\edef\upm@package@docclazz@ver{2009/10/30} +\global\edef\upm@package@docclazz@ver{2012/10/02} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver] @@ -67,39 +68,39 @@ \PassOptionsToPackage{english}{upmethodology-document} } \DeclareOption{nodocumentinfo}{% - \upm@package@docclazz@nodocinfotrue% + \global\upm@package@docclazz@nodocinfotrue% } \DeclareOption{documentinfo}{% - \upm@package@docclazz@nodocinfofalse% + \global\upm@package@docclazz@nodocinfofalse% } \DeclareOption{nopubpage}{% - \upm@package@docclazz@nopubpagetrue% + \global\upm@package@docclazz@nopubpagetrue% } \DeclareOption{pubpage}{% - \upm@package@docclazz@nopubpagefalse% + \global\upm@package@docclazz@nopubpagefalse% } \DeclareOption{book}{% - \upmbookformattrue - \upmreportformatfalse - \upmarticleformatfalse - \upm@package@docclazz@nopubpagefalse% - \upm@package@docclazz@nodocinfofalse% + \global\upmbookformattrue + \global\upmreportformatfalse + \global\upmarticleformatfalse + \global\upm@package@docclazz@nopubpagefalse% + \global\upm@package@docclazz@nodocinfofalse% \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,twoside}% } \DeclareOption{report}{% - \upmbookformatfalse - \upmreportformattrue - \upmarticleformatfalse - \upm@package@docclazz@nopubpagetrue% - \upm@package@docclazz@nodocinfofalse% + \global\upmbookformatfalse + \global\upmreportformattrue + \global\upmarticleformatfalse + \global\upm@package@docclazz@nopubpagetrue% + \global\upm@package@docclazz@nodocinfofalse% \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,oneside}% } \DeclareOption{article}{% - \upmbookformatfalse - \upmreportformatfalse - \upmarticleformattrue - \upm@package@docclazz@nopubpagetrue% - \upm@package@docclazz@nodocinfotrue% + \global\upmbookformatfalse + \global\upmreportformatfalse + \global\upmarticleformattrue + \global\upm@package@docclazz@nopubpagetrue% + \global\upm@package@docclazz@nodocinfotrue% \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,oneside}% } @@ -107,7 +108,7 @@ \xdef\upm@package@docclazz@optionstopass{\upm@package@docclazz@optionstopass,\CurrentOption}% } \ExecuteOptions{report} -\ProcessOptions +\ProcessOptions*\relax \ifupmbookformat \message{*********** UPMETHODOLOGY BOOK CLASS (WITH PART AND CHAPTER)} diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty index 5525c18d045..0ffe448ed45 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-extension.sty @@ -17,15 +17,16 @@ % write to the Free Software Foundation, Inc., 59 Temple Place - Suite % 330, Boston, MA 02111-1307, USA. % -% Creation date: 2006-10-24 +% Creation date: 2009-10-24 % Modifications: +% 2012-09-21 "(c)" -> "\copyright" % 2009-11-03 \If* are marked as \long. % 2006-10-30 Bug fix: provides "upmethodology-extension" insteed of "upmethodology-document". % 2006-10-29 Allow to override the default font. % 2006-10-27 Clean the API % -\global\edef\upm@package@ext@ver{2009/11/03} +\global\edef\upm@package@ext@ver{2012/09/21} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-extension}[\upm@package@ext@ver] @@ -91,7 +92,7 @@ \newcommand{\DeclareCopyright}[5][\upmcurrentlang]{% \ifthenelse{\equal{\upmcurrentlang}{#1}}{% - \Set{copyright}{Copyright (c) #3 #4.}% + \Set{copyright}{Copyright {(c)} #3 #4.}% \message{*** style extension #2, \Get{copyright} ****}% \Set{trademarks}{#5}% }{}% diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty index 00947b80d6d..61b9080242e 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty @@ -19,6 +19,7 @@ % % Creation date: 2006-04-06 % Modifications (lastest first): +% 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. @@ -47,7 +48,7 @@ % Bug fix: centering table's headers. % -\global\edef\upm@package@fmt@ver{2012/09/17} +\global\edef\upm@package@fmt@ver{2012/09/21} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver] @@ -140,8 +141,6 @@ %---------------------------------------- % SYMBOLS %---------------------------------------- -\let\upm@format@copyright\copyright -\renewcommand{\copyright}{\upm@format@copyright\xspace} \newcommand{\trademark}{\Pisymbol{psy}{228}\xspace} \newcommand{\regmark}{\Pisymbol{psy}{226}\xspace} \newcommand{\smalltrade}{{\tiny\trademark}\xspace} 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 3768fc94363..3beb327f31a 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-p-common.sty @@ -17,11 +17,12 @@ % % Creation date: 2009-10-30 % Modifications (lastest first): +% 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{2009/11/03} +\global\edef\upm@package@private@doctype@ver{2012/09/21} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-p-doctype}[\upm@package@private@doctype@ver] @@ -134,4 +135,10 @@ {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}} +%---------------------------------------- +% SYMBOLS +%---------------------------------------- +\let\upm@format@copyright\copyright +\renewcommand{\copyright}{\upm@format@copyright\xspace} + \endinput |