2016-02-03 14:46:13 +01:00
|
|
|
|
With perl-5.18.2 macros like
|
|
|
|
|
|
|
|
|
|
{\v S}
|
|
|
|
|
\s S
|
|
|
|
|
|
2016-06-14 16:29:44 +02:00
|
|
|
|
do not work. Also fastsort causes trouble.
|
2016-02-03 14:46:13 +01:00
|
|
|
|
|
|
|
|
|
---
|
2016-06-14 16:29:44 +02:00
|
|
|
|
t/sort-order.t | 24 +-----------------------
|
2016-02-03 14:46:13 +01:00
|
|
|
|
t/tdata/names.bib | 4 ++--
|
|
|
|
|
t/utils.t | 2 +-
|
2016-06-14 16:29:44 +02:00
|
|
|
|
3 files changed, 4 insertions(+), 26 deletions(-)
|
2016-02-03 14:46:13 +01:00
|
|
|
|
|
|
|
|
|
--- t/utils.t
|
|
|
|
|
+++ t/utils.t 2016-02-03 11:03:21.266959058 +0000
|
|
|
|
|
@@ -66,7 +66,7 @@ eq_or_diff(File::Spec->canonpath(locate_
|
|
|
|
|
eq_or_diff(normalise_string('"a, b–c: d" ', 1), 'a bc d', 'normalise_string' );
|
|
|
|
|
|
|
|
|
|
Biber::Config->setoption('output_encoding', 'UTF-8');
|
|
|
|
|
-eq_or_diff(NFC(normalise_string_underscore(latex_decode('\c Se\x{c}\"ok-\foo{a}, N\`i\~no
|
|
|
|
|
+eq_or_diff(NFC(normalise_string_underscore(latex_decode('\c{S}e\x{c}\"ok-\foo{a}, N\`i\~no
|
|
|
|
|
$§+ :-) '), 0)), 'Şecöka_Nìño', 'normalise_string_underscore 1' );
|
|
|
|
|
|
|
|
|
|
eq_or_diff(normalise_string_underscore('{Foo de Bar, Graf Ludwig}', 1), 'Foo_de_Bar_Graf_Ludwig', 'normalise_string_underscore 3');
|
|
|
|
|
--- t/tdata/names.bib
|
|
|
|
|
+++ t/tdata/names.bib 2016-02-03 11:33:24.475937720 +0000
|
|
|
|
|
@@ -87,11 +87,11 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@BOOK{L21,
|
|
|
|
|
- AUTHOR = {{\v S}omeone Smith},
|
|
|
|
|
+ AUTHOR = {\v{S}omeone Smith},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@BOOK{L22,
|
|
|
|
|
- AUTHOR = {Someone {\v S}mith},
|
|
|
|
|
+ AUTHOR = {Someone \v{S}mith},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@BOOK{L23,
|
2016-06-14 16:29:44 +02:00
|
|
|
|
--- t/sort-order.t
|
|
|
|
|
+++ t/sort-order.t 2016-06-14 14:21:07.085073233 +0000
|
|
|
|
|
@@ -4,7 +4,7 @@ use warnings;
|
|
|
|
|
use utf8;
|
|
|
|
|
no warnings 'utf8';
|
|
|
|
|
|
|
|
|
|
-use Test::More tests => 15;
|
|
|
|
|
+use Test::More tests => 14;
|
|
|
|
|
|
|
|
|
|
use Biber;
|
|
|
|
|
use Biber::Output::bbl;
|
|
|
|
|
@@ -32,7 +32,6 @@ $biber->set_output_obj(Biber::Output::bb
|
|
|
|
|
# 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->setblxoption('labelyear', undef);
|
|
|
|
|
Biber::Config->setblxoption('labelalpha', 0);
|
|
|
|
|
|
|
|
|
|
@@ -482,27 +481,6 @@ $section = $biber->sections->get_section
|
|
|
|
|
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', 'C.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 => [
|
|
|
|
|
[
|