custom-bib 4.31 (28jan11)

git-svn-id: svn://tug.org/texlive/trunk@21200 c570f23f-e606-0410-a88d-b1316a301751

21 files changed, 583 insertions, 131 deletions

diff --git a/Master/texmf-dist/tex/latex/custom-bib/catalan.mbs b/Master/texmf-dist/tex/latex/custom-bib/catalan.mbs
index a423cd6a93b..f561d1d0436 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/catalan.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/catalan.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: catalan.mbs
 % Copyright 1997-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % Copyright 1997, 1998 Robert Fuster
 % Departament de Matem\`atica Aplicada
diff --git a/Master/texmf-dist/tex/latex/custom-bib/dansk.mbs b/Master/texmf-dist/tex/latex/custom-bib/dansk.mbs
index d3cd21194c8..11b19795d03 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/dansk.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/dansk.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: dansk.mbs
 % Copyright 1995-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % Copyright (C) 1999, Brian Elmegaard
 % Department of Energy Engineering, Technical University of Denmark
diff --git a/Master/texmf-dist/tex/latex/custom-bib/dutch.mbs b/Master/texmf-dist/tex/latex/custom-bib/dutch.mbs
index c3b9ffb0259..2923d33aabf 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/dutch.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/dutch.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: dutch.mbs
 % Copyright 1997-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/english.mbs b/Master/texmf-dist/tex/latex/custom-bib/english.mbs
index a0e7c9ce9ef..384c15459ff 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/english.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/english.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: english.mbs
 % Copyright 1995-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/esperant.mbs b/Master/texmf-dist/tex/latex/custom-bib/esperant.mbs
index 3e5beddfaf8..5d2c5d4e768 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/esperant.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/esperant.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: esperant.mbs
 % Copyright 1995-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/finnish.mbs b/Master/texmf-dist/tex/latex/custom-bib/finnish.mbs
index 85574dea7b3..307067d3575 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/finnish.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/finnish.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: finnish.mbs
 % Copyright 1995-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/french.mbs b/Master/texmf-dist/tex/latex/custom-bib/french.mbs
index cf2a561ff40..29065accb51 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/french.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/french.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: french.mbs
 % Copyright 1995-2002 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/geojour.mbs b/Master/texmf-dist/tex/latex/custom-bib/geojour.mbs
index 9eb05791cf5..bf8519a543b 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/geojour.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/geojour.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: physjour.mbs
 % Copyright 1994-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/german.mbs b/Master/texmf-dist/tex/latex/custom-bib/german.mbs
index 63ae1006cc3..90cee2b64ee 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/german.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/german.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: german.mbs
 % Copyright 1995-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/italian.mbs b/Master/texmf-dist/tex/latex/custom-bib/italian.mbs
index 5f6b012cb6f..214d6e1dbbd 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/italian.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/italian.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: italian.mbs
 % Copyright 1995-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/makebst.tex b/Master/texmf-dist/tex/latex/custom-bib/makebst.tex
index 2800c8aa875..c5ad0c10654 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/makebst.tex
+++ b/Master/texmf-dist/tex/latex/custom-bib/makebst.tex
@@ -17,11 +17,11 @@
 %% Only a few abbreviated comments remain here to describe the usage.
 %% =============================================
 %% Copyright 1993-2003 Patrick W Daly
-%% Max-Planck-Institut f\"ur Aeronomie
+%% Max-Planck-Institut f\"ur Sonnensystemforschung
 %% Max-Planck-Str. 2
 %% D-37191 Katlenburg-Lindau
 %% Germany
-%% E-mail: daly@linmpi.mpg.de
+%% E-mail: daly@mps.mpg.de
 %%
 %% With additions by Arthur Ogawa
 %% E-mai: ogawa@teleport.com
diff --git a/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs b/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs
index f1c9cd61aac..e5e194ecaf1 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs
@@ -1,6 +1,6 @@
 %\iffalse         THIS IS A META COMMENT -*- TeX -*- -*- DTX -*-
 % File: merlin.mbs
-%% Copyright 1994-2007 Patrick W Daly
+%% Copyright 1994-2011 Patrick W Daly
 % Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
@@ -44,7 +44,7 @@
  % ===============================================================
  % Name and version information of the main mbs file:
 %\fi
- % \ProvidesFile{merlin.mbs}[2007/04/24 4.20 (PWD, AO, DPC)]
+ % \ProvidesFile{merlin.mbs}[2011/01/10 4.31 (PWD, AO, DPC)]
 %\iffalse
 %</!tail>
 %<*a&!a>
@@ -88,7 +88,7 @@
 %   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %   Right brace   \}     Tilde         \~}
 %
-% \CheckSum{516}
+% \CheckSum{517}
 % \setcounter{StandardModuleDepth}{1}
 % \setcounter{IndexColumns}{2}
 % \setlength{\IndexMin}{10cm}
@@ -267,6 +267,15 @@
 % \changes{4.16}{2006 Feb 15}{PWD: fix bug in \texttt{proceedings} that suppress number/series at times}
 % \changes{4.20}{2007 Apr 23}{PWD: add option to allow more than one author in cites before et al.}
 % \changes{4.20}{2007 Apr 24}{PWD: allow variable number of authors before truncating citation}
+% \changes{4.21}{2007 May 2}{PWD: reprogram \texttt{remove.dots} to retain dot accent}
+% \changes{4.22}{2007 Oct 10}{PWD: add code provided by Joseph Wright for 2-digit extra labels}
+% \changes{4.30}{2008 Aug 25}{PWD: fix bug in ordering with \texttt{seq-key} and truncated author lists}
+% \changes{4.30}{2008 Aug 25}{PWD: allow up to 6 authors with \texttt{mcite}}
+% \changes{4.30}{2008 Aug 27}{PWD: Fix bug for \texttt{nm-rvvc}, thanks to Ted Pavlic}
+% \changes{4.30}{2008 Aug 27}{PWD: Remove bibinfo encapsulation for DOI, treat like URL}
+% \changes{4.30}{2008 Aug 27}{PWD: Add option \texttt{url-doi} to make URL out of the DOI}
+% \changes{4.30}{2008 Oct 4}{PWD: Add option \texttt{xintls} to sort on surname only without initials}
+% \changes{4.31}{2011 Jan 10}{PWD: let the pre-date punctuation options \texttt{yr-com} etc. work with \texttt{harnm} too}
 %
 % \pagestyle{myheadings}
 % \markboth{P. W. Daly}{A General Master Bibliography Style}
@@ -818,12 +827,38 @@
 % \item[seq-no]  sequence by citation order
 % \item[seq-lab] (author--year) by label, date, title (means that Daly
 %                precedes Daly and Williams, precedes Daly et al.)
+% \item[seq-labc] (author--year) like \texttt{seq-lab} but the Daly et al.'s
+%                come in citation order
 % \item[seq-key] (author--year) like \texttt{seq-lab} except that for
 %                identical authors and year, the cite keyword is used
-%                instead of the title
+%                instead of the title or cite order
+% \item[xintls] (use with \texttt{seq-} options) to sort on surname only
+%                without the initials or first names
 % \item[vonx]    ignore \emph{von} part of name when ordering (default is
 %                to consider \emph{von} as part of the whole surname)
 % \end{opt}
+% Note on the \texttt{seq-lab} option and it variants: it orders the list of
+% references by \emph{label}, which is what the |\cite| command prints. The
+% ordering rules are:
+% \begin{enumerate}
+%   \item the first author, with name or initials (so P.~Daly is different from
+%   E.~Daly)
+%   \item by number of co-authors: single author, double author, multiple
+%   authors
+%   \item by year
+%   \item by co-authors
+%   \item by title
+% \end{enumerate}
+% Variations are: with \texttt{seq-key}, the last item becomes the \btx\ citation
+% keyword; with \texttt{seq-labc}, the co-author is still used for two-author
+% papers, but not for multiple authors, and the final criterion is the order of
+% citation in the document. These references will have identical labels (First
+% \emph{et~al}, year) and are distinguished by additional letters, which are
+% assigned in the order in which the first citations are made. The list of
+% references conforms to this order.
+%
+% With \texttt{xintls} as well, first names or initials are
+%  ignored for sorting, so all Daly's are mixed together.
 %
 % \textbf{Language selection:} the translations of certain explicit words.
 % \begin{opt}
@@ -932,8 +967,8 @@
 % cite only one name with \textsl{et~ al.}
 % \begin{opt}
 % \item[mcite] to change the default
-% \item[mct-1...mct-5] (with \texttt{mcite}) number of names preceding \textsl{et~al.}
-% \item[mct-x2...mct-x5] (with \texttt{mcite}) max number of authors without truncating
+% \item[mct-1...mct-6] (with \texttt{mcite}) number of names preceding \textsl{et~al.}
+% \item[mct-x2...mct-x6] (with \texttt{mcite}) max number of authors without truncating
 % \end{opt}
 % The default is equivalent to \texttt{mct-1} and \texttt{mct-x2}.
 %
@@ -1181,7 +1216,7 @@
 % \textbf{URL address:} include or not, and how
 % \begin{opt}
 % \item[--]       ignore URL field,
-% \item[url]      process URL field,
+% \item[url]      process URL field (needs one of next options too),
 % \item[url-blk]  (with \texttt{url}) URL text as regular blocked item,
 % \item[url-nt]   URL text treated as a note
 % \item[url-nl]   URL text added as new line below reference (Harvard style)
@@ -1191,9 +1226,15 @@
 % \begin{opt}
 % \item[--]       default is not to include the Digital Object Identifier
 % \item[doi]      include the DOI number
-% \item[agu-doi]  place DOI number AGU style, as part of page designation
-%
+% \item[agu-doi]  (with \texttt{doi}) place DOI number AGU style, as part of page designation
+% \item[url-doi]  (with \texttt{url} options) write DOI as a URL
 % \end{opt}
+% With the \texttt{url-doi} option, the DOI is formatted to be a URL, i.e. as
+%  |//dx.doi.org/|\emph{doi}; if there is a URL entry as well, it is ignored.
+%  If this option is given without the \texttt{url} options, it behaves like
+%  \texttt{doi}.
+%
+% The \texttt{agu-doi} option is for the special usage of the American Geophysical Society.
 %
 % \textbf{REV\TeX\ data fields:} for use with \texttt{revtex.bst}.
 % \begin{opt}
@@ -1630,6 +1671,8 @@
 \optdef{*}{}{Alphabetical}{by all authors}
 \optdef{l}{seq-lab}{By label}%
    {(Jones before Jones and James before Jones et al)}
+\optdef{m}{seq-labc}{By label and cite order}%
+   {(like above but all Jones et al ordered as cited)}
 \optdef{k}{seq-key}{By label and cite key}{instead of label and title, as above}
 \optdef{d}{seq-yr}{Year ordered}{and then by authors (for publication lists)}
 \optdef{r}{seq-yrr}{Reverse year ordered}{and then by authors (most recent first)}
@@ -1650,6 +1693,18 @@
 \endoptiongroup
 %    \end{macrocode}
 %
+% Sorting normally treats authors with the same surname but different initials
+% or first name separately; but a strict ordering by cite label would lump all
+% Smiths together.
+%    \begin{macrocode}
+\beginoptiongroup{IGNORE FIRST NAMES (if author-year citations)}
+  {\ifnumerical\else*\fi}%
+\optdef{*}{}{Respect first names}{or initials, treat as different authors}
+\optdef{x}{xintls}{Sort on surname only}{and treat all Smiths as one}
+\getans
+\endoptiongroup
+%    \end{macrocode}
+%
 % \subsection*{Formatting author names}
 % The default is that the full names of the authors are listed, given names
 % first, unabbreviated. Of course, if only the initials have been given in
@@ -1806,6 +1861,7 @@
 \optdef{3}{mct-3}{One, Two, Three et al}{}
 \optdef{4}{mct-4}{One, Two, Three, Four et al}{}
 \optdef{5}{mct-5}{One, Two, Three, Four, Five et al}{}
+\optdef{6}{mct-6}{One, Two, Three, Four, Five, Six et al}{}
 \getans
 \endoptiongroup
 \beginoptiongroup{MAX AUTHORS WITHOUT ET AL:
@@ -1815,6 +1871,7 @@
 \optdef{3}{mct-x3}{Three authors}{without truncating}
 \optdef{4}{mct-x4}{Four authors}{without truncating}
 \optdef{5}{mct-x5}{Five authors}{without truncating}
+\optdef{6}{mct-x6}{Six authors}{without truncating}
 \getans
 \endoptiongroup
 %    \end{macrocode}
@@ -2432,6 +2489,7 @@
 
 \beginoptiongroup{DOI NUMBER:}{}
 \optdef{*}{doi}{Include DOI}{as "doi: number"}
+\optdef{u}{url-doi}{Format DOI as URL //dx.doi.org/doi}{(must give url options!)}
 \optdef{a}{agu-doi,doi}{Insert DOI AGU style}{as part of page number}
 \optdef{x}{}{No DOI}{}
 \getans
@@ -2956,7 +3014,7 @@
 %<nat> %   \citep*{key} ==>>               (Jones, Baker, and Smith, 1990)
  %   \citep[chap. 2]{key} ==>>       (Jones et al., 1990, chap. 2)
  %   \citep[e.g.][]{key} ==>>        (e.g. Jones et al., 1990)
- %   \citep[e.g.][p. 32]{key} ==>>   (e.g. Jones et al., p. 32)
+ %   \citep[e.g.][p. 32]{key} ==>>   (e.g. Jones et al., 1990, p. 32)
  %   \citeauthor{key} ==>>           Jones et al.
 %<nat> %   \citeauthor*{key} ==>>          Jones, Baker, and Smith
  %   \citeyear{key} ==>>             1990
@@ -3065,7 +3123,7 @@ ENTRY
     booktitle
     chapter
 %<revdata>    collaboration
-%<doi>    doi
+%<doi|url-doi>    doi
     edition
     editor
     eid
@@ -3372,24 +3430,33 @@ FUNCTION {non.stop}
 %
 % \begin{macro}{`remove.dots'}
 % \changes{4.00}{1999 Oct 8}{Add macro}
