diff --git a/scripts/geodata/i18n/transliteration_rules.py b/scripts/geodata/i18n/transliteration_rules.py index 092bde7e..5dcfe8a7 100644 --- a/scripts/geodata/i18n/transliteration_rules.py +++ b/scripts/geodata/i18n/transliteration_rules.py @@ -818,11 +818,11 @@ def get_all_transform_rules(): continue step_index = len(all_steps) num_steps = len(steps) - for step_type, data in steps: + for i, (step_type, data) in enumerate(steps): if step_type == STEP_RULESET: rule_index = len(all_rules) num_rules = len(data) - step = (STEP_RULESET, str(rule_index), str(num_rules), 'NULL') + step = (STEP_RULESET, str(rule_index), str(num_rules), quote_string(str(i))) all_rules.extend(data) elif step_type == STEP_TRANSFORM: step = (STEP_TRANSFORM, '-1', '-1', quote_string(data)) diff --git a/src/transliteration_data.c b/src/transliteration_data.c index 51575aae..153d2a95 100644 --- a/src/transliteration_data.c +++ b/src/transliteration_data.c @@ -6849,78 +6849,78 @@ transliteration_rule_source_t rules_source[] = { transliteration_step_source_t steps_source[] = { {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,0,103,NULL}, + {STEP_RULESET,0,103,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,103,67,NULL}, - {STEP_RULESET,170,1,NULL}, + {STEP_RULESET,103,67,"1"}, + {STEP_RULESET,170,1,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFKC"}, - {STEP_RULESET,171,90,NULL}, - {STEP_RULESET,261,47,NULL}, + {STEP_RULESET,171,90,"1"}, + {STEP_RULESET,261,47,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,308,88,NULL}, + {STEP_RULESET,308,88,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Gujarati-InterIndic"}, {STEP_TRANSFORM,-1,-1,"InterIndic-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,396,82,NULL}, + {STEP_RULESET,396,82,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFKD"}, - {STEP_RULESET,478,107,NULL}, + {STEP_RULESET,478,107,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, - {STEP_RULESET,585,45,NULL}, - {STEP_RULESET,630,76,NULL}, + {STEP_RULESET,585,45,"0"}, + {STEP_RULESET,630,76,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, - {STEP_RULESET,706,95,NULL}, + {STEP_RULESET,706,95,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,801,74,NULL}, + {STEP_RULESET,801,74,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,875,268,NULL}, + {STEP_RULESET,875,268,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Devanagari-InterIndic"}, {STEP_TRANSFORM,-1,-1,"InterIndic-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,1143,49,NULL}, - {STEP_RULESET,1192,3,NULL}, + {STEP_RULESET,1143,49,"1"}, + {STEP_RULESET,1192,3,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,1195,114,NULL}, + {STEP_RULESET,1195,114,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,1309,63,NULL}, + {STEP_RULESET,1309,63,"1"}, {STEP_TRANSFORM,-1,-1,"Han-Spacedhan"}, - {STEP_RULESET,1372,1597,NULL}, + {STEP_RULESET,1372,1597,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,2969,114,NULL}, + {STEP_RULESET,2969,114,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFKD"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, - {STEP_RULESET,3083,92,NULL}, + {STEP_RULESET,3083,92,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,3175,33,NULL}, + {STEP_RULESET,3175,33,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,3208,298,NULL}, - {STEP_RULESET,3506,342,NULL}, - {STEP_RULESET,3848,83,NULL}, + {STEP_RULESET,3208,298,"1"}, + {STEP_RULESET,3506,342,"0"}, + {STEP_RULESET,3848,83,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,3931,87,NULL}, + {STEP_RULESET,3931,87,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,4018,116,NULL}, + {STEP_RULESET,4018,116,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Tamil-InterIndic"}, {STEP_TRANSFORM,-1,-1,"InterIndic-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, - {STEP_RULESET,4134,64,NULL}, + {STEP_RULESET,4134,64,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,4198,70,NULL}, + {STEP_RULESET,4198,70,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Telugu-InterIndic"}, {STEP_TRANSFORM,-1,-1,"InterIndic-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, - {STEP_RULESET,4268,35,NULL}, + {STEP_RULESET,4268,35,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,4303,322,NULL}, - {STEP_RULESET,4625,83,NULL}, + {STEP_RULESET,4303,322,"1"}, + {STEP_RULESET,4625,83,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,4708,96,NULL}, + {STEP_RULESET,4708,96,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Hiragana-Katakana"}, @@ -6930,7 +6930,7 @@ transliteration_step_source_t steps_source[] = { {STEP_TRANSFORM,-1,-1,"InterIndic-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFKD"}, - {STEP_RULESET,4804,108,NULL}, + {STEP_RULESET,4804,108,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Kannada-InterIndic"}, @@ -6943,47 +6943,47 @@ transliteration_step_source_t steps_source[] = { {STEP_TRANSFORM,-1,-1,"ThaiLogical-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,4912,97,NULL}, + {STEP_RULESET,4912,97,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Oriya-InterIndic"}, {STEP_TRANSFORM,-1,-1,"InterIndic-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,5009,137,NULL}, + {STEP_RULESET,5009,137,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,5146,101,NULL}, + {STEP_RULESET,5146,101,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,5247,190,NULL}, + {STEP_RULESET,5247,190,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFKD"}, - {STEP_RULESET,5437,84,NULL}, + {STEP_RULESET,5437,84,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Malayalam-InterIndic"}, {STEP_TRANSFORM,-1,-1,"InterIndic-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, - {STEP_RULESET,5521,106,NULL}, + {STEP_RULESET,5521,106,"0"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,5627,79,NULL}, + {STEP_RULESET,5627,79,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, {STEP_TRANSFORM,-1,-1,"Gurmukhi-InterIndic"}, {STEP_TRANSFORM,-1,-1,"InterIndic-Latin"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFD"}, - {STEP_RULESET,5706,1,NULL}, + {STEP_RULESET,5706,1,"1"}, {STEP_UNICODE_NORMALIZATION,-1,-1,"NFC"}, - {STEP_RULESET,5707,681,NULL}, - {STEP_RULESET,6388,6,NULL}, - {STEP_RULESET,6394,86,NULL}, - {STEP_RULESET,6480,81,NULL}, - {STEP_RULESET,6561,75,NULL}, - {STEP_RULESET,6636,1,NULL}, + {STEP_RULESET,5707,681,"3"}, + {STEP_RULESET,6388,6,"0"}, + {STEP_RULESET,6394,86,"1"}, + {STEP_RULESET,6480,81,"0"}, + {STEP_RULESET,6561,75,"0"}, + {STEP_RULESET,6636,1,"0"}, {STEP_TRANSFORM,-1,-1,"Han-Spacedhan"}, - {STEP_RULESET,6637,38,NULL}, - {STEP_RULESET,6675,2,NULL}, + {STEP_RULESET,6637,38,"2"}, + {STEP_RULESET,6675,2,"3"}, {STEP_TRANSFORM,-1,-1,"Han-Latin"}, - {STEP_RULESET,6677,86,NULL}, - {STEP_RULESET,6763,81,NULL} + {STEP_RULESET,6677,86,"0"}, + {STEP_RULESET,6763,81,"0"} }; transliterator_source_t transliterators_source[] = {