custom-bib (18nov11)

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

1 files changed, 8 insertions, 2 deletions

diff --git a/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs b/Master/texmf-dist/tex/latex/custom-bib/merlin.mbs
index e5f03aff724..e60196263eb 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/03/28 4.32 (PWD, AO, DPC)]
+ % \ProvidesFile{merlin.mbs}[2011/11/18 4.33 (PWD, AO, DPC)]
 %\iffalse
 %</!tail>
 %<*a&!a>
@@ -277,6 +277,8 @@
 % \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}}
+% \changes{4.33}{2011 May 13}{PWD: Fix bug with \texttt{remove.dots} by declaring string \texttt{z}}
+% \changes{4.33}{2011 Nov 18}{PWD: Fix bug so that \texttt{pub-xc} works without \texttt{ay} too}
 %
 % \pagestyle{myheadings}
 % \markboth{P. W. Daly}{A General Master Bibliography Style}
@@ -3432,6 +3434,7 @@ FUNCTION {non.stop}
 % \begin{macro}{`remove.dots'}
 % \changes{4.00}{1999 Oct 8}{Add macro}
 % \changes{4.21}{2007 May 2}{Retain dot accent}
+% \changes{4.33}{2011 May 13}{Add string declaration for \texttt{z}}
 % 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
@@ -3441,6 +3444,8 @@ FUNCTION {non.stop}
 % the dot accent |\.| to be retained.
 %    \begin{macrocode}
 %<*nm-rv|nm-rvx|nm-rvcx|mth-bare|jxper>
+STRINGS {z}
+
 FUNCTION {remove.dots}
 { 'z :=
    ""
@@ -6904,7 +6909,8 @@ FUNCTION {format.org.or.pub}
         'skip$
         { t empty$ address empty$ and
             'skip$
-            { ", " * }
+%<!pub-xc>            { ", " swap$ * * }
+%<pub-xc>            { " " swap$ * * }
           if$
           year "year" bibinfo.check
 %<dtbf>          bolden