public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/biber] epel10.2: 2.17 bump
@ 2026-08-18 11:40 
  0 siblings, 0 replies; only message in thread
From:  @ 2026-08-18 11:40 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/biber
Branch : epel10.2
Commit : 9dbe3a9af8545ca2b722e61b5c15ca563d0f5af8
Author : Petr Písař <ppisar@redhat.com>
Date   : 2022-01-26T16:37:30+01:00
Stats  : +10/-5597 in 14 file(s)
URL    : https://src.fedoraproject.org/rpms/biber/c/9dbe3a9af8545ca2b722e61b5c15ca563d0f5af8?branch=epel10.2

Log:
2.17 bump

---
diff --git a/.gitignore b/.gitignore
index d60be18..1dc1d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /v2.12.tar.gz
 /v2.14.tar.gz
 /v2.16.tar.gz
+/v2.17.tar.gz

diff --git a/biber-2.11-Adapt-tests-to-Unicode-Collate-1.27.patch b/biber-2.11-Adapt-tests-to-Unicode-Collate-1.27.patch
deleted file mode 100644
index 14cda81..0000000
--- a/biber-2.11-Adapt-tests-to-Unicode-Collate-1.27.patch
+++ /dev/null
@@ -1,1434 +0,0 @@
-From b0c6f83b801797aaa1576ef41383d83d6cffb4eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 12 Feb 2019 10:29:31 +0100
-Subject: [PATCH] Adapt tests to Unicode-Collate-1.27
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream implemented this change few commits after 2.12 release in:
-
-commit 6b61b4c13778cf638f82569ab9e413f09f111ba5
-Author: Philip Kime <Philip@kime.org.uk>
-Date:   Sat Jan 12 17:19:51 2019 +0100
-
-    Updated tests after U::C upgrade changed sortinit hashes
-
-But this fix for 2.11 is written from scratch due to many patch
-conflicts.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- t/annotations.t          |  2 +-
- t/basic-misc.t           | 28 +++++++++---------
- t/biblatexml.t           |  4 +--
- t/crossrefs.t            | 48 +++++++++++++++---------------
- t/datalists.t            |  4 +--
- t/dateformats.t          | 34 ++++++++++-----------
- t/encoding.t             | 12 ++++----
- t/names.t                | 64 ++++++++++++++++++++--------------------
- t/options.t              |  6 ++--
- t/related-entries.t      | 10 +++----
- t/set-dynamic.t          | 10 +++----
- t/set-legacy.t           |  2 +-
- t/set-static.t           | 10 +++----
- t/skips.t                | 16 +++++-----
- t/sort-complex.t         | 10 +++----
- t/uniqueness-nameparts.t | 30 +++++++++----------
- t/xdata.t                |  4 +--
- 17 files changed, 147 insertions(+), 147 deletions(-)
-
-diff --git a/t/annotations.t b/t/annotations.t
-index 0fa7286..174ae33 100644
---- a/t/annotations.t
-+++ b/t/annotations.t
-@@ -72,7 +72,7 @@ my $ann1 = q|    \entry{ann1}{misc}{}
-       \strng{authornamehash}{90ae96c82de92e36949bc64254bbde0c}
-       \strng{authorfullhash}{90ae96c82de92e36949bc64254bbde0c}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{title}{The Title}
-diff --git a/t/basic-misc.t b/t/basic-misc.t
-index e2bb567..092c981 100644
---- a/t/basic-misc.t
-+++ b/t/basic-misc.t
-@@ -97,7 +97,7 @@ my $u1 = q|    \entry{u1}{misc}{}
-       \strng{authorfullhash}{b78abdc838d79b6576f2ed0021642766}
-       \field{labelalpha}{AAA\textbf{+}00}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -231,7 +231,7 @@ my $murray1 = q|    \entry{murray}{article}{}
-       \strng{authorfullhash}{61836f4684b2615842b68c26479f6ec2}
-       \field{labelalpha}{Hos\textbf{+}98}
-       \field{sortinit}{H}
--      \field{sortinithash}{5f15a7bc777ad49ff15aa4d2831b1681}
-+      \field{sortinithash}{6db6145dae8dc9e1271a8d556090b50a}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -348,7 +348,7 @@ my $murray2 = q|    \entry{murray}{article}{}
-       \strng{authorfullhash}{61836f4684b2615842b68c26479f6ec2}
-       \field{labelalpha}{Hos98}
-       \field{sortinit}{H}
--      \field{sortinithash}{5f15a7bc777ad49ff15aa4d2831b1681}
-+      \field{sortinithash}{6db6145dae8dc9e1271a8d556090b50a}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -388,7 +388,7 @@ my $t1 = q+    \entry{t1}{misc}{}
-       \strng{authorfullhash}{858fcf9483ec29b7707a7dda2dde7a6f}
-       \field{labelalpha}{Bro92}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -417,7 +417,7 @@ my $t2 = q|    \entry{t2}{misc}{}
-       \strng{authorfullhash}{858fcf9483ec29b7707a7dda2dde7a6f}
-       \field{labelalpha}{Bro94}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -450,7 +450,7 @@ my $anon1 = q|    \entry{anon1}{unpublished}{}
-       \strng{shortauthorfullhash}{9873a6cc65c553faa2b21aaad626fe4b}
-       \field{labelalpha}{XAn35}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{shortauthor}
-@@ -489,7 +489,7 @@ my $anon2 = q|    \entry{anon2}{unpublished}{}
-       \strng{shortauthorfullhash}{f64c29e89ea49402b997956610b58ef6}
-       \field{labelalpha}{YAn39}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{shortauthor}
-@@ -523,7 +523,7 @@ my $url1 = q|    \entry{url1}{misc}{}
-       \strng{authorfullhash}{b2106a3dda6c5a4879a0cab37e9cca55}
-       \field{labelalpha}{Ali05}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{extraalpha}{4}
-       \field{labelnamesource}{author}
-       \field{year}{2005}
-@@ -706,7 +706,7 @@ my $isbn1 = q|    \entry{isbn1}{misc}{}
-       \strng{authorfullhash}{f6595ccb9db5f634e7bb242a3f78e5f9}
-       \field{labelalpha}{Flu}
-       \field{sortinit}{F}
--      \field{sortinithash}{669c706c6f1fbf3b5a83d26f1d9e9e72}
-+      \field{sortinithash}{fb0c0faa89eb6abae8213bf60e6799ea}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{isbn}{978-0-8165-2066-4}
-@@ -730,7 +730,7 @@ my $isbn2 = q|    \entry{isbn2}{misc}{}
-       \strng{authorfullhash}{f6595ccb9db5f634e7bb242a3f78e5f9}
-       \field{labelalpha}{Flu}
-       \field{sortinit}{F}
--      \field{sortinithash}{669c706c6f1fbf3b5a83d26f1d9e9e72}
-+      \field{sortinithash}{fb0c0faa89eb6abae8213bf60e6799ea}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{isbn}{978-0-8165-2066-4}
-@@ -772,7 +772,7 @@ my $clone1 = q|    \entry{snk1}{book}{}
-       \strng{authorfullhash}{83330b0520b5d4ea57529a23b404d43d}
-       \field{labelalpha}{vDoe}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -800,7 +800,7 @@ my $clone2 = q|    \entry{clone-snk1}{book}{}
-       \strng{authorfullhash}{83330b0520b5d4ea57529a23b404d43d}
-       \field{labelalpha}{vDoe}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{addendum}{add}
-@@ -832,7 +832,7 @@ my $ent1 = q|    \entry{ent1}{book}{}
-       \strng{authorfullhash}{b2536a425d549b46de5f21c4d468050a}
-       \field{labelalpha}{SdB}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -855,7 +855,7 @@ my $verb1 = q|    \entry{verb1}{book}{}
-       \strng{authorfullhash}{cac5a25f503e71f5ef28f474e14007b6}
-       \field{labelalpha}{All}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \verb{verba}
-diff --git a/t/biblatexml.t b/t/biblatexml.t
-index a8a67fc..91db76c 100644
---- a/t/biblatexml.t
-+++ b/t/biblatexml.t
-@@ -111,7 +111,7 @@ my $l1 = q|    \entry{bltx1}{misc}{useprefix=false}
-       \strng{translatornamehash}{b44eba830fe9817fbe8e53c82f1cbe04}
-       \strng{translatorfullhash}{b44eba830fe9817fbe8e53c82f1cbe04}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -157,7 +157,7 @@ my $l1 = q|    \entry{bltx1}{misc}{useprefix=false}
- 
- my $l2 = q|    \entry{loopkey:a}{book}{}
-       \field{sortinit}{0}
--      \field{sortinithash}{168ad0c7c5ed09f1d28c6675717b5b03}
-+      \field{sortinithash}{bcf7a1f4afb88b7299f988caccb80d1c}
-     \endentry
- |;
- 
-diff --git a/t/crossrefs.t b/t/crossrefs.t
-index 0c8f647..ed724ce 100644
---- a/t/crossrefs.t
-+++ b/t/crossrefs.t
-@@ -82,7 +82,7 @@ my $cr1 = q|    \entry{cr1}{inbook}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{G}
--      \field{sortinithash}{5e8d2bf9d38de41b1528bd307546008f}
-+      \field{sortinithash}{62eb2aa29549e4fdbd3cb154ec5711cb}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -131,7 +131,7 @@ my $cr2 = q|    \entry{cr2}{inbook}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{F}
--      \field{sortinithash}{669c706c6f1fbf3b5a83d26f1d9e9e72}
-+      \field{sortinithash}{fb0c0faa89eb6abae8213bf60e6799ea}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -165,7 +165,7 @@ my $cr_m = q|    \entry{cr_m}{book}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{G}
--      \field{sortinithash}{5e8d2bf9d38de41b1528bd307546008f}
-+      \field{sortinithash}{62eb2aa29549e4fdbd3cb154ec5711cb}
-       \true{crossrefsource}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-@@ -203,7 +203,7 @@ my $cr3 = q|    \entry{cr3}{inbook}{}
-       \strng{editornamehash}{a1f5c22413396d599ec766725b226735}
-       \strng{editorfullhash}{a1f5c22413396d599ec766725b226735}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -248,7 +248,7 @@ my $cr4 = q|    \entry{cr4}{inbook}{}
-       \strng{editornamehash}{6ea89bd4958743a20b70fe17647d6af5}
-       \strng{editorfullhash}{6ea89bd4958743a20b70fe17647d6af5}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -279,7 +279,7 @@ my $crt = q|    \entry{crt}{book}{}
-       \strng{editornamehash}{a1f5c22413396d599ec766725b226735}
-       \strng{editorfullhash}{a1f5c22413396d599ec766725b226735}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{title}{Beasts of the Burbling Burns}
-@@ -314,7 +314,7 @@ my $cr6 = q|    \entry{cr6}{inproceedings}{}
-       \strng{editornamehash}{344a7f427fb765610ef96eb7bce95257}
-       \strng{editorfullhash}{344a7f427fb765610ef96eb7bce95257}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -364,7 +364,7 @@ my $cr7 = q|    \entry{cr7}{inbook}{}
-       \strng{bookauthornamehash}{91a1dd4aeed3c4ec29ca74c4e778be5f}
-       \strng{bookauthorfullhash}{91a1dd4aeed3c4ec29ca74c4e778be5f}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -398,7 +398,7 @@ my $cr8 = q|    \entry{cr8}{incollection}{}
-       \strng{authornamehash}{3d449e56eb3ca1ae80dc99a18d689795}
-       \strng{authorfullhash}{3d449e56eb3ca1ae80dc99a18d689795}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -428,7 +428,7 @@ my $xr1 = q|    \entry{xr1}{inbook}{}
-       \strng{authornamehash}{e0ecc4fc668ee499d1afba44e1ac064d}
-       \strng{authorfullhash}{e0ecc4fc668ee499d1afba44e1ac064d}
-       \field{sortinit}{Z}
--      \field{sortinithash}{156173bd08b075d7295bc3e0f4735a04}
-+      \field{sortinithash}{8f7b480688e809b50b6f6577b16f3db5}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -457,7 +457,7 @@ my $xr2 = q|    \entry{xr2}{inbook}{}
-       \strng{authornamehash}{6afa09374ecfd6b394ce714d2d9709c7}
-       \strng{authorfullhash}{6afa09374ecfd6b394ce714d2d9709c7}
-       \field{sortinit}{I}
--      \field{sortinithash}{320bc8fe8101b9376f9f21cd507de0e8}
-+      \field{sortinithash}{9417e9a1288a9371e2691d999083ed39}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -488,7 +488,7 @@ my $xrm = q|    \entry{xrm}{book}{}
-       \strng{editornamehash}{809950f9b59ae207092b909a19dcb27b}
-       \strng{editorfullhash}{809950f9b59ae207092b909a19dcb27b}
-       \field{sortinit}{C}
--      \field{sortinithash}{963e9d84a3da2344e8833203de5aed05}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \true{xrefsource}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-@@ -513,7 +513,7 @@ my $xr3 = q|    \entry{xr3}{inbook}{}
-       \strng{authornamehash}{9788055665b9bb4b37c776c3f6b74f16}
-       \strng{authorfullhash}{9788055665b9bb4b37c776c3f6b74f16}
-       \field{sortinit}{N}
--      \field{sortinithash}{f7242c3ed3dc50029fca1be76c497c7c}
-+      \field{sortinithash}{98cf339a479c0454fe09153a08675a15}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -543,7 +543,7 @@ my $xrt = q|    \entry{xrt}{book}{}
-       \strng{editornamehash}{bf7d6b02f3e073913e5bfe5059508dd5}
-       \strng{editorfullhash}{bf7d6b02f3e073913e5bfe5059508dd5}
-       \field{sortinit}{K}
--      \field{sortinithash}{9fd838a31ba64d981e8f44562bd33f89}
-+      \field{sortinithash}{d3edc18d54b9438a72c24c925bfb38f4}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{title}{Kings, Cork and Calculation}
-@@ -568,7 +568,7 @@ my $xr4 = q|    \entry{xr4}{inbook}{}
-       \strng{authornamehash}{7804ffef086c0c4686c235807f5cb502}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -595,7 +595,7 @@ my $mxr = q|    \entry{mxr}{inbook}{}
-       \strng{authornamehash}{7804ffef086c0c4686c235807f5cb502}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -619,7 +619,7 @@ my $mcr = q|    \entry{mcr}{inbook}{}
-       \strng{authornamehash}{7804ffef086c0c4686c235807f5cb502}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -653,7 +653,7 @@ my $ccr1 = q|    \entry{ccr2}{book}{}
-       \strng{editornamehash}{cfee758a1c82df2e26af1985e061bb0a}
-       \strng{editorfullhash}{cfee758a1c82df2e26af1985e061bb0a}
-       \field{sortinit}{V}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -687,7 +687,7 @@ my $ccr2 = q|    \entry{ccr3}{inbook}{}
-       \strng{editornamehash}{cfee758a1c82df2e26af1985e061bb0a}
-       \strng{editorfullhash}{cfee758a1c82df2e26af1985e061bb0a}
-       \field{sortinit}{P}
--      \field{sortinithash}{8d51b3d5b78d75b54308d706b9bbe285}
-+      \field{sortinithash}{bb5b15f2db90f7aef79bb9e83defefcb}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{booktitle}{Misc etc.}
-@@ -719,7 +719,7 @@ my $ccr3 = q|    \entry{ccr4}{inbook}{}
- 
- my $s1 = q|    \entry{s1}{inbook}{}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \strng{crossref}{s2}
-@@ -752,7 +752,7 @@ my $xc2 = q|    \entry{xc2}{inbook}{}
-       \strng{bookauthornamehash}{1a0f7d518cccdad859a74412ef956474}
-       \strng{bookauthorfullhash}{1a0f7d518cccdad859a74412ef956474}
-       \field{sortinit}{C}
--      \field{sortinithash}{963e9d84a3da2344e8833203de5aed05}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \true{xrefsource}
-       \field{labelnamesource}{author}
-       \field{booktitle}{Title}
-@@ -761,7 +761,7 @@ my $xc2 = q|    \entry{xc2}{inbook}{}
- 
- my $b1 = q|    \entry{b1}{inbook}{}
-       \field{sortinit}{2}
--      \field{sortinithash}{cbff857e587bcb4635511624d773949e}
-+      \field{sortinithash}{ed39bb39cf854d5250e95b1c1f94f4ed}
-       \strng{crossref}{b2}
-       \field{day}{3}
-       \field{month}{3}
-@@ -794,7 +794,7 @@ my $sup1 = q|    \entry{sup1}{mvbook}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{crossrefsource}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -818,7 +818,7 @@ my $sup2 = q|    \entry{sup2}{book}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/datalists.t b/t/datalists.t
-index 3081cc4..4855e3d 100644
---- a/t/datalists.t
-+++ b/t/datalists.t
-@@ -187,7 +187,7 @@ my $K11 = q|    \entry{K11}{book}{}
-       \strng{authornamehash}{4edc280a0ef229f9c061e3b121b17482}
-       \strng{authorfullhash}{4edc280a0ef229f9c061e3b121b17482}
-       \field{sortinit}{a}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -219,7 +219,7 @@ my $K12 = q|    \entry{K12}{book}{}
-       \strng{authornamehash}{a846a485fc9cbb59b0ebeedd6ac637e4}
-       \strng{authorfullhash}{a846a485fc9cbb59b0ebeedd6ac637e4}
-       \field{sortinit}{Z}
--      \field{sortinithash}{156173bd08b075d7295bc3e0f4735a04}
-+      \field{sortinithash}{8f7b480688e809b50b6f6577b16f3db5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-diff --git a/t/dateformats.t b/t/dateformats.t
-index ee36f5e..e2e5efb 100644
---- a/t/dateformats.t
-+++ b/t/dateformats.t
-@@ -87,7 +87,7 @@ my $l13c = q|    \entry{L13}{book}{}
-       \strng{authornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -124,7 +124,7 @@ my $l14 = q|    \entry{L14}{book}{}
-       \strng{authornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{3}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -165,7 +165,7 @@ my $l15 = q|    \entry{L15}{book}{}
-       \strng{authornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{4}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -197,7 +197,7 @@ my $l16 = q|    \entry{L16}{proceedings}{}
-       \strng{editornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{7}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{event}
-@@ -235,7 +235,7 @@ my $l17 = q|    \entry{L17}{proceedings}{}
-       \strng{editornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{4}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -293,7 +293,7 @@ my $l17c = q|    \entry{L17}{proceedings}{}
-       \strng{editornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{orig}
-       \field{labelnamesource}{editor}
-@@ -350,7 +350,7 @@ my $l17e = q|    \entry{L17}{proceedings}{}
-       \strng{editornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{event}
-       \field{labelnamesource}{editor}
-@@ -471,7 +471,7 @@ my $era1 = q|    \entry{era1}{article}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -503,7 +503,7 @@ my $era2 = q|    \entry{era2}{inproceedings}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -536,7 +536,7 @@ my $era3 = q|    \entry{era3}{inproceedings}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -569,7 +569,7 @@ my $era4 = q|    \entry{era4}{inproceedings}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -610,7 +610,7 @@ my $time1 = q|    \entry{time1}{article}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -658,7 +658,7 @@ my $range1 = q|    \entry{range1}{inproceedings}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{1}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -698,7 +698,7 @@ my $range2 = q|    \entry{range2}{inproceedings}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{2}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -738,7 +738,7 @@ my $season1 = q|    \entry{season1}{inproceedings}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -769,7 +769,7 @@ my $unspec1 = q|    \entry{unspec1}{inproceedings}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -821,7 +821,7 @@ my $unspec2 = q|    \entry{unspec2}{article}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-diff --git a/t/encoding.t b/t/encoding.t
-index a658cec..a7681ad 100644
---- a/t/encoding.t
-+++ b/t/encoding.t
-@@ -52,7 +52,7 @@ my $encode1 = q|    \entry{testŠ}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -82,7 +82,7 @@ my $encode2 = q|    \entry{test1}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -112,7 +112,7 @@ my $encode3 = q|    \entry{test1}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -142,7 +142,7 @@ my $encode5 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -172,7 +172,7 @@ my $encode6 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -202,7 +202,7 @@ my $encode7 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-diff --git a/t/names.t b/t/names.t
-index 5dcd736..91290b9 100644
---- a/t/names.t
-+++ b/t/names.t
-@@ -188,7 +188,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \strng{authornamehash}{72287a68c1714cb1b9f4ab9e03a88b96}
-       \strng{authorfullhash}{72287a68c1714cb1b9f4ab9e03a88b96}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -208,7 +208,7 @@ my $l2 = q|    \entry{L2}{book}{}
-       \strng{authornamehash}{1c867a2b5ceb243bab70afb18702dc04}
-       \strng{authorfullhash}{1c867a2b5ceb243bab70afb18702dc04}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -228,7 +228,7 @@ my $l3 = q|    \entry{L3}{book}{}
-       \strng{authornamehash}{cecd18116c43ee86e5a136b6e0362948}
-       \strng{authorfullhash}{cecd18116c43ee86e5a136b6e0362948}
-       \field{sortinit}{C}
--      \field{sortinithash}{963e9d84a3da2344e8833203de5aed05}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -248,7 +248,7 @@ my $l4 = q|    \entry{L4}{book}{}
-       \strng{authornamehash}{675883f3aca7c6069c0b154d47af4c86}
-       \strng{authorfullhash}{675883f3aca7c6069c0b154d47af4c86}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -270,7 +270,7 @@ my $l5 = q|    \entry{L5}{book}{}
-       \strng{authornamehash}{c6b9d281cc1ff3f35570f76f463d4244}
-       \strng{authorfullhash}{c6b9d281cc1ff3f35570f76f463d4244}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -292,7 +292,7 @@ my $l6 = q|    \entry{L6}{book}{}
-       \strng{authornamehash}{dd96e3fc645eb4685988366f233403df}
-       \strng{authorfullhash}{dd96e3fc645eb4685988366f233403df}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -314,7 +314,7 @@ my $l7 = q|    \entry{L7}{book}{}
-       \strng{authornamehash}{1e802cc32f10930a9567712b8febdf19}
-       \strng{authorfullhash}{1e802cc32f10930a9567712b8febdf19}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -336,7 +336,7 @@ my $l8 = q|    \entry{L8}{book}{}
-       \strng{authornamehash}{076a9b62b331eb2cdfba234d9ad7bca9}
-       \strng{authorfullhash}{076a9b62b331eb2cdfba234d9ad7bca9}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -356,7 +356,7 @@ my $l9 = q|    \entry{L9}{book}{}
-       \strng{authornamehash}{1734924c4c55de5bb18d020c34a5249e}
-       \strng{authorfullhash}{1734924c4c55de5bb18d020c34a5249e}
-       \field{sortinit}{I}
--      \field{sortinithash}{320bc8fe8101b9376f9f21cd507de0e8}
-+      \field{sortinithash}{9417e9a1288a9371e2691d999083ed39}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -379,7 +379,7 @@ my $l10 = q|    \entry{L10}{book}{}
-       \strng{authornamehash}{37b4325752e394ddfb2fc810f6c88e27}
-       \strng{authorfullhash}{37b4325752e394ddfb2fc810f6c88e27}
-       \field{sortinit}{J}
--      \field{sortinithash}{fce5f8d0bd05e8d93f3dbe21c78897ca}
-+      \field{sortinithash}{c45040a764d616897e7f5b30174d7b92}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -402,7 +402,7 @@ my $l10a = q|    \entry{L10a}{book}{}
-       \strng{authornamehash}{264cb53d2295644c1c99523e254d9b0e}
-       \strng{authorfullhash}{264cb53d2295644c1c99523e254d9b0e}
-       \field{sortinit}{P}
--      \field{sortinithash}{8d51b3d5b78d75b54308d706b9bbe285}
-+      \field{sortinithash}{bb5b15f2db90f7aef79bb9e83defefcb}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -427,7 +427,7 @@ my $l11 = q|    \entry{L11}{book}{}
-       \strng{authornamehash}{c536dd808dc9193fda59ba1ff2afb38f}
-       \strng{authorfullhash}{c536dd808dc9193fda59ba1ff2afb38f}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -449,7 +449,7 @@ my $l12 = q|    \entry{L12}{book}{}
-       \strng{authornamehash}{6c883a8c1975ffff06f875bf366b3e47}
-       \strng{authorfullhash}{6c883a8c1975ffff06f875bf366b3e47}
-       \field{sortinit}{d}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \true{uniqueprimaryauthor}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -470,7 +470,7 @@ my $l13 = q|    \entry{L13}{book}{}
-       \strng{authornamehash}{5e79da6869afaf0d38e01285b494d555}
-       \strng{authorfullhash}{5e79da6869afaf0d38e01285b494d555}
-       \field{sortinit}{V}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -490,7 +490,7 @@ my $l14 = q|    \entry{L14}{book}{}
-       \strng{authornamehash}{2319907d9a5d5dd46da77879bdb7e609}
-       \strng{authorfullhash}{2319907d9a5d5dd46da77879bdb7e609}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -512,7 +512,7 @@ my $l15 = q|    \entry{L15}{book}{}
-       \strng{authornamehash}{b30b0fc69681fd11ad5d75a880124091}
-       \strng{authorfullhash}{b30b0fc69681fd11ad5d75a880124091}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -534,7 +534,7 @@ my $l16 = q|    \entry{L16}{book}{}
-       \strng{authornamehash}{2b17c50dc666b9cc73d132da9ef08c7b}
-       \strng{authorfullhash}{2b17c50dc666b9cc73d132da9ef08c7b}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -554,7 +554,7 @@ my $l17 = q|    \entry{L17}{book}{}
-       \strng{authornamehash}{766d5329cf995fcc7c1cef19de2a2ae8}
-       \strng{authorfullhash}{766d5329cf995fcc7c1cef19de2a2ae8}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -574,7 +574,7 @@ my $l18 = q|    \entry{L18}{book}{}
-       \strng{authornamehash}{58620d2c7d6839bac23306c732c563fb}
-       \strng{authorfullhash}{58620d2c7d6839bac23306c732c563fb}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -594,7 +594,7 @@ my $l19 = q|    \entry{L19}{book}{}
-       \strng{authornamehash}{83caa52f21f97e572dd3267bdf62978a}
-       \strng{authorfullhash}{83caa52f21f97e572dd3267bdf62978a}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -614,7 +614,7 @@ my $l19a = q|    \entry{L19a}{book}{}
-       \strng{authornamehash}{0963f6904ccfeaac2770c5882a587001}
-       \strng{authorfullhash}{0963f6904ccfeaac2770c5882a587001}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -635,7 +635,7 @@ my $l20 = q|    \entry{L20}{book}{}
-       \strng{authornamehash}{fdaa0936724be89ef8bd16cf02e08c74}
-       \strng{authorfullhash}{fdaa0936724be89ef8bd16cf02e08c74}
-       \field{sortinit}{F}
--      \field{sortinithash}{669c706c6f1fbf3b5a83d26f1d9e9e72}
-+      \field{sortinithash}{fb0c0faa89eb6abae8213bf60e6799ea}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -655,7 +655,7 @@ my $l21 = q|    \entry{L21}{book}{}
-       \strng{authornamehash}{b3df6330af0651b93bce079a36dea339}
-       \strng{authorfullhash}{b3df6330af0651b93bce079a36dea339}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -675,7 +675,7 @@ my $l22u = q|    \entry{L22}{book}{}
-       \strng{authornamehash}{2273e0084ca97649d7edced9ce8d0ea3}
-       \strng{authorfullhash}{2273e0084ca97649d7edced9ce8d0ea3}
-       \field{sortinit}{Š}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -696,7 +696,7 @@ my $l22 = q|    \entry{L22}{book}{}
-       \strng{authornamehash}{2273e0084ca97649d7edced9ce8d0ea3}
-       \strng{authorfullhash}{2273e0084ca97649d7edced9ce8d0ea3}
-       \field{sortinit}{\v{S}}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{uniqueprimaryauthor}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -718,7 +718,7 @@ my $l23 = q|    \entry{L23}{book}{}
-       \strng{authornamehash}{4389a3c0dc7da74487b50808ba9436ad}
-       \strng{authorfullhash}{4389a3c0dc7da74487b50808ba9436ad}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -738,7 +738,7 @@ my $l24 = q|    \entry{L24}{book}{}
-       \strng{authornamehash}{e58b861545799d0eaf883402a882126e}
-       \strng{authorfullhash}{e58b861545799d0eaf883402a882126e}
-       \field{sortinit}{Š}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -756,7 +756,7 @@ my $l25 = q|    \entry{L25}{book}{}
-       \strng{authornamehash}{7069367d4a4f37ffb0377e3830e98ed0}
-       \strng{authorfullhash}{7069367d4a4f37ffb0377e3830e98ed0}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -774,7 +774,7 @@ my $l26 = q|    \entry{L26}{book}{}
-       \strng{authornamehash}{d176a8af5ce1c45cb06875c4433f2fe2}
-       \strng{authorfullhash}{d176a8af5ce1c45cb06875c4433f2fe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -782,7 +782,7 @@ my $l26 = q|    \entry{L26}{book}{}
- # Malformed anyway but a decent test
- my $l28 = q|    \entry{L28}{book}{}
-       \field{sortinit}{0}
--      \field{sortinithash}{168ad0c7c5ed09f1d28c6675717b5b03}
-+      \field{sortinithash}{bcf7a1f4afb88b7299f988caccb80d1c}
-       \warn{\item Name "Deux et al.,, O." is malformed (consecutive commas): skipping name}
-     \endentry
- |;
-@@ -801,7 +801,7 @@ my $l29 = q|    \entry{L29}{book}{}
-       \strng{authornamehash}{59a5e43a502767d00e589eb29f863728}
-       \strng{authorfullhash}{59a5e43a502767d00e589eb29f863728}
-       \field{sortinit}{U}
--      \field{sortinithash}{36a2444f5238e0dcf4bb59704df6624d}
-+      \field{sortinithash}{77a6935510e008adcf5b555e7b4f0711}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -841,7 +841,7 @@ my $l31 = q|    \entry{L31}{book}{}
-       \strng{translatornamehash}{b43419361d83c9ab010e98aed1a83e35}
-       \strng{translatorfullhash}{b43419361d83c9ab010e98aed1a83e35}
-       \field{sortinit}{\~{Z}}
--      \field{sortinithash}{156173bd08b075d7295bc3e0f4735a04}
-+      \field{sortinithash}{8f7b480688e809b50b6f6577b16f3db5}
-       \true{uniqueprimaryauthor}
-       \field{labelnamesource}{author}
-     \endentry
-diff --git a/t/options.t b/t/options.t
-index 07c3e10..6daa2a4 100644
---- a/t/options.t
-+++ b/t/options.t
-@@ -100,7 +100,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -137,7 +137,7 @@ my $l2 = q|    \entry{L2}{book}{maxcitenames=3,maxbibnames=3,maxitems=2}
-       \strng{authornamehash}{19eec87c959944d6d9c72434a42856ba}
-       \strng{authorfullhash}{19eec87c959944d6d9c72434a42856ba}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -169,7 +169,7 @@ my $l3 = q|    \entry{L3}{book}{blah=10}
-       \strng{authornamehash}{490250da1f3b92580d97563dc96c6c84}
-       \strng{authorfullhash}{490250da1f3b92580d97563dc96c6c84}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-diff --git a/t/related-entries.t b/t/related-entries.t
-index 4237bba..57d7cd8 100644
---- a/t/related-entries.t
-+++ b/t/related-entries.t
-@@ -55,7 +55,7 @@ my $k1 = q|    \entry{key1}{article}{}
-       \strng{authornamehash}{a517747c3d12f99244ae598910d979c5}
-       \strng{authorfullhash}{a517747c3d12f99244ae598910d979c5}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -93,7 +93,7 @@ my $k2 = q|    \entry{key2}{inbook}{}
-       \strng{authornamehash}{a517747c3d12f99244ae598910d979c5}
-       \strng{authorfullhash}{a517747c3d12f99244ae598910d979c5}
-       \field{sortinit}{2}
--      \field{sortinithash}{cbff857e587bcb4635511624d773949e}
-+      \field{sortinithash}{ed39bb39cf854d5250e95b1c1f94f4ed}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -241,7 +241,7 @@ my $kck4 = q|    \entry{caf8e34be07426ae7127c1b4829983c1}{inbook}{dataonly,useed
- 
- my $c1 = q|    \entry{c1}{book}{}
-       \field{sortinit}{3}
--      \field{sortinithash}{a4b52e5432884761f50fb9571273b93e}
-+      \field{sortinithash}{a37a8ef248a93c322189792c34fc68c9}
-       \field{related}{9ab62b5ef34a985438bfdf7ee0102229}
-     \endentry
- |;
-@@ -327,7 +327,7 @@ my $un1 = q|    \entry{kullback}{book}{}
-       \strng{authornamehash}{34c5bbf9876c37127c3abe4e7d7a7198}
-       \strng{authorfullhash}{34c5bbf9876c37127c3abe4e7d7a7198}
-       \field{sortinit}{5}
--      \field{sortinithash}{3c19c3776b658b3558e9e2e4840c01e2}
-+      \field{sortinithash}{5dd416adbafacc8226114bc0202d5fdd}
-       \field{extradatescope}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -360,7 +360,7 @@ my $un2 = q|    \entry{kullback:related}{book}{}
-       \strng{authornamehash}{34c5bbf9876c37127c3abe4e7d7a7198}
-       \strng{authorfullhash}{34c5bbf9876c37127c3abe4e7d7a7198}
-       \field{sortinit}{6}
--      \field{sortinithash}{57e57fb8451e7fcfa45d1e069f6d3136}
-+      \field{sortinithash}{7851c86048328b027313775d8fbd2131}
-       \field{extradatescope}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/set-dynamic.t b/t/set-dynamic.t
-index 9ab5fdd..0846f8a 100644
---- a/t/set-dynamic.t
-+++ b/t/set-dynamic.t
-@@ -51,7 +51,7 @@ my $out = $biber->get_output_obj;
- my $string1 = q|    \entry{DynSet}{set}{}
-       \set{Dynamic1,Dynamic2,Dynamic3}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-     \endentry
- |;
- 
-@@ -71,7 +71,7 @@ my $string2 = q|    \entry{Dynamic1}{book}{}
-       \strng{authornamehash}{252caa7921a061ca92087a1a52f15b78}
-       \strng{authorfullhash}{252caa7921a061ca92087a1a52f15b78}
-       \field{sortinit}{8}
--      \field{sortinithash}{07edf88d4ea82509b9c4b4d13f41c452}
-+      \field{sortinithash}{1b24cab5087933ef0826a7cd3b99e994}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -98,7 +98,7 @@ my $string3 = q|    \entry{Dynamic2}{book}{}
-       \strng{authornamehash}{894a5fe6de820f5dcce84a65581667f4}
-       \strng{authorfullhash}{894a5fe6de820f5dcce84a65581667f4}
-       \field{sortinit}{9}
--      \field{sortinithash}{1dd72ab054147731c9d824b49aba0534}
-+      \field{sortinithash}{54047ffb55bdefa0694bbd554c1b11a0}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -124,7 +124,7 @@ my $string4 = q|    \entry{Dynamic3}{book}{}
-       \strng{authornamehash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \strng{authorfullhash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -151,7 +151,7 @@ my $string5 = q|    \entry{Dynamic3}{book}{}
-       \strng{authornamehash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \strng{authorfullhash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/set-legacy.t b/t/set-legacy.t
-index ad2ab8f..9798b0c 100644
---- a/t/set-legacy.t
-+++ b/t/set-legacy.t
-@@ -45,7 +45,7 @@ my $out = $biber->get_output_obj;
- my $string1 = q|    \entry{Elias1955}{set}{}
-       \set{Elias1955a,Elias1955b}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-     \endentry
- |;
- 
-diff --git a/t/set-static.t b/t/set-static.t
-index 1e45d4d..a6cbe73 100644
---- a/t/set-static.t
-+++ b/t/set-static.t
-@@ -47,7 +47,7 @@ my $out = $biber->get_output_obj;
- my $string1 = q|    \entry{Static1}{set}{}
-       \set{Static2,Static4,Static3}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \field{annotation}{Some notes}
-     \endentry
- |;
-@@ -68,7 +68,7 @@ my $string2 = q|    \entry{Static2}{book}{}
-       \strng{authornamehash}{43874d80d7ce68027102819f16c47df1}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -94,7 +94,7 @@ my $string3 = q|    \entry{Static3}{book}{}
-       \strng{authornamehash}{22dafa5cd57bb5dd7f3e3bab98fd539c}
-       \strng{authorfullhash}{22dafa5cd57bb5dd7f3e3bab98fd539c}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -119,7 +119,7 @@ my $string4 = q|    \entry{Static4}{book}{}
-       \strng{authornamehash}{da80091c8cd89e5269bd55af1bd5d2fa}
-       \strng{authorfullhash}{da80091c8cd89e5269bd55af1bd5d2fa}
-       \field{sortinit}{C}
--      \field{sortinithash}{963e9d84a3da2344e8833203de5aed05}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -145,7 +145,7 @@ my $string5 = q|    \entry{Static2}{book}{}
-       \strng{authornamehash}{43874d80d7ce68027102819f16c47df1}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/skips.t b/t/skips.t
-index c60435c..449c03c 100644
---- a/t/skips.t
-+++ b/t/skips.t
-@@ -50,7 +50,7 @@ my $set1 = q|    \entry{seta}{set}{}
-       \field{labelalpha}{Doe10}
-       \field{extraalpha}{1}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-     \endentry
- |;
- 
-@@ -70,7 +70,7 @@ my $set2 = q|    \entry{set:membera}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -97,7 +97,7 @@ my $set3 = q|    \entry{set:memberb}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -123,7 +123,7 @@ my $set4 = q|    \entry{set:memberc}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -149,7 +149,7 @@ my $noset1 = q|    \entry{noseta}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{2}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -178,7 +178,7 @@ my $noset2 = q|    \entry{nosetb}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{3}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -207,7 +207,7 @@ my $noset3 = q|    \entry{nosetc}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{4}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -241,7 +241,7 @@ my $sk4 = q|    \entry{skip4}{article}{dataonly}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/sort-complex.t b/t/sort-complex.t
-index 19b37a6..d7aff10 100644
---- a/t/sort-complex.t
-+++ b/t/sort-complex.t
-@@ -122,7 +122,7 @@ my $l4 = q|    \entry{L4}{book}{}
-       \strng{authorfullhash}{6eb389989020e8246fee90ac93fcecbe}
-       \field{labelalpha}{Doe\textbf{+}95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -153,7 +153,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -184,7 +184,7 @@ my $l2 = q|    \entry{L2}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -215,7 +215,7 @@ my $l3 = q|    \entry{L3}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -248,7 +248,7 @@ my $l5 = q|    \entry{L5}{book}{}
-       \strng{authorfullhash}{6eb389989020e8246fee90ac93fcecbe}
-       \field{labelalpha}{Doe\textbf{+}95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/uniqueness-nameparts.t b/t/uniqueness-nameparts.t
-index 0d1f6b7..7f0dd05 100644
---- a/t/uniqueness-nameparts.t
-+++ b/t/uniqueness-nameparts.t
-@@ -81,7 +81,7 @@ my $un1 = q|    \entry{un1}{article}{}
-       \strng{authorfullhash}{329d8f9192ea3349d700160c9ddb505d}
-       \field{labelalpha}{SmiJohSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -106,7 +106,7 @@ my $un2 = q|    \entry{un2}{article}{}
-       \strng{authorfullhash}{7551114aede4ef69e4b3683039801706}
-       \field{labelalpha}{SmiJohAla}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -131,7 +131,7 @@ my $un3 = q|    \entry{un3}{article}{}
-       \strng{authorfullhash}{401aebda288799a7c757526242d8c9fc}
-       \field{labelalpha}{SmiJohArt}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -156,7 +156,7 @@ my $un4 = q|    \entry{un4}{article}{}
-       \strng{authorfullhash}{f6038a264619efefd49c7daac56424ca}
-       \field{labelalpha}{SmiAlaSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -181,7 +181,7 @@ my $un1a = q|    \entry{un1}{article}{}
-       \strng{authorfullhash}{329d8f9192ea3349d700160c9ddb505d}
-       \field{labelalpha}{SmiJohSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -206,7 +206,7 @@ my $un2a = q|    \entry{un2}{article}{}
-       \strng{authorfullhash}{7551114aede4ef69e4b3683039801706}
-       \field{labelalpha}{SmiJohAla}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -231,7 +231,7 @@ my $un3a = q|    \entry{un3}{article}{}
-       \strng{authorfullhash}{401aebda288799a7c757526242d8c9fc}
-       \field{labelalpha}{SmiJohArt}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -257,7 +257,7 @@ my $un4a = q|    \entry{un4}{article}{}
-       \strng{authorfullhash}{f6038a264619efefd49c7daac56424ca}
-       \field{labelalpha}{SmiAlaSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -284,7 +284,7 @@ my $un1b = q|    \entry{un1}{article}{}
-       \strng{authorfullhash}{329d8f9192ea3349d700160c9ddb505d}
-       \field{labelalpha}{SmiJohSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{5}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -310,7 +310,7 @@ my $un2b = q|    \entry{un2}{article}{}
-       \strng{authorfullhash}{7551114aede4ef69e4b3683039801706}
-       \field{labelalpha}{SmiJohAla}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -335,7 +335,7 @@ my $un3b = q|    \entry{un3}{article}{}
-       \strng{authorfullhash}{401aebda288799a7c757526242d8c9fc}
-       \field{labelalpha}{SmiJohArt}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -362,7 +362,7 @@ my $un4b = q|    \entry{un4}{article}{}
-       \strng{authorfullhash}{f6038a264619efefd49c7daac56424ca}
-       \field{labelalpha}{SmiAlaSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{1}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -390,7 +390,7 @@ my $un5 = q|    \entry{un5}{article}{uniquenametemplatename=test3}
-       \strng{authorfullhash}{74fba0d07ca65976bbff1034f9bb22e6}
-       \field{labelalpha}{SmiArtSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{2}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -418,7 +418,7 @@ my $un6 = q|    \entry{un6}{article}{}
-       \strng{authorfullhash}{8100e7d06d05938e91bf8863f5c20e33}
-       \field{labelalpha}{SmiArtSmy}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{3}
-       \field{labelnamesource}{author}
-     \\endentry
-@@ -446,7 +446,7 @@ my $un7 = q|    \entry{un7}{article}{}
-       \strng{authorfullhash}{c21736158273b6f2f368818459734e04}
-       \field{labelalpha}{SmiArtSme}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{4}
-       \field{labelnamesource}{author}
-     \endentry
-diff --git a/t/xdata.t b/t/xdata.t
-index 8d4ec53..b583451 100644
---- a/t/xdata.t
-+++ b/t/xdata.t
-@@ -74,7 +74,7 @@ my $xd1 = q|    \entry{xd1}{book}{}
-       \strng{authornamehash}{51db4bfd331cba22959ce2d224c517cd}
-       \strng{authorfullhash}{51db4bfd331cba22959ce2d224c517cd}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -106,7 +106,7 @@ my $xd2 = q|    \entry{xd2}{book}{}
-       \strng{authornamehash}{68539e0ce4922cc4957c6cabf35e6fc8}
-       \strng{authorfullhash}{68539e0ce4922cc4957c6cabf35e6fc8}
-       \field{sortinit}{P}
--      \field{sortinithash}{8d51b3d5b78d75b54308d706b9bbe285}
-+      \field{sortinithash}{bb5b15f2db90f7aef79bb9e83defefcb}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
--- 
-2.20.1
-

diff --git a/biber-2.12-Updated-tests-after-U-C-upgrade-changed-sortinit.patch b/biber-2.12-Updated-tests-after-U-C-upgrade-changed-sortinit.patch
deleted file mode 100644
index 4597eaa..0000000
--- a/biber-2.12-Updated-tests-after-U-C-upgrade-changed-sortinit.patch
+++ /dev/null
@@ -1,1768 +0,0 @@
-From 6b61b4c13778cf638f82569ab9e413f09f111ba5 Mon Sep 17 00:00:00 2001
-From: Philip Kime <Philip@kime.org.uk>
-Date: Sat, 12 Jan 2019 17:19:51 +0100
-Subject: [PATCH 01/77] Updated tests after U::C upgrade changed sortinit
- hashes
-
----
- t/annotations.t            |  4 +--
- t/basic-misc.t             | 28 ++++++++---------
- t/biblatexml.t             |  4 +--
- t/crossrefs.t              | 48 ++++++++++++++--------------
- t/datalists.t              |  4 +--
- t/dateformats.t            | 34 ++++++++++----------
- t/encoding.t               | 12 +++----
- t/names.t                  | 64 +++++++++++++++++++-------------------
- t/options.t                |  6 ++--
- t/related-entries.t        | 10 +++---
- t/remote-files.t           | 64 +++++++++++++++-----------------------
- t/set-dynamic.t            | 10 +++---
- t/set-legacy.t             |  2 +-
- t/set-static.t             | 10 +++---
- t/skips.t                  | 16 +++++-----
- t/sort-complex.t           | 10 +++---
- t/tdata/full-bbl.bbl       |  6 ++--
- t/tdata/full-bblxml.bblxml | 40 ++++++++++++------------
- t/tdata/remote-files.bcf   |  4 +--
- t/uniqueness-nameparts.t   | 30 +++++++++---------
- t/xdata.t                  |  4 +--
- 21 files changed, 198 insertions(+), 212 deletions(-)
-
-diff --git a/t/annotations.t b/t/annotations.t
-index b4f641eb..c6f86c7f 100644
---- a/t/annotations.t
-+++ b/t/annotations.t
-@@ -73,7 +73,7 @@ my $ann1 = q|    \entry{ann1}{misc}{}
-       \strng{authorfullhash}{90ae96c82de92e36949bc64254bbde0c}
-       \field{extraname}{1}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{title}{The Title}
-@@ -116,7 +116,7 @@ my $ann2 = q|    \entry{ann2}{misc}{}
-       \strng{authorfullhash}{90ae96c82de92e36949bc64254bbde0c}
-       \field{extraname}{2}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{title}{The Title}
-diff --git a/t/basic-misc.t b/t/basic-misc.t
-index 3da513a1..c9622693 100644
---- a/t/basic-misc.t
-+++ b/t/basic-misc.t
-@@ -97,7 +97,7 @@ my $u1 = q|    \entry{u1}{misc}{}
-       \strng{authorfullhash}{b78abdc838d79b6576f2ed0021642766}
-       \field{labelalpha}{AAA\textbf{+}00}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -231,7 +231,7 @@ my $murray1 = q|    \entry{murray}{article}{}
-       \strng{authorfullhash}{1572cc3fd324f560e5e71d041a6bd764}
-       \field{labelalpha}{Hos\textbf{+}98}
-       \field{sortinit}{H}
--      \field{sortinithash}{5f15a7bc777ad49ff15aa4d2831b1681}
-+      \field{sortinithash}{6db6145dae8dc9e1271a8d556090b50a}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -348,7 +348,7 @@ my $murray2 = q|    \entry{murray}{article}{}
-       \strng{authorfullhash}{1572cc3fd324f560e5e71d041a6bd764}
-       \field{labelalpha}{Hos98}
-       \field{sortinit}{H}
--      \field{sortinithash}{5f15a7bc777ad49ff15aa4d2831b1681}
-+      \field{sortinithash}{6db6145dae8dc9e1271a8d556090b50a}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -389,7 +389,7 @@ my $t1 = q+    \entry{t1}{misc}{}
-       \field{extraname}{1}
-       \field{labelalpha}{Bro92}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -419,7 +419,7 @@ my $t2 = q|    \entry{t2}{misc}{}
-       \field{extraname}{2}
-       \field{labelalpha}{Bro94}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -452,7 +452,7 @@ my $anon1 = q|    \entry{anon1}{unpublished}{}
-       \strng{shortauthorfullhash}{9873a6cc65c553faa2b21aaad626fe4b}
-       \field{labelalpha}{XAn35}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{shortauthor}
-@@ -491,7 +491,7 @@ my $anon2 = q|    \entry{anon2}{unpublished}{}
-       \strng{shortauthorfullhash}{f64c29e89ea49402b997956610b58ef6}
-       \field{labelalpha}{YAn39}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{shortauthor}
-@@ -526,7 +526,7 @@ my $url1 = q|    \entry{url1}{misc}{}
-       \field{extraname}{4}
-       \field{labelalpha}{Ali05}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{extraalpha}{4}
-       \field{labelnamesource}{author}
-       \field{year}{2005}
-@@ -710,7 +710,7 @@ my $isbn1 = q|    \entry{isbn1}{misc}{}
-       \field{extraname}{1}
-       \field{labelalpha}{Flu}
-       \field{sortinit}{F}
--      \field{sortinithash}{669c706c6f1fbf3b5a83d26f1d9e9e72}
-+      \field{sortinithash}{fb0c0faa89eb6abae8213bf60e6799ea}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{isbn}{978-0-8165-2066-4}
-@@ -735,7 +735,7 @@ my $isbn2 = q|    \entry{isbn2}{misc}{}
-       \field{extraname}{2}
-       \field{labelalpha}{Flu}
-       \field{sortinit}{F}
--      \field{sortinithash}{669c706c6f1fbf3b5a83d26f1d9e9e72}
-+      \field{sortinithash}{fb0c0faa89eb6abae8213bf60e6799ea}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{isbn}{978-0-8165-2066-4}
-@@ -778,7 +778,7 @@ my $clone1 = q|    \entry{snk1}{book}{}
-       \field{extraname}{2}
-       \field{labelalpha}{vDoe}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -807,7 +807,7 @@ my $clone2 = q|    \entry{clone-snk1}{book}{}
-       \field{extraname}{1}
-       \field{labelalpha}{vDoe}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{addendum}{add}
-@@ -839,7 +839,7 @@ my $ent1 = q|    \entry{ent1}{book}{}
-       \strng{authorfullhash}{b2536a425d549b46de5f21c4d468050a}
-       \field{labelalpha}{SdB}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -862,7 +862,7 @@ my $verb1 = q|    \entry{verb1}{book}{}
-       \strng{authorfullhash}{cac5a25f503e71f5ef28f474e14007b6}
-       \field{labelalpha}{All}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \verb{verba}
-diff --git a/t/biblatexml.t b/t/biblatexml.t
-index ad9ad259..0959bfa5 100644
---- a/t/biblatexml.t
-+++ b/t/biblatexml.t
-@@ -111,7 +111,7 @@ my $l1 = q|    \entry{bltx1}{misc}{useprefix=false}
-       \strng{translatornamehash}{b44eba830fe9817fbe8e53c82f1cbe04}
-       \strng{translatorfullhash}{b44eba830fe9817fbe8e53c82f1cbe04}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -158,7 +158,7 @@ my $l1 = q|    \entry{bltx1}{misc}{useprefix=false}
- 
- my $l2 = q|    \entry{loopkey:a}{book}{}
-       \field{sortinit}{0}
--      \field{sortinithash}{168ad0c7c5ed09f1d28c6675717b5b03}
-+      \field{sortinithash}{bcf7a1f4afb88b7299f988caccb80d1c}
-     \endentry
- |;
- 
-diff --git a/t/crossrefs.t b/t/crossrefs.t
-index 915b52b2..b6191c62 100644
---- a/t/crossrefs.t
-+++ b/t/crossrefs.t
-@@ -82,7 +82,7 @@ my $cr1 = q|    \entry{cr1}{inbook}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{G}
--      \field{sortinithash}{5e8d2bf9d38de41b1528bd307546008f}
-+      \field{sortinithash}{62eb2aa29549e4fdbd3cb154ec5711cb}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -131,7 +131,7 @@ my $cr2 = q|    \entry{cr2}{inbook}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{F}
--      \field{sortinithash}{669c706c6f1fbf3b5a83d26f1d9e9e72}
-+      \field{sortinithash}{fb0c0faa89eb6abae8213bf60e6799ea}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -165,7 +165,7 @@ my $cr_m = q|    \entry{cr_m}{book}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{G}
--      \field{sortinithash}{5e8d2bf9d38de41b1528bd307546008f}
-+      \field{sortinithash}{62eb2aa29549e4fdbd3cb154ec5711cb}
-       \true{crossrefsource}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-@@ -203,7 +203,7 @@ my $cr3 = q|    \entry{cr3}{inbook}{}
-       \strng{editornamehash}{a1f5c22413396d599ec766725b226735}
-       \strng{editorfullhash}{a1f5c22413396d599ec766725b226735}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -248,7 +248,7 @@ my $cr4 = q|    \entry{cr4}{inbook}{}
-       \strng{editornamehash}{6ea89bd4958743a20b70fe17647d6af5}
-       \strng{editorfullhash}{6ea89bd4958743a20b70fe17647d6af5}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -279,7 +279,7 @@ my $crt = q|    \entry{crt}{book}{}
-       \strng{editornamehash}{a1f5c22413396d599ec766725b226735}
-       \strng{editorfullhash}{a1f5c22413396d599ec766725b226735}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{title}{Beasts of the Burbling Burns}
-@@ -315,7 +315,7 @@ my $cr6 = q|    \entry{cr6}{inproceedings}{}
-       \strng{editorfullhash}{344a7f427fb765610ef96eb7bce95257}
-       \field{extraname}{2}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -366,7 +366,7 @@ my $cr7 = q|    \entry{cr7}{inbook}{}
-       \strng{bookauthorfullhash}{91a1dd4aeed3c4ec29ca74c4e778be5f}
-       \field{extraname}{1}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -401,7 +401,7 @@ my $cr8 = q|    \entry{cr8}{incollection}{}
-       \strng{authorfullhash}{3d449e56eb3ca1ae80dc99a18d689795}
-       \field{extraname}{4}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -431,7 +431,7 @@ my $xr1 = q|    \entry{xr1}{inbook}{}
-       \strng{authornamehash}{e0ecc4fc668ee499d1afba44e1ac064d}
-       \strng{authorfullhash}{e0ecc4fc668ee499d1afba44e1ac064d}
-       \field{sortinit}{Z}
--      \field{sortinithash}{156173bd08b075d7295bc3e0f4735a04}
-+      \field{sortinithash}{8f7b480688e809b50b6f6577b16f3db5}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -460,7 +460,7 @@ my $xr2 = q|    \entry{xr2}{inbook}{}
-       \strng{authornamehash}{6afa09374ecfd6b394ce714d2d9709c7}
-       \strng{authorfullhash}{6afa09374ecfd6b394ce714d2d9709c7}
-       \field{sortinit}{I}
--      \field{sortinithash}{320bc8fe8101b9376f9f21cd507de0e8}
-+      \field{sortinithash}{9417e9a1288a9371e2691d999083ed39}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -491,7 +491,7 @@ my $xrm = q|    \entry{xrm}{book}{}
-       \strng{editornamehash}{809950f9b59ae207092b909a19dcb27b}
-       \strng{editorfullhash}{809950f9b59ae207092b909a19dcb27b}
-       \field{sortinit}{C}
--      \field{sortinithash}{963e9d84a3da2344e8833203de5aed05}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \true{xrefsource}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-@@ -516,7 +516,7 @@ my $xr3 = q|    \entry{xr3}{inbook}{}
-       \strng{authornamehash}{9788055665b9bb4b37c776c3f6b74f16}
-       \strng{authorfullhash}{9788055665b9bb4b37c776c3f6b74f16}
-       \field{sortinit}{N}
--      \field{sortinithash}{f7242c3ed3dc50029fca1be76c497c7c}
-+      \field{sortinithash}{98cf339a479c0454fe09153a08675a15}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -546,7 +546,7 @@ my $xrt = q|    \entry{xrt}{book}{}
-       \strng{editornamehash}{bf7d6b02f3e073913e5bfe5059508dd5}
-       \strng{editorfullhash}{bf7d6b02f3e073913e5bfe5059508dd5}
-       \field{sortinit}{K}
--      \field{sortinithash}{9fd838a31ba64d981e8f44562bd33f89}
-+      \field{sortinithash}{d3edc18d54b9438a72c24c925bfb38f4}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{title}{Kings, Cork and Calculation}
-@@ -572,7 +572,7 @@ my $xr4 = q|    \entry{xr4}{inbook}{}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{extraname}{1}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -600,7 +600,7 @@ my $mxr = q|    \entry{mxr}{inbook}{}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{extraname}{2}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -625,7 +625,7 @@ my $mcr = q|    \entry{mcr}{inbook}{}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{extraname}{3}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -660,7 +660,7 @@ my $ccr1 = q|    \entry{ccr2}{book}{}
-       \strng{editorfullhash}{cfee758a1c82df2e26af1985e061bb0a}
-       \field{extraname}{1}
-       \field{sortinit}{V}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -694,7 +694,7 @@ my $ccr2 = q|    \entry{ccr3}{inbook}{}
-       \strng{editornamehash}{cfee758a1c82df2e26af1985e061bb0a}
-       \strng{editorfullhash}{cfee758a1c82df2e26af1985e061bb0a}
-       \field{sortinit}{P}
--      \field{sortinithash}{8d51b3d5b78d75b54308d706b9bbe285}
-+      \field{sortinithash}{bb5b15f2db90f7aef79bb9e83defefcb}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{booktitle}{Misc etc.}
-@@ -726,7 +726,7 @@ my $ccr3 = q|    \entry{ccr4}{inbook}{}
- 
- my $s1 = q|    \entry{s1}{inbook}{}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \strng{crossref}{s2}
-@@ -760,7 +760,7 @@ my $xc2 = q|    \entry{xc2}{inbook}{}
-       \strng{bookauthorfullhash}{1a0f7d518cccdad859a74412ef956474}
-       \field{extraname}{2}
-       \field{sortinit}{C}
--      \field{sortinithash}{963e9d84a3da2344e8833203de5aed05}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \true{xrefsource}
-       \field{labelnamesource}{author}
-       \field{booktitle}{Title}
-@@ -769,7 +769,7 @@ my $xc2 = q|    \entry{xc2}{inbook}{}
- 
- my $b1 = q|    \entry{b1}{inbook}{}
-       \field{sortinit}{2}
--      \field{sortinithash}{cbff857e587bcb4635511624d773949e}
-+      \field{sortinithash}{ed39bb39cf854d5250e95b1c1f94f4ed}
-       \strng{crossref}{b2}
-       \field{day}{3}
-       \field{month}{3}
-@@ -803,7 +803,7 @@ my $sup1 = q|    \entry{sup1}{mvbook}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{3}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{crossrefsource}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -828,7 +828,7 @@ my $sup2 = q|    \entry{sup2}{book}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{1}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/datalists.t b/t/datalists.t
-index 3081cc49..4855e3d9 100644
---- a/t/datalists.t
-+++ b/t/datalists.t
-@@ -187,7 +187,7 @@ my $K11 = q|    \entry{K11}{book}{}
-       \strng{authornamehash}{4edc280a0ef229f9c061e3b121b17482}
-       \strng{authorfullhash}{4edc280a0ef229f9c061e3b121b17482}
-       \field{sortinit}{a}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -219,7 +219,7 @@ my $K12 = q|    \entry{K12}{book}{}
-       \strng{authornamehash}{a846a485fc9cbb59b0ebeedd6ac637e4}
-       \strng{authorfullhash}{a846a485fc9cbb59b0ebeedd6ac637e4}
-       \field{sortinit}{Z}
--      \field{sortinithash}{156173bd08b075d7295bc3e0f4735a04}
-+      \field{sortinithash}{8f7b480688e809b50b6f6577b16f3db5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-diff --git a/t/dateformats.t b/t/dateformats.t
-index f941cde8..2c01de8d 100644
---- a/t/dateformats.t
-+++ b/t/dateformats.t
-@@ -88,7 +88,7 @@ my $l13c = q|    \entry{L13}{book}{}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{extraname}{3}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -126,7 +126,7 @@ my $l14 = q|    \entry{L14}{book}{}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{extraname}{4}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{3}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -168,7 +168,7 @@ my $l15 = q|    \entry{L15}{book}{}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{extraname}{12}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{4}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -201,7 +201,7 @@ my $l16 = q|    \entry{L16}{proceedings}{}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{extraname}{13}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{7}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{event}
-@@ -240,7 +240,7 @@ my $l17 = q|    \entry{L17}{proceedings}{}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{extraname}{5}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{4}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -299,7 +299,7 @@ my $l17c = q|    \entry{L17}{proceedings}{}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{extraname}{5}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{orig}
-       \field{labelnamesource}{editor}
-@@ -357,7 +357,7 @@ my $l17e = q|    \entry{L17}{proceedings}{}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{extraname}{5}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{event}
-       \field{labelnamesource}{editor}
-@@ -479,7 +479,7 @@ my $era1 = q|    \entry{era1}{article}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{9}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -512,7 +512,7 @@ my $era2 = q|    \entry{era2}{inproceedings}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{10}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -546,7 +546,7 @@ my $era3 = q|    \entry{era3}{inproceedings}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{11}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -580,7 +580,7 @@ my $era4 = q|    \entry{era4}{inproceedings}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{6}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -622,7 +622,7 @@ my $time1 = q|    \entry{time1}{article}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{2}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -671,7 +671,7 @@ my $range1 = q|    \entry{range1}{inproceedings}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{7}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{1}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -712,7 +712,7 @@ my $range2 = q|    \entry{range2}{inproceedings}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{8}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{2}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -753,7 +753,7 @@ my $season1 = q|    \entry{season1}{inproceedings}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{1}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -785,7 +785,7 @@ my $unspec1 = q|    \entry{unspec1}{inproceedings}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{4}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -838,7 +838,7 @@ my $unspec2 = q|    \entry{unspec2}{article}{}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{extraname}{3}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-diff --git a/t/encoding.t b/t/encoding.t
-index a150b4f5..36d99558 100644
---- a/t/encoding.t
-+++ b/t/encoding.t
-@@ -52,7 +52,7 @@ my $encode1 = q|    \entry{testŠ}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -82,7 +82,7 @@ my $encode2 = q|    \entry{test1}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -112,7 +112,7 @@ my $encode3 = q|    \entry{test1}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -142,7 +142,7 @@ my $encode5 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -172,7 +172,7 @@ my $encode6 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -202,7 +202,7 @@ my $encode7 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-diff --git a/t/names.t b/t/names.t
-index 7b9a59a3..4908bea1 100644
---- a/t/names.t
-+++ b/t/names.t
-@@ -188,7 +188,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \strng{authornamehash}{72287a68c1714cb1b9f4ab9e03a88b96}
-       \strng{authorfullhash}{72287a68c1714cb1b9f4ab9e03a88b96}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -208,7 +208,7 @@ my $l2 = q|    \entry{L2}{book}{}
-       \strng{authornamehash}{2098d59d0f19a2e003ee06c1aa750d57}
-       \strng{authorfullhash}{2098d59d0f19a2e003ee06c1aa750d57}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -228,7 +228,7 @@ my $l3 = q|    \entry{L3}{book}{}
-       \strng{authornamehash}{c8b06fe88bde128b25eb0b3b1cc5837c}
-       \strng{authorfullhash}{c8b06fe88bde128b25eb0b3b1cc5837c}
-       \field{sortinit}{C}
--      \field{sortinithash}{963e9d84a3da2344e8833203de5aed05}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -248,7 +248,7 @@ my $l4 = q|    \entry{L4}{book}{}
-       \strng{authornamehash}{5ec958b850c0c2de7de7c42c84b9c419}
-       \strng{authorfullhash}{5ec958b850c0c2de7de7c42c84b9c419}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -270,7 +270,7 @@ my $l5 = q|    \entry{L5}{book}{}
-       \strng{authornamehash}{c6b9d281cc1ff3f35570f76f463d4244}
-       \strng{authorfullhash}{c6b9d281cc1ff3f35570f76f463d4244}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -292,7 +292,7 @@ my $l6 = q|    \entry{L6}{book}{}
-       \strng{authornamehash}{5fd24d3d1608a310ec205a6b201a5495}
-       \strng{authorfullhash}{5fd24d3d1608a310ec205a6b201a5495}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -314,7 +314,7 @@ my $l7 = q|    \entry{L7}{book}{}
-       \strng{authornamehash}{98edb0b90251df22b74328d9227eceb7}
-       \strng{authorfullhash}{98edb0b90251df22b74328d9227eceb7}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -336,7 +336,7 @@ my $l8 = q|    \entry{L8}{book}{}
-       \strng{authornamehash}{1211dc8dbbc191cbcab4da3c3c1fc48a}
-       \strng{authorfullhash}{1211dc8dbbc191cbcab4da3c3c1fc48a}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -356,7 +356,7 @@ my $l9 = q|    \entry{L9}{book}{}
-       \strng{authornamehash}{bae61a889ab149a6deafe45333204cf0}
-       \strng{authorfullhash}{bae61a889ab149a6deafe45333204cf0}
-       \field{sortinit}{I}
--      \field{sortinithash}{320bc8fe8101b9376f9f21cd507de0e8}
-+      \field{sortinithash}{9417e9a1288a9371e2691d999083ed39}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -379,7 +379,7 @@ my $l10 = q|    \entry{L10}{book}{}
-       \strng{authornamehash}{37b4325752e394ddfb2fc810f6c88e27}
-       \strng{authorfullhash}{37b4325752e394ddfb2fc810f6c88e27}
-       \field{sortinit}{J}
--      \field{sortinithash}{fce5f8d0bd05e8d93f3dbe21c78897ca}
-+      \field{sortinithash}{c45040a764d616897e7f5b30174d7b92}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -402,7 +402,7 @@ my $l10a = q|    \entry{L10a}{book}{}
-       \strng{authornamehash}{7bf2c9d8b89a1930ee91bfddcaf20c9c}
-       \strng{authorfullhash}{7bf2c9d8b89a1930ee91bfddcaf20c9c}
-       \field{sortinit}{P}
--      \field{sortinithash}{8d51b3d5b78d75b54308d706b9bbe285}
-+      \field{sortinithash}{bb5b15f2db90f7aef79bb9e83defefcb}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -427,7 +427,7 @@ my $l11 = q|    \entry{L11}{book}{}
-       \strng{authornamehash}{9f48d231be68c9435fab4faca55a5caf}
-       \strng{authorfullhash}{9f48d231be68c9435fab4faca55a5caf}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -449,7 +449,7 @@ my $l12 = q|    \entry{L12}{book}{}
-       \strng{authornamehash}{d7ca88c13a8f7ce1c23e920010a31f83}
-       \strng{authorfullhash}{d7ca88c13a8f7ce1c23e920010a31f83}
-       \field{sortinit}{d}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \true{uniqueprimaryauthor}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -470,7 +470,7 @@ my $l13 = q|    \entry{L13}{book}{}
-       \strng{authornamehash}{227ac48bb788a658cfaa4eefc71ff0cc}
-       \strng{authorfullhash}{227ac48bb788a658cfaa4eefc71ff0cc}
-       \field{sortinit}{V}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -490,7 +490,7 @@ my $l14 = q|    \entry{L14}{book}{}
-       \strng{authornamehash}{779475052c17ed56dc3be900d0dfdf87}
-       \strng{authorfullhash}{779475052c17ed56dc3be900d0dfdf87}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -513,7 +513,7 @@ my $l15 = q|    \entry{L15}{book}{}
-       \strng{authorfullhash}{783c636e853e47a854ae034ebe9dde62}
-       \field{extraname}{1}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -536,7 +536,7 @@ my $l16 = q|    \entry{L16}{book}{}
-       \strng{authorfullhash}{783c636e853e47a854ae034ebe9dde62}
-       \field{extraname}{2}
-       \field{sortinit}{v}
--      \field{sortinithash}{75dd7385c90b2252c3ae853a80ca853b}
-+      \field{sortinithash}{02432525618c08e2b03cac47c19764af}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -557,7 +557,7 @@ my $l17 = q|    \entry{L17}{book}{}
-       \strng{authorfullhash}{b51f667a3384d92ea5458ba80716bff7}
-       \field{extraname}{1}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -578,7 +578,7 @@ my $l18 = q|    \entry{L18}{book}{}
-       \strng{authorfullhash}{b51f667a3384d92ea5458ba80716bff7}
-       \field{extraname}{2}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -598,7 +598,7 @@ my $l19 = q|    \entry{L19}{book}{}
-       \strng{authornamehash}{83caa52f21f97e572dd3267bdf62978a}
-       \strng{authorfullhash}{83caa52f21f97e572dd3267bdf62978a}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -618,7 +618,7 @@ my $l19a = q|    \entry{L19a}{book}{}
-       \strng{authornamehash}{0963f6904ccfeaac2770c5882a587001}
-       \strng{authorfullhash}{0963f6904ccfeaac2770c5882a587001}
-       \field{sortinit}{L}
--      \field{sortinithash}{2c7981aaabc885868aba60f0c09ee20f}
-+      \field{sortinithash}{dad3efd0836470093a7b4a7bb756eb8c}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -639,7 +639,7 @@ my $l20 = q|    \entry{L20}{book}{}
-       \strng{authornamehash}{5f26c2f3b33095d5b005714893f4d698}
-       \strng{authorfullhash}{5f26c2f3b33095d5b005714893f4d698}
-       \field{sortinit}{F}
--      \field{sortinithash}{669c706c6f1fbf3b5a83d26f1d9e9e72}
-+      \field{sortinithash}{fb0c0faa89eb6abae8213bf60e6799ea}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -660,7 +660,7 @@ my $l21 = q|    \entry{L21}{book}{}
-       \strng{authorfullhash}{4389a3c0dc7da74487b50808ba9436ad}
-       \field{extraname}{1}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -681,7 +681,7 @@ my $l22u = q|    \entry{L22}{book}{}
-       \strng{authorfullhash}{e58b861545799d0eaf883402a882126e}
-       \field{extraname}{1}
-       \field{sortinit}{Š}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -703,7 +703,7 @@ my $l22 = q|    \entry{L22}{book}{}
-       \strng{authorfullhash}{e58b861545799d0eaf883402a882126e}
-       \field{extraname}{1}
-       \field{sortinit}{\v{S}}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \true{uniqueprimaryauthor}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -726,7 +726,7 @@ my $l23 = q|    \entry{L23}{book}{}
-       \strng{authorfullhash}{4389a3c0dc7da74487b50808ba9436ad}
-       \field{extraname}{3}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -747,7 +747,7 @@ my $l24 = q|    \entry{L24}{book}{}
-       \strng{authorfullhash}{e58b861545799d0eaf883402a882126e}
-       \field{extraname}{2}
-       \field{sortinit}{Š}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -765,7 +765,7 @@ my $l25 = q|    \entry{L25}{book}{}
-       \strng{authornamehash}{d7cd2c5ea0848abc3e90609558b84a45}
-       \strng{authorfullhash}{d7cd2c5ea0848abc3e90609558b84a45}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -783,7 +783,7 @@ my $l26 = q|    \entry{L26}{book}{}
-       \strng{authornamehash}{8eee1dbafdbd0a4b73157e60f18b4784}
-       \strng{authorfullhash}{8eee1dbafdbd0a4b73157e60f18b4784}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -791,7 +791,7 @@ my $l26 = q|    \entry{L26}{book}{}
- # Malformed anyway but a decent test
- my $l28 = q|    \entry{L28}{book}{}
-       \field{sortinit}{0}
--      \field{sortinithash}{168ad0c7c5ed09f1d28c6675717b5b03}
-+      \field{sortinithash}{bcf7a1f4afb88b7299f988caccb80d1c}
-       \warn{\item Name "Deux et al.,, O." is malformed (consecutive commas): skipping name}
-     \endentry
- |;
-@@ -810,7 +810,7 @@ my $l29 = q|    \entry{L29}{book}{}
-       \strng{authornamehash}{27ad192a3a715aa89152b2a4ee392e8c}
-       \strng{authorfullhash}{27ad192a3a715aa89152b2a4ee392e8c}
-       \field{sortinit}{U}
--      \field{sortinithash}{36a2444f5238e0dcf4bb59704df6624d}
-+      \field{sortinithash}{77a6935510e008adcf5b555e7b4f0711}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -850,7 +850,7 @@ my $l31 = q|    \entry{L31}{book}{}
-       \strng{translatornamehash}{29c3ff92fff79d09a8b44d2f775de0b1}
-       \strng{translatorfullhash}{29c3ff92fff79d09a8b44d2f775de0b1}
-       \field{sortinit}{\~{Z}}
--      \field{sortinithash}{156173bd08b075d7295bc3e0f4735a04}
-+      \field{sortinithash}{8f7b480688e809b50b6f6577b16f3db5}
-       \true{uniqueprimaryauthor}
-       \field{labelnamesource}{author}
-     \endentry
-diff --git a/t/options.t b/t/options.t
-index 8cb3b612..7e4c1f20 100644
---- a/t/options.t
-+++ b/t/options.t
-@@ -100,7 +100,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -137,7 +137,7 @@ my $l2 = q|    \entry{L2}{book}{maxcitenames=3,maxbibnames=3,maxsortnames=3,maxi
-       \strng{authornamehash}{19eec87c959944d6d9c72434a42856ba}
-       \strng{authorfullhash}{19eec87c959944d6d9c72434a42856ba}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -169,7 +169,7 @@ my $l3 = q|    \entry{L3}{book}{blah=10}
-       \strng{authornamehash}{490250da1f3b92580d97563dc96c6c84}
-       \strng{authorfullhash}{490250da1f3b92580d97563dc96c6c84}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-diff --git a/t/related-entries.t b/t/related-entries.t
-index 53dce64b..b38ac79f 100644
---- a/t/related-entries.t
-+++ b/t/related-entries.t
-@@ -56,7 +56,7 @@ my $k1 = q|    \entry{key1}{article}{}
-       \strng{authorfullhash}{a517747c3d12f99244ae598910d979c5}
-       \field{extraname}{1}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -95,7 +95,7 @@ my $k2 = q|    \entry{key2}{inbook}{}
-       \strng{authorfullhash}{a517747c3d12f99244ae598910d979c5}
-       \field{extraname}{2}
-       \field{sortinit}{2}
--      \field{sortinithash}{cbff857e587bcb4635511624d773949e}
-+      \field{sortinithash}{ed39bb39cf854d5250e95b1c1f94f4ed}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -243,7 +243,7 @@ my $kck4 = q|    \entry{caf8e34be07426ae7127c1b4829983c1}{inbook}{dataonly,useed
- 
- my $c1 = q|    \entry{c1}{book}{}
-       \field{sortinit}{3}
--      \field{sortinithash}{a4b52e5432884761f50fb9571273b93e}
-+      \field{sortinithash}{a37a8ef248a93c322189792c34fc68c9}
-       \field{related}{9ab62b5ef34a985438bfdf7ee0102229}
-     \endentry
- |;
-@@ -330,7 +330,7 @@ my $un1 = q|    \entry{kullback}{book}{}
-       \strng{authorfullhash}{34c5bbf9876c37127c3abe4e7d7a7198}
-       \field{extraname}{1}
-       \field{sortinit}{5}
--      \field{sortinithash}{3c19c3776b658b3558e9e2e4840c01e2}
-+      \field{sortinithash}{5dd416adbafacc8226114bc0202d5fdd}
-       \field{extradatescope}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -364,7 +364,7 @@ my $un2 = q|    \entry{kullback:related}{book}{}
-       \strng{authorfullhash}{34c5bbf9876c37127c3abe4e7d7a7198}
-       \field{extraname}{2}
-       \field{sortinit}{6}
--      \field{sortinithash}{57e57fb8451e7fcfa45d1e069f6d3136}
-+      \field{sortinithash}{7851c86048328b027313775d8fbd2131}
-       \field{extradatescope}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/remote-files.t b/t/remote-files.t
-index 64ea7452..c6158d1f 100644
---- a/t/remote-files.t
-+++ b/t/remote-files.t
-@@ -86,7 +86,7 @@ my $cu1 = q|    \entry{citeulike:8283461}{article}{}
-       \strng{authornamehash}{a700cc0bdce78f5a1f50ff6314ff6f2a}
-       \strng{authorfullhash}{094b095bbb7ac93fdd3e2eafdcec0cac}
-       \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \field{sortinithash}{2e5c2f51f7fa2d957f3206819bf86dc3}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-@@ -133,7 +133,7 @@ my $dl1 = q|    \entry{AbdelbarH98}{article}{}
-       \strng{authornamehash}{bb887c5d0458bfb1f3f7e6afc8d1def4}
-       \strng{authorfullhash}{bb887c5d0458bfb1f3f7e6afc8d1def4}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-@@ -147,55 +147,41 @@ my $dl1 = q|    \entry{AbdelbarH98}{article}{}
-     \endentry
- |;
- 
--my $ssl = q|    \entry{merleau-ponty_philosophe_2010}{incollection}{}
-+my $ssl = q|    \entry{crossley_politics_1994}{book}{}
-       \name{author}{1}{}{%
--        {{uniquename=0,uniquepart=base,hash=83d062f99d033839537243075d75bad2}{%
--           family={Merleau-Ponty},
--           familyi={M\bibinithyphendelim P\bibinitperiod},
--           given={Maurice},
--           giveni={M\bibinitperiod},
-+        {{uniquename=0,uniquepart=base,hash=92a23f84d2ee0a6817cf6e31edda9ac2}{%
-+           family={Crossley},
-+           familyi={C\bibinitperiod},
-+           given={Nick},
-+           giveni={N\bibinitperiod},
-            givenun=0}}%
-       }
--      \name{editor}{1}{}{%
--        {{hash=ff5f90046157eecef0c22da4dac6486e}{%
--           family={Lefort},
--           familyi={L\bibinitperiod},
--           given={Claude},
--           giveni={C\bibinitperiod}}}%
--      }
-       \list{language}{1}{%
--        {Fransk}%
--      }
--      \list{location}{1}{%
--        {Paris}%
-+        {en}%
-       }
-       \list{publisher}{1}{%
--        {Éditions Gallimard}%
-+        {Avebury}%
-       }
--      \strng{namehash}{83d062f99d033839537243075d75bad2}
--      \strng{fullhash}{83d062f99d033839537243075d75bad2}
--      \strng{bibnamehash}{83d062f99d033839537243075d75bad2}
--      \strng{authorbibnamehash}{83d062f99d033839537243075d75bad2}
--      \strng{authornamehash}{83d062f99d033839537243075d75bad2}
--      \strng{authorfullhash}{83d062f99d033839537243075d75bad2}
--      \strng{editorbibnamehash}{ff5f90046157eecef0c22da4dac6486e}
--      \strng{editornamehash}{ff5f90046157eecef0c22da4dac6486e}
--      \strng{editorfullhash}{ff5f90046157eecef0c22da4dac6486e}
--      \field{sortinit}{M}
--      \field{sortinithash}{cfd219b90152c06204fab207bc6c7cab}
-+      \strng{namehash}{92a23f84d2ee0a6817cf6e31edda9ac2}
-+      \strng{fullhash}{92a23f84d2ee0a6817cf6e31edda9ac2}
-+      \strng{bibnamehash}{92a23f84d2ee0a6817cf6e31edda9ac2}
-+      \strng{authorbibnamehash}{92a23f84d2ee0a6817cf6e31edda9ac2}
-+      \strng{authornamehash}{92a23f84d2ee0a6817cf6e31edda9ac2}
-+      \strng{authorfullhash}{92a23f84d2ee0a6817cf6e31edda9ac2}
-+      \field{sortinit}{C}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
--      \field{labeltitlesource}{title}
--      \field{title}{Le philosophe et son ombre}
--      \field{year}{2010}
--      \field{pages}{1267\bibrangedash 1289}
--      \range{pages}{23}
--      \keyw{Husserl,Edmund,autrui,chair,constitution,intercorporéité,l'impensé,ouverture}
-+      \field{labeltitlesource}{shorttitle}
-+      \field{isbn}{9781856288866}
-+      \field{shorttitle}{The politics of subjectivity}
-+      \field{title}{The politics of subjectivity : {Between} {Foucault} and {Merleau}-{Ponty}}
-+      \field{year}{1994}
-+      \keyw{Philosophy / General,Philosophy / History \& Surveys / Modern,Subjectivity}
-     \endentry
- |;
- 
--
- eq_or_diff( $out->get_output_entry('citeulike:8283461', $main), $cu1, 'Fetch from citeulike') ;
- eq_or_diff( $out->get_output_entry('AbdelbarH98', $main), $dl1, 'Fetch from plain bib download') ;
--eq_or_diff( $out->get_output_entry('merleau-ponty_philosophe_2010', $main), $ssl, 'HTTPS test') ;
-+eq_or_diff( $out->get_output_entry('crossley_politics_1994', $main), $ssl, 'HTTPS test') ;
-diff --git a/t/set-dynamic.t b/t/set-dynamic.t
-index 73f98735..e5db23a9 100644
---- a/t/set-dynamic.t
-+++ b/t/set-dynamic.t
-@@ -51,7 +51,7 @@ my $out = $biber->get_output_obj;
- my $string1 = q|    \entry{DynSet}{set}{}
-       \set{Dynamic1,Dynamic2,Dynamic3}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-     \endentry
- |;
- 
-@@ -71,7 +71,7 @@ my $string2 = q|    \entry{Dynamic1}{book}{}
-       \strng{authornamehash}{252caa7921a061ca92087a1a52f15b78}
-       \strng{authorfullhash}{252caa7921a061ca92087a1a52f15b78}
-       \field{sortinit}{8}
--      \field{sortinithash}{07edf88d4ea82509b9c4b4d13f41c452}
-+      \field{sortinithash}{1b24cab5087933ef0826a7cd3b99e994}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -98,7 +98,7 @@ my $string3 = q|    \entry{Dynamic2}{book}{}
-       \strng{authornamehash}{894a5fe6de820f5dcce84a65581667f4}
-       \strng{authorfullhash}{894a5fe6de820f5dcce84a65581667f4}
-       \field{sortinit}{9}
--      \field{sortinithash}{1dd72ab054147731c9d824b49aba0534}
-+      \field{sortinithash}{54047ffb55bdefa0694bbd554c1b11a0}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -124,7 +124,7 @@ my $string4 = q|    \entry{Dynamic3}{book}{}
-       \strng{authornamehash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \strng{authorfullhash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -151,7 +151,7 @@ my $string5 = q|    \entry{Dynamic3}{book}{}
-       \strng{authornamehash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \strng{authorfullhash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-diff --git a/t/set-legacy.t b/t/set-legacy.t
-index 4e56991e..9d40acb7 100644
---- a/t/set-legacy.t
-+++ b/t/set-legacy.t
-@@ -45,7 +45,7 @@ my $out = $biber->get_output_obj;
- my $string1 = q|    \entry{Elias1955}{set}{}
-       \set{Elias1955a,Elias1955b}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-     \endentry
- |;
- 
-diff --git a/t/set-static.t b/t/set-static.t
-index 56a72e08..2a2094b2 100644
---- a/t/set-static.t
-+++ b/t/set-static.t
-@@ -47,7 +47,7 @@ my $out = $biber->get_output_obj;
- my $string1 = q|    \entry{Static1}{set}{}
-       \set{Static2,Static4,Static3}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \field{annotation}{Some notes}
-     \endentry
- |;
-@@ -68,7 +68,7 @@ my $string2 = q|    \entry{Static2}{book}{}
-       \strng{authornamehash}{43874d80d7ce68027102819f16c47df1}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{B}
--      \field{sortinithash}{276475738cc058478c1677046f857703}
-+      \field{sortinithash}{8de16967003c7207dae369d874f1456e}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -94,7 +94,7 @@ my $string3 = q|    \entry{Static3}{book}{}
-       \strng{authornamehash}{22dafa5cd57bb5dd7f3e3bab98fd539c}
-       \strng{authorfullhash}{22dafa5cd57bb5dd7f3e3bab98fd539c}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -119,7 +119,7 @@ my $string4 = q|    \entry{Static4}{book}{}
-       \strng{authornamehash}{da80091c8cd89e5269bd55af1bd5d2fa}
-       \strng{authorfullhash}{da80091c8cd89e5269bd55af1bd5d2fa}
-       \field{sortinit}{C}
--      \field{sortinithash}{963e9d84a3da2344e8833203de5aed05}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -145,7 +145,7 @@ my $string5 = q|    \entry{Static2}{book}{}
-       \strng{authornamehash}{43874d80d7ce68027102819f16c47df1}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{1}
--      \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-diff --git a/t/skips.t b/t/skips.t
-index 7c80d391..caa835fb 100644
---- a/t/skips.t
-+++ b/t/skips.t
-@@ -50,7 +50,7 @@ my $set1 = q|    \entry{seta}{set}{}
-       \field{labelalpha}{Doe10}
-       \field{extraalpha}{1}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-     \endentry
- |;
- 
-@@ -70,7 +70,7 @@ my $set2 = q|    \entry{set:membera}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -97,7 +97,7 @@ my $set3 = q|    \entry{set:memberb}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -123,7 +123,7 @@ my $set4 = q|    \entry{set:memberc}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -150,7 +150,7 @@ my $noset1 = q|    \entry{noseta}{book}{}
-       \field{extraname}{3}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{2}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -180,7 +180,7 @@ my $noset2 = q|    \entry{nosetb}{book}{}
-       \field{extraname}{4}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{3}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -210,7 +210,7 @@ my $noset3 = q|    \entry{nosetc}{book}{}
-       \field{extraname}{5}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extradate}{4}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-@@ -244,7 +244,7 @@ my $sk4 = q|    \entry{skip4}{article}{dataonly}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/sort-complex.t b/t/sort-complex.t
-index 75061f1c..8c1fabea 100644
---- a/t/sort-complex.t
-+++ b/t/sort-complex.t
-@@ -123,7 +123,7 @@ my $l4 = q|    \entry{L4}{book}{}
-       \field{extraname}{2}
-       \field{labelalpha}{Doe\textbf{+}95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -155,7 +155,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \field{extraname}{1}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -187,7 +187,7 @@ my $l2 = q|    \entry{L2}{book}{}
-       \field{extraname}{3}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -219,7 +219,7 @@ my $l3 = q|    \entry{L3}{book}{}
-       \field{extraname}{2}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -253,7 +253,7 @@ my $l5 = q|    \entry{L5}{book}{}
-       \field{extraname}{1}
-       \field{labelalpha}{Doe\textbf{+}95}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/tdata/full-bbl.bbl b/t/tdata/full-bbl.bbl
-index 4f168de8..07c2fab4 100644
---- a/t/tdata/full-bbl.bbl
-+++ b/t/tdata/full-bbl.bbl
-@@ -36,7 +36,7 @@
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{\emph{A}}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -63,7 +63,7 @@
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{\emph{A}}
-       \field{sortinit}{A}
--      \field{sortinithash}{d77c7cdd82ff690d4c3ef13216f92f0b}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -90,7 +90,7 @@
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{\emph{A}}
-       \field{sortinit}{D}
--      \field{sortinithash}{2ef1bd9a78cc71eb74d7231c635177b8}
-+      \field{sortinithash}{c438b3d5d027251ba63f5ed538d98af5}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/tdata/full-bblxml.bblxml b/t/tdata/full-bblxml.bblxml
-index 9eea7d18..a39a7872 100644
---- a/t/tdata/full-bblxml.bblxml
-+++ b/t/tdata/full-bblxml.bblxml
-@@ -47,7 +47,7 @@
-         <bbl:field name="authorbibnamehash">860705eb8ffac6e40507746c7ede79ca</bbl:field>
-         <bbl:field name="labelalpha">Aks\textbf{+}06</bbl:field>
-         <bbl:field name="sortinit">A</bbl:field>
--        <bbl:field name="sortinithash">d77c7cdd82ff690d4c3ef13216f92f0b</bbl:field>
-+        <bbl:field name="sortinithash">a3dcedd53b04d1adfd5ac303ecd5e6fa</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="indextitle">Effect of immobilization on catalytic characteristics</bbl:field>
-@@ -79,7 +79,7 @@
-         <bbl:field name="authorbibnamehash">9717d2d959a4b18727868ca7928c34b4</bbl:field>
-         <bbl:field name="labelalpha">Ang02</bbl:field>
-         <bbl:field name="sortinit">A</bbl:field>
--        <bbl:field name="sortinithash">d77c7cdd82ff690d4c3ef13216f92f0b</bbl:field>
-+        <bbl:field name="sortinithash">a3dcedd53b04d1adfd5ac303ecd5e6fa</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-         <bbl:field name="annotation">A German article in a French journal. Apart from that, a typical article entry. Note the indextitle field</bbl:field>
-@@ -109,7 +109,7 @@
-         </bbl:set>
-         <bbl:field name="labelalpha">Gla61</bbl:field>
-         <bbl:field name="sortinit">G</bbl:field>
--        <bbl:field name="sortinithash">5e8d2bf9d38de41b1528bd307546008f</bbl:field>
-+        <bbl:field name="sortinithash">62eb2aa29549e4fdbd3cb154ec5711cb</bbl:field>
-         <bbl:field name="annotation">A set entry with three members discussing the standard model of particle physics.</bbl:field>
-       </bbl:entry>
-       <bbl:entry key="stdmodel:glashow" type="article">
-@@ -129,7 +129,7 @@
-         <bbl:field name="authorfullhash">eb3f242602109f5bdbeb41fdd990fcc0</bbl:field>
-         <bbl:field name="authorbibnamehash">eb3f242602109f5bdbeb41fdd990fcc0</bbl:field>
-         <bbl:field name="sortinit">G</bbl:field>
--        <bbl:field name="sortinithash">5e8d2bf9d38de41b1528bd307546008f</bbl:field>
-+        <bbl:field name="sortinithash">62eb2aa29549e4fdbd3cb154ec5711cb</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="journaltitle">Nucl. Phys.</bbl:field>
-@@ -168,7 +168,7 @@
-         <bbl:field name="extraname">1</bbl:field>
-         <bbl:field name="labelalpha">Knu86</bbl:field>
-         <bbl:field name="sortinit">K</bbl:field>
--        <bbl:field name="sortinithash">9fd838a31ba64d981e8f44562bd33f89</bbl:field>
-+        <bbl:field name="sortinithash">d3edc18d54b9438a72c24c925bfb38f4</bbl:field>
-         <bbl:field name="extraalpha">1</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-@@ -207,7 +207,7 @@
-         <bbl:field name="extraname">2</bbl:field>
-         <bbl:field name="labelalpha">Knu86</bbl:field>
-         <bbl:field name="sortinit">K</bbl:field>
--        <bbl:field name="sortinithash">9fd838a31ba64d981e8f44562bd33f89</bbl:field>
-+        <bbl:field name="sortinithash">d3edc18d54b9438a72c24c925bfb38f4</bbl:field>
-         <bbl:field name="extraalpha">2</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-@@ -236,7 +236,7 @@
-         <bbl:field name="authorbibnamehash">d52f05e0199eae563725b4165f4b2520</bbl:field>
-         <bbl:field name="labelalpha">Ree58</bbl:field>
-         <bbl:field name="sortinit">R</bbl:field>
--        <bbl:field name="sortinithash">da6b42bd3ab22fee61abed031ee405f7</bbl:field>
-+        <bbl:field name="sortinithash">b9c68a358aea118dfa887b6e902414a7</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="annotation">An article entry with a series and a volume field. Note the format of the series. If the value of the series field is an integer, this number is printed as an ordinal and the string *series is appended automatically</bbl:field>
-@@ -286,7 +286,7 @@
-         <bbl:field name="editorfullhash">d0ec890e59163c24c111a08d2a4be982</bbl:field>
-         <bbl:field name="editorbibnamehash">d0ec890e59163c24c111a08d2a4be982</bbl:field>
-         <bbl:field name="sortinit">S</bbl:field>
--        <bbl:field name="sortinithash">322b1d5276f2f6c1bccdcd15920dbee6</bbl:field>
-+        <bbl:field name="sortinithash">c319cff79d99c853d775f88277d4e45f</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="booksubtitle">Relativistic groups and analyticity</bbl:field>
-@@ -317,7 +317,7 @@
-         <bbl:field name="authorbibnamehash">93f17724cbd884231ef39a73755ef5bb</bbl:field>
-         <bbl:field name="labelalpha">Sho91</bbl:field>
-         <bbl:field name="sortinit">S</bbl:field>
--        <bbl:field name="sortinithash">322b1d5276f2f6c1bccdcd15920dbee6</bbl:field>
-+        <bbl:field name="sortinithash">c319cff79d99c853d775f88277d4e45f</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="annotation">An article entry with series, volume, and number fields. Note the format of the series which is a localization key</bbl:field>
-@@ -353,7 +353,7 @@
-         <bbl:field name="authorfullhash">15e144c72b0b9d10db00ddc6d37a19e6</bbl:field>
-         <bbl:field name="authorbibnamehash">15e144c72b0b9d10db00ddc6d37a19e6</bbl:field>
-         <bbl:field name="sortinit">W</bbl:field>
--        <bbl:field name="sortinithash">ecb89ff85896a47dc313960773ac311d</bbl:field>
-+        <bbl:field name="sortinithash">1af34bd8c148ffb32de1494636b49713</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="journaltitle">Phys. Rev. Lett.</bbl:field>
-@@ -411,7 +411,7 @@
-         <bbl:field name="authorbibnamehash">860705eb8ffac6e40507746c7ede79ca</bbl:field>
-         <bbl:field name="labelalpha">Aks\textbf{+}06</bbl:field>
-         <bbl:field name="sortinit">A</bbl:field>
--        <bbl:field name="sortinithash">d77c7cdd82ff690d4c3ef13216f92f0b</bbl:field>
-+        <bbl:field name="sortinithash">a3dcedd53b04d1adfd5ac303ecd5e6fa</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="indextitle">Effect of immobilization on catalytic characteristics</bbl:field>
-@@ -443,7 +443,7 @@
-         <bbl:field name="authorbibnamehash">9717d2d959a4b18727868ca7928c34b4</bbl:field>
-         <bbl:field name="labelalpha">Ang02</bbl:field>
-         <bbl:field name="sortinit">A</bbl:field>
--        <bbl:field name="sortinithash">d77c7cdd82ff690d4c3ef13216f92f0b</bbl:field>
-+        <bbl:field name="sortinithash">a3dcedd53b04d1adfd5ac303ecd5e6fa</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-         <bbl:field name="annotation">A German article in a French journal. Apart from that, a typical article entry. Note the indextitle field</bbl:field>
-@@ -473,7 +473,7 @@
-         </bbl:set>
-         <bbl:field name="labelalpha">Gla61</bbl:field>
-         <bbl:field name="sortinit">G</bbl:field>
--        <bbl:field name="sortinithash">5e8d2bf9d38de41b1528bd307546008f</bbl:field>
-+        <bbl:field name="sortinithash">62eb2aa29549e4fdbd3cb154ec5711cb</bbl:field>
-         <bbl:field name="annotation">A set entry with three members discussing the standard model of particle physics.</bbl:field>
-       </bbl:entry>
-       <bbl:entry key="stdmodel:glashow" type="article">
-@@ -493,7 +493,7 @@
-         <bbl:field name="authorfullhash">eb3f242602109f5bdbeb41fdd990fcc0</bbl:field>
-         <bbl:field name="authorbibnamehash">eb3f242602109f5bdbeb41fdd990fcc0</bbl:field>
-         <bbl:field name="sortinit">G</bbl:field>
--        <bbl:field name="sortinithash">5e8d2bf9d38de41b1528bd307546008f</bbl:field>
-+        <bbl:field name="sortinithash">62eb2aa29549e4fdbd3cb154ec5711cb</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="journaltitle">Nucl. Phys.</bbl:field>
-@@ -532,7 +532,7 @@
-         <bbl:field name="extraname">1</bbl:field>
-         <bbl:field name="labelalpha">Knu86</bbl:field>
-         <bbl:field name="sortinit">K</bbl:field>
--        <bbl:field name="sortinithash">9fd838a31ba64d981e8f44562bd33f89</bbl:field>
-+        <bbl:field name="sortinithash">d3edc18d54b9438a72c24c925bfb38f4</bbl:field>
-         <bbl:field name="extraalpha">1</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-@@ -571,7 +571,7 @@
-         <bbl:field name="extraname">2</bbl:field>
-         <bbl:field name="labelalpha">Knu86</bbl:field>
-         <bbl:field name="sortinit">K</bbl:field>
--        <bbl:field name="sortinithash">9fd838a31ba64d981e8f44562bd33f89</bbl:field>
-+        <bbl:field name="sortinithash">d3edc18d54b9438a72c24c925bfb38f4</bbl:field>
-         <bbl:field name="extraalpha">2</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-@@ -600,7 +600,7 @@
-         <bbl:field name="authorbibnamehash">d52f05e0199eae563725b4165f4b2520</bbl:field>
-         <bbl:field name="labelalpha">Ree58</bbl:field>
-         <bbl:field name="sortinit">R</bbl:field>
--        <bbl:field name="sortinithash">da6b42bd3ab22fee61abed031ee405f7</bbl:field>
-+        <bbl:field name="sortinithash">b9c68a358aea118dfa887b6e902414a7</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="annotation">An article entry with a series and a volume field. Note the format of the series. If the value of the series field is an integer, this number is printed as an ordinal and the string *series is appended automatically</bbl:field>
-@@ -650,7 +650,7 @@
-         <bbl:field name="editorfullhash">d0ec890e59163c24c111a08d2a4be982</bbl:field>
-         <bbl:field name="editorbibnamehash">d0ec890e59163c24c111a08d2a4be982</bbl:field>
-         <bbl:field name="sortinit">S</bbl:field>
--        <bbl:field name="sortinithash">322b1d5276f2f6c1bccdcd15920dbee6</bbl:field>
-+        <bbl:field name="sortinithash">c319cff79d99c853d775f88277d4e45f</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="booksubtitle">Relativistic groups and analyticity</bbl:field>
-@@ -681,7 +681,7 @@
-         <bbl:field name="authorbibnamehash">93f17724cbd884231ef39a73755ef5bb</bbl:field>
-         <bbl:field name="labelalpha">Sho91</bbl:field>
-         <bbl:field name="sortinit">S</bbl:field>
--        <bbl:field name="sortinithash">322b1d5276f2f6c1bccdcd15920dbee6</bbl:field>
-+        <bbl:field name="sortinithash">c319cff79d99c853d775f88277d4e45f</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="annotation">An article entry with series, volume, and number fields. Note the format of the series which is a localization key</bbl:field>
-@@ -717,7 +717,7 @@
-         <bbl:field name="authorfullhash">15e144c72b0b9d10db00ddc6d37a19e6</bbl:field>
-         <bbl:field name="authorbibnamehash">15e144c72b0b9d10db00ddc6d37a19e6</bbl:field>
-         <bbl:field name="sortinit">W</bbl:field>
--        <bbl:field name="sortinithash">ecb89ff85896a47dc313960773ac311d</bbl:field>
-+        <bbl:field name="sortinithash">1af34bd8c148ffb32de1494636b49713</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="journaltitle">Phys. Rev. Lett.</bbl:field>
-diff --git a/t/tdata/remote-files.bcf b/t/tdata/remote-files.bcf
-index c2d784b6..a2a1842b 100644
---- a/t/tdata/remote-files.bcf
-+++ b/t/tdata/remote-files.bcf
-@@ -1853,12 +1853,12 @@
-     <bcf:datasource type="file" datatype="bibtex">http://www.citeulike.org/bibtex/group/8082</bcf:datasource>
-     <bcf:datasource type="file" datatype="bibtex">http://people.cs.uu.nl/hansb/graphs-bib/definitions.bib</bcf:datasource>
-     <bcf:datasource type="file" datatype="bibtex">http://people.cs.uu.nl/hansb/graphs-bib/papers.bib</bcf:datasource>
--    <bcf:datasource type="file" datatype="bibtex">https://api.zotero.org/groups/9097/items/II22KQ7D?format=bibtex&amp;limit=1</bcf:datasource>
-+    <bcf:datasource type="file" datatype="bibtex">https://api.zotero.org/groups/9097/items/8VITAT46?format=bibtex&amp;limit=1</bcf:datasource>
-   </bcf:bibdata>
-   <bcf:section number="0">
-     <bcf:citekey order="1">citeulike:8283461</bcf:citekey>
-     <bcf:citekey order="2">AbdelbarH98</bcf:citekey>
--    <bcf:citekey order="3">merleau-ponty_philosophe_2010</bcf:citekey>
-+    <bcf:citekey order="3">crossley_politics_1994</bcf:citekey>
-   </bcf:section>
-   <!-- SORTING TEMPLATES -->
-   <bcf:sortingtemplate name="nty">
-diff --git a/t/uniqueness-nameparts.t b/t/uniqueness-nameparts.t
-index 08d8d97c..09e18a8b 100644
---- a/t/uniqueness-nameparts.t
-+++ b/t/uniqueness-nameparts.t
-@@ -81,7 +81,7 @@ my $un1 = q|    \entry{un1}{article}{}
-       \strng{authorfullhash}{329d8f9192ea3349d700160c9ddb505d}
-       \field{labelalpha}{SmiJohSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -106,7 +106,7 @@ my $un2 = q|    \entry{un2}{article}{}
-       \strng{authorfullhash}{7551114aede4ef69e4b3683039801706}
-       \field{labelalpha}{SmiJohAla}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -131,7 +131,7 @@ my $un3 = q|    \entry{un3}{article}{}
-       \strng{authorfullhash}{401aebda288799a7c757526242d8c9fc}
-       \field{labelalpha}{SmiJohArt}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -156,7 +156,7 @@ my $un4 = q|    \entry{un4}{article}{}
-       \strng{authorfullhash}{f6038a264619efefd49c7daac56424ca}
-       \field{labelalpha}{SmiAlaSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -181,7 +181,7 @@ my $un1a = q|    \entry{un1}{article}{}
-       \strng{authorfullhash}{329d8f9192ea3349d700160c9ddb505d}
-       \field{labelalpha}{SmiJohSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -206,7 +206,7 @@ my $un2a = q|    \entry{un2}{article}{}
-       \strng{authorfullhash}{7551114aede4ef69e4b3683039801706}
-       \field{labelalpha}{SmiJohAla}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -231,7 +231,7 @@ my $un3a = q|    \entry{un3}{article}{}
-       \strng{authorfullhash}{401aebda288799a7c757526242d8c9fc}
-       \field{labelalpha}{SmiJohArt}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -257,7 +257,7 @@ my $un4a = q|    \entry{un4}{article}{}
-       \strng{authorfullhash}{f6038a264619efefd49c7daac56424ca}
-       \field{labelalpha}{SmiAlaSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -285,7 +285,7 @@ my $un1b = q|    \entry{un1}{article}{}
-       \field{extraname}{5}
-       \field{labelalpha}{SmiJohSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{5}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -311,7 +311,7 @@ my $un2b = q|    \entry{un2}{article}{}
-       \strng{authorfullhash}{7551114aede4ef69e4b3683039801706}
-       \field{labelalpha}{SmiJohAla}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -336,7 +336,7 @@ my $un3b = q|    \entry{un3}{article}{}
-       \strng{authorfullhash}{401aebda288799a7c757526242d8c9fc}
-       \field{labelalpha}{SmiJohArt}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -364,7 +364,7 @@ my $un4b = q|    \entry{un4}{article}{}
-       \field{extraname}{1}
-       \field{labelalpha}{SmiAlaSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{1}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -393,7 +393,7 @@ my $un5 = q|    \entry{un5}{article}{uniquenametemplatename=test3}
-       \field{extraname}{2}
-       \field{labelalpha}{SmiArtSim}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{2}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -422,7 +422,7 @@ my $un6 = q|    \entry{un6}{article}{}
-       \field{extraname}{3}
-       \field{labelalpha}{SmiArtSmy}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{3}
-       \field{labelnamesource}{author}
-     \\endentry
-@@ -451,7 +451,7 @@ my $un7 = q|    \entry{un7}{article}{}
-       \field{extraname}{4}
-       \field{labelalpha}{SmiArtSme}
-       \field{sortinit}{S}
--      \field{sortinithash}{322b1d5276f2f6c1bccdcd15920dbee6}
-+      \field{sortinithash}{c319cff79d99c853d775f88277d4e45f}
-       \field{extradate}{4}
-       \field{labelnamesource}{author}
-     \endentry
-diff --git a/t/xdata.t b/t/xdata.t
-index 7411b1dd..73dcb8b1 100644
---- a/t/xdata.t
-+++ b/t/xdata.t
-@@ -75,7 +75,7 @@ my $xd1 = q|    \entry{xd1}{book}{}
-       \strng{authorfullhash}{51db4bfd331cba22959ce2d224c517cd}
-       \field{extraname}{2}
-       \field{sortinit}{E}
--      \field{sortinithash}{f615fb9c6fba11c6f962fb3fd599810e}
-+      \field{sortinithash}{c554bd1a0b76ea92b9f105fe36d9c7b0}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -107,7 +107,7 @@ my $xd2 = q|    \entry{xd2}{book}{}
-       \strng{authornamehash}{68539e0ce4922cc4957c6cabf35e6fc8}
-       \strng{authorfullhash}{68539e0ce4922cc4957c6cabf35e6fc8}
-       \field{sortinit}{P}
--      \field{sortinithash}{8d51b3d5b78d75b54308d706b9bbe285}
-+      \field{sortinithash}{bb5b15f2db90f7aef79bb9e83defefcb}
-       \field{extradatescope}{labelyear}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
--- 
-2.23.0
-

diff --git a/biber-2.12-backport-test-changes-after-U-C-fix.patch b/biber-2.12-backport-test-changes-after-U-C-fix.patch
deleted file mode 100644
index 22c74d7..0000000
--- a/biber-2.12-backport-test-changes-after-U-C-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 06b39a9a6273c56a52ed647fcb033884737a30dd Mon Sep 17 00:00:00 2001
-From: "Colin B. Macdonald" <cbm@m.fsf.org>
-Date: Sun, 17 Nov 2019 02:34:05 -0800
-Subject: [PATCH] ... and delete them again
-
----
- t/set-dynamic.t | 1 -
- t/set-static.t  | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/t/set-dynamic.t b/t/set-dynamic.t
-index e5db23a9..0846f8a9 100644
---- a/t/set-dynamic.t
-+++ b/t/set-dynamic.t
-@@ -152,7 +152,6 @@ my $string5 = q|    \entry{Dynamic3}{book}{}
-       \strng{authorfullhash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \field{sortinit}{1}
-       \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
--      \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/set-static.t b/t/set-static.t
-index 2a2094b2..a6cbe738 100644
---- a/t/set-static.t
-+++ b/t/set-static.t
-@@ -146,7 +146,6 @@ my $string5 = q|    \entry{Static2}{book}{}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{1}
-       \field{sortinithash}{50c6687d7fc80f50136d75228e3c59ba}
--      \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
--- 
-2.23.0
-

diff --git a/biber-2.12-backport-test-changes-for-U-C-fix.patch b/biber-2.12-backport-test-changes-for-U-C-fix.patch
deleted file mode 100644
index b837c6b..0000000
--- a/biber-2.12-backport-test-changes-for-U-C-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 70ce175631299ba6472200279f3e0430c1fd9a1e Mon Sep 17 00:00:00 2001
-From: "Colin B. Macdonald" <cbm@m.fsf.org>
-Date: Sun, 17 Nov 2019 02:20:18 -0800
-Subject: [PATCH] backport test changes between v2.12 and U::C fix
-
----
- t/remote-files.t | 1 -
- t/set-dynamic.t  | 1 +
- t/set-static.t   | 1 +
- 3 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/t/remote-files.t b/t/remote-files.t
-index c747dcd0..64ea7452 100644
---- a/t/remote-files.t
-+++ b/t/remote-files.t
-@@ -187,7 +187,6 @@ my $ssl = q|    \entry{merleau-ponty_philosophe_2010}{incollection}{}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
--      \field{booktitle}{Œuvres}
-       \field{title}{Le philosophe et son ombre}
-       \field{year}{2010}
-       \field{pages}{1267\bibrangedash 1289}
-diff --git a/t/set-dynamic.t b/t/set-dynamic.t
-index 9ab5fddb..73f98735 100644
---- a/t/set-dynamic.t
-+++ b/t/set-dynamic.t
-@@ -152,6 +152,7 @@ my $string5 = q|    \entry{Dynamic3}{book}{}
-       \strng{authorfullhash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \field{sortinit}{1}
-       \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/set-static.t b/t/set-static.t
-index 1e45d4df..56a72e08 100644
---- a/t/set-static.t
-+++ b/t/set-static.t
-@@ -146,6 +146,7 @@ my $string5 = q|    \entry{Static2}{book}{}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{1}
-       \field{sortinithash}{2174f786c6195e7fe2ee1c229b416e29}
-+      \field{extradatescope}{labelyear}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
--- 
-2.23.0
-

diff --git a/biber-bump-perl-u-n-dep-with-xsub.patch b/biber-bump-perl-u-n-dep-with-xsub.patch
deleted file mode 100644
index 3c56ffc..0000000
--- a/biber-bump-perl-u-n-dep-with-xsub.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7998b16045ddcb86a9e2b7ef322f329637653a6b Mon Sep 17 00:00:00 2001
-From: Philip Kime <Philip@kime.org.uk>
-Date: Mon, 26 Oct 2015 21:47:38 +0000
-Subject: [PATCH] Bumped U::N to new XSUB version
-
----
- Build.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Build.PL b/Build.PL
-index eefb1a8..d84786d 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -57,7 +57,7 @@ my $builder = $class->new(
-         'Regexp::Common' => 0,
-         'Log::Log4perl' => 0,
-         'Unicode::Collate' => '1.14',
--        'Unicode::Normalize' => '<= 1.17',# 1.18 removes XS and is too slow
-+        'Unicode::Normalize' => '1.23',
-         'Unicode::GCString' => 0,
-         'Encode::EUCJPASCII' => 0,
-         'Encode::JIS2K' => 0,

diff --git a/biber-drop-minor-failing-test.patch b/biber-drop-minor-failing-test.patch
deleted file mode 100644
index becde73..0000000
--- a/biber-drop-minor-failing-test.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream says:
-
-I think you can ignore this. It's almost certainly to do with minor
-difference in locales between OSX and Linux. You are using the same
-locale as I am (en_GB.UTF-8) in the OS and this usually means that the
-collation tables for the locale are different between OSes. Since the
-default is to use the Unicode Collation algorithm anyway, this hardly
-matters. I only use OS locales in the tests to speed them up a bit.
-
-https://github.com/plk/biber/issues/72#issuecomment-114232856
-
----
-
-diff -u -r biblatex-biber-2.1-orig/t/sort-order.t biblatex-biber-2.1/t/sort-order.t
---- biblatex-biber-2.1-orig/t/sort-order.t
-+++ biblatex-biber-2.1/t/sort-order.t
-@@ -4,7 +4,7 @@
- use utf8;
- no warnings 'utf8';
- 
--use Test::More tests => 15;
-+use Test::More tests => 14;
- 
- use Biber;
- use Biber::Output::bbl;
-@@ -482,26 +482,6 @@
- is_deeply([$main->get_keys], ['L9','L6','L7','L8','L5','L4','L3','L2','L1B','L1A','L1'], 'nty with descending n');
- 
- 
--# testing case sensitive with fastsort
--# In alphabetic, all uppercase comes before lower so the
--# "sortcase => 1" on location means that "edinburgh" sorts at the end after "London"
--# Take this out of the location sorting spec and it fails as it should
--$S = { spec => [
--                                                    [
--                                                     {sortcase => 1},
--                                                     {'location'     => {}}
--                                                    ]
--                                                   ]};
--
--$main->set_sortscheme($S);
--
--$biber->set_output_obj(Biber::Output::bbl->new());
--# Have to set locale to something which understands lexical/case differences for this test
--# otherwise testing on Windows doesn't work ...
--Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
--$biber->prepare;
--$section = $biber->sections->get_section(0);
--is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
- 
- # Test nosort option
- $S = { spec => [

diff --git a/biber-more-sort-test-fixes.patch b/biber-more-sort-test-fixes.patch
deleted file mode 100644
index 1a2ded9..0000000
--- a/biber-more-sort-test-fixes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1f2ffc6824f23681143b3f1ff1b2fb0a0b771bd8 Mon Sep 17 00:00:00 2001
-From: Philip Kime <Philip@kime.org.uk>
-Date: Mon, 22 Jun 2015 21:39:16 +0200
-Subject: [PATCH] More sort test fixes
-
----
- t/sort-complex.t | 2 +-
- t/sort-order.t   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/sort-complex.t b/t/sort-complex.t
-index 650d40e..746f5f8 100755
---- a/t/sort-complex.t
-+++ b/t/sort-complex.t
-@@ -240,7 +240,7 @@ Biber::Config->setoption('sourcemap', undef); # no longer ignore shorthand*
- $bibentries->del_entries;
- $section->del_everykeys;
- Biber::Input::file::bibtex->init_cache;
--Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
-+Biber::Config->setoption('fastsort', 0);
- $biber->prepare;
- $section = $biber->sections->get_section(0);
- $shs = $biber->sortlists->get_list(0, 'shorthands', 'list', 'shorthands');
-diff --git a/t/sort-order.t b/t/sort-order.t
-index 4e9ad5d..c201e4c 100755
---- a/t/sort-order.t
-+++ b/t/sort-order.t
-@@ -498,7 +498,7 @@ $main->set_sortscheme($S);
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Have to set locale to something which understands lexical/case differences for this test
- # otherwise testing on Windows doesn't work ...
--Biber::Config->setoption('sortlocale', 'en_US.UTF-8');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- $biber->prepare;
- $section = $biber->sections->get_section(0);
- is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
--- 
-2.5.0
-

diff --git a/biber-test-fixes-for-Fedora.patch b/biber-test-fixes-for-Fedora.patch
deleted file mode 100644
index 7207043..0000000
--- a/biber-test-fixes-for-Fedora.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2b578a8e1c8e6c7d780418fa05d3293771cc0f62 Mon Sep 17 00:00:00 2001
-From: Philip Kime <Philip@kime.org.uk>
-Date: Mon, 22 Jun 2015 09:50:39 +0200
-Subject: [PATCH] Test fixes for Fedora
-
----
- t/sort-complex.t | 1 +
- t/sort-order.t   | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/t/sort-complex.t b/t/sort-complex.t
-index 3bd580c..650d40e 100755
---- a/t/sort-complex.t
-+++ b/t/sort-complex.t
-@@ -240,6 +240,7 @@ Biber::Config->setoption('sourcemap', undef); # no longer ignore shorthand*
- $bibentries->del_entries;
- $section->del_everykeys;
- Biber::Input::file::bibtex->init_cache;
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- $biber->prepare;
- $section = $biber->sections->get_section(0);
- $shs = $biber->sortlists->get_list(0, 'shorthands', 'list', 'shorthands');
-diff --git a/t/sort-order.t b/t/sort-order.t
-index 27c5bf5..4e9ad5d 100755
---- a/t/sort-order.t
-+++ b/t/sort-order.t
-@@ -496,9 +496,9 @@ $S = { spec => [
- $main->set_sortscheme($S);
- 
- $biber->set_output_obj(Biber::Output::bbl->new());
--# Have to set locale to something which understand lexical/case differences for this test
-+# Have to set locale to something which understands lexical/case differences for this test
- # otherwise testing on Windows doesn't work ...
--Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
-+Biber::Config->setoption('sortlocale', 'en_US.UTF-8');
- $biber->prepare;
- $section = $biber->sections->get_section(0);
- is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
--- 
-2.5.0
-

diff --git a/biber-updated-u-c-which-needed-test-updates.patch b/biber-updated-u-c-which-needed-test-updates.patch
deleted file mode 100644
index 23074a9..0000000
--- a/biber-updated-u-c-which-needed-test-updates.patch
+++ /dev/null
@@ -1,1423 +0,0 @@
-From 3d62817080598d68514ed2691b1f616fcda2abe3 Mon Sep 17 00:00:00 2001
-From: Philip Kime <Philip@kime.org.uk>
-Date: Fri, 11 Nov 2016 00:07:58 +0100
-Subject: [PATCH] Updated U::C which needed test updates
-
----
- Build.PL                   |  2 +-
- t/annotations.t            |  3 ++-
- t/basic-misc.t             | 50 ++++++++++++++++++------------------
- t/biblatexml.t             |  4 +--
- t/crossrefs.t              | 48 +++++++++++++++++-----------------
- t/dateformats.t            | 34 ++++++++++++------------
- t/encoding.t               | 12 ++++-----
- t/full-bbl.t               |  4 +--
- t/full-bblxml.t            |  4 +--
- t/names.t                  | 64 +++++++++++++++++++++++-----------------------
- t/options.t                |  6 ++---
- t/related-entries.t        |  6 ++---
- t/remote-files.t           |  6 ++---
- t/set-dynamic.t            | 10 ++++----
- t/set-legacy.t             |  2 +-
- t/set-static.t             |  6 ++---
- t/skips.t                  | 16 ++++++------
- t/sort-complex.t           | 10 ++++----
- t/sortlists.t              |  4 +--
- t/tdata/full-bbl.bbl       |  4 +--
- t/tdata/full-bblxml.bblxml | 20 +++++++--------
- t/xdata.t                  |  4 +--
- 22 files changed, 160 insertions(+), 159 deletions(-)
-
-diff --git a/Build.PL b/Build.PL
-index 3cbf404..99cac07 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -57,7 +57,7 @@ my $builder = $class->new(
-                  'Mozilla::CA' =>  '20160104',
-                  'Regexp::Common' => 0,
-                  'Log::Log4perl' => 0,
--                 'Unicode::Collate' => '1.14',
-+                 'Unicode::Collate' => '1.18',
-                  'Unicode::Normalize' => '1.25',
-                  'Unicode::LineBreak' => '2016.003',
-                  'Unicode::GCString' => 0,
-diff --git a/t/annotations.t b/t/annotations.t
-index 07c8d58..b5fd649 100644
---- a/t/annotations.t
-+++ b/t/annotations.t
-@@ -1,3 +1,4 @@
-+
- # -*- cperl -*-
- use strict;
- use warnings;
-@@ -70,7 +71,7 @@ my $ann1 = q|    \entry{ann1}{misc}{}
-       \strng{authornamehash}{90ae96c82de92e36949bc64254bbde0c}
-       \strng{authorfullhash}{90ae96c82de92e36949bc64254bbde0c}
-       \field{sortinit}{L}
--      \field{sortinithash}{872351f18d0f736066eda0bf18bfa4f7}
-+      \field{sortinithash}{7bba64db83423e3c29ad597f3b682cf3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{title}{The Title}
-diff --git a/t/basic-misc.t b/t/basic-misc.t
-index 740d171..aaaf857 100755
---- a/t/basic-misc.t
-+++ b/t/basic-misc.t
-@@ -94,7 +94,7 @@ my $u1 = q|    \entry{u1}{misc}{}
-       \strng{authorfullhash}{b78abdc838d79b6576f2ed0021642766}
-       \field{labelalpha}{AAA\textbf{+}00}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -211,7 +211,7 @@ my $murray1 = q|    \entry{murray}{article}{}
-       \strng{authorfullhash}{61836f4684b2615842b68c26479f6ec2}
-       \field{labelalpha}{Hos\textbf{+}98}
-       \field{sortinit}{H}
--      \field{sortinithash}{82012198d5dfa657b8c4a168793268a6}
-+      \field{sortinithash}{2f664b453ec75da1fe3804ca92633405}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -312,7 +312,7 @@ my $murray2 = q|    \entry{murray}{article}{}
-       \strng{authorfullhash}{61836f4684b2615842b68c26479f6ec2}
-       \field{labelalpha}{Hos98}
-       \field{sortinit}{H}
--      \field{sortinithash}{82012198d5dfa657b8c4a168793268a6}
-+      \field{sortinithash}{2f664b453ec75da1fe3804ca92633405}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -349,7 +349,7 @@ my $t1 = q+    \entry{t1}{misc}{}
-       \strng{authorfullhash}{858fcf9483ec29b7707a7dda2dde7a6f}
-       \field{labelalpha}{Bro92}
-       \field{sortinit}{B}
--      \field{sortinithash}{4ecbea03efd0532989d3836d1a048c32}
-+      \field{sortinithash}{5f6fa000f686ee5b41be67ba6ff7962d}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -375,7 +375,7 @@ my $t2 = q|    \entry{t2}{misc}{}
-       \strng{authorfullhash}{858fcf9483ec29b7707a7dda2dde7a6f}
-       \field{labelalpha}{Bro94}
-       \field{sortinit}{B}
--      \field{sortinithash}{4ecbea03efd0532989d3836d1a048c32}
-+      \field{sortinithash}{5f6fa000f686ee5b41be67ba6ff7962d}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -405,7 +405,7 @@ my $anon1 = q|    \entry{anon1}{unpublished}{}
-       \strng{shortauthorfullhash}{9873a6cc65c553faa2b21aaad626fe4b}
-       \field{labelalpha}{XAn35}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{shortauthor}
-@@ -441,7 +441,7 @@ my $anon2 = q|    \entry{anon2}{unpublished}{}
-       \strng{shortauthorfullhash}{f64c29e89ea49402b997956610b58ef6}
-       \field{labelalpha}{YAn39}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \true{singletitle}
-       \true{uniquework}
-       \field{labelnamesource}{shortauthor}
-@@ -472,7 +472,7 @@ my $url1 = q|    \entry{url1}{misc}{}
-       \strng{authorfullhash}{b2106a3dda6c5a4879a0cab37e9cca55}
-       \field{labelalpha}{Ali05}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \field{extraalpha}{4}
-       \field{labelnamesource}{author}
-       \field{year}{2005}
-@@ -637,7 +637,7 @@ my $isbn1 = q|    \entry{isbn1}{misc}{}
-       \strng{authorfullhash}{f6595ccb9db5f634e7bb242a3f78e5f9}
-       \field{labelalpha}{Flu}
-       \field{sortinit}{F}
--      \field{sortinithash}{c6a7d9913bbd7b20ea954441c0460b78}
-+      \field{sortinithash}{276475738cc058478c1677046f857703}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{isbn}{978-0-8165-2066-4}
-@@ -658,7 +658,7 @@ my $isbn2 = q|    \entry{isbn2}{misc}{}
-       \strng{authorfullhash}{f6595ccb9db5f634e7bb242a3f78e5f9}
-       \field{labelalpha}{Flu}
-       \field{sortinit}{F}
--      \field{sortinithash}{c6a7d9913bbd7b20ea954441c0460b78}
-+      \field{sortinithash}{276475738cc058478c1677046f857703}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{isbn}{978-0-8165-2066-4}
-@@ -696,7 +696,7 @@ my $clone1 = q|    \entry{snk1}{book}{}
-       \strng{authorfullhash}{83330b0520b5d4ea57529a23b404d43d}
-       \field{labelalpha}{vDoe}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -720,7 +720,7 @@ my $clone2 = q|    \entry{clone-snk1}{book}{}
-       \strng{authorfullhash}{83330b0520b5d4ea57529a23b404d43d}
-       \field{labelalpha}{vDoe}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{addendum}{add}
-@@ -747,7 +747,7 @@ my $ent1 = q|    \entry{ent1}{book}{}
-       \strng{authorfullhash}{b2536a425d549b46de5f21c4d468050a}
-       \field{labelalpha}{SdB}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-     \endentry
-diff --git a/t/biblatexml.t b/t/biblatexml.t
-index 57510dd..b90353c 100755
---- a/t/biblatexml.t
-+++ b/t/biblatexml.t
-@@ -106,7 +106,7 @@ my $l1 = q|    \entry{bltx1}{misc}{useprefix=false}
-       \strng{translatornamehash}{b44eba830fe9817fbe8e53c82f1cbe04}
-       \strng{translatorfullhash}{b44eba830fe9817fbe8e53c82f1cbe04}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -151,7 +151,7 @@ my $l1 = q|    \entry{bltx1}{misc}{useprefix=false}
- 
- my $l2 = q|    \entry{loopkey:a}{book}{}
-       \field{sortinit}{0}
--      \field{sortinithash}{990108227b3316c02842d895999a0165}
-+      \field{sortinithash}{e07d8eeb31ded4126e0aa0cfcdcb5a8f}
-     \endentry
- |;
- 
-diff --git a/t/crossrefs.t b/t/crossrefs.t
-index 47f2940..7ac21a9 100755
---- a/t/crossrefs.t
-+++ b/t/crossrefs.t
-@@ -79,7 +79,7 @@ my $cr1 = q|    \entry{cr1}{inbook}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{G}
--      \field{sortinithash}{1c854ef9177a91bf894e66485bdbd3ed}
-+      \field{sortinithash}{618d986594b7198ba52cf8b00d348f3f}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -125,7 +125,7 @@ my $cr2 = q|    \entry{cr2}{inbook}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{F}
--      \field{sortinithash}{c6a7d9913bbd7b20ea954441c0460b78}
-+      \field{sortinithash}{276475738cc058478c1677046f857703}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -158,7 +158,7 @@ my $cr_m = q|    \entry{cr_m}{book}{}
-       \strng{editornamehash}{c129df5593fdaa7475548811bfbb227d}
-       \strng{editorfullhash}{c129df5593fdaa7475548811bfbb227d}
-       \field{sortinit}{G}
--      \field{sortinithash}{1c854ef9177a91bf894e66485bdbd3ed}
-+      \field{sortinithash}{618d986594b7198ba52cf8b00d348f3f}
-       \true{crossrefsource}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-@@ -193,7 +193,7 @@ my $cr3 = q|    \entry{cr3}{inbook}{}
-       \strng{editornamehash}{a1f5c22413396d599ec766725b226735}
-       \strng{editorfullhash}{a1f5c22413396d599ec766725b226735}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -235,7 +235,7 @@ my $cr4 = q|    \entry{cr4}{inbook}{}
-       \strng{editornamehash}{6ea89bd4958743a20b70fe17647d6af5}
-       \strng{editorfullhash}{6ea89bd4958743a20b70fe17647d6af5}
-       \field{sortinit}{M}
--      \field{sortinithash}{2684bec41e9697b92699b46491061da2}
-+      \field{sortinithash}{c26a05ef03e4429073ed5c825140fac3}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -265,7 +265,7 @@ my $crt = q|    \entry{crt}{book}{}
-       \strng{editornamehash}{a1f5c22413396d599ec766725b226735}
-       \strng{editorfullhash}{a1f5c22413396d599ec766725b226735}
-       \field{sortinit}{B}
--      \field{sortinithash}{4ecbea03efd0532989d3836d1a048c32}
-+      \field{sortinithash}{5f6fa000f686ee5b41be67ba6ff7962d}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{title}{Beasts of the Burbling Burns}
-@@ -297,7 +297,7 @@ my $cr6 = q|    \entry{cr6}{inproceedings}{}
-       \strng{editornamehash}{344a7f427fb765610ef96eb7bce95257}
-       \strng{editorfullhash}{344a7f427fb765610ef96eb7bce95257}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -344,7 +344,7 @@ my $cr7 = q|    \entry{cr7}{inbook}{}
-       \strng{bookauthornamehash}{91a1dd4aeed3c4ec29ca74c4e778be5f}
-       \strng{bookauthorfullhash}{91a1dd4aeed3c4ec29ca74c4e778be5f}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -376,7 +376,7 @@ my $cr8 = q|    \entry{cr8}{incollection}{}
-       \strng{authornamehash}{3d449e56eb3ca1ae80dc99a18d689795}
-       \strng{authorfullhash}{3d449e56eb3ca1ae80dc99a18d689795}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -404,7 +404,7 @@ my $xr1 = q|    \entry{xr1}{inbook}{}
-       \strng{authornamehash}{e0ecc4fc668ee499d1afba44e1ac064d}
-       \strng{authorfullhash}{e0ecc4fc668ee499d1afba44e1ac064d}
-       \field{sortinit}{Z}
--      \field{sortinithash}{fdda4caaa6b5fa63e0c081dcb159543a}
-+      \field{sortinithash}{35589aa085e881766b72503e53fd4c97}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -431,7 +431,7 @@ my $xr2 = q|    \entry{xr2}{inbook}{}
-       \strng{authornamehash}{6afa09374ecfd6b394ce714d2d9709c7}
-       \strng{authorfullhash}{6afa09374ecfd6b394ce714d2d9709c7}
-       \field{sortinit}{I}
--      \field{sortinithash}{25e99d37ba90f7c4fb20baf4e310faf3}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -461,7 +461,7 @@ my $xrm = q|    \entry{xrm}{book}{}
-       \strng{editornamehash}{809950f9b59ae207092b909a19dcb27b}
-       \strng{editorfullhash}{809950f9b59ae207092b909a19dcb27b}
-       \field{sortinit}{C}
--      \field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
-+      \field{sortinithash}{095692fd22cc3c74d7fe223d02314dbd}
-       \true{xrefsource}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-@@ -484,7 +484,7 @@ my $xr3 = q|    \entry{xr3}{inbook}{}
-       \strng{authornamehash}{9788055665b9bb4b37c776c3f6b74f16}
-       \strng{authorfullhash}{9788055665b9bb4b37c776c3f6b74f16}
-       \field{sortinit}{N}
--      \field{sortinithash}{925374ca63e7594de7fafdb83e64d41d}
-+      \field{sortinithash}{1163c28585427c673ad5a010cbf82f52}
-       \true{singletitle}
-       \true{uniquetitle}
-       \true{uniquework}
-@@ -513,7 +513,7 @@ my $xrt = q|    \entry{xrt}{book}{}
-       \strng{editornamehash}{bf7d6b02f3e073913e5bfe5059508dd5}
-       \strng{editorfullhash}{bf7d6b02f3e073913e5bfe5059508dd5}
-       \field{sortinit}{K}
--      \field{sortinithash}{a7d5b3aec5a0890aae7baf85a209abfc}
-+      \field{sortinithash}{4c244ceae61406cdc0cc2ce1cb1ff703}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{title}{Kings, Cork and Calculation}
-@@ -536,7 +536,7 @@ my $xr4 = q|    \entry{xr4}{inbook}{}
-       \strng{authornamehash}{7804ffef086c0c4686c235807f5cb502}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{sortinit}{M}
--      \field{sortinithash}{2684bec41e9697b92699b46491061da2}
-+      \field{sortinithash}{c26a05ef03e4429073ed5c825140fac3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -561,7 +561,7 @@ my $mxr = q|    \entry{mxr}{inbook}{}
-       \strng{authornamehash}{7804ffef086c0c4686c235807f5cb502}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{sortinit}{M}
--      \field{sortinithash}{2684bec41e9697b92699b46491061da2}
-+      \field{sortinithash}{c26a05ef03e4429073ed5c825140fac3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -583,7 +583,7 @@ my $mcr = q|    \entry{mcr}{inbook}{}
-       \strng{authornamehash}{7804ffef086c0c4686c235807f5cb502}
-       \strng{authorfullhash}{7804ffef086c0c4686c235807f5cb502}
-       \field{sortinit}{M}
--      \field{sortinithash}{2684bec41e9697b92699b46491061da2}
-+      \field{sortinithash}{c26a05ef03e4429073ed5c825140fac3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-       \field{origyear}{1933}
-@@ -614,7 +614,7 @@ my $ccr1 = q|    \entry{ccr2}{book}{}
-       \strng{editornamehash}{cfee758a1c82df2e26af1985e061bb0a}
-       \strng{editorfullhash}{cfee758a1c82df2e26af1985e061bb0a}
-       \field{sortinit}{V}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \true{uniquetitle}
-       \true{uniquework}
-       \field{labelnamesource}{author}
-@@ -646,7 +646,7 @@ my $ccr2 = q|    \entry{ccr3}{inbook}{}
-       \strng{editornamehash}{cfee758a1c82df2e26af1985e061bb0a}
-       \strng{editorfullhash}{cfee758a1c82df2e26af1985e061bb0a}
-       \field{sortinit}{P}
--      \field{sortinithash}{c0a4896d0e424f9ca4d7f14f2b3428e7}
-+      \field{sortinithash}{24100cef455d7974167575052c29146e}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \field{booktitle}{Misc etc.}
-@@ -678,7 +678,7 @@ my $ccr3 = q|    \entry{ccr4}{inbook}{}
- 
- my $s1 = q|    \entry{s1}{inbook}{}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \true{uniquetitle}
-       \field{labeltitlesource}{title}
-       \strng{crossref}{s2}
-@@ -708,7 +708,7 @@ my $xc2 = q|    \entry{xc2}{inbook}{}
-       \strng{bookauthornamehash}{1a0f7d518cccdad859a74412ef956474}
-       \strng{bookauthorfullhash}{1a0f7d518cccdad859a74412ef956474}
-       \field{sortinit}{C}
--      \field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
-+      \field{sortinithash}{095692fd22cc3c74d7fe223d02314dbd}
-       \true{xrefsource}
-       \field{labelnamesource}{author}
-       \field{booktitle}{Title}
-@@ -717,7 +717,7 @@ my $xc2 = q|    \entry{xc2}{inbook}{}
- 
- my $b1 = q|    \entry{b1}{inbook}{}
-       \field{sortinit}{2}
--      \field{sortinithash}{8343b463aacf48517c044b4d2c9c45ed}
-+      \field{sortinithash}{0aa614ace9f3a40ef5a67e7f7a184048}
-       \strng{crossref}{b2}
-       \field{day}{3}
-       \field{month}{3}
-@@ -748,7 +748,7 @@ my $sup1 = q|    \entry{sup1}{mvbook}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \true{crossrefsource}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -770,7 +770,7 @@ my $sup2 = q|    \entry{sup2}{book}{}
-       \strng{authornamehash}{556c8dba145b472e6a8598d506f7cbe2}
-       \strng{authorfullhash}{556c8dba145b472e6a8598d506f7cbe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/dateformats.t b/t/dateformats.t
-index 9bdf7f4..d543757 100755
---- a/t/dateformats.t
-+++ b/t/dateformats.t
-@@ -84,7 +84,7 @@ my $l13c = q|    \entry{L13}{book}{}
-       \strng{authornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -118,7 +118,7 @@ my $l14 = q|    \entry{L14}{book}{}
-       \strng{authornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extrayear}{3}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-@@ -156,7 +156,7 @@ my $l15 = q|    \entry{L15}{book}{}
-       \strng{authornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{authorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extrayear}{4}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -186,7 +186,7 @@ my $l16 = q|    \entry{L16}{proceedings}{}
-       \strng{editornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extrayear}{1}
-       \field{labeldatesource}{event}
-       \field{labelnamesource}{editor}
-@@ -221,7 +221,7 @@ my $l17 = q|    \entry{L17}{proceedings}{}
-       \strng{editornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extrayear}{5}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{editor}
-@@ -276,7 +276,7 @@ my $l17c = q|    \entry{L17}{proceedings}{}
-       \strng{editornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labeldatesource}{orig}
-       \field{labelnamesource}{editor}
-       \field{labeltitlesource}{title}
-@@ -330,7 +330,7 @@ my $l17e = q|    \entry{L17}{proceedings}{}
-       \strng{editornamehash}{8c77336299b25bdada7bf8038f46722f}
-       \strng{editorfullhash}{8c77336299b25bdada7bf8038f46722f}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labeldatesource}{event}
-       \field{labelnamesource}{editor}
-       \field{labeltitlesource}{title}
-@@ -437,7 +437,7 @@ eq_or_diff($bibentries->entry('L17')->get_labeldate_info->{field}{source}, 'pubs
- 
- my $era1 = q|    \entry{era1}{book}{}
-       \field{sortinit}{3}
--      \field{sortinithash}{7e21a31d9ef6ddc352701d4fa590bfbc}
-+      \field{sortinithash}{197da6d6c34c6b20ce45c4d4baace5a4}
-       \field{labeldatesource}{}
-       \field{month}{2}
-       \field{origendyear}{219}
-@@ -451,7 +451,7 @@ my $era1 = q|    \entry{era1}{book}{}
- 
- my $era2 = q|    \entry{era2}{book}{}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{}
-       \field{eventyear}{249}
-       \field{origendyear}{44}
-@@ -466,7 +466,7 @@ my $era2 = q|    \entry{era2}{book}{}
- 
- my $era3 = q|    \entry{era3}{book}{}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{}
-       \field{eventday}{2}
-       \field{eventmonth}{3}
-@@ -481,7 +481,7 @@ my $era3 = q|    \entry{era3}{book}{}
- 
- my $era4 = q|    \entry{era4}{book}{}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{}
-       \field{eventyear}{1565}
-       \field{origendyear}{1488}
-@@ -504,7 +504,7 @@ my $era4 = q|    \entry{era4}{book}{}
- 
- my $time1 = q|    \entry{time1}{book}{}
-       \field{sortinit}{2}
--      \field{sortinithash}{8343b463aacf48517c044b4d2c9c45ed}
-+      \field{sortinithash}{0aa614ace9f3a40ef5a67e7f7a184048}
-       \field{labeldatesource}{}
-       \field{day}{3}
-       \field{eventday}{3}
-@@ -534,7 +534,7 @@ my $time1 = q|    \entry{time1}{book}{}
- 
- my $range1 = q|    \entry{range1}{book}{}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{}
-       \field{endyear}{}
-       \field{eventendyear}{}
-@@ -550,7 +550,7 @@ my $range1 = q|    \entry{range1}{book}{}
- 
- my $season1 = q|    \entry{season1}{book}{}
-       \field{sortinit}{2}
--      \field{sortinithash}{8343b463aacf48517c044b4d2c9c45ed}
-+      \field{sortinithash}{0aa614ace9f3a40ef5a67e7f7a184048}
-       \field{labeldatesource}{}
-       \field{eventseason}{autumn}
-       \field{eventyear}{2002}
-@@ -563,7 +563,7 @@ my $season1 = q|    \entry{season1}{book}{}
- 
- my $unspec1 = q|    \entry{unspec1}{book}{}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{}
-       \field{endyear}{1999}
-       \field{eventendyear}{1999}
-@@ -597,7 +597,7 @@ my $unspec1 = q|    \entry{unspec1}{book}{}
- 
- my $unspec2 = q|    \entry{unspec2}{book}{}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{}
-       \field{day}{1}
-       \field{endday}{31}
-diff --git a/t/encoding.t b/t/encoding.t
-index f9c9b09..e0d635b 100755
---- a/t/encoding.t
-+++ b/t/encoding.t
-@@ -49,7 +49,7 @@ my $encode1 = q|    \entry{testŠ}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{fefc5210ef4721525b2a478df41efcd4}
-+      \field{sortinithash}{07bbd5a529b5beaa311df5be05b874bc}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -76,7 +76,7 @@ my $encode2 = q|    \entry{test1}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{fefc5210ef4721525b2a478df41efcd4}
-+      \field{sortinithash}{07bbd5a529b5beaa311df5be05b874bc}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -103,7 +103,7 @@ my $encode3 = q|    \entry{test1}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{fefc5210ef4721525b2a478df41efcd4}
-+      \field{sortinithash}{07bbd5a529b5beaa311df5be05b874bc}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -130,7 +130,7 @@ my $encode5 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{fefc5210ef4721525b2a478df41efcd4}
-+      \field{sortinithash}{07bbd5a529b5beaa311df5be05b874bc}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -157,7 +157,7 @@ my $encode6 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{fefc5210ef4721525b2a478df41efcd4}
-+      \field{sortinithash}{07bbd5a529b5beaa311df5be05b874bc}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-@@ -184,7 +184,7 @@ my $encode7 = q|    \entry{test}{book}{}
-       \strng{authorfullhash}{06a47edae2e847800cfd78323a0e6be8}
-       \field{labelalpha}{Enc99}
-       \field{sortinit}{E}
--      \field{sortinithash}{fefc5210ef4721525b2a478df41efcd4}
-+      \field{sortinithash}{07bbd5a529b5beaa311df5be05b874bc}
-       \field{labeldatesource}{year}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-diff --git a/t/full-bbl.t b/t/full-bbl.t
-index 3de6770..9bf5121 100755
---- a/t/full-bbl.t
-+++ b/t/full-bbl.t
-@@ -29,8 +29,8 @@ my $stdout;
- my $stderr;
- 
- run3  [ $perl, 'bin/biber', '--noconf', '--nolog', "--output-file=$bbl", 't/tdata/full-bbl.bcf' ], \undef, \$stdout, \$stderr;
--#say $stdout;
--#say $stderr;
-+# say $stdout;
-+# say $stderr;
- 
- is($? >> 8, 0, 'Full test has zero exit status');
- ok(compare($bbl, 't/tdata/full-bbl.bbl') == 0, 'Testing lossort case and sortinit for macros');
-diff --git a/t/full-bblxml.t b/t/full-bblxml.t
-index ee317d4..528f224 100755
---- a/t/full-bblxml.t
-+++ b/t/full-bblxml.t
-@@ -29,8 +29,8 @@ my $stdout;
- my $stderr;
- 
- run3  [ $perl, 'bin/biber', '--noconf', '--nolog', '--output-format=bblxml', "--output-file=$bblxml", '--validate-bblxml', 't/tdata/full-bblxml.bcf' ], \undef, \$stdout, \$stderr;
--#say $stdout;
--#say $stderr;
-+# say $stdout;
-+# say $stderr;
- 
- is($? >> 8, 0, 'Full test has zero exit status');
- 
-diff --git a/t/names.t b/t/names.t
-index 713e692..e6f8d95 100755
---- a/t/names.t
-+++ b/t/names.t
-@@ -265,7 +265,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \strng{authornamehash}{72287a68c1714cb1b9f4ab9e03a88b96}
-       \strng{authorfullhash}{72287a68c1714cb1b9f4ab9e03a88b96}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -283,7 +283,7 @@ my $l2 = q|    \entry{L2}{book}{}
-       \strng{authornamehash}{1c867a2b5ceb243bab70afb18702dc04}
-       \strng{authorfullhash}{1c867a2b5ceb243bab70afb18702dc04}
-       \field{sortinit}{B}
--      \field{sortinithash}{4ecbea03efd0532989d3836d1a048c32}
-+      \field{sortinithash}{5f6fa000f686ee5b41be67ba6ff7962d}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -301,7 +301,7 @@ my $l3 = q|    \entry{L3}{book}{}
-       \strng{authornamehash}{cecd18116c43ee86e5a136b6e0362948}
-       \strng{authorfullhash}{cecd18116c43ee86e5a136b6e0362948}
-       \field{sortinit}{C}
--      \field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
-+      \field{sortinithash}{095692fd22cc3c74d7fe223d02314dbd}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -319,7 +319,7 @@ my $l4 = q|    \entry{L4}{book}{}
-       \strng{authornamehash}{675883f3aca7c6069c0b154d47af4c86}
-       \strng{authorfullhash}{675883f3aca7c6069c0b154d47af4c86}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -339,7 +339,7 @@ my $l5 = q|    \entry{L5}{book}{}
-       \strng{authornamehash}{c6b9d281cc1ff3f35570f76f463d4244}
-       \strng{authorfullhash}{c6b9d281cc1ff3f35570f76f463d4244}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -359,7 +359,7 @@ my $l6 = q|    \entry{L6}{book}{}
-       \strng{authornamehash}{dd96e3fc645eb4685988366f233403df}
-       \strng{authorfullhash}{dd96e3fc645eb4685988366f233403df}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -379,7 +379,7 @@ my $l7 = q|    \entry{L7}{book}{}
-       \strng{authornamehash}{1e802cc32f10930a9567712b8febdf19}
-       \strng{authorfullhash}{1e802cc32f10930a9567712b8febdf19}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -399,7 +399,7 @@ my $l8 = q|    \entry{L8}{book}{}
-       \strng{authornamehash}{076a9b62b331eb2cdfba234d9ad7bca9}
-       \strng{authorfullhash}{076a9b62b331eb2cdfba234d9ad7bca9}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -417,7 +417,7 @@ my $l9 = q|    \entry{L9}{book}{}
-       \strng{authornamehash}{1734924c4c55de5bb18d020c34a5249e}
-       \strng{authorfullhash}{1734924c4c55de5bb18d020c34a5249e}
-       \field{sortinit}{I}
--      \field{sortinithash}{25e99d37ba90f7c4fb20baf4e310faf3}
-+      \field{sortinithash}{a3dcedd53b04d1adfd5ac303ecd5e6fa}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -438,7 +438,7 @@ my $l10 = q|    \entry{L10}{book}{}
-       \strng{authornamehash}{37b4325752e394ddfb2fc810f6c88e27}
-       \strng{authorfullhash}{37b4325752e394ddfb2fc810f6c88e27}
-       \field{sortinit}{J}
--      \field{sortinithash}{ec3950a647c092421b9fcca6d819504a}
-+      \field{sortinithash}{c86bd6cced82a15683b396c2169909ef}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -459,7 +459,7 @@ my $l10a = q|    \entry{L10a}{book}{}
-       \strng{authornamehash}{264cb53d2295644c1c99523e254d9b0e}
-       \strng{authorfullhash}{264cb53d2295644c1c99523e254d9b0e}
-       \field{sortinit}{P}
--      \field{sortinithash}{c0a4896d0e424f9ca4d7f14f2b3428e7}
-+      \field{sortinithash}{24100cef455d7974167575052c29146e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -482,7 +482,7 @@ my $l11 = q|    \entry{L11}{book}{}
-       \strng{authornamehash}{c536dd808dc9193fda59ba1ff2afb38f}
-       \strng{authorfullhash}{c536dd808dc9193fda59ba1ff2afb38f}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -502,7 +502,7 @@ my $l12 = q|    \entry{L12}{book}{}
-       \strng{authornamehash}{7e7640f3cb87a1cf11a86307a186ec0f}
-       \strng{authorfullhash}{7e7640f3cb87a1cf11a86307a186ec0f}
-       \field{sortinit}{d}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \true{uniqueprimaryauthor}
-       \field{labelnamesource}{author}
-     \endentry
-@@ -521,7 +521,7 @@ my $l13 = q|    \entry{L13}{book}{}
-       \strng{authornamehash}{5e79da6869afaf0d38e01285b494d555}
-       \strng{authorfullhash}{5e79da6869afaf0d38e01285b494d555}
-       \field{sortinit}{V}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -539,7 +539,7 @@ my $l14 = q|    \entry{L14}{book}{}
-       \strng{authornamehash}{2319907d9a5d5dd46da77879bdb7e609}
-       \strng{authorfullhash}{2319907d9a5d5dd46da77879bdb7e609}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -559,7 +559,7 @@ my $l15 = q|    \entry{L15}{book}{}
-       \strng{authornamehash}{b30b0fc69681fd11ad5d75a880124091}
-       \strng{authorfullhash}{b30b0fc69681fd11ad5d75a880124091}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -579,7 +579,7 @@ my $l16 = q|    \entry{L16}{book}{}
-       \strng{authornamehash}{2b17c50dc666b9cc73d132da9ef08c7b}
-       \strng{authorfullhash}{2b17c50dc666b9cc73d132da9ef08c7b}
-       \field{sortinit}{v}
--      \field{sortinithash}{d18f5ce25ce0b5ca7f924e3f6c04870e}
-+      \field{sortinithash}{555737dafdcf1396ebfeae5822e5bde2}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -597,7 +597,7 @@ my $l17 = q|    \entry{L17}{book}{}
-       \strng{authornamehash}{766d5329cf995fcc7c1cef19de2a2ae8}
-       \strng{authorfullhash}{766d5329cf995fcc7c1cef19de2a2ae8}
-       \field{sortinit}{L}
--      \field{sortinithash}{872351f18d0f736066eda0bf18bfa4f7}
-+      \field{sortinithash}{7bba64db83423e3c29ad597f3b682cf3}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -615,7 +615,7 @@ my $l18 = q|    \entry{L18}{book}{}
-       \strng{authornamehash}{58620d2c7d6839bac23306c732c563fb}
-       \strng{authorfullhash}{58620d2c7d6839bac23306c732c563fb}
-       \field{sortinit}{L}
--      \field{sortinithash}{872351f18d0f736066eda0bf18bfa4f7}
-+      \field{sortinithash}{7bba64db83423e3c29ad597f3b682cf3}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -633,7 +633,7 @@ my $l19 = q|    \entry{L19}{book}{}
-       \strng{authornamehash}{83caa52f21f97e572dd3267bdf62978a}
-       \strng{authorfullhash}{83caa52f21f97e572dd3267bdf62978a}
-       \field{sortinit}{M}
--      \field{sortinithash}{2684bec41e9697b92699b46491061da2}
-+      \field{sortinithash}{c26a05ef03e4429073ed5c825140fac3}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -651,7 +651,7 @@ my $l19a = q|    \entry{L19a}{book}{}
-       \strng{authornamehash}{0963f6904ccfeaac2770c5882a587001}
-       \strng{authorfullhash}{0963f6904ccfeaac2770c5882a587001}
-       \field{sortinit}{L}
--      \field{sortinithash}{872351f18d0f736066eda0bf18bfa4f7}
-+      \field{sortinithash}{7bba64db83423e3c29ad597f3b682cf3}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -670,7 +670,7 @@ my $l20 = q|    \entry{L20}{book}{}
-       \strng{authornamehash}{fdaa0936724be89ef8bd16cf02e08c74}
-       \strng{authorfullhash}{fdaa0936724be89ef8bd16cf02e08c74}
-       \field{sortinit}{F}
--      \field{sortinithash}{c6a7d9913bbd7b20ea954441c0460b78}
-+      \field{sortinithash}{276475738cc058478c1677046f857703}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -688,7 +688,7 @@ my $l21 = q|    \entry{L21}{book}{}
-       \strng{authornamehash}{4389a3c0dc7da74487b50808ba9436ad}
-       \strng{authorfullhash}{4389a3c0dc7da74487b50808ba9436ad}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -706,7 +706,7 @@ my $l22u = q|    \entry{L22}{book}{}
-       \strng{authornamehash}{e58b861545799d0eaf883402a882126e}
-       \strng{authorfullhash}{e58b861545799d0eaf883402a882126e}
-       \field{sortinit}{Š}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -725,7 +725,7 @@ my $l22 = q|    \entry{L22}{book}{}
-       \strng{authornamehash}{e58b861545799d0eaf883402a882126e}
-       \strng{authorfullhash}{e58b861545799d0eaf883402a882126e}
-       \field{sortinit}{\v{S}}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -744,7 +744,7 @@ my $l23 = q|    \entry{L23}{book}{}
-       \strng{authornamehash}{4389a3c0dc7da74487b50808ba9436ad}
-       \strng{authorfullhash}{4389a3c0dc7da74487b50808ba9436ad}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -762,7 +762,7 @@ my $l24 = q|    \entry{L24}{book}{}
-       \strng{authornamehash}{e58b861545799d0eaf883402a882126e}
-       \strng{authorfullhash}{e58b861545799d0eaf883402a882126e}
-       \field{sortinit}{Š}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -778,7 +778,7 @@ my $l25 = q|    \entry{L25}{book}{}
-       \strng{authornamehash}{7069367d4a4f37ffb0377e3830e98ed0}
-       \strng{authorfullhash}{7069367d4a4f37ffb0377e3830e98ed0}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -794,7 +794,7 @@ my $l26 = q|    \entry{L26}{book}{}
-       \strng{authornamehash}{d176a8af5ce1c45cb06875c4433f2fe2}
-       \strng{authorfullhash}{d176a8af5ce1c45cb06875c4433f2fe2}
-       \field{sortinit}{S}
--      \field{sortinithash}{fd1e7c5ab79596b13dbbb67f8d70fb5a}
-+      \field{sortinithash}{3c1547c63380458f8ca90e40ed14b83e}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -802,7 +802,7 @@ my $l26 = q|    \entry{L26}{book}{}
- # Malformed anyway but a decent test
- my $l28 = q|    \entry{L28}{book}{}
-       \field{sortinit}{0}
--      \field{sortinithash}{990108227b3316c02842d895999a0165}
-+      \field{sortinithash}{e07d8eeb31ded4126e0aa0cfcdcb5a8f}
-       \warn{\item Name "Deux et al.,, O." is malformed (consecutive commas): skipping name}
-     \endentry
- |;
-@@ -819,7 +819,7 @@ my $l29 = q|    \entry{L29}{book}{}
-       \strng{authornamehash}{59a5e43a502767d00e589eb29f863728}
-       \strng{authorfullhash}{59a5e43a502767d00e589eb29f863728}
-       \field{sortinit}{U}
--      \field{sortinithash}{8145509bd2718876fc77d31fd2cde117}
-+      \field{sortinithash}{1554584e7f69d2b4fe0a645e73d50194}
-       \field{labelnamesource}{author}
-     \endentry
- |;
-@@ -855,7 +855,7 @@ my $l31 = q|    \entry{L31}{book}{}
-       \strng{translatornamehash}{29c3ff92fff79d09a8b44d2f775de0b1}
-       \strng{translatorfullhash}{29c3ff92fff79d09a8b44d2f775de0b1}
-       \field{sortinit}{\~{Z}}
--      \field{sortinithash}{fdda4caaa6b5fa63e0c081dcb159543a}
-+      \field{sortinithash}{35589aa085e881766b72503e53fd4c97}
-       \true{uniqueprimaryauthor}
-       \field{labelnamesource}{author}
-     \endentry
-diff --git a/t/options.t b/t/options.t
-index a40e397..1a96242 100755
---- a/t/options.t
-+++ b/t/options.t
-@@ -97,7 +97,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -130,7 +130,7 @@ my $l2 = q|    \entry{L2}{book}{maxcitenames=3,maxbibnames=3,maxitems=2}
-       \strng{authornamehash}{19eec87c959944d6d9c72434a42856ba}
-       \strng{authorfullhash}{19eec87c959944d6d9c72434a42856ba}
-       \field{sortinit}{E}
--      \field{sortinithash}{fefc5210ef4721525b2a478df41efcd4}
-+      \field{sortinithash}{07bbd5a529b5beaa311df5be05b874bc}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -158,7 +158,7 @@ my $l3 = q|    \entry{L3}{book}{blah=10}
-       \strng{authornamehash}{490250da1f3b92580d97563dc96c6c84}
-       \strng{authorfullhash}{490250da1f3b92580d97563dc96c6c84}
-       \field{sortinit}{B}
--      \field{sortinithash}{4ecbea03efd0532989d3836d1a048c32}
-+      \field{sortinithash}{5f6fa000f686ee5b41be67ba6ff7962d}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/related-entries.t b/t/related-entries.t
-index 2b31d3f..f107f8e 100755
---- a/t/related-entries.t
-+++ b/t/related-entries.t
-@@ -55,7 +55,7 @@ my $k1 = q|    \entry{key1}{article}{}
-       \strng{authornamehash}{a517747c3d12f99244ae598910d979c5}
-       \strng{authorfullhash}{a517747c3d12f99244ae598910d979c5}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -90,7 +90,7 @@ my $k2 = q|    \entry{key2}{inbook}{}
-       \strng{authornamehash}{a517747c3d12f99244ae598910d979c5}
-       \strng{authorfullhash}{a517747c3d12f99244ae598910d979c5}
-       \field{sortinit}{2}
--      \field{sortinithash}{8343b463aacf48517c044b4d2c9c45ed}
-+      \field{sortinithash}{0aa614ace9f3a40ef5a67e7f7a184048}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -229,7 +229,7 @@ my $kck4 = q|    \entry{caf8e34be07426ae7127c1b4829983c1}{inbook}{dataonly,useed
- 
- my $c1 = q|    \entry{c1}{book}{}
-       \field{sortinit}{3}
--      \field{sortinithash}{7e21a31d9ef6ddc352701d4fa590bfbc}
-+      \field{sortinithash}{197da6d6c34c6b20ce45c4d4baace5a4}
-       \field{related}{9ab62b5ef34a985438bfdf7ee0102229}
-     \endentry
- |;
-diff --git a/t/remote-files.t b/t/remote-files.t
-index 8d9ae24..b5acd93 100755
---- a/t/remote-files.t
-+++ b/t/remote-files.t
-@@ -80,7 +80,7 @@ my $cu1 = q|    \entry{citeulike:8283461}{article}{}
-       \strng{authornamehash}{7f19319e09aa3239f02eb31ec7a4aa8b}
-       \strng{authorfullhash}{ee363ce5e21ebe022f83aae896dd47f9}
-       \field{sortinit}{M}
--      \field{sortinithash}{2684bec41e9697b92699b46491061da2}
-+      \field{sortinithash}{c26a05ef03e4429073ed5c825140fac3}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -119,7 +119,7 @@ my $dl1 = q|    \entry{AbdelbarH98}{article}{}
-       \strng{authornamehash}{01599a4cb58316d64208b12a07741765}
-       \strng{authorfullhash}{01599a4cb58316d64208b12a07741765}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -163,7 +163,7 @@ my $ssl = q|    \entry{merleau-ponty_philosophe_2010}{incollection}{}
-       \strng{editornamehash}{ff5f90046157eecef0c22da4dac6486e}
-       \strng{editorfullhash}{ff5f90046157eecef0c22da4dac6486e}
-       \field{sortinit}{M}
--      \field{sortinithash}{2684bec41e9697b92699b46491061da2}
-+      \field{sortinithash}{c26a05ef03e4429073ed5c825140fac3}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/set-dynamic.t b/t/set-dynamic.t
-index b6fc569..858d1e5 100755
---- a/t/set-dynamic.t
-+++ b/t/set-dynamic.t
-@@ -60,7 +60,7 @@ my $string1 = q|    \entry{DynSet}{set}{}
-       \strng{authornamehash}{252caa7921a061ca92087a1a52f15b78}
-       \strng{authorfullhash}{252caa7921a061ca92087a1a52f15b78}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -85,7 +85,7 @@ my $string2 = q|    \entry{Dynamic1}{book}{}
-       \strng{authornamehash}{252caa7921a061ca92087a1a52f15b78}
-       \strng{authorfullhash}{252caa7921a061ca92087a1a52f15b78}
-       \field{sortinit}{8}
--      \field{sortinithash}{ff392057b609ad7b4de0b8e2cc30b687}
-+      \field{sortinithash}{2f1b0e69e7617f99664f1cd00bb9603c}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -110,7 +110,7 @@ my $string3 = q|    \entry{Dynamic2}{book}{}
-       \strng{authornamehash}{894a5fe6de820f5dcce84a65581667f4}
-       \strng{authorfullhash}{894a5fe6de820f5dcce84a65581667f4}
-       \field{sortinit}{9}
--      \field{sortinithash}{5a7694b2c36c7534b22948c31e4b7920}
-+      \field{sortinithash}{2999ebab86052e6d71b434385f8b4ed2}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -134,7 +134,7 @@ my $string4 = q|    \entry{Dynamic3}{book}{}
-       \strng{authornamehash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \strng{authorfullhash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -159,7 +159,7 @@ my $string5 = q|    \entry{Dynamic3}{book}{}
-       \strng{authornamehash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \strng{authorfullhash}{fc3cc97631ceaecdde2aee6cc60ab42b}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/set-legacy.t b/t/set-legacy.t
-index dd072b0..1f9bfd1 100755
---- a/t/set-legacy.t
-+++ b/t/set-legacy.t
-@@ -56,7 +56,7 @@ my $string1 = q|    \entry{Elias1955}{set}{}
-       \strng{authornamehash}{bdd4981ffb5a62685c993d6f9dec4c23}
-       \strng{authorfullhash}{bdd4981ffb5a62685c993d6f9dec4c23}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/set-static.t b/t/set-static.t
-index 34df869..98f3e19 100755
---- a/t/set-static.t
-+++ b/t/set-static.t
-@@ -56,7 +56,7 @@ my $string1 = q|    \entry{Static1}{set}{}
-       \strng{authornamehash}{43874d80d7ce68027102819f16c47df1}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{2}
--      \field{sortinithash}{8343b463aacf48517c044b4d2c9c45ed}
-+      \field{sortinithash}{0aa614ace9f3a40ef5a67e7f7a184048}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -80,7 +80,7 @@ my $string2 = q|    \entry{Static2}{book}{}
-       \strng{authornamehash}{43874d80d7ce68027102819f16c47df1}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -147,7 +147,7 @@ my $string5 = q|    \entry{Static2}{book}{}
-       \strng{authornamehash}{43874d80d7ce68027102819f16c47df1}
-       \strng{authorfullhash}{43874d80d7ce68027102819f16c47df1}
-       \field{sortinit}{1}
--      \field{sortinithash}{53e85f4cf497d2a4e1d51786552bcbf1}
-+      \field{sortinithash}{27a2bc5dfb9ed0a0422134d636544b5d}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/skips.t b/t/skips.t
-index 3ea41a1..66a4f6e 100755
---- a/t/skips.t
-+++ b/t/skips.t
-@@ -59,7 +59,7 @@ my $set1 = q|    \entry{seta}{set}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extrayear}{1}
-       \field{labeldatesource}{}
-       \field{extraalpha}{1}
-@@ -85,7 +85,7 @@ my $set2 = q|    \entry{set:membera}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -110,7 +110,7 @@ my $set3 = q|    \entry{set:memberb}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -134,7 +134,7 @@ my $set4 = q|    \entry{set:memberc}{book}{}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -158,7 +158,7 @@ my $noset1 = q|    \entry{noseta}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extrayear}{2}
-       \field{labeldatesource}{}
-       \field{extraalpha}{2}
-@@ -184,7 +184,7 @@ my $noset2 = q|    \entry{nosetb}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extrayear}{3}
-       \field{labeldatesource}{}
-       \field{extraalpha}{3}
-@@ -210,7 +210,7 @@ my $noset3 = q|    \entry{nosetc}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe10}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extrayear}{4}
-       \field{labeldatesource}{}
-       \field{extraalpha}{4}
-@@ -241,7 +241,7 @@ my $sk4 = q|    \entry{skip4}{article}{dataonly}
-       \strng{authornamehash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{labeldatesource}{year}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/sort-complex.t b/t/sort-complex.t
-index 30115b7..77f515c 100755
---- a/t/sort-complex.t
-+++ b/t/sort-complex.t
-@@ -119,7 +119,7 @@ my $l4 = q|    \entry{L4}{book}{}
-       \strng{authorfullhash}{6eb389989020e8246fee90ac93fcecbe}
-       \field{labelalpha}{Doe\textbf{+}95}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -148,7 +148,7 @@ my $l1 = q|    \entry{L1}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -177,7 +177,7 @@ my $l2 = q|    \entry{L2}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extraalpha}{3}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -206,7 +206,7 @@ my $l3 = q|    \entry{L3}{book}{}
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{Doe95}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extraalpha}{2}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -237,7 +237,7 @@ my $l5 = q|    \entry{L5}{book}{}
-       \strng{authorfullhash}{6eb389989020e8246fee90ac93fcecbe}
-       \field{labelalpha}{Doe\textbf{+}95}
-       \field{sortinit}{D}
--      \field{sortinithash}{78f7c4753a2004675f316a80bdb31742}
-+      \field{sortinithash}{d10b5413de1f3d197b20897dd0d565bb}
-       \field{extraalpha}{1}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/sortlists.t b/t/sortlists.t
-index 91a3a1f..b9702e9 100755
---- a/t/sortlists.t
-+++ b/t/sortlists.t
-@@ -84,7 +84,7 @@ my $K11 = q|    \entry{K11}{book}{}
-       \strng{authornamehash}{4edc280a0ef229f9c061e3b121b17482}
-       \strng{authorfullhash}{4edc280a0ef229f9c061e3b121b17482}
-       \field{sortinit}{a}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -113,7 +113,7 @@ my $K12 = q|    \entry{K12}{book}{}
-       \strng{authornamehash}{a846a485fc9cbb59b0ebeedd6ac637e4}
-       \strng{authorfullhash}{a846a485fc9cbb59b0ebeedd6ac637e4}
-       \field{sortinit}{Z}
--      \field{sortinithash}{fdda4caaa6b5fa63e0c081dcb159543a}
-+      \field{sortinithash}{35589aa085e881766b72503e53fd4c97}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/tdata/full-bbl.bbl b/t/tdata/full-bbl.bbl
-index 0337f2c..cedc3be 100644
---- a/t/tdata/full-bbl.bbl
-+++ b/t/tdata/full-bbl.bbl
-@@ -33,7 +33,7 @@
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{\emph{A}}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-@@ -57,7 +57,7 @@
-       \strng{authorfullhash}{bd051a2f7a5f377e3a62581b0e0f8577}
-       \field{labelalpha}{\emph{A}}
-       \field{sortinit}{A}
--      \field{sortinithash}{b685c7856330eaee22789815b49de9bb}
-+      \field{sortinithash}{3248043b5fe8d0a34dab5ab6b8d4309b}
-       \true{singletitle}
-       \field{labelnamesource}{author}
-       \field{labeltitlesource}{title}
-diff --git a/t/tdata/full-bblxml.bblxml b/t/tdata/full-bblxml.bblxml
-index 9ad3302..0acc09a 100644
---- a/t/tdata/full-bblxml.bblxml
-+++ b/t/tdata/full-bblxml.bblxml
-@@ -45,7 +45,7 @@
-         <bbl:field name="authorfullhash">562d8cda005e7c37bc696e0d0edc306e</bbl:field>
-         <bbl:field name="labelalpha">Aks+06</bbl:field>
-         <bbl:field name="sortinit">A</bbl:field>
--        <bbl:field name="sortinithash">b685c7856330eaee22789815b49de9bb</bbl:field>
-+        <bbl:field name="sortinithash">3248043b5fe8d0a34dab5ab6b8d4309b</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="indextitle">Effect of immobilization on catalytic characteristics</bbl:field>
-@@ -75,7 +75,7 @@
-         <bbl:field name="authorfullhash">9717d2d959a4b18727868ca7928c34b4</bbl:field>
-         <bbl:field name="labelalpha">Ang02</bbl:field>
-         <bbl:field name="sortinit">A</bbl:field>
--        <bbl:field name="sortinithash">b685c7856330eaee22789815b49de9bb</bbl:field>
-+        <bbl:field name="sortinithash">3248043b5fe8d0a34dab5ab6b8d4309b</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-         <bbl:field name="annotation">A German article in a French journal. Apart from that, a typical article entry. Note the indextitle field</bbl:field>
-@@ -115,7 +115,7 @@
-         <bbl:field name="authorfullhash">eb3f242602109f5bdbeb41fdd990fcc0</bbl:field>
-         <bbl:field name="labelalpha">Gla61</bbl:field>
-         <bbl:field name="sortinit">G</bbl:field>
--        <bbl:field name="sortinithash">1c854ef9177a91bf894e66485bdbd3ed</bbl:field>
-+        <bbl:field name="sortinithash">618d986594b7198ba52cf8b00d348f3f</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="annotation">A set entry with three members discussing the standard model of particle physics.</bbl:field>
-@@ -145,7 +145,7 @@
-         <bbl:field name="authornamehash">eb3f242602109f5bdbeb41fdd990fcc0</bbl:field>
-         <bbl:field name="authorfullhash">eb3f242602109f5bdbeb41fdd990fcc0</bbl:field>
-         <bbl:field name="sortinit">G</bbl:field>
--        <bbl:field name="sortinithash">1c854ef9177a91bf894e66485bdbd3ed</bbl:field>
-+        <bbl:field name="sortinithash">618d986594b7198ba52cf8b00d348f3f</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="journaltitle">Nucl. Phys.</bbl:field>
-@@ -178,7 +178,7 @@
-         <bbl:field name="authorfullhash">fcbea740aeb72b8e941e0d4aa9f6a9c6</bbl:field>
-         <bbl:field name="labelalpha">Knu86</bbl:field>
-         <bbl:field name="sortinit">K</bbl:field>
--        <bbl:field name="sortinithash">a7d5b3aec5a0890aae7baf85a209abfc</bbl:field>
-+        <bbl:field name="sortinithash">4c244ceae61406cdc0cc2ce1cb1ff703</bbl:field>
-         <bbl:field name="extraalpha">1</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-@@ -211,7 +211,7 @@
-         <bbl:field name="authorfullhash">fcbea740aeb72b8e941e0d4aa9f6a9c6</bbl:field>
-         <bbl:field name="labelalpha">Knu86</bbl:field>
-         <bbl:field name="sortinit">K</bbl:field>
--        <bbl:field name="sortinithash">a7d5b3aec5a0890aae7baf85a209abfc</bbl:field>
-+        <bbl:field name="sortinithash">4c244ceae61406cdc0cc2ce1cb1ff703</bbl:field>
-         <bbl:field name="extraalpha">2</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">shorttitle</bbl:field>
-@@ -238,7 +238,7 @@
-         <bbl:field name="authorfullhash">7c73b571a33320e72d2d87ff821579fd</bbl:field>
-         <bbl:field name="labelalpha">Ree58</bbl:field>
-         <bbl:field name="sortinit">R</bbl:field>
--        <bbl:field name="sortinithash">c7387613477035a752d935acfc3e3ea2</bbl:field>
-+        <bbl:field name="sortinithash">c15bc8eb6936bc6b3c8baa9e8575af53</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="annotation">An article entry with a series and a volume field. Note the format of the series. If the value of the series field is an integer, this number is printed as an ordinal and the string *series is appended automatically</bbl:field>
-@@ -285,7 +285,7 @@
-         <bbl:field name="editornamehash">d0ec890e59163c24c111a08d2a4be982</bbl:field>
-         <bbl:field name="editorfullhash">d0ec890e59163c24c111a08d2a4be982</bbl:field>
-         <bbl:field name="sortinit">S</bbl:field>
--        <bbl:field name="sortinithash">fd1e7c5ab79596b13dbbb67f8d70fb5a</bbl:field>
-+        <bbl:field name="sortinithash">3c1547c63380458f8ca90e40ed14b83e</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="booksubtitle">Relativistic groups and analyticity</bbl:field>
-@@ -314,7 +314,7 @@
-         <bbl:field name="authorfullhash">93f17724cbd884231ef39a73755ef5bb</bbl:field>
-         <bbl:field name="labelalpha">Sho91</bbl:field>
-         <bbl:field name="sortinit">S</bbl:field>
--        <bbl:field name="sortinithash">fd1e7c5ab79596b13dbbb67f8d70fb5a</bbl:field>
-+        <bbl:field name="sortinithash">3c1547c63380458f8ca90e40ed14b83e</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="annotation">An article entry with series, volume, and number fields. Note the format of the series which is a localization key</bbl:field>
-@@ -348,7 +348,7 @@
-         <bbl:field name="authornamehash">15e144c72b0b9d10db00ddc6d37a19e6</bbl:field>
-         <bbl:field name="authorfullhash">15e144c72b0b9d10db00ddc6d37a19e6</bbl:field>
-         <bbl:field name="sortinit">W</bbl:field>
--        <bbl:field name="sortinithash">99e3ba1b3f78bb6f073e7fa7ac11636b</bbl:field>
-+        <bbl:field name="sortinithash">6d25b3eefe5aa2147d1f339686808918</bbl:field>
-         <bbl:field name="labelnamesource">author</bbl:field>
-         <bbl:field name="labeltitlesource">title</bbl:field>
-         <bbl:field name="journaltitle">Phys. Rev. Lett.</bbl:field>
-diff --git a/t/xdata.t b/t/xdata.t
-index 9664ed0..5f7eba4 100644
---- a/t/xdata.t
-+++ b/t/xdata.t
-@@ -72,7 +72,7 @@ my $xd1 = q|    \entry{xd1}{book}{}
-       \strng{authornamehash}{51db4bfd331cba22959ce2d224c517cd}
-       \strng{authorfullhash}{51db4bfd331cba22959ce2d224c517cd}
-       \field{sortinit}{E}
--      \field{sortinithash}{fefc5210ef4721525b2a478df41efcd4}
-+      \field{sortinithash}{07bbd5a529b5beaa311df5be05b874bc}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{note}{A Note}
-@@ -101,7 +101,7 @@ my $xd2 = q|    \entry{xd2}{book}{}
-       \strng{authornamehash}{68539e0ce4922cc4957c6cabf35e6fc8}
-       \strng{authorfullhash}{68539e0ce4922cc4957c6cabf35e6fc8}
-       \field{sortinit}{P}
--      \field{sortinithash}{c0a4896d0e424f9ca4d7f14f2b3428e7}
-+      \field{sortinithash}{24100cef455d7974167575052c29146e}
-       \field{labeldatesource}{}
-       \field{labelnamesource}{author}
-       \field{abstract}{An abstract}

diff --git a/biber-updates-for-perl-5.22-changes.patch b/biber-updates-for-perl-5.22-changes.patch
deleted file mode 100644
index 2cd813e..0000000
--- a/biber-updates-for-perl-5.22-changes.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-From d03fc1a65850213ff3254dc18dc374594e144a6c Mon Sep 17 00:00:00 2001
-From: Philip Kime <Philip@kime.org.uk>
-Date: Sun, 21 Jun 2015 10:25:39 +0200
-Subject: [PATCH] Updates for perl 5.22 changes
-
----
- lib/Biber/Input/file/bibtex.pm |  8 +++-----
- lib/Biber/LaTeX/Recode.pm      |  6 +++---
- t/basic-misc.t                 |  2 +-
- t/biblatexml.t                 |  2 +-
- t/bibtex-aliases.t             |  2 +-
- t/bibtex-output.t              |  2 +-
- t/crossrefs.t                  |  2 +-
- t/dm-constraints.t             |  2 +-
- t/dm-dateformats.t             |  2 +-
- t/encoding.t                   |  2 +-
- t/endnotexml.t                 |  2 +-
- t/extratitle.t                 |  2 +-
- t/extratitleyear.t             |  2 +-
- t/extrayear.t                  |  2 +-
- t/labelalpha.t                 |  2 +-
- t/labelname.t                  |  2 +-
- t/names.t                      |  2 +-
- t/options.t                    |  3 ++-
- t/related-entries.t            |  2 +-
- t/remote-files.t               |  2 +-
- t/ris.t                        |  2 +-
- t/sections-complex.t           |  2 +-
- t/sections.t                   |  2 +-
- t/set-dynamic.t                |  2 +-
- t/set-legacy.t                 |  2 +-
- t/set-static.t                 |  2 +-
- t/skips.t                      |  2 +-
- t/sort-case.t                  |  2 +-
- t/sort-complex.t               |  2 +-
- t/sort-order.t                 |  4 ++--
- t/sort-uc.t                    |  2 +-
- t/sorting.t                    |  2 +-
- t/tool-bltxml.t                |  2 +-
- t/tool.t                       |  2 +-
- t/uniqueness.t                 | 32 ++++++++++++++++----------------
- t/xdata.t                      |  2 +-
- t/zoterordfxml.t               |  2 +-
- 37 files changed, 58 insertions(+), 59 deletions(-)
-
-diff --git a/lib/Biber/Input/file/bibtex.pm b/lib/Biber/Input/file/bibtex.pm
-index 24b2772..a6e240d 100644
---- a/lib/Biber/Input/file/bibtex.pm
-+++ b/lib/Biber/Input/file/bibtex.pm
-@@ -657,8 +657,6 @@ sub _literal {
-   else {
-     $bibentry->set_datafield($field, $value);
-   }
--
--
-   return;
- }
- 
-@@ -759,7 +757,7 @@ sub _name {
-     # Check for malformed names in names which aren't completely escaped
- 
-     # Too many commas
--    unless ($name =~ m/\A{\X+}\z/xms) { # Ignore these tests for escaped names
-+    unless ($name =~ m/\A\{\X+\}\z/xms) { # Ignore these tests for escaped names
-       my @commas = $name =~ m/,/g;
-       if ($#commas > 1) {
-         biber_warn("Name \"$name\" has too many commas: skipping name", $bibentry);
-@@ -1262,8 +1260,8 @@ my %months = (
- 
- sub _hack_month {
-   my $in_month = shift;
--  if ($in_month =~ m/\A\s*((?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*)\s*\z/i) {
--    return $months{lc(Unicode::GCString->new($1)->substr(0,3)->as_string)};
-+  if (my ($m) = $in_month =~ m/\A\s*((?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*)\s*\z/i) {
-+    return $months{lc(Unicode::GCString->new($m)->substr(0,3)->as_string)};
-   }
-   else {
-     return $in_month;
-diff --git a/lib/Biber/LaTeX/Recode.pm b/lib/Biber/LaTeX/Recode.pm
-index a2900b2..427f7f5 100644
---- a/lib/Biber/LaTeX/Recode.pm
-+++ b/lib/Biber/LaTeX/Recode.pm
-@@ -230,13 +230,13 @@ sub latex_decode {
-         $text =~ s/\\not\\($re)/$map->{$1}/ge;
-       }
-       elsif ($type eq 'superscripts') {
--        $text =~ s/\\textsuperscript{($re)}/$map->{$1}/ge;
-+        $text =~ s/\\textsuperscript\{($re)\}/$map->{$1}/ge;
-       }
-       elsif ($type eq 'cmdsuperscripts') {
--        $text =~ s/\\textsuperscript{\\($re)}/$map->{$1}/ge;
-+        $text =~ s/\\textsuperscript\{\\($re)\}/$map->{$1}/ge;
-       }
-       elsif ($type eq 'dings') {
--        $text =~ s/\\ding{([2-9AF][0-9A-F])}/$map->{$1}/ge;
-+        $text =~ s/\\ding\{([2-9AF][0-9A-F])\}/$map->{$1}/ge;
-       }
-       elsif ($type eq 'letters') {
-         $text =~ s/\\($re)(?:\{\}|\s+|\b)/$map->{$1}/ge;
-diff --git a/t/basic-misc.t b/t/basic-misc.t
-index bee5728..817fe13 100755
---- a/t/basic-misc.t
-+++ b/t/basic-misc.t
-@@ -37,7 +37,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
- Biber::Config->setblxoption('uniquelist', 1);
- Biber::Config->setblxoption('maxcitenames', 3);
-diff --git a/t/biblatexml.t b/t/biblatexml.t
-index 3bf4b0c..0642d44 100755
---- a/t/biblatexml.t
-+++ b/t/biblatexml.t
-@@ -38,8 +38,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Now generate the information
- $biber->prepare;
-diff --git a/t/bibtex-aliases.t b/t/bibtex-aliases.t
-index ba0b1d6..c1970e9 100755
---- a/t/bibtex-aliases.t
-+++ b/t/bibtex-aliases.t
-@@ -37,8 +37,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- Biber::Config->setoption('validate_datamodel', 1);
- 
- # THERE IS A MAPPING SECTION IN THE .bcf BEING USED TO TEST USER MAPS TOO!
-diff --git a/t/bibtex-output.t b/t/bibtex-output.t
-index 21c1ae7..673cba7 100755
---- a/t/bibtex-output.t
-+++ b/t/bibtex-output.t
-@@ -36,7 +36,7 @@ Log::Log4perl->init(\$l4pconf);
- # Biber options
- Biber::Config->setoption('output_resolve', 1);
- Biber::Config->setoption('output_format', 'bibtex');
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- $biber->parse_ctrlfile('bibtex-output.bcf');
- $biber->set_output_obj(Biber::Output::bibtex->new());
- 
-diff --git a/t/crossrefs.t b/t/crossrefs.t
-index 6108f34..473bec7 100755
---- a/t/crossrefs.t
-+++ b/t/crossrefs.t
-@@ -40,8 +40,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- Biber::Config->setoption('nodieonerror', 1); # because there is a failing cyclic crossref check
- 
- # Now generate the information
-diff --git a/t/dm-constraints.t b/t/dm-constraints.t
-index b16e326..187c482 100755
---- a/t/dm-constraints.t
-+++ b/t/dm-constraints.t
-@@ -50,9 +50,9 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
- Biber::Config->setoption('validate_datamodel', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Now generate the information
- $biber->prepare;
-diff --git a/t/dm-dateformats.t b/t/dm-dateformats.t
-index 85f7927..71a0ab6 100755
---- a/t/dm-dateformats.t
-+++ b/t/dm-dateformats.t
-@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- Biber::Config->setoption('validate_datamodel', 1);
- 
- # Biblatex options
-diff --git a/t/encoding.t b/t/encoding.t
-index a4aae96..321ca09 100755
---- a/t/encoding.t
-+++ b/t/encoding.t
-@@ -30,8 +30,8 @@ my $l4pconf = qq|
- |;
- Log::Log4perl->init(\$l4pconf);
- 
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- my $encode1 = q|    \entry{testŠ}{book}{}
-       \name{author}{1}{}{%
-diff --git a/t/endnotexml.t b/t/endnotexml.t
-index 7dc871f..dc171f0 100755
---- a/t/endnotexml.t
-+++ b/t/endnotexml.t
-@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # THERE IS A CONFIG FILE BEING READ TO TEST USER MAPS TOO!
- 
-diff --git a/t/extratitle.t b/t/extratitle.t
-index 425b458..aa7724b 100755
---- a/t/extratitle.t
-+++ b/t/extratitle.t
-@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 1);
-diff --git a/t/extratitleyear.t b/t/extratitleyear.t
-index df40e14..7c1e311 100755
---- a/t/extratitleyear.t
-+++ b/t/extratitleyear.t
-@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Now generate the information
- $biber->prepare;
-diff --git a/t/extrayear.t b/t/extrayear.t
-index 2da61c6..51d1389 100755
---- a/t/extrayear.t
-+++ b/t/extrayear.t
-@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 1);
-diff --git a/t/labelalpha.t b/t/labelalpha.t
-index 3dcf427..8a25c36 100755
---- a/t/labelalpha.t
-+++ b/t/labelalpha.t
-@@ -37,8 +37,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Biblatex options
- Biber::Config->setblxoption('maxalphanames', 1);
-diff --git a/t/labelname.t b/t/labelname.t
-index a1362b1..ae731df 100755
---- a/t/labelname.t
-+++ b/t/labelname.t
-@@ -27,8 +27,8 @@ my $l4pconf = qq|
- |;
- Log::Log4perl->init(\$l4pconf);
- 
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- $biber->parse_ctrlfile("general1.bcf");
- $biber->set_output_obj(Biber::Output::bbl->new());
- 
-diff --git a/t/names.t b/t/names.t
-index 776ebf0..f14e48b 100755
---- a/t/names.t
-+++ b/t/names.t
-@@ -38,8 +38,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('namesep', 'und'); # Testing custom name splitting string
- Biber::Config->setoption('others_string', 'andere'); # Testing custom implied "et al"
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- Biber::Config->setblxoption('mincitenames', 3);
- 
- # Now generate the information
-diff --git a/t/options.t b/t/options.t
-index ae19a92..0d845ce 100755
---- a/t/options.t
-+++ b/t/options.t
-@@ -34,8 +34,9 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+
- # Testing customg xsv format sep
- Biber::Config->setoption('xsvsep', '\s*\|\s*');
- 
-diff --git a/t/related-entries.t b/t/related-entries.t
-index 273aa0b..bad2f1c 100755
---- a/t/related-entries.t
-+++ b/t/related-entries.t
-@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Now generate the information
- $biber->prepare;
-diff --git a/t/remote-files.t b/t/remote-files.t
-index 76bc4ff..4919522 100755
---- a/t/remote-files.t
-+++ b/t/remote-files.t
-@@ -41,8 +41,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- Biber::Config->setoption('quiet', 1);
- Biber::Config->setoption('nodieonerror', 1); # because the remote bibs might be messy
- 
-diff --git a/t/ris.t b/t/ris.t
-index f558891..97170d9 100755
---- a/t/ris.t
-+++ b/t/ris.t
-@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # THERE IS A CONFIG FILE BEING READ TO TEST USER MAPS TOO!
- 
-diff --git a/t/sections-complex.t b/t/sections-complex.t
-index 899b876..4d07f51 100755
---- a/t/sections-complex.t
-+++ b/t/sections-complex.t
-@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 1);
-diff --git a/t/sections.t b/t/sections.t
-index 4ed5a90..51d3ff8 100755
---- a/t/sections.t
-+++ b/t/sections.t
-@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
- Biber::Config->setoption('output_safechars', 1);
- 
-diff --git a/t/set-dynamic.t b/t/set-dynamic.t
-index d306f58..9ca03c6 100755
---- a/t/set-dynamic.t
-+++ b/t/set-dynamic.t
-@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- 
- # Now generate the information
- $biber->prepare;
-diff --git a/t/set-legacy.t b/t/set-legacy.t
-index 0fe1b22..70fedaa 100755
---- a/t/set-legacy.t
-+++ b/t/set-legacy.t
-@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
- 
- # Now generate the information
-diff --git a/t/set-static.t b/t/set-static.t
-index e9a3224..f292b05 100755
---- a/t/set-static.t
-+++ b/t/set-static.t
-@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
- 
- # Now generate the information
-diff --git a/t/skips.t b/t/skips.t
-index 23ff3c7..8c4cf3e 100755
---- a/t/skips.t
-+++ b/t/skips.t
-@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
- 
- # Now generate the information
-diff --git a/t/sort-case.t b/t/sort-case.t
-index d8269b6..4eace90 100755
---- a/t/sort-case.t
-+++ b/t/sort-case.t
-@@ -33,7 +33,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- Biber::Config->setoption('sortcase', 1);
- Biber::Config->setoption('sortupper', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- 
- $S =  [
-                                                 [
-diff --git a/t/sort-complex.t b/t/sort-complex.t
-index b8d2e12..3bd580c 100755
---- a/t/sort-complex.t
-+++ b/t/sort-complex.t
-@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- # relying on here for tests
- 
- # Biber options
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- # Want to ignore SHORTHAND* fields for the first few tests
- Biber::Config->setoption('sourcemap', [
-   {
-diff --git a/t/sort-order.t b/t/sort-order.t
-index 2590d32..27c5bf5 100755
---- a/t/sort-order.t
-+++ b/t/sort-order.t
-@@ -31,8 +31,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- 
- # Options - we could set these in the control file but it's nice to see what we're
- # relying on here for tests
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
- Biber::Config->setblxoption('labelyear', undef);
- Biber::Config->setblxoption('labelalpha', 0);
- 
-@@ -498,7 +498,7 @@ $main->set_sortscheme($S);
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Have to set locale to something which understand lexical/case differences for this test
- # otherwise testing on Windows doesn't work ...
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- $biber->prepare;
- $section = $biber->sections->get_section(0);
- is_deeply([$main->get_keys], ['L1B','L1','L1A','L2','L3','L4','L5','L7','L8','L9','L6'], 'location - sortcase=1');
-diff --git a/t/sort-uc.t b/t/sort-uc.t
-index ceb722b..33680ae 100755
---- a/t/sort-uc.t
-+++ b/t/sort-uc.t
-@@ -31,7 +31,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- 
- # Options - we could set these in the control file but it's nice to see what we're
- # relying on here for tests
--Biber::Config->setoption('sortlocale', 'sv_SE');
-+Biber::Config->setoption('sortlocale', 'sv_SE.UTF-8');
- 
- # U::C Swedish tailoring
- $biber->prepare;
-diff --git a/t/sorting.t b/t/sorting.t
-index c7ed9d5..3d878cf 100755
---- a/t/sorting.t
-+++ b/t/sorting.t
-@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- 
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- 
- my $yearoff1    = 'mm,,Knuth!Donald E,Computers Typesetting,1984,0000';
- my $yearoff2    = 'mm,,Knuth!Donald E,Computers Typesetting,198,0000';
-diff --git a/t/tool-bltxml.t b/t/tool-bltxml.t
-index 7bd62b9..9134f98 100644
---- a/t/tool-bltxml.t
-+++ b/t/tool-bltxml.t
-@@ -44,7 +44,7 @@ $out->set_output_target_file(\$outvar);
- Biber::Config->setoption('tool', 1);
- Biber::Config->setoption('output_resolve', 1);
- Biber::Config->setoption('output_format', 'biblatexml');
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- 
- # THERE IS A CONFIG FILE BEING READ!
- 
-diff --git a/t/tool.t b/t/tool.t
-index 8a4283b..22325d0 100755
---- a/t/tool.t
-+++ b/t/tool.t
-@@ -38,7 +38,7 @@ $biber->set_output_obj(Biber::Output::bibtex->new());
- Biber::Config->setoption('tool', 1);
- Biber::Config->setoption('output_resolve', 1);
- Biber::Config->setoption('output_format', 'bibtex');
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- 
- # THERE IS A CONFIG FILE BEING READ!
- 
-diff --git a/t/uniqueness.t b/t/uniqueness.t
-index 23eaf5b..b990e3b 100755
---- a/t/uniqueness.t
-+++ b/t/uniqueness.t
-@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- 
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- 
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 1);
-@@ -84,7 +84,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- 
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 1);
-@@ -111,7 +111,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- 
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 5);
-@@ -138,7 +138,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 2);
- Biber::Config->setblxoption('mincitenames', 1);
-@@ -157,7 +157,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('uniquename', 1);
- Biber::Config->setblxoption('uniquelist', 1);
-@@ -218,7 +218,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 1);
- Biber::Config->setblxoption('mincitenames', 1);
-@@ -247,7 +247,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 3);
- Biber::Config->setblxoption('mincitenames', 3);
-@@ -317,7 +317,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 3);
- Biber::Config->setblxoption('mincitenames', 1);
-@@ -357,7 +357,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 2);
- Biber::Config->setblxoption('mincitenames', 1);
-@@ -393,7 +393,7 @@ $biber->parse_ctrlfile('uniqueness5.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 1);
- Biber::Config->setblxoption('mincitenames', 1);
-@@ -422,7 +422,7 @@ $biber->parse_ctrlfile('uniqueness5.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('maxcitenames', 3);
- Biber::Config->setblxoption('mincitenames', 2);
-@@ -451,7 +451,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('uniquename', 1);
- Biber::Config->setblxoption('uniquelist', 0);
-@@ -480,7 +480,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('uniquename', 2);
- Biber::Config->setblxoption('uniquelist', 1);
-@@ -509,7 +509,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('uniquename', 0);
- Biber::Config->setblxoption('uniquelist', 0);
-@@ -538,7 +538,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('uniquename', 3);
- Biber::Config->setblxoption('uniquelist', 1);
-@@ -565,7 +565,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
- $biber->set_output_obj(Biber::Output::bbl->new());
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- # Biblatex options
- Biber::Config->setblxoption('uniquename', 4);
- Biber::Config->setblxoption('uniquelist', 1);
-diff --git a/t/xdata.t b/t/xdata.t
-index 2110639..49d0005 100644
---- a/t/xdata.t
-+++ b/t/xdata.t
-@@ -44,7 +44,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- 
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- Biber::Config->setoption('nodieonerror', 1); # because there is a cyclic xdata check
- 
- # Now generate the information
-diff --git a/t/zoterordfxml.t b/t/zoterordfxml.t
-index 09b5fa1..33e058e 100755
---- a/t/zoterordfxml.t
-+++ b/t/zoterordfxml.t
-@@ -37,7 +37,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
- 
- # Biber options
- Biber::Config->setoption('fastsort', 1);
--Biber::Config->setoption('sortlocale', 'C');
-+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
- 
- # Now generate the information
- $biber->prepare;
--- 
-2.5.0
-

diff --git a/biber.rpmlintrc b/biber.rpmlintrc
index f6ee413..48d7e09 100644
--- a/biber.rpmlintrc
+++ b/biber.rpmlintrc
@@ -1,4 +1,3 @@
-from Config import *
-addFilter("spelling-error .* (bibtex|biblatex|superset|texlive)")
-addFilter("-tests\.noarch: W: no-documentation")
-addFilter("-tests\.noarch: W: dangling-symlink /usr/libexec/biber/")
+addFilter('spelling-error .* (bibtex|biblatex|superset|texlive)')
+addFilter('-tests\.noarch: W: no-documentation')
+addFilter('-tests\.noarch: W: dangling-symlink /usr/libexec/biber/')

diff --git a/biber.spec b/biber.spec
index fdc0e54..ec342de 100644
--- a/biber.spec
+++ b/biber.spec
@@ -2,8 +2,8 @@
 %bcond_without biber_enables_extra_test
 
 Name:           biber
-Version:        2.16
-Release:        5%{?dist}
+Version:        2.17
+Release:        1%{?dist}
 Summary:        Command-line bibliographic manager, BibTeX replacement
 # bin/biber:        Artistic 2.0
 # data/texmap.xsl:  Artistic 2.0
@@ -263,6 +263,9 @@ export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print
 
 
 %changelog
+* Wed Jan 26 2022 Petr Pisar <ppisar@redhat.com> - 2.17-1
+- 2.17 bump
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.16-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

diff --git a/sources b/sources
index d4684e7..f4c5887 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v2.16.tar.gz) = 12b939c194e171f4e7d8e0341b6301b55be8376eab3aa3e14a72a780e5bd8f6d61fa601a95f99c9d17894b8c10a785ccc916b23593391ed00ef31e0a8c2a4662
+SHA512 (v2.17.tar.gz) = 5dc076b6a2e42986e54dbadbcdab5ff9c01235e301f8bd4e9b52b0b823f1939ebe881810fb138de9b6c2f06bb1e894e934769a6946da42ce1cba96415de06430

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-18 11:40 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-18 11:40 [rpms/biber] epel10.2: 2.17 bump 

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox