Skip to content

Commit 5056fb7

Browse files
macchiatimacchiati
committed
Minor cleanup
1 parent 5d876cb commit 5056fb7

File tree

6 files changed

+93
-99
lines changed

6 files changed

+93
-99
lines changed

‎unicodetools/data/linkification/dev/LinkBracket.txt‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# LinkBracket.txt
2-
# Date: 2025-12-14, 02:36:55 GMT
2+
# Date: 2025-12-14, 06:29:27 GMT
33
# © 2025 Unicode®, Inc.
44
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
55
# For terms of use and license, see https://www.unicode.org/terms_of_use.html
@@ -27,69 +27,69 @@
2727
#
2828
# ================================================
2929

30-
0029 ; 0028 #1.1 () ⇒ () RIGHT PARENTHESIS
31-
003E ; 003C #1.1 (> ⇒ <) GREATER-THAN SIGN
32-
005D ; 005B #1.1 (] ⇒ [) RIGHT SQUARE BRACKET
33-
007D ; 007B #1.1 (} ⇒ {) RIGHT CURLY BRACKET
34-
0F3B ; 0F3A #2.0 (༻ ⇒ ༺) TIBETAN MARK GUG RTAGS GYAS
35-
0F3D ; 0F3C #2.0 (༽ ⇒ ༼) TIBETAN MARK ANG KHANG GYAS
36-
169C ; 169B #3.0 (᚜ ⇒ ᚛) OGHAM REVERSED FEATHER MARK
37-
2046 ; 2045 #1.1 (⁆ ⇒ ⁅) RIGHT SQUARE BRACKET WITH QUILL
38-
207E ; 207D #1.1 (⁾ ⇒ ⁽) SUPERSCRIPT RIGHT PARENTHESIS
39-
208E ; 208D #1.1 (₎ ⇒ ₍) SUBSCRIPT RIGHT PARENTHESIS
40-
2309 ; 2308 #1.1 (⌉ ⇒ ⌈) RIGHT CEILING
41-
230B ; 230A #1.1 (⌋ ⇒ ⌊) RIGHT FLOOR
42-
2769 ; 2768 #3.2 (❩ ⇒ ❨) MEDIUM RIGHT PARENTHESIS ORNAMENT
43-
276B ; 276A #3.2 (❫ ⇒ ❪) MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT
44-
276D ; 276C #3.2 (❭ ⇒ ❬) MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT
45-
276F ; 276E #3.2 (❯ ⇒ ❮) HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
46-
2771 ; 2770 #3.2 (❱ ⇒ ❰) HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
47-
2773 ; 2772 #3.2 (❳ ⇒ ❲) LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
48-
2775 ; 2774 #3.2 (❵ ⇒ ❴) MEDIUM RIGHT CURLY BRACKET ORNAMENT
49-
27C6 ; 27C5 #4.1 (⟆ ⇒ ⟅) RIGHT S-SHAPED BAG DELIMITER
50-
27E7 ; 27E6 #3.2 (⟧ ⇒ ⟦) MATHEMATICAL RIGHT WHITE SQUARE BRACKET
51-
27E9 ; 27E8 #3.2 (⟩ ⇒ ⟨) MATHEMATICAL RIGHT ANGLE BRACKET
52-
27EB ; 27EA #3.2 (⟫ ⇒ ⟪) MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
53-
27ED ; 27EC #5.1 (⟭ ⇒ ⟬) MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
54-
27EF ; 27EE #5.1 (⟯ ⇒ ⟮) MATHEMATICAL RIGHT FLATTENED PARENTHESIS
55-
2984 ; 2983 #3.2 (⦄ ⇒ ⦃) RIGHT WHITE CURLY BRACKET
56-
2986 ; 2985 #3.2 (⦆ ⇒ ⦅) RIGHT WHITE PARENTHESIS
57-
2988 ; 2987 #3.2 (⦈ ⇒ ⦇) Z NOTATION RIGHT IMAGE BRACKET
58-
298A ; 2989 #3.2 (⦊ ⇒ ⦉) Z NOTATION RIGHT BINDING BRACKET
59-
298C ; 298B #3.2 (⦌ ⇒ ⦋) RIGHT SQUARE BRACKET WITH UNDERBAR
60-
298E ; 298F #3.2 (⦎ ⇒ ⦏) RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
61-
2990 ; 298D #3.2 (⦐ ⇒ ⦍) RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
62-
2992 ; 2991 #3.2 (⦒ ⇒ ⦑) RIGHT ANGLE BRACKET WITH DOT
63-
2994 ; 2993 #3.2 (⦔ ⇒ ⦓) RIGHT ARC GREATER-THAN BRACKET
64-
2996 ; 2995 #3.2 (⦖ ⇒ ⦕) DOUBLE RIGHT ARC LESS-THAN BRACKET
65-
2998 ; 2997 #3.2 (⦘ ⇒ ⦗) RIGHT BLACK TORTOISE SHELL BRACKET
66-
29D9 ; 29D8 #3.2 (⧙ ⇒ ⧘) RIGHT WIGGLY FENCE
67-
29DB ; 29DA #3.2 (⧛ ⇒ ⧚) RIGHT DOUBLE WIGGLY FENCE
68-
29FD ; 29FC #3.2 (⧽ ⇒ ⧼) RIGHT-POINTING CURVED ANGLE BRACKET
69-
2E23 ; 2E22 #5.1 (⸣ ⇒ ⸢) TOP RIGHT HALF BRACKET
70-
2E25 ; 2E24 #5.1 (⸥ ⇒ ⸤) BOTTOM RIGHT HALF BRACKET
71-
2E27 ; 2E26 #5.1 (⸧ ⇒ ⸦) RIGHT SIDEWAYS U BRACKET
72-
2E29 ; 2E28 #5.1 (⸩ ⇒ ⸨) RIGHT DOUBLE PARENTHESIS
73-
2E56 ; 2E55 #14.0 (⹖ ⇒ ⹕) RIGHT SQUARE BRACKET WITH STROKE
74-
2E58 ; 2E57 #14.0 (⹘ ⇒ ⹗) RIGHT SQUARE BRACKET WITH DOUBLE STROKE
75-
2E5A ; 2E59 #14.0 (⹚ ⇒ ⹙) TOP HALF RIGHT PARENTHESIS
76-
2E5C ; 2E5B #14.0 (⹜ ⇒ ⹛) BOTTOM HALF RIGHT PARENTHESIS
77-
3009 ; 3008 #1.1 (〉 ⇒ 〈) RIGHT ANGLE BRACKET
78-
300B ; 300A #1.1 (》 ⇒ 《) RIGHT DOUBLE ANGLE BRACKET
79-
300D ; 300C #1.1 (」 ⇒ 「) RIGHT CORNER BRACKET
80-
300F ; 300E #1.1 (』 ⇒ 『) RIGHT WHITE CORNER BRACKET
81-
3011 ; 3010 #1.1 (】 ⇒ 【) RIGHT BLACK LENTICULAR BRACKET
82-
3015 ; 3014 #1.1 (〕 ⇒ 〔) RIGHT TORTOISE SHELL BRACKET
83-
3017 ; 3016 #1.1 (〗 ⇒ 〖) RIGHT WHITE LENTICULAR BRACKET
84-
3019 ; 3018 #1.1 (〙 ⇒ 〘) RIGHT WHITE TORTOISE SHELL BRACKET
85-
301B ; 301A #1.1 (〛 ⇒ 〚) RIGHT WHITE SQUARE BRACKET
86-
FE5A ; FE59 #1.1 (﹚ ⇒ ﹙) SMALL RIGHT PARENTHESIS
87-
FE5C ; FE5B #1.1 (﹜ ⇒ ﹛) SMALL RIGHT CURLY BRACKET
88-
FE5E ; FE5D #1.1 (﹞ ⇒ ﹝) SMALL RIGHT TORTOISE SHELL BRACKET
89-
FF09 ; FF08 #1.1 (） ⇒ （) FULLWIDTH RIGHT PARENTHESIS
90-
FF3D ; FF3B #1.1 (］ ⇒ ［) FULLWIDTH RIGHT SQUARE BRACKET
91-
FF5D ; FF5B #1.1 (｝ ⇒ ｛) FULLWIDTH RIGHT CURLY BRACKET
92-
FF60 ; FF5F #3.2 (｠ ⇒ ｟) FULLWIDTH RIGHT WHITE PARENTHESIS
93-
FF63 ; FF62 #1.1 (｣ ⇒ ｢) HALFWIDTH RIGHT CORNER BRACKET
30+
0029 ; 0028 #1.1 () ⇒ () RIGHT PARENTHESIS
31+
003E ; 003C #1.1 (> ⇒ <) GREATER-THAN SIGN
32+
005D ; 005B #1.1 (] ⇒ [) RIGHT SQUARE BRACKET
33+
007D ; 007B #1.1 (} ⇒ {) RIGHT CURLY BRACKET
34+
0F3B ; 0F3A #2.0 (༻ ⇒ ༺) TIBETAN MARK GUG RTAGS GYAS
35+
0F3D ; 0F3C #2.0 (༽ ⇒ ༼) TIBETAN MARK ANG KHANG GYAS
36+
169C ; 169B #3.0 (᚜ ⇒ ᚛) OGHAM REVERSED FEATHER MARK
37+
2046 ; 2045 #1.1 (⁆ ⇒ ⁅) RIGHT SQUARE BRACKET WITH QUILL
38+
207E ; 207D #1.1 (⁾ ⇒ ⁽) SUPERSCRIPT RIGHT PARENTHESIS
39+
208E ; 208D #1.1 (₎ ⇒ ₍) SUBSCRIPT RIGHT PARENTHESIS
40+
2309 ; 2308 #1.1 (⌉ ⇒ ⌈) RIGHT CEILING
41+
230B ; 230A #1.1 (⌋ ⇒ ⌊) RIGHT FLOOR
42+
2769 ; 2768 #3.2 (❩ ⇒ ❨) MEDIUM RIGHT PARENTHESIS ORNAMENT
43+
276B ; 276A #3.2 (❫ ⇒ ❪) MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT
44+
276D ; 276C #3.2 (❭ ⇒ ❬) MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT
45+
276F ; 276E #3.2 (❯ ⇒ ❮) HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
46+
2771 ; 2770 #3.2 (❱ ⇒ ❰) HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
47+
2773 ; 2772 #3.2 (❳ ⇒ ❲) LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
48+
2775 ; 2774 #3.2 (❵ ⇒ ❴) MEDIUM RIGHT CURLY BRACKET ORNAMENT
49+
27C6 ; 27C5 #4.1 (⟆ ⇒ ⟅) RIGHT S-SHAPED BAG DELIMITER
50+
27E7 ; 27E6 #3.2 (⟧ ⇒ ⟦) MATHEMATICAL RIGHT WHITE SQUARE BRACKET
51+
27E9 ; 27E8 #3.2 (⟩ ⇒ ⟨) MATHEMATICAL RIGHT ANGLE BRACKET
52+
27EB ; 27EA #3.2 (⟫ ⇒ ⟪) MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
53+
27ED ; 27EC #5.1 (⟭ ⇒ ⟬) MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
54+
27EF ; 27EE #5.1 (⟯ ⇒ ⟮) MATHEMATICAL RIGHT FLATTENED PARENTHESIS
55+
2984 ; 2983 #3.2 (⦄ ⇒ ⦃) RIGHT WHITE CURLY BRACKET
56+
2986 ; 2985 #3.2 (⦆ ⇒ ⦅) RIGHT WHITE PARENTHESIS
57+
2988 ; 2987 #3.2 (⦈ ⇒ ⦇) Z NOTATION RIGHT IMAGE BRACKET
58+
298A ; 2989 #3.2 (⦊ ⇒ ⦉) Z NOTATION RIGHT BINDING BRACKET
59+
298C ; 298B #3.2 (⦌ ⇒ ⦋) RIGHT SQUARE BRACKET WITH UNDERBAR
60+
298E ; 298F #3.2 (⦎ ⇒ ⦏) RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
61+
2990 ; 298D #3.2 (⦐ ⇒ ⦍) RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
62+
2992 ; 2991 #3.2 (⦒ ⇒ ⦑) RIGHT ANGLE BRACKET WITH DOT
63+
2994 ; 2993 #3.2 (⦔ ⇒ ⦓) RIGHT ARC GREATER-THAN BRACKET
64+
2996 ; 2995 #3.2 (⦖ ⇒ ⦕) DOUBLE RIGHT ARC LESS-THAN BRACKET
65+
2998 ; 2997 #3.2 (⦘ ⇒ ⦗) RIGHT BLACK TORTOISE SHELL BRACKET
66+
29D9 ; 29D8 #3.2 (⧙ ⇒ ⧘) RIGHT WIGGLY FENCE
67+
29DB ; 29DA #3.2 (⧛ ⇒ ⧚) RIGHT DOUBLE WIGGLY FENCE
68+
29FD ; 29FC #3.2 (⧽ ⇒ ⧼) RIGHT-POINTING CURVED ANGLE BRACKET
69+
2E23 ; 2E22 #5.1 (⸣ ⇒ ⸢) TOP RIGHT HALF BRACKET
70+
2E25 ; 2E24 #5.1 (⸥ ⇒ ⸤) BOTTOM RIGHT HALF BRACKET
71+
2E27 ; 2E26 #5.1 (⸧ ⇒ ⸦) RIGHT SIDEWAYS U BRACKET
72+
2E29 ; 2E28 #5.1 (⸩ ⇒ ⸨) RIGHT DOUBLE PARENTHESIS
73+
2E56 ; 2E55 #14.0 (⹖ ⇒ ⹕) RIGHT SQUARE BRACKET WITH STROKE
74+
2E58 ; 2E57 #14.0 (⹘ ⇒ ⹗) RIGHT SQUARE BRACKET WITH DOUBLE STROKE
75+
2E5A ; 2E59 #14.0 (⹚ ⇒ ⹙) TOP HALF RIGHT PARENTHESIS
76+
2E5C ; 2E5B #14.0 (⹜ ⇒ ⹛) BOTTOM HALF RIGHT PARENTHESIS
77+
3009 ; 3008 #1.1 (〉 ⇒ 〈) RIGHT ANGLE BRACKET
78+
300B ; 300A #1.1 (》 ⇒ 《) RIGHT DOUBLE ANGLE BRACKET
79+
300D ; 300C #1.1 (」 ⇒ 「) RIGHT CORNER BRACKET
80+
300F ; 300E #1.1 (』 ⇒ 『) RIGHT WHITE CORNER BRACKET
81+
3011 ; 3010 #1.1 (】 ⇒ 【) RIGHT BLACK LENTICULAR BRACKET
82+
3015 ; 3014 #1.1 (〕 ⇒ 〔) RIGHT TORTOISE SHELL BRACKET
83+
3017 ; 3016 #1.1 (〗 ⇒ 〖) RIGHT WHITE LENTICULAR BRACKET
84+
3019 ; 3018 #1.1 (〙 ⇒ 〘) RIGHT WHITE TORTOISE SHELL BRACKET
85+
301B ; 301A #1.1 (〛 ⇒ 〚) RIGHT WHITE SQUARE BRACKET
86+
FE5A ; FE59 #1.1 (﹚ ⇒ ﹙) SMALL RIGHT PARENTHESIS
87+
FE5C ; FE5B #1.1 (﹜ ⇒ ﹛) SMALL RIGHT CURLY BRACKET
88+
FE5E ; FE5D #1.1 (﹞ ⇒ ﹝) SMALL RIGHT TORTOISE SHELL BRACKET
89+
FF09 ; FF08 #1.1 (） ⇒ （) FULLWIDTH RIGHT PARENTHESIS
90+
FF3D ; FF3B #1.1 (］ ⇒ ［) FULLWIDTH RIGHT SQUARE BRACKET
91+
FF5D ; FF5B #1.1 (｝ ⇒ ｛) FULLWIDTH RIGHT CURLY BRACKET
92+
FF60 ; FF5F #3.2 (｠ ⇒ ｟) FULLWIDTH RIGHT WHITE PARENTHESIS
93+
FF63 ; FF62 #1.1 (｣ ⇒ ｢) HALFWIDTH RIGHT CORNER BRACKET
9494

