summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-08-15 22:13:47 +0000
committerKarl Berry <karl@freefriends.org>2013-08-15 22:13:47 +0000
commit348ee98f6e5612626fbf72093fa8b526e573a1a3 (patch)
treef9d9b527a52eceea9851541e954d16b0b2035d7f /Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty
parent383f3a1a4878dab62fcae9f73369be14150bf0a6 (diff)
upmethodology (16aug13)
git-svn-id: svn://tug.org/texlive/trunk@31435 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty')
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-document.sty58
1 files changed, 29 insertions, 29 deletions
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
%----------------------------------------