+% \changes{4.21}{2007 May 2}{Retain dot accent}
 % This macro removes any periods from the string on the stack. To be used
 % for undotting journal names, months, and juniors. Previously
 % \texttt{purify\$} was used for this, but that removes more than just
 % dots.
+%
+% May 2007, Joseph A. Wright (Morning Star, UK) contributed a revision to allow
+% the dot accent |\.| to be retained.
 %    \begin{macrocode}
 %<*nm-rv|nm-rvx|nm-rvcx|mth-bare|jxper>
-STRINGS {z}
 FUNCTION {remove.dots}
 { 'z :=
-  ""
-  { z empty$ not }
-  { z #1 #1 substring$
-    z #2 global.max$ substring$ 'z :=
-    duplicate$ "." = 'pop$
-      { * }
-    if$
-  }
-  while$
+   ""
+   { z empty$ not }
+   { z #1 #2 substring$
+     duplicate$ "\." =
+       { z #3 global.max$ substring$ 'z :=  * }
+       { pop$
+         z #1 #1 substring$
+         z #2 global.max$ substring$ 'z :=
+         duplicate$ "." = 'pop$
+           { * }
+         if$
+       }
+     if$
+   }
+   while$
 }
 %</nm-rv|nm-rvx|nm-rvcx|mth-bare|jxper>
 %    \end{macrocode}
@@ -4139,7 +4206,6 @@ MACRO {tcs} {"Theor. Comput. Sci."}
 % \begin{description}
 % \item[  \texttt{author}        ]\texttt{format.names}
 % \item[  \texttt{collaboration} ]\texttt{format.authors}
-% \item[  \texttt{doi}           ]\texttt{format.doi}
 % \item[  \texttt{editor}        ]\texttt{format.editors} (\texttt{book}, \texttt{inbook}, \texttt{proceedings}), \texttt{format.names.ed} (\texttt{format.in.ed.booktitle})
 % \item[  \texttt{eid}           ]\texttt{format.journal.eid} (\texttt{format.vol.num.pages}, article) checks the output from \texttt{format.journal.pages}
 % \item[  \texttt{isbn}          ]\texttt{format.isbn}
@@ -4172,6 +4238,11 @@ MACRO {tcs} {"Theor. Comput. Sci."}
 % \item[  \texttt{url}           ]\texttt{format.url} (\texttt{\char`\\harvardurl}, \texttt{\char`\\url}), \texttt{format.url} (\texttt{\char`\\url}), \texttt{format.note} (\texttt{\char`\\url})
 % \end{description}
 %
+% \subsubsection*{Encapsulated via \texttt{\char`\\doi}}
+% \begin{description}
+% \item[  \texttt{doi}           ]\texttt{format.doi} (\texttt{\char`\\doi})
+% \end{description}
+%
 % \subsubsection*{Encapsulated via \texttt{\char`\\eprint}}
 % \begin{description}
 % \item[  \texttt{eprint}        ]\texttt{format.eprint}
@@ -4291,6 +4362,7 @@ FUNCTION {format.eprint}
 %   \texttt{harnm}}
 % \changes{3.87}{1998 Jul 23}{Apply to non-Harvard styles}
 % \changes{4.03}{2002 Jan 14}{Fix bug when both harnm and url-nl given}
+% \changes{4.30}{2008 Aug 27}{Add option to put DOI as URL}
 % This function taken over from \texttt{agsm.sty}, the main \texttt{harvard}
 % bib style. For non-Harvard styles that want to add the URL on a new line
 % after the reference, use this function too, but defined slightly
@@ -4299,18 +4371,34 @@ FUNCTION {format.eprint}
 %<*(harnm|url-nl)&!revdata>
 FUNCTION {write.url}
 %<*!html>
-{ url empty$
-    { skip$ }
-%<harnm>    { "\newline\harvardurl{" url * "}" * write$ newline$ }
-%<!harnm&url-nl>    { "\newline\urlprefix\url{" url * "}" * write$ newline$ }
+{
+%<*url-doi&url>
+  doi empty$
+    { url }
+    { "http://dx.doi.org/" doi * }
+  if$
+%</url-doi&url>
+%<!url-doi|!url>  url
+  duplicate$ empty$
+    { pop$ }
+%<harnm>    { "\newline\harvardurl{" swap$ * "}" * write$ newline$ }
+%<!harnm&url-nl>    { "\newline\urlprefix\url{" swap$ * "}" * write$ newline$ }
   if$
 }
 %</!html>
 %<*html>
-{ url empty$
-    { skip$ }
-    {  "<br><a href=" quote$ * url * quote$
-      * ">" * url * "</a>" *  write$ newline$ }
+{
+%<*url-doi&url>
+  doi empty$
+    { url }
+    { "http://dx.doi.org/" doi * }
+  if$
+%</url-doi&url>
+%<!url-doi|!url>  url
+  duplicate$ empty$
+    { pop$ }
+    {  duplicate$ "<br><a href=" quote$ * swap$ * quote$
+      * ">" * swap$ * "</a>" *  write$ newline$ }
   if$
 }
 %</html>
@@ -4321,6 +4409,7 @@ FUNCTION {write.url}
 %
 % \begin{macro}{`format.url'}
 % \changes{3.87}{1998 Jul 22}{Add function for regular URLs}
+% \changes{4.30}{2008 Aug 27}{Add option to put DOI as URL}
 % A non-harvard version of URL is also made for regular styles.
 % This is used only if the URL text is added as a regular item to the
 % reference information, blocked if necessary. Alternatives are on a new line
@@ -4328,11 +4417,19 @@ FUNCTION {write.url}
 %    \begin{macrocode}
 %<*(url-blk&!harnm)|revdata>
 FUNCTION {format.url}
-{ url empty$
-    { "" }
-%<!html>    { "\urlprefix\url{" url * "}" * }
-%<html>    {  "<a href=" quote$ * url * quote$
-%<html>      * ">" * url * "</a>" * }
+{
+%<*url-doi&url>
+  doi empty$
+    { url }
+    { "http://dx.doi.org/" doi * }
+  if$
+%</url-doi&url>
+%<!url-doi|!url>  url
+  duplicate$ empty$
+    { pop$ "" }
+%<!html>    { "\urlprefix\url{" swap$ * "}" * }
+%<html>    {  duplicate$ "<a href=" quote$ * swap$ * quote$
+%<html>      * ">" * swap$ * "</a>" * }
   if$
 }
 
@@ -4780,6 +4877,7 @@ FUNCTION {format.names}
 % \changes{3.88}{1999 Mar 18}{Bug fix: \texttt{and-com-ed} used correctly}
 % \changes{3.89d1}{1999 July 20}{AO: encapsulate editor for later processing;
 %    trap empty editor list}
+% \changes{4.30}{2008 Aug 27}{Fix bug for \texttt{nm-rvvc}}
 % When editors are used in place of authors to identify the work, the
 % names are always formatted just like authors'. However, in collections,
 % where ``edited by'' or ``\emph{names} (editors)'' are given, it is
@@ -4905,7 +5003,7 @@ FUNCTION {format.names.ed}
       if$
 %</nm-rvx|nm-rvcx>
 %<*!nm-rvx&!nm-rvcx>
-%<*nm-rvv>
+%<*nm-rvv|nm-rvvc>
       "{f{.}.}" format.name$ duplicate$ empty$ 'skip$
         { tie.or.space.prefix bib.fname.font swap$ * }
       if$
@@ -4915,8 +5013,8 @@ FUNCTION {format.names.ed}
       "{jj}" format.name$ duplicate$ empty$ 'skip$
         { bib.fname.font " " swap$ * }
       if$
-%</nm-rvv>
-%<*!nm-rvv>
+%</nm-rvv|nm-rvvc>
+%<*!nm-rvv&!nm-rvvc>
       "{ff}" format.name$ duplicate$ empty$ 'skip$
         { tie.or.space.prefix bib.fname.font swap$ * }
       if$
@@ -4926,7 +5024,7 @@ FUNCTION {format.names.ed}
       "{jj}" format.name$ duplicate$ empty$ 'skip$
         { bib.fname.font ", " swap$ * }
       if$
-%</!nm-rvv>
+%</!nm-rvv&!nm-rvvc>
 %</!nm-rvx&!nm-rvcx>
 %</!nm-rv>
 %</!nm-revv1>
@@ -5143,19 +5241,21 @@ FUNCTION {format.issn}
 %
 % \begin{macro}{`format.doi'}
 % \changes{4.10}{2003 May 28}{Add function}
+% \changes{4.30}{2008 Aug 27}{Remove bibinfo encapsulation for DOI}
+% DOIs like URLs are encapsulated by their own commands, so need no \texttt{bibinfo.check}.
 %    \begin{macrocode}
-%<*doi>
+%<*doi|(url-doi&!url)>
 FUNCTION {format.doi}
-{ doi "doi" bibinfo.check
-  duplicate$ empty$ 'skip$
+{ doi empty$
+    { "" }
     {
 %<!blk-com&!blk-tit&!blk-tita>      new.block
-%<!html>      "\doi{" swap$ * "}" *
-%<html>      "doi:" swap$ *
+%<!html>      "\doi{" doi * "}" *
+%<html>      "doi:" doi *
     }
   if$
 }
-%</doi>
+%</doi|(url-doi&!url)>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -5749,11 +5849,12 @@ FUNCTION {word.in}
 % \changes{3.87}{1998 Jul 23}{For \texttt{harnm}, suppress punctuation before date}
 % \changes{3.89}{1999 May 12}{Add \texttt{blkyear} option}
 % \changes{3.89d1}{1999 July 20}{AO: encapsulate the date for further processing}
+% \changes{4.31}{2011 Jan 10}{Allow options for punctuation preceding date to work with harvard}
 % The new \texttt{harvard.sty} allows variable brackets around the date
 % in the reference list. It uses |\harvardyearleft| and |\harvardyearright|
 % in the \texttt{.bst} files. Allow this with the option \texttt{harnm},
 % which could actually be used without the \texttt{har} option. Note that
-% this overrides the other year formatting options.
+% this overrides the other year formatting options, except for the preceding punctuation.
 %    \begin{macrocode}
 %<*ay>
 FUNCTION {format.date}
@@ -5790,8 +5891,14 @@ FUNCTION {format.date}
 %<!yr-par&!yr-brk&!yr-col&!yr-com&!yr-per&yr-blk>  " " swap$ *
 %</yr-par|yr-brk|yr-col|yr-blk|yr-com|yr-per>
 %</!harnm>
-%<harnm>  before.all 'output.state :=
-%<harnm>  " \harvardyearleft " swap$ * "\harvardyearright{}" *
+%<*harnm>
+  before.all 'output.state :=
+  " \harvardyearleft " swap$ * "\harvardyearright{}" *
+%<yr-col>  ":" swap$ *
+%<!yr-col&yr-com>  "," swap$ *
+%<!yr-col&!yr-com&yr-per>  after.sentence 'output.state :=
+%<!yr-col&!yr-com&!yr-per&yr-blk>  " " swap$ *
+%</harnm>
 }
 %</ay>
 %<*!ay>
@@ -6963,7 +7070,7 @@ FUNCTION {article}
   if$
 %</pp-last>
 %<issn>  format.issn output
-%<doi&!agu-doi>  format.doi output
+%<(doi|(url-doi&!url))&!agu-doi>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7037,7 +7144,7 @@ FUNCTION {book}
 %<!dt-beg&!dt-end&!pub-date>  format.date "year" output.check
 %<isbn>  format.isbn output
 %<pg-bk&!pg-pre>  format.book.pages output
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7082,7 +7189,7 @@ FUNCTION {booklet}
 %<!ay&!dt-beg&!dt-end>  format.date output
 %<isbn>  format.isbn output
 %<pg-bk>  format.book.pages output
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7189,7 +7296,7 @@ FUNCTION {inbook}
   date.block
 %</(!dt-beg&!dt-end&dt-jnl)&!pub-date>
 %<pp-last>  format.pages "pages" output.check
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7256,7 +7363,7 @@ FUNCTION {incollection}
   date.block
 %</(!dt-beg&!dt-end&dt-jnl)&!pub-date>
 %<pp-last>  format.pages "pages" output.check
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7336,7 +7443,7 @@ FUNCTION {inproceedings}
   format.pages "pages" output.check
 %</!dt-beg&!dt-end&dt-jnl&!pp-last>
 %<pp-last>  format.pages "pages" output.check
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7384,7 +7491,7 @@ FUNCTION {manual}
   address "address" bibinfo.check output
   format.edition output
 %<!dt-beg&!dt-end>  format.date "year" output.check
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7443,7 +7550,7 @@ FUNCTION {manual}
   format.edition output
 %<ay&!dt-beg&!dt-end>  format.date "year" output.check
 %<!ay&!dt-beg&!dt-end>  format.date output
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7500,7 +7607,7 @@ FUNCTION {mastersthesis}
   school "school" bibinfo.warn output
   address "address" bibinfo.check output
 %<!dt-beg&!dt-end>  format.date "year" output.check
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7551,7 +7658,7 @@ FUNCTION {misc}
   howpublished "howpublished" bibinfo.check output
 %<ay&!dt-beg&!dt-end>  format.date "year" output.check
 %<!ay&!dt-beg&!dt-end>  format.date output
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7607,7 +7714,7 @@ FUNCTION {phdthesis}
   school "school" bibinfo.warn output
   address "address" bibinfo.check output
 %<!dt-beg&!dt-end>  format.date "year" output.check
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7694,7 +7801,7 @@ FUNCTION {proceedings}
 %<!dt-beg&!dt-end&!pub-date>  format.date "year" output.check
 %<isbn>  format.isbn output
 %<issn>  format.issn output
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7756,7 +7863,7 @@ FUNCTION {proceedings}
 %<!dt-beg&!dt-end&!pub-date>      format.date "year" output.check
 %<isbn>  format.isbn output
 %<issn>  format.issn output
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7806,7 +7913,7 @@ FUNCTION {techreport}
   institution "institution" bibinfo.warn output
   address "address" bibinfo.check output
 %<!dt-beg&!dt-end>  format.date "year" output.check
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -7846,7 +7953,7 @@ FUNCTION {unpublished}
 %<blk-com&tit-qq>  end.quote.title
 %<ay&!dt-beg&!dt-end>  format.date "year" output.check
 %<!ay&!dt-beg&!dt-end>  format.date output
-%<doi>  format.doi output
+%<doi|(url-doi&!url)>  format.doi output
 %<*url-blk&!harnm&!revdata>
 %<!blk-com&!blk-tit&!blk-tita>  new.block
   format.url output
@@ -8087,6 +8194,7 @@ FUNCTION {format.lab.names}
 %
 % \changes{4.20}{2007 Apr 23}{Add citations with more than one author with \emph{et~al.}}
 % \changes{4.20}{2007 Apr 24}{Select number of authors before truncating}
+% \changes{4.30}{2008 Aug 25}{Up to 6 authors possible in citation}
 % The code for formating author--year citations with more than one author
 % before \emph{et al.} or selecting a number other than two for truncating,
 % is much the same as the \texttt{format.full.names} function.
@@ -8114,10 +8222,12 @@ FUNCTION {format.lab.names}
 %<mct-3>          nameptr #4 =
 %<mct-4>          nameptr #5 =
 %<mct-5>          nameptr #6 =
+%<mct-6>          nameptr #7 =
 %<mct-x2>          numnames #2 > and
 %<mct-x3>          numnames #3 > and
 %<mct-x4>          numnames #4 > and
 %<mct-x5>          numnames #5 > and
+%<mct-x6>          numnames #6 > and
             { "others" 't :=
               #1 'namesleft := }
             'skip$
@@ -8382,6 +8492,10 @@ FUNCTION {calc.short.label}
 % \changes{3.5}{1995 Oct 24}{For limited authors, sort only on those present}
 % \changes{3.5}{1995 Oct 24}{`Et al' considered author before all others}
 % \changes{3.83}{1997 Feb 25}{`Et al' considered author after all others}
+% \changes{4.30}{2008 Aug 25}{Improve sorting for `others', both in bib file and when truncated}
+% \changes{4.30}{2008 Aug 25}{Add \texttt{seq-labc}, like \texttt{seq-lab} but cite order
+%   used instead of co-authors and title/cite-key}
+% \changes{4.30}{2008 Aug 27}{Fix bug for \texttt{nm-rvvc}}
 %    \begin{macrocode}
 FUNCTION {sort.format.names}
 { 's :=
@@ -8391,14 +8505,20 @@ FUNCTION {sort.format.names}
   numnames 'namesleft :=
     { namesleft #0 > }
     { s nameptr
-%<*!nm-init&!nm-rev&!nm-rev1&!nm-rv&!nm-rvx&!nm-rvcx&!nm-rvv>
+%<*xintls>
+%<!vonx>      "{vv{ } }{ll{ }}"
+%<vonx>      "{ll{ }}"
+%</xintls>
+%<*!xintls>
+%<*!nm-init&!nm-rev&!nm-rev1&!nm-rv&!nm-rvx&!nm-rvcx&!nm-rvv&!nm-rvvc>
 %<!vonx>      "{vv{ } }{ll{ }}{  ff{ }}{  jj{ }}"
 %<vonx>      "{ll{ }}{  ff{ }}{  jj{ }}"
-%</!nm-init&!nm-rev&!nm-rev1&!nm-rv&!nm-rvx&!nm-rvcx&!nm-rvv>
-%<*nm-init|nm-rev|nm-rev1|nm-rv|nm-rvx|nm-rvcx|nm-rvv>
+%</!nm-init&!nm-rev&!nm-rev1&!nm-rv&!nm-rvx&!nm-rvcx&!nm-rvv&!nm-rvvc>
+%<*nm-init|nm-rev|nm-rev1|nm-rv|nm-rvx|nm-rvcx|nm-rvv|nm-rvvc>
 %<!vonx>      "{vv{ } }{ll{ }}{  f{ }}{  jj{ }}"
 %<vonx>      "{ll{ }}{  f{ }}{  jj{ }}"
-%</nm-init|nm-rev|nm-rev1|nm-rv|nm-rvx|nm-rvcx|nm-rvv>
+%</nm-init|nm-rev|nm-rev1|nm-rv|nm-rvx|nm-rvcx|nm-rvv|nm-rvvc>
+%</!xintls>
       format.name$ 't :=
       nameptr #1 >
         {
@@ -8450,17 +8570,19 @@ FUNCTION {sort.format.names}
 %</nmlm>
           "   "  *
           namesleft #1 = t "others" = and
-            { "zzzzz" * }
-%<*seq-lab|seq-key>
-            { numnames #2 > nameptr #2 = and
-                { "zz" * year field.or.null * "   " * }
-                'skip$
-              if$
-              t sortify *
+            { "zzzzz" 't := }
+            'skip$
+          if$
+%<*seq-lab|seq-key|seq-labc>
+          numnames #2 > nameptr #2 = and
+            { "zz" * year field.or.null * "   " *
+%<seq-labc>              #1 'namesleft :=
             }
-%</seq-lab|seq-key>
-%<!seq-lab&!seq-key>            { t sortify * }
+%<seq-labc>            { t sortify * }
+%<!seq-labc>            'skip$
           if$
+%</seq-lab|seq-key|seq-labc>
+%<!seq-labc>          t sortify *
         }
         { t sortify * }
       if$
@@ -8630,18 +8752,19 @@ FUNCTION {presort}
   'sort.label :=
   sort.label
   *
-  "    "
-  *
 %<seq-yr>  "    " * year field.or.null *
 %<seq-yrr&!seq-yr>  "    " * negate.year field.or.null *
-%<*!seq-key&!seq-yr&!seq-yrr>
+%<*!seq-key&!seq-labc&!seq-yr&!seq-yrr>
+  "    "
+  *
   title field.or.null
   sort.format.title
-%</!seq-key&!seq-yr&!seq-yrr>
-%<seq-key|seq-yr|seq-yrr>  cite$
   *
+%</!seq-key&!seq-labc&!seq-yr&!seq-yrr>
+%<seq-key|seq-yr|seq-yrr>  "    " * cite$ *
   #1 entry.max$ substring$
   'sort.key$ :=
+%  "For " cite$ * ", sort.key=" * sort.key$ * warning$
 }
 
 %    \end{macrocode}
@@ -8755,9 +8878,6 @@ SORT
 %</ay|alph|!seq-no>
 %    \end{macrocode}
 %
-% \subsection{`forward.pass'}
-% \changes{3.4}{1995 Sep 5}{Include number of references in argument to
-%     \texttt{thebibliography} environment}
 % With version~6.0 of \texttt{natbib}, the author-year styles can also be
 % used for numerical citations; then the \texttt{thebibliography} environment
 % must have an argument indicating the length of the longest label.
@@ -8770,27 +8890,48 @@ SORT
 STRINGS { last.label next.extra }
 %    \end{macrocode}
 %
+% With computer-generated articles, it is possible to have more than 26 articles
+% in one year. It has finally occurred that the extra labels go beyond `z'.
+% The current code now allows for `aa', \dots `az', 'ba', \dots `zz'. This
+% code was provided by Joseph Wright (2007 Oct 10).
 %    \begin{macrocode}
-INTEGERS { last.extra.num number.label }
+INTEGERS { last.extra.num last.extra.num.extended last.extra.num.blank number.label }
 %    \end{macrocode}
 %
 % \begin{macro}{`initialize.extra.label.stuff'}
+% \changes{4.22}{2007 Oct 10}{Add code to allow extra labels to go beyond 26}
 %    \begin{macrocode}
 FUNCTION {initialize.extra.label.stuff}
 { #0 int.to.chr$ 'last.label :=
   "" 'next.extra :=
   #0 'last.extra.num :=
+  "a" chr.to.int$ #1 - 'last.extra.num.blank :=
+  last.extra.num.blank 'last.extra.num.extended :=
   #0 'number.label :=
 }
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{`forward.pass'}
+% \changes{3.4}{1995 Sep 5}{Include number of references in argument to
+%     \texttt{thebibliography} environment}
+% \changes{4.22}{2007 Oct 10}{Add code to allow extra labels to go beyond 26}
 %    \begin{macrocode}
 FUNCTION {forward.pass}
 { last.label label =
     { last.extra.num #1 + 'last.extra.num :=
-      last.extra.num int.to.chr$ 'extra.label :=
+      last.extra.num "z" chr.to.int$ >
+       { "a" chr.to.int$ 'last.extra.num :=
+         last.extra.num.extended #1 + 'last.extra.num.extended :=
+       }
+       'skip$
+      if$
+      last.extra.num.extended last.extra.num.blank >
+        { last.extra.num.extended int.to.chr$
+          last.extra.num int.to.chr$
+          * 'extra.label := }
+        { last.extra.num int.to.chr$ 'extra.label := }
+      if$
     }
     { "a" chr.to.int$ 'last.extra.num :=
       "" 'extra.label :=
@@ -8949,18 +9090,19 @@ FUNCTION {bib.sort.order}
   *
 %<seq-yrr>  negate.year field.or.null sortify
 %<!seq-yrr>  year field.or.null sortify
-%<(seq-yr|seq-yrr)&!(seq-lab|seq-key)>  swap$
+%<(seq-yr|seq-yrr)&!(seq-lab|seq-key|seq-labc)>  swap$
   *
+%<*!seq-key&!seq-labc&!seq-yr&!seq-yrr>
   "    "
   *
-%<*!seq-key&!seq-yr&!seq-yrr>
   title field.or.null
   sort.format.title
-%</!seq-key&!seq-yr&!seq-yrr>
-%<seq-key|seq-yr|seq-yrr>  cite$
   *
+%</!seq-key&!seq-labc&!seq-yr&!seq-yrr>
+%<seq-key|seq-yr|seq-yrr>  "    " * cite$ *
   #1 entry.max$ substring$
   'sort.key$ :=
+%  "For " cite$ * ", bib.sort.key=" * sort.key$ * warning$
 %<har|cay|nmd|cn|ast>  calc.short.label
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/custom-bib/norsk.mbs b/Master/texmf-dist/tex/latex/custom-bib/norsk.mbs
index c7fe487283e..0946f1e1d1a 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/norsk.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/norsk.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: norsk.mbs
 % Copyright 1995-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % Copyright 1995, Rolf Lindgren, OPERATOR
 % Universitetes Senter for Informasjonsteknologi
diff --git a/Master/texmf-dist/tex/latex/custom-bib/photjour.mbs b/Master/texmf-dist/tex/latex/custom-bib/photjour.mbs
index 4cdb4561744..6707a9a4eef 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/photjour.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/photjour.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: photjour.mbs
 % Copyright 1997-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 % 
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/physjour.mbs b/Master/texmf-dist/tex/latex/custom-bib/physjour.mbs
index 2285527f9f7..164a7f7ab0d 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/physjour.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/physjour.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: physjour.mbs
 % Copyright 1994-2002 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/polski.mbs b/Master/texmf-dist/tex/latex/custom-bib/polski.mbs
index 9c6f40a01a8..2f6c1efd28a 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/polski.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/polski.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: polski.mbs
 % Copyright 1995-2000 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % Copyright (C) 2000, Andrzej M. Borzyszkowski
 % Instytut Podstaw Informatyki Polskiej Akademii Nauk
diff --git a/Master/texmf-dist/tex/latex/custom-bib/portuges.mbs b/Master/texmf-dist/tex/latex/custom-bib/portuges.mbs
index 692115d1d9c..178e7c50664 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/portuges.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/portuges.mbs
@@ -1,19 +1,18 @@
 %\iffalse         THIS IS A META COMMENT
 % File: portuges.mbs
 % Copyright 1997-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % Copyright 1997 Rui Ara\'ujo
 % Instituto de Sistemas e Rob\'otica, e
-% Departamento de Engenharia Electrot\'ecnica
-% Universidade de Coimbra
-% P\'olo II; Pinhal de Marrocos
-% P-3030 Coimbra, Portugal
-% E-mail: rui@isr.uc.pt, rui@dee.uc.pt
+% Departamento de Engenharia Electrot\'ecnica e de Computadores
+% Universidade de Coimbra, P\'olo II
+% P-3030-290 Coimbra, Portugal
+% E-mail: rui@isr.uc.pt, rui@deec.uc.pt
 %
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/slovene.mbs b/Master/texmf-dist/tex/latex/custom-bib/slovene.mbs
index 7eb459620b8..854f5406672 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/slovene.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/slovene.mbs
@@ -9,6 +9,13 @@
 % Slovenia
 % E-mail: primoz.peterlin@biofiz.mf.uni-lj.si
 % 
+% From templates by Patrick W. Daly
+% Max-Planck-Institut f\"ur Sonnensystemforschung
+% Max-Planck-Str. 2
+% D-37191 Katlenburg-Lindau
+% Germany
+% E-mail: daly@mps.mpg.de
+% 
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
 % archives in directory macros/latex/base/lppl.txt; either
diff --git a/Master/texmf-dist/tex/latex/custom-bib/spanish.mbs b/Master/texmf-dist/tex/latex/custom-bib/spanish.mbs
index 2e9b7c8dfc1..920ed4da62f 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/spanish.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/spanish.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: spanish.mbs
 % Copyright 1995-1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 %
 % Copyright 1995 Tom\'as Bautista
 % Divisi\'on de CAD del Centro de Microelectr\'onica Aplicada
diff --git a/Master/texmf-dist/tex/latex/custom-bib/suppjour.mbs b/Master/texmf-dist/tex/latex/custom-bib/suppjour.mbs
index 69f2ca69c66..df3045f7fbc 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/suppjour.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/suppjour.mbs
@@ -1,11 +1,11 @@
 %\iffalse         THIS IS A META COMMENT
 % File: suppjour.mbs
 % Copyright 1998, 1999 Patrick W Daly
-% Max-Planck-Institut f\"ur Aeronomie
+% Max-Planck-Institut f\"ur Sonnensystemforschung
 % Max-Planck-Str. 2
 % D-37191 Katlenburg-Lindau
 % Germany
-% E-mail: daly@linmpi.mpg.de
+% E-mail: daly@mps.mpg.de
 % 
 % This program can be redistributed and/or modified under the terms
 % of the LaTeX Project Public License Distributed from CTAN
diff --git a/Master/texmf-dist/tex/latex/custom-bib/svenska.mbs b/Master/texmf-dist/tex/latex/custom-bib/svenska.mbs
new file mode 100644
index 00000000000..1720b4dd2e8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/custom-bib/svenska.mbs
@@ -0,0 +1,304 @@
+%\iffalse         THIS IS A META COMMENT
+% File: svenska.mbs
+% Copyright 1995-1999 Patrick W Daly
+% Max-Planck-Institut f\"ur Sonnensystemforschung
+% Max-Planck-Str. 2
+% D-37191 Katlenburg-Lindau
+% Germany
+% E-mail: daly@mps.mpg.de
+%
+% Swedish translations by Erik \"{O}sthols
+%
+% This program can be redistributed and/or modified under the terms
+% of the LaTeX Project Public License Distributed from CTAN
+% archives in directory macros/latex/base/lppl.txt; either
+% version 1 of the License, or any later version.
+%
+% It is part of the custom-bib collection,
+%   a contribution to the LaTeX2e system.
+%====================================================================
+%       A Language Definition File:  SWEDISH
+%     to be included with other master bibliography style files
+%--------------------------------------------------------------------
+%   (See version and date in the \ProvidesFile command below)
+%--------------------------------------------------------------------
+%    This file is self-documenting: simply LaTeX it!
+%====================================================================
+%
+ %-------------------------------------------------------------------
+ % Begin module:
+%\fi
+ % \ProvidesFile{svenska.mbs}[2008/08/15  (EO)]
+%\iffalse
+%<*a&!a>
+% The following ensures that the driver part is not seen by makebst
+% The driver part must not contain any \end other than \end{document} !
+\ifx\endoptions\undefined\let\tempx=\relax\else
+  \long\def\tempx#1\end#2{}\fi\tempx
+%</a&!a>
+%<*driver>
+   \NeedsTeXFormat{LaTeX2e}%
+   \documentclass[a4paper,10pt,twoside]{article}%
+   \usepackage{doc}%
+   \raggedbottom
+   \CodelineNumbered
+   \RecordChanges
+ %  Comment out next line to print coding
+   \OnlyDescription
+   \setlength{\oddsidemargin}{0.5\paperwidth}
+   \addtolength{\oddsidemargin}{-0.5\textwidth}
+   \addtolength{\oddsidemargin}{-1in}
+   \setlength{\evensidemargin}{\oddsidemargin}
+
+\begin{document}
+   \DocInput{svenska.mbs}
+\end{document}
+%</driver>
+%                   END OF META COMMENT   \fi
+% \CharacterTable
+%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%   Digits        \0\1\2\3\4\5\6\7\8\9
+%   Exclamation   \!     Double quote  \"     Hash (number) \#
+%   Dollar        \$     Percent       \%     Ampersand     \&
+%   Acute accent  \'     Left paren    \(     Right paren   \)
+%   Asterisk      \*     Plus          \+     Comma         \,
+%   Minus         \-     Point         \.     Solidus       \/
+%   Colon         \:     Semicolon     \;     Less than     \<
+%   Equals        \=     Greater than  \>     Question mark \?
+%   Commercial at \@     Left bracket  \[     Backslash     \\
+%   Right bracket \]     Circumflex    \^     Underscore    \_
+%   Grave accent  \`     Left brace    \{     Vertical bar  \|
+%   Right brace   \}     Tilde         \~}
+%
+% \setcounter{StandardModuleDepth}{1}
+% \setcounter{IndexColumns}{2}
+% \setlength{\IndexMin}{10cm}
+%
+% \changes{1.0}{2008 Aug 15}{First version, converted from dansk.mbs}
+%
+% \markboth{Erik {\"{O}}sthols}{Swedish bibliographies}
+%
+% \title{{\bfseries Swedish Language Definition File}\\
+%      for master bibliographic style files}
+%
+% \author{Patrick W. Daly}
+%
+% \GetFileInfo{svenska.mbs}
+% \date{This paper describes file \texttt{\filename},\\
+%  version \fileversion{} from \filedate}
+%
+% \maketitle
+%
+% \MakeShortVerb{\|}
+%
+% \parskip=1ex \parindent=0pt
+%
+% \newcommand{\btx}{{\sc Bib}\TeX}
+% \newcommand{\dtx}{\textsf{docstrip}}
+%
+% \section{Introduction}
+% This file is to be used as a language definition file with master
+% bibliographic files. The language it defines is
+% \begin{quote}\bfseries Svenska\end{quote}
+%
+% This is not a self-sufficient \texttt{.mbs} file, but rather may
+% be used together with one that contains language support via
+% external definition files.
+%
+% See the documentation for \texttt{makebst} for formatting details.
+%
+% \section{The Menu Information}
+%
+% All the menu information is nested between \dtx{} guard options
+% |%<*options>| \dots\ |%</options>|, and the last command is
+% |\endoptions|. The rest of the file is nested between |%<*!options&!driver>|
+% \dots\ |%</!options&!driver>| in order to exclude it if \dtx{} is used to
+% extract only the menu information or the documentation driver.
+%
+%    \begin{macrocode}
+%<*options>
+\mes{^^JOptions for SVENSKA}
+\wr{\spsp\spsp svenska,\pc: Swedish language}
+
+\beginoptiongroup{ABBREVIATE WORD `PAGES':}{}
+\optdef{*}{}{`Sidan'}{(no abbreviation)}
+\optdef{a}{pp}{`Sidan' abbreviated}{as s. or ss.}
+\optdef{x}{ppx}{`Sidan' omitted}{}
+\getans
+\endoptiongroup
+\beginoptiongroup{ABBREVIATE WORD `EDITORS':}{}
+\optdef{*}{}{`Redakt\string\"or(er)'}{(no abbreviation)}
+\optdef{a}{ed}{`Redakt\string\"or' abbreviated}{as red.}
+\getans
+\endoptiongroup
+\beginoptiongroup{OTHER ABBREVIATIONS:}{}
+\optdef{*}{}{No abbreviations}{of volym, utg\string\a{a}va, kapitel, o.s.v.}
+\optdef{a}{abr}{Abbreviations}{of such words}
+\getans
+\endoptiongroup
+\beginoptiongroup{EDITION NUMBERS:}{}
+\optdef{*}{xedn}{Editions as in database}{saving much processing memory}
+\optdef{w}{}{Write out editions}{as f\string\"orsta, andra, tredje, o.s.v.}
+\optdef{n}{ord}{Numerical editions}{as 1:a, 2:a, 3:e, osv}
+\getans
+\endoptiongroup
+\endoptions
+%</options>
+%    \end{macrocode}
+%
+% \StopEventually{\PrintChanges}
+%
+% \section{The Coding}
+%    \begin{macrocode}
+%<*!options&!driver>
+
+ % The language selected here is SWEDISH
+
+FUNCTION {bbl.and}
+{ "och"}
+
+FUNCTION {bbl.etal}
+{ "et~al." }
+
+FUNCTION {bbl.editors}
+%<!ed>{ "redakt{\^^b{o}}rer" }
+%<ed>{ "red." }
+
+FUNCTION {bbl.editor}
+%<!ed>{ "redakt{\^^b{o}}r" }
+%<ed>{ "red." }
+
+FUNCTION {bbl.edby}
+{ "redigerad av" }
+
+FUNCTION {bbl.edition}
+%<!abr>{ "utg{\a{a}}va" }
+%<abr>{ "utg." }
+
+FUNCTION {bbl.volume}
+%<!abr>{ "volym" }
+%<abr>{ "vol." }
+
+FUNCTION {bbl.of}
+{ "av" }
+
+FUNCTION {bbl.number}
+%<!abr>{ "nummer" }
+%<abr>{ "nr." }
+
+FUNCTION {bbl.nr}
+{ "nr." }
+
+FUNCTION {bbl.in}
+{ "i" }
+
+FUNCTION {bbl.pages}
+%<!pp&!ppx>{ "sidorna" }
+%<pp>{ "ss." }
+%<!pp&ppx>{ "" }
+
+FUNCTION {bbl.page}
+%<!pp&!ppx>{ "sidan" }
+%<pp>{ "s." }
+%<!pp&ppx>{ "" }
+
+%<*revdata>
+FUNCTION {bbl.eidpp}
+{ "sidor" }
+
+%</revdata>
+FUNCTION {bbl.chapter}
+%<!abr>{ "kapitel" }
+%<abr>{ "kap." }
+
+FUNCTION {bbl.techrep}
+%<!abr>{ "Teknisk rapport" }
+%<abr>{ "Tekn. rapp." }
+
+FUNCTION {bbl.mthesis}
+{ "Examensarbete" }
+
+FUNCTION {bbl.phdthesis}
+{ "Doktorsavhandling" }
+
+%<*!xedn>
+FUNCTION {bbl.first}
+%<!ord>{ "F{\^^b{o}}rsta" }
+%<ord>{ "1:a" }
+
+FUNCTION {bbl.second}
+%<!ord>{ "Andra" }
+%<ord>{ "2." }
+
+FUNCTION {bbl.third}
+%<!ord>{ "Tredje" }
+%<ord>{ "3." }
+
+FUNCTION {bbl.fourth}
+%<!ord>{ "Fj{\^^b{a}}rde" }
+%<ord>{ "4:e" }
+
+FUNCTION {bbl.fifth}
+%<!ord>{ "Femte" }
+%<ord>{ "5:e" }
+
+FUNCTION {bbl.th}
+{ ":e" }
+%</!xedn>
+%<*!abr>
+MACRO {jan} {"januari"}
+
+MACRO {feb} {"februari"}
+
+MACRO {mar} {"mars"}
+
+MACRO {apr} {"april"}
+
+MACRO {may} {"maj"}
+
+MACRO {jun} {"juni"}
+
+MACRO {jul} {"juli"}
+
+MACRO {aug} {"augusti"}
+
+MACRO {sep} {"september"}
+
+MACRO {oct} {"oktober"}
+
+MACRO {nov} {"november"}
+
+MACRO {dec} {"december"}
+
+%</!abr>
+%<*abr>
+MACRO {jan} {"jan."}
+
+MACRO {feb} {"feb."}
+
+MACRO {mar} {"mar."}
+
+MACRO {apr} {"apr."}
+
+MACRO {may} {"maj"}
+
+MACRO {jun} {"jun."}
+
+MACRO {jul} {"jul."}
+
+MACRO {aug} {"aug."}
+
+MACRO {sep} {"sep."}
+
+MACRO {oct} {"okt."}
+
+MACRO {nov} {"nov."}
+
+MACRO {dec} {"dec."}
+
+%</abr>
+%</!options&!driver>
+ % End module: svenska.mbs
+%    \end{macrocode}
+% \Finale