summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/upmethodology/Changelog5
-rw-r--r--Master/texmf-dist/doc/latex/upmethodology/VERSION2
-rw-r--r--Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty14
3 files changed, 9 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/upmethodology/Changelog b/Master/texmf-dist/doc/latex/upmethodology/Changelog
index 9ae00415024..a15d511ffd6 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/Changelog
+++ b/Master/texmf-dist/doc/latex/upmethodology/Changelog
@@ -1,3 +1,8 @@
+2013-04-01 Stéphane GALLAND <galland@arakhne.org>
+ * upmethodology-fmt.sty: Do not put the default
+ bibliography style if it was already given
+ by the expanding of \bibliographystyle.
+
2012-10-02 Stéphane GALLAND <galland@arakhne.org>
* upmethodology-document.cls: Process the class options in
the order given by the caller and not in the order given
diff --git a/Master/texmf-dist/doc/latex/upmethodology/VERSION b/Master/texmf-dist/doc/latex/upmethodology/VERSION
index cffa0e088cd..8593eabd9d6 100644
--- a/Master/texmf-dist/doc/latex/upmethodology/VERSION
+++ b/Master/texmf-dist/doc/latex/upmethodology/VERSION
@@ -1 +1 @@
-upmethodology-20121002
+upmethodology-20130401
diff --git a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
index 61b9080242e..df21ed93386 100644
--- a/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
+++ b/Master/texmf-dist/tex/latex/upmethodology/upmethodology-fmt.sty
@@ -1,6 +1,6 @@
% Layout and Pagraph Format for Unified Process Methodology
%
-% Copyright (c) 2006-2009, 2012 Stephane GALLAND <galland@arakhne.org>
+% Copyright (c) 2006-2009, 2012-2013 Stephane GALLAND <galland@arakhne.org>
%
% This program is free library; you can redistribute it and/or modify
% it under the terms of the GNU Lesser General Public License as
@@ -19,6 +19,7 @@
%
% Creation date: 2006-04-06
% Modifications (lastest first):
+% 2013-04-01 Do not put the default bibliography style if it was already provided.
% 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.
@@ -48,7 +49,7 @@
% Bug fix: centering table's headers.
%
-\global\edef\upm@package@fmt@ver{2012/09/21}
+\global\edef\upm@package@fmt@ver{2013/04/01}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -603,15 +604,6 @@
\gdef\@bibitem#1{\item\upm@bibsize\if@filesw%
\immediate\write\@auxout{\string\bibcite{#1}{\the\value{\@listctr}}}\fi\ignorespaces}
-%-----
-\let\upm@bibliographystyle\bibliographystyle
-\let\upm@bibliography\bibliography
-\gdef\upm@bibstyle{abbr}
-\renewcommand{\bibliographystyle}[1]{\gdef\upm@bibstyle{#1}}
-\renewcommand{\bibliography}[1]{%
- \upm@bibliographystyle{\upm@bibstyle}%
- \upm@bibliography{#1}%
-}
%----------------------------------------
% TABLE OF CONTENT