From c69e20250cee54fad79255cd32d5c3c8f13e1d39 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 30 Sep 2013 22:17:14 +0000 Subject: upmethodology (30sep13) git-svn-id: svn://tug.org/texlive/trunk@31801 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/upmethodology/UPMVERSION.def | 1 + .../latex/upmethodology/upmethodology-document.cls | 54 ++++++++++------ .../latex/upmethodology/upmethodology-document.sty | 12 +--- .../tex/latex/upmethodology/upmethodology-fmt.sty | 75 ++++++++++++---------- .../upmethodology/upmethodology-frontpage.sty | 11 ---- .../latex/upmethodology/upmethodology-p-common.sty | 21 +++++- 6 files changed, 97 insertions(+), 77 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def (limited to 'Master/texmf-dist/tex/latex/upmethodology') diff --git a/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def new file mode 100644 index 00000000000..4d43eaf7d5f --- /dev/null +++ b/Master/texmf-dist/tex/latex/upmethodology/UPMVERSION.def @@ -0,0 +1 @@ +\def\UPMVERSION{20130929} diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.cls index 4e993264da1..94372cf9632 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/09/05} +\global\edef\upm@package@docclazz@ver{2013/09/29} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver] @@ -28,6 +28,8 @@ \upm@package@docclazz@nodocinfofalse \newif\ifupm@package@docclazz@nopubpage \upm@package@docclazz@nopubpagefalse +\newif\ifupm@package@docclazz@autofrontmatter +\upm@package@docclazz@autofrontmatterfalse \gdef\upm@package@docclazz@optionstopass{a4paper,11pt} @@ -62,6 +64,12 @@ \DeclareOption{pubpage}{% \global\upm@package@docclazz@nopubpagefalse% } +\DeclareOption{nofrontmatter}{% + \global\upm@package@docclazz@autofrontmatterfalse% +} +\DeclareOption{frontmatter}{% + \global\upm@package@docclazz@autofrontmattertrue% +} \DeclareOption{book}{% \global\upmbookformattrue \global\upmreportformatfalse @@ -166,19 +174,36 @@ \fi +%---------------------------------------- +% FRONT, MAIN AND BACK MATTERS +%---------------------------------------- + +\global\let\upm@package@docclazz@frontmatter\frontmatter +\gdef\frontmatter{\pagestyle{headings}\pagenumbering{roman}\global\let\frontmatter\relax} + +\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% +%} + %---------------------------------------- % AUTO-GENERATED DOCUMENT %---------------------------------------- -\AtBeginDocument{ - \makefrontcover - \ifupm@package@docclazz@nopubpage\else\upmpublicationpage\fi - \ifupm@package@docclazz@nodocinfo\else\upmdocinfopage\fi - \sloppy +\AtBeginDocument{% + \ifupm@package@docclazz@autofrontmatter\frontmatter\fi% + \makefrontcover% + \ifupm@package@docclazz@nopubpage\else\upmpublicationpage\fi% + \ifupm@package@docclazz@nodocinfo\else\upmdocinfopage\fi% + \sloppy% } -\AtEndDocument{ - \makebackcover +\AtEndDocument{% + \makebackcover% } %---------------------------------------- @@ -221,17 +246,4 @@ \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-document.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty index 5878e98b2f2..9c47c8b77af 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/08/15} +\global\edef\upm@package@doc@ver{2013/09/29} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-document}[\upm@package@doc@ver] @@ -173,15 +173,6 @@ % Display the the document information on a page %\upmpublicationpage \newcommand{\upmdocinfopage}{ - \if@twoside% - \ifodd\thepage% - \setcounter{page}{-1}% - \else% - \setcounter{page}{0}% - \fi% - \else% - \setcounter{page}{0}% - \fi% \thispagestyle{plain} \upmdocumentsummary\upmdocumentauthors\upmdocumentvalidators\upmdocumentinformedpeople\vfill\upmhistory\clearpage% } @@ -190,7 +181,6 @@ % Display the publication pag for the document %\upmpublicationpage \newcommand{\upmpublicationpage}{ - \setcounter{page}{0}% \thispagestyle{empty}% \upmpublicationminipage% } diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty index b37b3727a10..0e56a9a08d4 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/09/19} +\global\edef\upm@package@fmt@ver{2013/09/26} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver] @@ -446,39 +446,48 @@ %----- %\mtable[options]{width}{ncolumns}{columns}{caption}{label} +% size= \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}} +% position: h t b p H ! +\define@key[autolatex]{mtable}{h}[\relax]{\gdef\@autolatex@mtable@position{h}} +\define@key[autolatex]{mtable}{t}[\relax]{\gdef\@autolatex@mtable@position{t}} +\define@key[autolatex]{mtable}{b}[\relax]{\gdef\@autolatex@mtable@position{b}} +\define@key[autolatex]{mtable}{p}[\relax]{\gdef\@autolatex@mtable@position{p}} +\define@key[autolatex]{mtable}{H}[\relax]{\gdef\@autolatex@mtable@position{H}} +\define@key[autolatex]{mtable}{ht}[\relax]{\gdef\@autolatex@mtable@position{ht}} +\define@key[autolatex]{mtable}{hb}[\relax]{\gdef\@autolatex@mtable@position{hb}} +\define@key[autolatex]{mtable}{hp}[\relax]{\gdef\@autolatex@mtable@position{hp}} +\define@key[autolatex]{mtable}{hH}[\relax]{\gdef\@autolatex@mtable@position{hH}} +\define@key[autolatex]{mtable}{h!}[\relax]{\gdef\@autolatex@mtable@position{h!}} +\define@key[autolatex]{mtable}{tb}[\relax]{\gdef\@autolatex@mtable@position{tb}} +\define@key[autolatex]{mtable}{tp}[\relax]{\gdef\@autolatex@mtable@position{tp}} +\define@key[autolatex]{mtable}{tH}[\relax]{\gdef\@autolatex@mtable@position{tH}} +\define@key[autolatex]{mtable}{t!}[\relax]{\gdef\@autolatex@mtable@position{t!}} +\define@key[autolatex]{mtable}{bp}[\relax]{\gdef\@autolatex@mtable@position{bp}} +\define@key[autolatex]{mtable}{bH}[\relax]{\gdef\@autolatex@mtable@position{bH}} +\define@key[autolatex]{mtable}{b!}[\relax]{\gdef\@autolatex@mtable@position{b!}} +\define@key[autolatex]{mtable}{pH}[\relax]{\gdef\@autolatex@mtable@position{pH}} +\define@key[autolatex]{mtable}{p!}[\relax]{\gdef\@autolatex@mtable@position{p!}} +\define@key[autolatex]{mtable}{H!}[\relax]{\gdef\@autolatex@mtable@position{H!}} +\define@key[autolatex]{mtable}{htb}[\relax]{\gdef\@autolatex@mtable@position{htb}} +\define@key[autolatex]{mtable}{htp}[\relax]{\gdef\@autolatex@mtable@position{htp}} +\define@key[autolatex]{mtable}{htH}[\relax]{\gdef\@autolatex@mtable@position{htH}} +\define@key[autolatex]{mtable}{ht!}[\relax]{\gdef\@autolatex@mtable@position{ht!}} +\define@key[autolatex]{mtable}{tbp}[\relax]{\gdef\@autolatex@mtable@position{tbp}} +\define@key[autolatex]{mtable}{tbH}[\relax]{\gdef\@autolatex@mtable@position{tbH}} +\define@key[autolatex]{mtable}{tb!}[\relax]{\gdef\@autolatex@mtable@position{tb!}} +\define@key[autolatex]{mtable}{bpH}[\relax]{\gdef\@autolatex@mtable@position{bpH}} +\define@key[autolatex]{mtable}{bp!}[\relax]{\gdef\@autolatex@mtable@position{bp!}} +\define@key[autolatex]{mtable}{pH!}[\relax]{\gdef\@autolatex@mtable@position{pH!}} +\define@key[autolatex]{mtable}{htbp}[\relax]{\gdef\@autolatex@mtable@position{htbp}} +\define@key[autolatex]{mtable}{htbH}[\relax]{\gdef\@autolatex@mtable@position{htbH}} +\define@key[autolatex]{mtable}{htb!}[\relax]{\gdef\@autolatex@mtable@position{htb!}} +\define@key[autolatex]{mtable}{tbpH}[\relax]{\gdef\@autolatex@mtable@position{tbpH}} +\define@key[autolatex]{mtable}{tbp!}[\relax]{\gdef\@autolatex@mtable@position{tbp!}} +\define@key[autolatex]{mtable}{bpH!}[\relax]{\gdef\@autolatex@mtable@position{bph!}} +\define@key[autolatex]{mtable}{htbpH}[\relax]{\gdef\@autolatex@mtable@position{htbpH}} +\define@key[autolatex]{mtable}{htbp!}[\relax]{\gdef\@autolatex@mtable@position{htbp!}} +\define@key[autolatex]{mtable}{htbpH!}[\relax]{\gdef\@autolatex@mtable@position{htbpH!}} % \newenvironment{mtable}[6][ht]{% \global\let\@autolatex@mtable@position\relax% diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty index ded8bcfa8fe..133786fe4c7 100644 --- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty +++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-frontpage.sty @@ -17,17 +17,6 @@ % write to the Free Software Foundation, Inc., 59 Temple Place - Suite % 330, Boston, MA 02111-1307, USA. % -% Creation date: 2006-04-11 -% Modifications: -% 2009-10-30 Clean code. -% 2009-10-29 Major bug fix: invert order of the \setfrontillustration parameters. -% 2009-10-27 Clean the extension API. -% 2009-10-22 Add support for front page from UPM extensions. -% 2007-07-05 Add people name formatting function. -% 2007-07-03 Force single spacing inside the title. -% 2007-03-19 Add localization. -% 2006-04-19 Add version number. -% \global\edef\upm@package@fp@ver{2009/10/30} 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 f3a977fcd56..119e4e320d7 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/09/19} +\global\edef\upm@package@private@doctype@ver{2013/09/29} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-p-common}[\upm@package@private@doctype@ver] @@ -25,6 +25,19 @@ \RequirePackage{xspace} \RequirePackage{xcolor} +%---------------------------------------- +% UPMVERSION MACRO +%---------------------------------------- +\input UPMVERSION.def +\def\upm@common@parseversion@to@tex#1#2#3#4#5#6#7#8#9\@nil{#1#2#3#4/#5#6/#7#8} +\def\upm@common@parseversion@major#1#2#3#4#5#6#7#8#9\@nil{#1#2#3#4#5#6#7#8} +\edef\ver@UPMVERSION@major{\expandafter\upm@common@parseversion@major\UPMVERSION-\relax\@nil} +\edef\ver@UPMVERSION{\expandafter\upm@common@parseversion@to@tex\UPMVERSION\@nil} +\expandafter\let\csname ver@UPMVERSION.sty\endcsname\ver@UPMVERSION +\expandafter\let\csname ver@UPMVERSION.cls\endcsname\ver@UPMVERSION + +\gdef\UPMVERSIONTEST{\ver@UPMVERSION\\\ver@UPMVERSION@major} + %---------------------------------------- % ARAKHNE.ORG MACRO %---------------------------------------- @@ -158,6 +171,12 @@ \fi% } +% Loop on parts of a text given a specific separator. +% In the bodies, the macros \upm@foreach@term is the current data. +% #1: is the separator to consider +% #2: is the data set +% #3: is the body to run for each loop, except the last. +% #4: is the body to run for the last loop. \def\upm@foreach#1\in#2\do#3#4{% \global\upm@foreach@oneseparatorfalse% \gdef\upm@foreach@searchseparator##1#1##2\@nil{% -- cgit v1.2.3