Skip to content

Commit 72ccc96

Browse files
jowilcojowilco
authored
Updated TR42 to remove edit flags for revision 38 (#1199)
* Updated TR42 to remove edit flags for revision 38 * Replaced generate-id with an id based on title attribute and order of ucdxml:block
1 parent 5f85cbf commit 72ccc96

File tree

24 files changed

+648
-966
lines changed

24 files changed

+648
-966
lines changed

‎unicodetools/src/main/java/org/unicode/xml/GeneratePropertyValues.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public String getSyntax() {
111111
private static HashMap<String, TRDetails> syntaxTR57;
112112
private static final String NAMESPACE = "http://unicode.org/ns/2001/ucdxml";
113113
private static final String TR38URL = "https://www.unicode.org/reports/tr38/proposed.html";
114-
private static final String TR57URL = "https://www.unicode.org/reports/tr57/proposed.html";
114+
private static final String TR57URL = "https://www.unicode.org/reports/tr57/tr57-5d1.html";
115115
private static final UOption[] options = {
116116
UOption.HELP_H(),
117117
UOption.create("ucdversion", 'v', UOption.OPTIONAL_ARG),

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/InPC.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
attribute InPC { "Bottom"
55
| "Bottom_And_Left"
66
| "Bottom_And_Right"
7-
| <edit flag='changed'>"Invisible"</edit>
7+
| "Invisible"
88
| "Left"
99
| "Left_And_Right"
1010
| "NA"

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/InSC.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
| "Consonant_Placeholder"
1616
| "Consonant_Preceding_Repha"
1717
| "Consonant_Prefixed"
18-
| <edit flag='changed'>"Consonant_Repha"</edit>
18+
| "Consonant_Repha"
1919
| "Consonant_Subjoined"
2020
| "Consonant_Succeeding_Repha"
2121
| "Consonant_With_Stacker"

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/Nushu.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ucdxml:block xmlns:ucdxml="http://unicode.org/ns/2001/ucdxml" title="Nushu data" id='schema.nushu'>
33
code-point-attributes &amp;=
4-
attribute <edit flag='removed'>kSrc_NushuDuben</edit><edit flag='changed'>kNSHU_DubenSrc</edit> { xsd:string { pattern="[0-9]+\.[0-9]+" } }?
4+
attribute kNSHU_DubenSrc { xsd:string { pattern="[0-9]+\.[0-9]+" } }?
55

66
code-point-attributes &amp;=
7-
attribute <edit flag='removed'>kReading</edit><edit flag='changed'>kNSHU_Reading</edit> { xsd:string }?
7+
attribute kNSHU_Reading { xsd:string }?
88
</ucdxml:block>

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/Tangut.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ucdxml:block xmlns:ucdxml="http://unicode.org/ns/2001/ucdxml" title="Tangut data" id='schema.tangut'>
33
code-point-attributes &amp;=
4-
attribute <edit flag='removed'>kRSTUnicode</edit><edit flag='changed'>kTGT_RSUnicode</edit> { xsd:string { pattern="[0-9]+\.[0-9]+" } }?
4+
attribute kTGT_RSUnicode { xsd:string { pattern="[0-9]+\.[0-9]+" } }?
55

66
code-point-attributes &amp;=
77
attribute kTGT_MergedSrc

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/Unihan.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@
7272
code-point-attributes &amp;= attribute kGB5
7373
{ xsd:string { pattern="\d{4}" } }?
7474

75-
<edit flag='removed'> code-point-attributes &amp;= attribute kGB7
76-
{ xsd:string {pattern="[0-9A-F]{4}"} }?</edit>
77-
7875
code-point-attributes &amp;= attribute kGB8
7976
{ xsd:string { pattern="\d{4}" } }?
8077

@@ -187,9 +184,6 @@
187184
code-point-attributes &amp;= attribute kIRGKangXi
188185
{ list { xsd:string { pattern="[01]\d{3}\.[0-7]\d[01]" }+ } }?
189186

190-
<edit flag='removed'> code-point-attributes &amp;= attribute kJa
191-
{ list { xsd:string { pattern="[0-9A-F]{4}S?" }+ } }?</edit>
192-
193187
code-point-attributes &amp;= attribute kJapanese
194188
{ list { xsd:string { pattern="[\x{3041}-\x{3096}\x{3099}\x{309A}\x{30A1}-\x{30FA}\x{30FC}]+" }+ } }?
195189

@@ -308,8 +302,8 @@
308302
code-point-attributes &amp;= attribute kTang
309303
{ list { xsd:string { pattern="\*?[A-Za-z()\x{E6}\x{251}\x{259}\x{25B}\x{300}\x{30C}]+" }+ } }?
310304

311-
<edit flag='changed'> code-point-attributes &amp;= attribute kTayNumeric
312-
{ list { xsd:string { pattern="\d+" }+ } }?</edit>
305+
code-point-attributes &amp;= attribute kTayNumeric
306+
{ list { xsd:string { pattern="\d+" }+ } }?
313307

314308
code-point-attributes &amp;= attribute kTGH
315309
{ list { xsd:string { pattern="20\d{2}:[1-9]\d{0,3}" }+ } }?

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/Unikemet.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ucdxml:block xmlns:ucdxml="http://unicode.org/ns/2001/ucdxml" title="Unikemet data" id='schema.unikemet'>
3-
<edit flag='changed'> code-point-attributes &amp;= attribute kEH_Cat
3+
code-point-attributes &amp;= attribute kEH_Cat
44
{ xsd:string { pattern="([A-IK-Z]|AA)-\d{2}-\d{3}" } }?
55

66
code-point-attributes &amp;=
@@ -10,10 +10,10 @@
1010
{ xsd:string { pattern='[^\t"]+' } }?
1111

1212
code-point-attributes &amp;= attribute kEH_Func
13-
{ list { ("/" | xsd:string { pattern='[^\t"]+' } )+} }?
13+
{ list { ("/" | xsd:string { pattern='[^\t]+' } )+} }?
1414

1515
code-point-attributes &amp;= attribute kEH_FVal
16-
{ list { ("|" | xsd:string { pattern="[bdf-hjkmnpr-twy\.,/\-\+=;?>&amp;\(\)\{\}\s\x{303}\x{30C}\x{323}\x{32E}\x{331}\x{A723}\x{A725}\x{A7BD}]+" } )+} }?
16+
{ list { ("|" | xsd:string { pattern="[BDF-HJKMNPR-TWY-bdf-hjkmnpr-twy\.,/\-\+=;?>&amp;\(\)\{\}\s\x{303}\x{30C}\x{323}\x{32E}\x{331}\x{A722}\x{A723}\x{A724}\x{A725}\x{A7BC}\x{A7BD}]+" } )+} }?
1717

1818
code-point-attributes &amp;= attribute kEH_UniK
1919
{ xsd:string { pattern="([A-IK-Z]|AA|NL|NU)\d{3}[A-Z]{0,2}" }
@@ -38,5 +38,5 @@
3838
attribute kEH_NoRotate { boolean }?
3939

4040
code-point-attributes &amp;= attribute kEH_AltSeq
41-
{ xsd:string { pattern="[0-9A-F]{5}(\s[0-9A-F]{4,5})*" } }?</edit>
41+
{ xsd:string { pattern="[0-9A-F]{5}(\s[0-9A-F]{4,5})*" } }?
4242
</ucdxml:block>

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/age.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
| "14.0"
1818
| "15.0" | "15.1"
1919
| "16.0"
20-
| <edit flag='changed'>"17.0"</edit>
20+
| "17.0"
2121
| "unassigned"
2222
}?
2323
</ucdxml:block>

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/blk.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
| "Bassa_Vah"
2929
| "Batak"
3030
| "Bengali"
31-
| <edit flag='changed'>"Beria_Erfe"</edit>
31+
| "Beria_Erfe"
3232
| "Bhaiksuki"
3333
| "Block_Elements"
3434
| "Bopomofo"
@@ -61,7 +61,7 @@
6161
| "CJK_Ext_G"
6262
| "CJK_Ext_H"
6363
| "CJK_Ext_I"
64-
| <edit flag='changed'>"CJK_Ext_J"</edit>
64+
| "CJK_Ext_J"
6565
| "CJK_Radicals_Sup"
6666
| "CJK_Strokes"
6767
| "CJK_Symbols"
@@ -211,7 +211,7 @@
211211
| "Misc_Math_Symbols_B"
212212
| "Misc_Pictographs"
213213
| "Misc_Symbols"
214-
| <edit flag='changed'>"Misc_Symbols_Sup"</edit>
214+
| "Misc_Symbols_Sup"
215215
| "Misc_Technical"
216216
| "Modi"
217217
| "Modifier_Letters"
@@ -271,11 +271,11 @@
271271
| "Samaritan"
272272
| "Saurashtra"
273273
| "Sharada"
274-
| <edit flag='changed'>"Sharada_Sup"</edit>
274+
| "Sharada_Sup"
275275
| "Shavian"
276276
| "Shorthand_Format_Controls"
277277
| "Siddham"
278-
| <edit flag='changed'>"Sidetic"</edit>
278+
| "Sidetic"
279279
| "Sinhala"
280280
| "Sinhala_Archaic_Numbers"
281281
| "Small_Forms"
@@ -310,14 +310,14 @@
310310
| "Tai_Tham"
311311
| "Tai_Viet"
312312
| "Tai_Xuan_Jing"
313-
| <edit flag='changed'>"Tai_Yo"</edit>
313+
| "Tai_Yo"
314314
| "Takri"
315315
| "Tamil"
316316
| "Tamil_Sup"
317317
| "Tangsa"
318318
| "Tangut"
319319
| "Tangut_Components"
320-
| <edit flag='changed'>"Tangut_Components_Sup"</edit>
320+
| "Tangut_Components_Sup"
321321
| "Tangut_Sup"
322322
| "Telugu"
323323
| "Thaana"
@@ -326,7 +326,7 @@
326326
| "Tifinagh"
327327
| "Tirhuta"
328328
| "Todhri"
329-
| <edit flag='changed'>"Tolong_Siki"</edit>
329+
| "Tolong_Siki"
330330
| "Toto"
331331
| "Transport_And_Map"
332332
| "Tulu_Tigalari"

‎unicodetools/src/main/resources/org/unicode/uax42/fragments/boundaries.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
code-point-attributes &amp;=
1010
attribute OGr_Ext { boolean }?
1111

12-
<edit flag='removed'> code-point-attributes &amp;=
13-
attribute Gr_Link { boolean }?</edit>
14-
1512
code-point-attributes &amp;=
1613
attribute GCB { "CN" | "CR"
1714
| "EB" | "EBG" | "EM" | "EX"

0 commit comments

Comments
 (0)