9595
# Total code points: 64

‎unicodetools/data/linkification/dev/LinkDetectionTest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# LinkDetectionTest.txt
2-
# Date: 2025-12-14, 02:36:55 GMT
2+
# Date: 2025-12-14, 06:29:27 GMT
33
# © 2025 Unicode®, Inc.
44
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
55
# For terms of use and license, see https://www.unicode.org/terms_of_use.html

‎unicodetools/data/linkification/dev/LinkEmail.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# LinkEmail.txt
2-
# Date: 2025-12-14, 02:36:55 GMT
2+
# Date: 2025-12-14, 06:29:27 GMT
33
# © 2025 Unicode®, Inc.
44
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
55
# For terms of use and license, see https://www.unicode.org/terms_of_use.html

‎unicodetools/data/linkification/dev/LinkFormattingTest.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# LinkFormattingTest.txt
2-
# Date: 2025-12-14, 02:36:55 GMT
2+
# Date: 2025-12-14, 06:29:27 GMT
33
# © 2025 Unicode®, Inc.
44
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
55
# For terms of use and license, see https://www.unicode.org/terms_of_use.html

‎unicodetools/data/linkification/dev/LinkTerm.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# LinkTerm.txt
2-
# Date: 2025-12-14, 02:36:55 GMT
2+
# Date: 2025-12-14, 06:29:27 GMT
33
# © 2025 Unicode®, Inc.
44
# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
55
# For terms of use and license, see https://www.unicode.org/terms_of_use.html

