Merge branch 'upstream' into debian/sid

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/sisu/v3/constants.rb b/lib/sisu/v3/constants.rb
index d94da654..57491a7c 100644
--- a/lib/sisu/v3/constants.rb
+++ b/lib/sisu/v3/constants.rb
@@ -147,20 +147,18 @@ Px[:lng_lst]=%w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi h
 Px[:lv1]=     '*'
 Px[:lv2]=     '='
 Px[:lv3]=     '='
-#Px[:lv2_3]=   '='
 Px[:lv4]=     '-'
 Px[:lv5]=     '.'
 Px[:lv6]=     '.'
-#Px[:lv5_6]=   '.'
-Db[:name_prefix]="SiSU#{SiSU_version_dir}c_"
-Db[:name_prefix_db]="sisu_#{SiSU_version_dir}c_"
+Db[:name_prefix]="SiSU#{SiSU_version_dir}d_"
+Db[:name_prefix_db]="sisu_#{SiSU_version_dir}d_"
 Db[:col_title]=800
 Db[:col_title_part]=400
 Db[:col_title_edition]=10
 Db[:col_name]=600
 Db[:col_creator_misc_short]=100
 Db[:col_language]=100
-Db[:col_language_char]=3
+Db[:col_language_char]=6
 Db[:col_date_text]=10
 Db[:col_classify_txt_long]=600
 Db[:col_classify_txt_short]=600
@@ -312,7 +310,7 @@ see polyglossia for subset
 * es_GA (Spanish, as spoken in Gabon)
 * es_GT (Spanish, as spoken in Guatemala)
 * es_HN (Spanish, as spoken in Honduras)
-* es_LA (Spanish, as spoken in Lao People's Democratic Republic)
+* es_LA (Spanish, as spoken in Lao People''s Democratic Republic)
 * es_MX (Spanish, as spoken in Mexico)
 * es_NI (Spanish, as spoken in Nicaragua)
 * es_PA (Spanish, as spoken in Panama)