summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/custom-bib
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-03-28 23:10:42 +0000
committerKarl Berry <karl@freefriends.org>2011-03-28 23:10:42 +0000
commit39a323bc3f0276930c0bac3d8025a8513786f0eb (patch)
treef245ae7aba0309a25ec9fc0ce600106085ef32f7 /Master/texmf-dist/tex/latex/custom-bib
parent5821532477f392106277500f4f4747409957fc76 (diff)
custom-bib (28mar11)
git-svn-id: svn://tug.org/texlive/trunk@21868 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/custom-bib')
-rw-r--r--Master/texmf-dist/tex/latex/custom-bib/merlin.mbs7
1 files changed, 6 insertions, 1 deletions
diff --git a/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs b/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs
index e5e194ecaf1..e5f03aff724 100644
--- a/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs
+++ b/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs
@@ -44,7 +44,7 @@
% ===============================================================
% Name and version information of the main mbs file:
%\fi
- % \ProvidesFile{merlin.mbs}[2011/01/10 4.31 (PWD, AO, DPC)]
+ % \ProvidesFile{merlin.mbs}[2011/03/28 4.32 (PWD, AO, DPC)]
%\iffalse
%</!tail>
%<*a&!a>
@@ -276,6 +276,7 @@
% \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}
+% \changes{4.32}{2011 Mar 28}{PWD: Fix bug with \texttt{numser} in \texttt{proceedings}}
%
% \pagestyle{myheadings}
% \markboth{P. W. Daly}{A General Master Bibliography Style}
@@ -7820,6 +7821,9 @@ FUNCTION {proceedings}
}
%</ay>
+% \end{macrocode}
+% \changes{4.32}{2011 Mar 28}{For numerical, fix bug when \texttt{numser} absent}
+% \begin{macrocode}
%<*!ay>
FUNCTION {proceedings}
{ output.bibitem
@@ -7838,6 +7842,7 @@ FUNCTION {proceedings}
%<!numser> format.number.series output
editor empty$
{ publisher empty$
+%<!numser> 'skip$
%<numser> { format.number.series output }
{
%<!blk-com&!blk-tit&!blk-tita> new.sentence