‎unicodetools/src/main/java/org/unicode/props/BagFormatter.java‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -741,48 +741,42 @@ private void showLine(int start, int end) {
741741
}
742742

743743
private String insertLiteral(String thing) {
744-
return (showLiteral == null
745-
? ""
746-
: " \t(" + showLiteral.transliterate(thing) + showValue(thing) + ") ");
744+
if (showLiteral == null) {
745+
return "";
746+
}
747+
return " \t(" + showLiteral.transliterate(thing) + showValue(thing);
747748
}
748749

749750
private String showValue(String source) {
750-
return showValueInComment
751-
? " ⇒ "
752-
+ showLiteral.transliterate(
753-
getValueSource().getValue(source.codePointAt(0), false))
754-
: "";
751+
if (!showValueInComment) {
752+
return ") ";
753+
}
754+
String value = getValueSource().getValue(source.codePointAt(0), false);
755+
return " ⇒ " + showLiteral.transliterate(value) + ") ";
755756
}
756757

757758
private String showValue(int start, int end) {
759+
if (!showValueInComment) {
760+
return ") ";
761+
}
758762
String startValue = getValueSource().getValue(start, false);
759763
String endValue = getValueSource().getValue(end, false);
760-
return showValueInComment
761-
? " ⇒ "
762-
+ showLiteral.transliterate(startValue)
763-
+ (startValue != endValue
764-
? ".." + showLiteral.transliterate(endValue)
765-
: "")
766-
: "";
764+
return " ⇒ "
765+
+ showLiteral.transliterate(startValue)
766+
+ (startValue == endValue
767+
? ") "
768+
: ".." + showLiteral.transliterate(endValue) + ") ");
767769
}
768770

769771
private String insertLiteral(int start, int end, String value) {
770-
return (showLiteral == null
771-
? ""
772-
: " \t("
773-
+ showLiteral.transliterate(UTF16.valueOf(start))
774-
+ ((start != end)
775-
? (".." + showLiteral.transliterate(UTF16.valueOf(end)))
776-
: "")
777-
+ showValue(start, end)
778-
+ ") ");
779-
}
780-
/*
781-
private String insertLiteral(int cp) {
782-
return (showLiteral == null ? ""
783-
: " \t(" + showLiteral.transliterate(UTF16.valueOf(cp)) + ") ");
772+
if (showLiteral == null) {
773+
return "";
774+
}
775+
return " \t("
776+
+ showLiteral.transliterate(UTF16.valueOf(start))
777+
+ (start == end ? "" : (".." + showLiteral.transliterate(UTF16.valueOf(end))))
778+
+ showValue(start, end);
784779
}
785-
*/
786780
}
787781

788782
/**

0 commit comments

Comments
 (0)