biblatex (3nov18)

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

2 files changed, 126 insertions, 111 deletions

diff --git a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
index 36ac849dd2f..6730a9ded77 100644
--- a/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
+++ b/Master/texmf-dist/bibtex/bib/biblatex/biblatex/biblatex-examples.bib
@@ -417,7 +417,7 @@
                   \texttt{editor} as well as a \texttt{series} field},
 }
 
-@book{aristotle:rhetoric,
+@mvbook{aristotle:rhetoric,
   author       = {Aristotle},
   title        = {The Rhetoric of {Aristotle} with a commentary by the late {Edward
                   Meredith Cope}},
@@ -666,7 +666,7 @@
                   fields},
 }
 
-@book{knuth:ct,
+@mvbook{knuth:ct,
   author       = {Knuth, Donald E.},
   title        = {Computers \& Typesetting},
   date         = {1984/1986},
@@ -675,16 +675,15 @@
   location     = {Reading, Mass.},
   langid       = {english},
   langidopts   = {variant=american},
-  sortyear     = {1984-0},
   sorttitle    = {Computers & Typesetting},
   indexsorttitle= {Computers & Typesetting},
-  annotation   = {A five-volume book cited as a whole. This is a \texttt{book}
+  annotation   = {A five-volume book cited as a whole. This is a \texttt{mvbook}
                   entry, note the \texttt{volumes} field},
 }
 
 @book{knuth:ct:a,
   author       = {Knuth, Donald E.},
-  title        = {The {\TeX} book},
+  title        = {The {\TeX book}},
   date         = 1984,
   maintitle    = {Computers \& Typesetting},
   volume       = {A},
@@ -692,13 +691,12 @@
   location     = {Reading, Mass.},
   langid       = {english},
   langidopts   = {variant=american},
-  sortyear     = {1984-1},
   sorttitle    = {Computers & Typesetting A},
   indexsorttitle= {The TeXbook},
   indextitle   = {\protect\TeX book, The},
   shorttitle   = {\TeX book},
   annotation   = {The first volume of a five-volume book. Note the
-                  \texttt{sorttitle} and \texttt{sortyear} fields. We want this
+                  \texttt{sorttitle} field. We want this
                   volume to be listed after the entry referring to the entire
                   five-volume set. Also note the \texttt{indextitle} and
                   \texttt{indexsorttitle} fields. Indexing packages that don't
@@ -708,7 +706,7 @@
 
 @book{knuth:ct:b,
   author       = {Knuth, Donald E.},
-  title        = {\TeX: The Program},
+  title        = {{\TeX}: The Program},
   date         = 1986,
   maintitle    = {Computers \& Typesetting},
   volume       = {B},
@@ -716,12 +714,11 @@
   location     = {Reading, Mass.},
   langid       = {english},
   langidopts   = {variant=american},
-  sortyear     = {1986-1},
   sorttitle    = {Computers & Typesetting B},
   indexsorttitle= {TeX: The Program},
   shorttitle   = {\TeX},
   annotation   = {The second volume of a five-volume book. Note the
-                  \texttt{sorttitle} and \texttt{sortyear} fields. Also note the
+                  \texttt{sorttitle} field. Also note the
                   \texttt{indexsorttitle} field},
 }
 
@@ -735,18 +732,17 @@
   location     = {Reading, Mass.},
   langid       = {english},
   langidopts   = {variant=american},
-  sortyear     = {1986-2},
   sorttitle    = {Computers & Typesetting C},
   indextitle   = {METAFONTbook, The},
   shorttitle   = {METAFONTbook},
   annotation   = {The third volume of a five-volume book. Note the
-                  \texttt{sorttitle} and \texttt{sortyear} fields as well as the
+                  \texttt{sorttitle} field as well as the
                   \texttt{indextitle} field},
 }
 
 @book{knuth:ct:d,
   author       = {Knuth, Donald E.},
-  title        = {METAFONT: The Program},
+  title        = {{METAFONT}: The Program},
   date         = 1986,
   maintitle    = {Computers \& Typesetting},
   volume       = {D},
@@ -754,11 +750,10 @@
   location     = {Reading, Mass.},
   langid       = {english},
   langidopts   = {variant=american},
-  sortyear     = {1986-3},
   sorttitle    = {Computers & Typesetting D},
   shorttitle   = {METAFONT},
   annotation   = {The fourth volume of a five-volume book. Note the
-                  \texttt{sorttitle} and \texttt{sortyear} fields},
+                  \texttt{sorttitle} field},
 }
 
 @book{knuth:ct:e,
@@ -771,13 +766,12 @@
   location     = {Reading, Mass.},
   langid       = {english},
   langidopts   = {variant=american},
-  sortyear     = {1986-4},
   sorttitle    = {Computers & Typesetting E},
   annotation   = {The fifth volume of a five-volume book. Note the
-                  \texttt{sorttitle} and \texttt{sortyear} fields},
+                  \texttt{sorttitle} field},
 }
 
-@book{knuth:ct:related,
+@mvbook{knuth:ct:related,
   author       = {Knuth, Donald E.},
   title        = {Computers \& Typesetting},
   date         = {1984/1986},
@@ -786,7 +780,6 @@
   location     = {Reading, Mass.},
   langid       = {english},
   langidopts   = {variant=american},
-  sortyear     = {1984-0},
   sorttitle    = {Computers & Typesetting},
   indexsorttitle= {Computers & Typesetting},
   related      = {knuth:ct:a,knuth:ct:b,knuth:ct:c,knuth:ct:d,knuth:ct:e},
@@ -909,7 +902,7 @@
                   \texttt{relatedtype} fields},
 }
 
-@book{nietzsche:ksa,
+@mvbook{nietzsche:ksa,
   author       = {Nietzsche, Friedrich},
   title        = {S{\"a}mtliche Werke},
   date         = 1988,
@@ -919,16 +912,15 @@
   publisher    = dtv # { and Walter de Gruyter},
   location     = {M{\"u}nchen and Berlin and New York},
   langid       = {german},
-  sortyear     = {1988-0},
   sorttitle    = {Werke-00-000},
   indexsorttitle= {Samtliche Werke},
   subtitle     = {Kritische Studienausgabe},
   annotation   = {The critical edition of Nietzsche's works. This is a
-                  \texttt{book} entry referring to a 15-volume work as a
+                  \texttt{mvbook} entry referring to a 15-volume work as a
                   whole. Note the \texttt{volumes} field and the format of the
                   \texttt{publisher} and \texttt{location} fields in the
                   database file. Also note the \texttt{sorttitle} and
-                  \texttt{sortyear} fields which are used to fine-tune the
+                  field which is used to fine-tune the
                   sorting order of the bibliography. We want this item listed
                   first in the bibliography},
 }
@@ -946,7 +938,6 @@
   publisher    = dtv # { and Walter de Gruyter},
   location     = {M{\"u}nchen and Berlin and New York},
   langid       = {german},
-  sortyear     = {1988-1},
   sorttitle    = {Werke-01-000},
   indexsorttitle= {Samtliche Werke I},
   bookauthor   = {Nietzsche, Friedrich},
@@ -955,8 +946,8 @@
   annotation   = {A single volume from the critical edition of Nietzsche's
                   works. This \texttt{book} entry explicitly refers to the first
                   volume only. Note the \texttt{title} and \texttt{maintitle}
-                  fields. Also note the \texttt{sorttitle} and \texttt{sortyear}
-                  fields. We want this entry to be listed after the entry
+                  fields. Also note the \texttt{sorttitle} 
+                  field. We want this entry to be listed after the entry
                   referring to the entire edition},
 }
 
@@ -1061,7 +1052,7 @@
                   the \texttt{related} and \texttt{relatedtype} fields},
 }
 
-@book{vazques-de-parga,
+@mvbook{vazques-de-parga,
   author       = {V{\'a}zques{ de }Parga, Luis and Lacarra, Jos{\'e} Mar{\'i}a
                   and Ur{\'i}a R{\'i}u, Juan},
   title        = {Las Peregrinaciones a Santiago de Compostela},
@@ -1074,7 +1065,7 @@
   sorttitle    = {Peregrinaciones a Santiago de Compostela},
   indextitle   = {Peregrinaciones a Santiago de Compostela, Las},
   shorttitle   = {Peregrinaciones},
-  annotation   = {A multivolume book cited as a whole. This is a \texttt{book}
+  annotation   = {A multivolume book cited as a whole. This is a \texttt{mvbook}
                   entry with \texttt{volumes}, \texttt{note},
                   \texttt{sorttitle}, and \texttt{indextitle} fields},
 }
@@ -1108,7 +1099,7 @@
                   \texttt{indextitle} fields},
 }
 
-@collection{britannica,
+@mvcollection{britannica,
   editor       = {Preece, Warren E.},
   title        = {The {New Encyclop{\ae}dia Britannica}},
   date         = 2003,
@@ -1123,7 +1114,7 @@
   sorttitle    = {Encyclop{\ae}dia Britannica},
   indextitle   = {{Encyclop{\ae}dia Britannica}, The {New}},
   shorttitle   = {{Encyclop{\ae}dia Britannica}},
-  annotation   = {This is a \texttt{collection} entry for an encyclopedia. Note
+  annotation   = {This is a \texttt{mvcollection} entry for an encyclopedia. Note
                   the \texttt{useeditor} option in the \texttt{options} field as
                   well as the \texttt{sorttitle} field. We want this entry to be
                   cited and alphabetized by title even though there is an
@@ -1159,7 +1150,7 @@
   pages        = {1-23},
 }
 
-@collection{jaffe,
+@mvcollection{jaffe,
   editor       = {Jaff{\'e}, Philipp},
   title        = {Regesta Pontificum Romanorum ab condita ecclesia ad annum post
                   Christum natum \textsc{mcxcviii}},
@@ -1173,7 +1164,7 @@
   editoratype  = {redactor},
   indextitle   = {Regesta Pontificum Romanorum},
   shorttitle   = {Regesta Pontificum Romanorum},
-  annotation   = {A \texttt{collection} entry with \texttt{edition} and
+  annotation   = {A \texttt{mvcollection} entry with \texttt{edition} and
                   \texttt{volumes} fields. Note the \texttt{editora} and
                   \texttt{editoratype} fields},
 }
@@ -1252,7 +1243,6 @@
   location     = {M{\"u}nchen and Berlin and New York},
   pages        = {243-334},
   langid       = {german},
-  sortyear     = {1988-2},
   sorttitle    = {Werke-01-243},
   indexsorttitle= {Vom Nutzen und Nachtheil der Historie fur das Leben},
   indextitle   = {Vom Nutzen und Nachtheil der Historie f{\"u}r das Leben},
@@ -1261,7 +1251,7 @@
                   This \texttt{inbook} entry explicitly refers to an essay found
                   in the first volume. Note the \texttt{title},
                   \texttt{booktitle}, and \texttt{maintitle} fields. Also note
-                  the \texttt{sorttitle} and \texttt{sortyear} fields. We want
+                  the \texttt{sorttitle} field. We want
                   this entry to be listed after the entry referring to the
                   entire first volume},
 }
diff --git a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
index a14e23a8f95..1d52835c94d 100644
--- a/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
+++ b/Master/texmf-dist/bibtex/bst/biblatex/biblatex.bst
@@ -158,24 +158,29 @@ ENTRY {
     verbb
     verbc
   }
-  { skipbib skiplos skiplab useauthor useeditor usetranslator useprefix singletitle }
-  { entryoptions labelhash namehash fullhash dateyear dateendyear extradate labelalpha extraalpha 
-    sortinit label.name label.year sortkey.nosort sortkey.name sortkey.year
-    sortkey.title sortkey.alpha sort.year sort.alph warningmsg }
+  { skipbib skiplos skiplab
+    useauthor useeditor usetranslator useprefix
+    singletitle }
+  { entryoptions labelhash namehash fullhash
+    dateyear dateendyear extradate labelalpha extraalpha label.name label.year
+    sortinit sortkey.nosort sortkey.name sortkey.year
+    sortkey.title sortkey.alpha sort.year sort.alph
+    warningmsg }
 
 INTEGERS { ctrl.debug ctrl.bibtex8 ctrl.maxline ctrl.sorting ctrl.cssort
-           ctrl.maxnames ctrl.minnames ctrl.useauthor ctrl.useeditor ctrl.usetranslator
+           ctrl.maxnames ctrl.minnames ctrl.maxalphanames ctrl.minalphanames
+           ctrl.useauthor ctrl.useeditor ctrl.usetranslator
            ctrl.useprefix ctrl.labelalpha ctrl.singletitle
-           ctrl.labeldate citecount 
+           ctrl.labeldate citecount
            tempctra tempctrb tempctrc resvctra resvctrb resvctrc
            last.extra.num }
 
-STRINGS  { ctrl.alphaothers ctrl.sortstr
+STRINGS  { ctrl.alphaothers ctrl.sortalphaothers ctrl.sortstr
            templist tempstrga tempstrgb resvstrga resvstrgb resvstrgc
            last.name last.hash last.year last.extra }
 
 FUNCTION {initialize} {
-  "$Revision: 3.8 $"
+  "$Revision: 3.11 $"
   #12 entry.max$ substring$
   #-3 entry.max$ substring$
   "Biblatex version: " swap$ * top$
@@ -190,8 +195,11 @@ FUNCTION {initialize} {
    #0   'ctrl.useprefix :=
    #1   'ctrl.minnames :=
   #99   'ctrl.maxnames :=
+   #1   'ctrl.minalphanames :=
+   #3   'ctrl.maxalphanames :=
   #79   'ctrl.maxline :=
   "+"   'ctrl.alphaothers :=
+  " "   'ctrl.sortalphaothers :=
   "nty" 'ctrl.sortstr :=
 }
 
@@ -255,8 +263,8 @@ FUNCTION {ctrl:skiplab} {
 }
 
 FUNCTION {ctrl:labelalpha} {
-  ctrl.labelalpha ctrl:skiplab not and
-  shorthand empty$
+  ctrl.labelalpha
+  ctrl:skiplab not
   and
 }
 
@@ -474,7 +482,7 @@ FUNCTION {push:labelname:editor} {
           if$
         }
         { "shorteditor" }
-      if$  
+      if$
     }
     { push:labelname:translator }
   if$
@@ -596,7 +604,7 @@ FUNCTION {push:labelname} {
           if$
         }
         { "shortauthor" }
-      if$  
+      if$
     }
     { push:labelname:editor }
   if$
@@ -610,7 +618,7 @@ FUNCTION {check:sortname} {
 }
 
 FUNCTION {warning} {
-  "\item " swap$ * 
+  "\item " swap$ *
   warningmsg empty$
     'skip$
     { warningmsg " " * swap$ * }
@@ -679,14 +687,16 @@ FUNCTION {format:name:part} {
 }
 
 FUNCTION {format:name:initials} {
+  ".-" "\bibinithyphendelim " str:replace
   ".~" "\bibinitperiod\bibinitdelim " str:replace
+  ". " "\bibinitperiod\bibinitdelim " str:replace
   "." "\bibinitperiod" str:replace
 }
 
 FUNCTION {is.number} {
   #1
   { #0 > }
-    { duplicate$ #1 #1 substring$ chr.to.int$ 
+    { duplicate$ #1 #1 substring$ chr.to.int$
       duplicate$ #47 >
       swap$      #58 <
       and
@@ -873,7 +883,7 @@ FUNCTION {split.date} {
       split.date:date
       tempctra
         'skip$
-        { pop$ pop$ pop$ pop$ pop$ pop$ "" "" "" "" "" "" 
+        { pop$ pop$ pop$ pop$ pop$ pop$ "" "" "" "" "" ""
           templist warning:invalid
         }
       if$
@@ -906,7 +916,7 @@ FUNCTION {sortkey:name:format} {
         { templist tempctra "{vv}" format.name$
           duplicate$ empty$
             { pop$ "" }
-            { "u" change.case$ "t" change.case$ 
+            { "u" change.case$ "t" change.case$
               delimiter.3 * }
           if$
           templist tempctra
@@ -1122,7 +1132,7 @@ FUNCTION {output:write:year} {
         'skip$
       if$
       swap$ "\field" swap$ wrap:braces *
-      swap$ wrap:braces * output:indent:field 
+      swap$ wrap:braces * output:indent:field
       }
   if$
 }
@@ -1201,7 +1211,8 @@ FUNCTION {output:write:verb} {
     { 'tempstrga :=
       "\verb" swap$ wrap:braces * output:indent:field
       { tempstrga empty$ not }
-        { "\verb " tempstrga #1 ctrl.maxline #10 - substring$ * output:indent:field
+        { "\verb " tempstrga #1 ctrl.maxline #10 - substring$ *
+          output:indent:field
           tempstrga ctrl.maxline #9 - global.max$ substring$ 'tempstrga :=
         }
       while$
@@ -1315,7 +1326,7 @@ FUNCTION {output:write:name} {
           output:write:name:prefix
           output:write:name:last
           output:write:name:suffix
-	      output:write:name:first
+          output:write:name:first
           "}}%" output:indent:subfield
           tempctra #1 + 'tempctra :=
           tempctrb #1 - 'tempctrb :=
@@ -1346,28 +1357,28 @@ FUNCTION {output:write:list} {
       #0 'tempctrc :=
       { templist purify tempctrb global.max$ substring$ num.names$ #0 > }
         { templist tempctrb #1 substring$ "{" =
-	    { tempctrc #1 + 'tempctrc :=
-	      tempctrb #1 + 'tempctrb := }
-	    { templist tempctrb #1 substring$ "}" =
-		{ tempctrc #1 - 'tempctrc :=
-		  tempctrb #1 + 'tempctrb := }
-		{ templist tempctrb #5 substring$
-        	  duplicate$ " AND " =
-        	  swap$      " and " =
-        	  or
-		  tempctrc #1 <
-		  and
-        	    { templist tempctra tempctrb tempctra - substring$
-        	      wrap:braces "%" * output:indent:subfield
-        	      tempctrb #5 + duplicate$
-        	      'tempctra :=
-        	      'tempctrb :=
-        	    }
-        	    { tempctrb #1 + 'tempctrb := }
-        	  if$
-		}
+            { tempctrc #1 + 'tempctrc :=
+              tempctrb #1 + 'tempctrb := }
+            { templist tempctrb #1 substring$ "}" =
+                { tempctrc #1 - 'tempctrc :=
+                  tempctrb #1 + 'tempctrb := }
+                { templist tempctrb #5 substring$
+                  duplicate$ " AND " =
+                  swap$      " and " =
+                  or
+                  tempctrc #1 <
+                  and
+                    { templist tempctra tempctrb tempctra - substring$
+                      wrap:braces "%" * output:indent:subfield
+                      tempctrb #5 + duplicate$
+                      'tempctra :=
+                      'tempctrb :=
+                    }
+                    { tempctrb #1 + 'tempctrb := }
+                  if$
+                }
               if$
-	    }
+            }
           if$
         }
       while$
@@ -1388,7 +1399,7 @@ FUNCTION {output:specials} {
         { "\set"   }
         { "\inset" }
       if$
-      entryset wrap:braces * output:indent:field 
+      entryset wrap:braces * output:indent:field
     }
   if$
   xref empty$
@@ -1661,7 +1672,7 @@ FUNCTION {output:compat.1} {
       if$
     }
   if$
-  output:write:field 
+  output:write:field
   "location" location
   duplicate$ empty$
     { pop$ address }
@@ -1887,14 +1898,16 @@ FUNCTION {input:control:options} {
 % This version corresponds to the .bbl version, *not* the biblatex version!
 FUNCTION {input:control:version} {
   input:control:parse
-  "$Revision: 2.9 $"
+  "$Revision: 3.0 $"
   #12 entry.max$ substring$
   #-3 entry.max$ substring$
   'tempstrga :=
   duplicate$ tempstrga =
     { pop$ }
-    { "Version mismatch: biblatex.bst=" tempstrga *
-      ", biblatex.sty=" * swap$ * warning$
+    { "bbl version mismatch: biblatex.bst has " tempstrga *
+      ", but biblatex.sty has " * swap$ * warning$
+      "         The bbl version need not be the same as the biblatex version."
+      top$
       pop$ "" }
   if$
 }
@@ -1918,8 +1931,11 @@ FUNCTION {input:control} {
           input:control:options 'ctrl.sorting :=
           input:control:options 'ctrl.maxnames :=
           input:control:options 'ctrl.minnames :=
+          input:control:options 'ctrl.maxalphanames :=
+          input:control:options 'ctrl.minalphanames :=
           input:control:options 'ctrl.maxline :=
           input:control:parse   'ctrl.alphaothers :=
+          input:control:parse   'ctrl.sortalphaothers :=
           'ctrl.sortstr :=
         }
       if$
@@ -1952,10 +1968,10 @@ FUNCTION {input:options:known} {
     { tempstrgb input:options:add
       #1 }
     { duplicate$ "true" =
-        { pop$ "" tempstrgb input:options:add 
+        { pop$ "" tempstrgb input:options:add
           #1 }
         { duplicate$ tempstrgb input:options:add
-          bol.to.int 
+          bol.to.int
         }
       if$
     }
@@ -1978,11 +1994,11 @@ FUNCTION {input:options:parse} {
                         { input:options:known 'skiplos := }
                         { tempstrgb "skiplab" =
                             { input:options:known 'skiplab := }
-                            { tempstrgb "dataonly" = 
-                                { input:options:known 
+                            { tempstrgb "dataonly" =
+                                { input:options:known
                                   duplicate$ 'skipbib :=
-                                  duplicate$ 'skiplos := 
-                                             'skiplab := 
+                                  duplicate$ 'skiplos :=
+                                             'skiplab :=
                                 }
                                 { tempstrgb input:options:add }
                               if$
@@ -2072,8 +2088,8 @@ FUNCTION {input:iterate} {
       ctrl:set entryset empty$ or
         'skip$
         { #1 'skipbib :=
-          #1 'skiplos := 
-          #1 'skiplab := 
+          #1 'skiplos :=
+          #1 'skiplab :=
         }
       if$
       "date" date split.date
@@ -2122,7 +2138,7 @@ FUNCTION {makelabel:name:format} {
         { templist tempctra "{vv}" format.name$
           duplicate$ empty$
             { pop$ "" }
-            { "u" change.case$ "t" change.case$ 
+            { "u" change.case$ "t" change.case$
               delimiter.3 * }
           if$
         }
@@ -2168,8 +2184,8 @@ FUNCTION {makelabel:alpha:format} {
         { templist num.names$ #1 - 'tempctrb := }
         { templist num.names$ 'tempctrb := }
       if$
-      tempctrb ctrl.maxnames >
-        { ctrl.minnames 'tempctrb := }
+      tempctrb ctrl.maxalphanames >
+        { ctrl.minalphanames 'tempctrb := }
         'skip$
       if$
       tempctrb #1 >
@@ -2197,7 +2213,7 @@ FUNCTION {makelabel:alpha:format} {
       if$
     }
   if$
-  templist num.names$ ctrl.maxnames >
+  templist num.names$ ctrl.maxalphanames >
   templist andothers
   or
     { ctrl.alphaothers * }
@@ -2273,33 +2289,36 @@ FUNCTION {makelabel:hash:format:full} {
 
 FUNCTION {makelabel:ctrl:alpha} {
   ctrl:labelalpha
-    { label empty$
-        { push:cite purify #1 #3 substring$
-          "u" change.case$ "t" change.case$ }
-        { label makelabel:alpha:year * }
-      if$
-    }
     { shorthand empty$
-        { "" }
+        { label empty$
+            { push:cite purify #1 #3 substring$
+              "u" change.case$ "t" change.case$ }
+            { label makelabel:alpha:year * }
+          if$
+        }
         { shorthand }
       if$
     }
+    { "" }
   if$
 }
 
 FUNCTION {makelabel:ctrl:alpha:format} {
   ctrl:labelalpha
-    { label empty$
-        { makelabel:alpha:format }
-        { pop$ label }
+    { shorthand empty$
+        { label empty$
+            { makelabel:alpha:format }
+            { pop$ label }
+          if$
+          makelabel:alpha:year *
+        }
+        { pop$
+          shorthand
+        }
       if$
-      makelabel:alpha:year *
     }
     { pop$
-      ctrl.labelalpha not shorthand empty$ or
-        { "" }
-        { shorthand }
-      if$
+      ""
     }
   if$
 }
@@ -2353,7 +2372,8 @@ FUNCTION {labelsort:main} {
 
 FUNCTION {labelsort:alph} {
   ctrl:labelalpha
-    { labelalpha normalize delimiter.1 *
+    { labelalpha ctrl.alphaothers ctrl.sortalphaothers str:replace
+      purify delimiter.1 *
       push:presort * delimiter.1 *
       sortkey empty$
         { ctrl.sorting #10 >
@@ -2620,8 +2640,13 @@ FUNCTION {labelsort:alph:reverse} {
       labelalpha empty$
         'skip$
         { extraalpha empty$
-            { labelalpha normalize 'sortkey.alpha := }
-            { labelalpha normalize extraalpha #4 pad.number * 'sortkey.alpha := }
+            { labelalpha ctrl.alphaothers ctrl.sortalphaothers str:replace
+              purify
+              'sortkey.alpha := }
+            { labelalpha ctrl.alphaothers ctrl.sortalphaothers str:replace
+              purify
+              extraalpha #4 pad.number *
+              'sortkey.alpha := }
           if$
         }
       if$
@@ -2705,7 +2730,7 @@ SORT
 % This version corresponds to the .bbl version, *not* the biblatex version!
 FUNCTION {output:main:begin} {
   "% $ biblatex auxiliary file $"                               write$ newline$
-  "% $ biblatex bbl format version " "$Revision: 2.9 $"
+  "% $ biblatex bbl format version " "$Revision: 3.0 $"
   #12 entry.max$ substring$ #-3 entry.max$ substring$ * " $" *  write$ newline$
   "% Do not modify the above lines!"                            write$ newline$
   "%"                                                           write$ newline$
@@ -2723,7 +2748,7 @@ FUNCTION {output:main:begin} {
   "  {}"                                                        write$ newline$
   "\endgroup"                                                   write$ newline$
   newline$
-  "\datalist[entry]{" ctrl.sortstr * "/global//global/global}" *              write$
+  "\datalist[entry]{" ctrl.sortstr * "/global//global/global}" *         write$
 }
 
 FUNCTION {output:main:preamble} {