From b22d04f115b64301bf1a25d313038f6e5abede89 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 8 Feb 2023 10:18:47 +0700 Subject: [PATCH 1/2] fix: Update langtags schema for _conformance --- DevUtils/parse-langtags/langtags.schema.json | 25 +++++++++++++++++++- DistFiles/iso639.txt | 17 ++++++------- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/DevUtils/parse-langtags/langtags.schema.json b/DevUtils/parse-langtags/langtags.schema.json index 2d6dc4a8..30610671 100644 --- a/DevUtils/parse-langtags/langtags.schema.json +++ b/DevUtils/parse-langtags/langtags.schema.json @@ -9,7 +9,8 @@ {"$ref": "#/definitions/langtag"}, {"$ref": "#/definitions/_globalvar"}, {"$ref": "#/definitions/_phonvar"}, - {"$ref": "#/definitions/_version"} + {"$ref": "#/definitions/_version"}, + {"$ref": "#/definitions/_conformance"} ] }, "additionalItems": false }, @@ -150,6 +151,28 @@ "additionalProperties": false }, + "_conformance": { + "type": "object", + "properties": { + "tag": { + "type": "string", + "const": "_conformance" + }, + "regions": { + "type": "array", + "items": { "$ref": "#/definitions/iso3166_1" }, + "additionalItems": false + }, + "scripts": { + "type": "array", + "items": { "$ref": "#/definitions/iso15924" }, + "additionalItems": false + } + }, + "required": ["tag", "regions", "scripts"], + "additionalProperties": false + }, + "bcp47": { "type": "string", "pattern": "^(((en-GB-oed|i-ami|i-bnn|i-default|i-enochian|i-hak|i-klingon|i-lux|i-mingo|i-navajo|i-pwn|i-tao|i-tay|i-tsu|sgn-BE-FR|sgn-BE-NL|sgn-CH-DE)|(art-lojban|cel-gaulish|no-bok|no-nyn|zh-guoyu|zh-hakka|zh-min|zh-min-nan|zh-xiang)|(brv-(Thai|TH)-x-(dongluang|khongchiem|sakonnakon)|cek-(Latn-)?(MM-)?x-asangkhongso|cek-(Latn-)?(MM-)?x-khawngtuu|dao-(Latn-)?(MM-)?x-khengdaai|1901|1996|dgl-(Copt-)?(SD-)?x-oldnubian|ers-(Zzzz-)?(CN-)?x-ersushaba|fia-(Copt-)?(SD-)?x-oldnubian|mnc-(Mong-)?(CN-)?x-oldmanchu|nst-(Latn-)?(MM-)?x-moshanghawa|onw-(Copt-)?(SD-)?x-oldnubian|sgn-(Zxxx-)?MY-(Zxxx-)?MM|sgn-MY-Zxxx|sgn-Zxxx-MY-mm|tew-(Latn-)?(US-)?x-santaclara|tzo-(Latn-)?(MX-)?x-sanandres|tzo-(Latn-)?(MX-)?x-zinacantan|xnz-(Copt-)?(EG-)?x-oldnubian))|((([A-Za-z]{2,3}(-([A-Za-z]{3}(-[A-Za-z]{3}){0,2}))?)|[A-Za-z]{4}|[A-Za-z]{5,8})(-([A-Za-z]{4}))?(-([A-Za-z]{2}|[0-9]{3}))?(-([A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(-([0-9A-WY-Za-wy-z](-[A-Za-z0-9]{2,8})+))*(-(x(-[A-Za-z0-9]{1,8})+))?)|(x(-[A-Za-z0-9]{1,8})+))$" diff --git a/DistFiles/iso639.txt b/DistFiles/iso639.txt index 1d595753..22b10952 100644 --- a/DistFiles/iso639.txt +++ b/DistFiles/iso639.txt @@ -215,7 +215,7 @@ air|air|air|Airoran| ait|ait|ait|Arikem| aiw|aiw|aiw|Aari| aiw|aiw|aiw-Arab|Aari (Arab script)| -aiw|aiw|aiw-Ethi|Aari (Ethi script)|Aari +aiw|aiw|aiw-Ethi|Aari (Ethi script)|አፋን፡ኣሪ፡ aix|aix|aix|Aighon| aiy|aiy|aiy|Ali| aja|aja|aja|Aja| @@ -826,8 +826,7 @@ bhq|bhq|bhq|Tukang Besi South| bhr|bhr|bhr|Malagasy, Bara| bhs|bhs|bhs|Buwal| bht|bht|bht|Bhattiyali| -bht|bht|bht-Deva|Bhattiyali (Deva script)| -bht|bht|bht-Latn|Bhattiyali (Latn script)| +bht|bht|bht-Takr|Bhattiyali (Takr script)| bhu|bhu|bhu|Bhunjia| bhv|bhv|bhv|Bahau| bhw|bhw|bhw|Biak| @@ -3483,6 +3482,7 @@ kap|kap|kap|Bezhta| kaq|kaq|kaq|Capanahua|Capa Baquebo kav|kav|kav|Katukína| kaw|kaw|kaw|Kawi| +kaw|kaw|kaw-Bali|Kawi (Bali script)| kax|kax|kax|Kao| kay|kay|kay|Kamayurá| kba|kba|kba|Kalarko| @@ -5884,7 +5884,7 @@ oia|oia|oia|Oirata| oie|oie|oie|Okolie| oin|oin|oin|One, Inebu| oji|oji|oj|Ojibwa| -oji|oji|oj-Cans|Ojibwa (Cans script)| +oji|oji|oj-Latn|Ojibwa (Latn script)| ojb|ojb|ojb|Ojibwa, Northwestern| ojb|ojb|ojb-Cans|Ojibwa, Northwestern (Cans script)| ojc|ojc|ojc|Ojibwa, Central| @@ -6559,8 +6559,7 @@ ria|ria|ria|Riang| rie|rie|rie|Rien| rif|rif|rif|Tarifit| rif|rif|rif-Arab|Tarifit (Arab script)| -rif|rif|rif-Latn|Tarifit (Latn script)| -rif|rif|rif-NL|Tarifit (Netherlands)| +rif|rif|rif-Tfng|Tarifit (Tfng script)| ril|ril|ril|Riang Lang| rim|rim|rim|Nyaturu| rin|rin|rin|Nungu| @@ -6639,7 +6638,7 @@ rri|rri|rri|Ririo| rro|rro|rro|Waima| rrt|rrt|rrt|Arritinngithigh| rsb|rsb|rsb|Romano-Serbian| -||rsk|Ruthenian| +rsk|rsk|rsk|Ruthenian| rtc|rtc|rtc|Chin, Rungtu| rth|rth|rth|Ratahan| rtm|rtm|rtm|Rotuman| @@ -6783,8 +6782,8 @@ scv|scv|scv|Sheni| scw|scw|scw|Sya| scx|scx|scx|Sicel| snd|snd|sd|Sindhi|سنڌي -snd|snd|sd-Deva|Sindhi (Deva script)|सिन्धी snd|snd|sd-Guru|Sindhi (Guru script)| +snd|snd|sd-IN|Sindhi (India)|सिन्धी snd|snd|sd-Khoj|Sindhi (Khoj script)| snd|snd|sd-Khoj-PK|Sindhi (Khoj script, Pakistan)| snd|snd|sd-Sind|Sindhi (Sind script)| @@ -9082,6 +9081,7 @@ zho|zho|zh-BN|Chinese (Brunei Darussalam)| zho|zho|zh-Bopo|Chinese (Bopo script)| cmn|cmn|zh-Brai|Chinese, Mandarin (Brai script)| zho|zho|zh-CN|Chinese (China)|中文 +cmn|cmn|zh-ES|Chinese, Mandarin (Spain)| zho|zho|zh-GB|Chinese (United Kingdom)| zho|zho|zh-GF|Chinese (French Guiana)| zho|zho|zh-HK|Chinese (Hong Kong)|中文 @@ -9237,6 +9237,7 @@ zum|zum|zum|Kumzari| zun|zun|zun|Zuni| zuy|zuy|zuy|Zumaya| zwa|zwa|zwa-Ethi|Zay (Ethi script)| +zwa|zwa|zwa-Latn|Zay (Latn script)| zxx|zxx|zxx|No linguistic content| zyg|zyg|zyg|Zhuang, Yang| zyj|zyj|zyj|Zhuang, Youjiang| From 85db78af58ccd81f3f1122083cdfaa01ba3fa347 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Tue, 14 Feb 2023 11:52:55 +0700 Subject: [PATCH 2/2] fix: Print leading 0's for reference number --- Src/SA/Sa_Doc.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Src/SA/Sa_Doc.cpp b/Src/SA/Sa_Doc.cpp index bfc3220f..0ff0f499 100644 --- a/Src/SA/Sa_Doc.cpp +++ b/Src/SA/Sa_Doc.cpp @@ -5827,7 +5827,8 @@ void CSaDoc::AddReferenceData(CDlgAutoReferenceData & dlg, int selection) { // there are references for (int i = start; i < pGloss->GetOffsetSize(); i++) { CSaString text; - text.Format(L"%d", val); + // Format with leading 0's for compatibility with PA and Flex + text.Format(L"%03d", val); DWORD offset = pGloss->GetOffset(i); DWORD duration = pGloss->GetDuration(i); bool found = false;