Changes to en-ueb-chardefs.cti and en-ueb-g2.ctb
- en-ueb-chardefs.cti: U+2019 (right single quote) between letters should
be treated as apostrophe
- en-ueb-g2.ctb: Add U+2015 (horizontal bar) as a sequence delimiter;
add variant of where'er with U+2019
Added a selection of test cases for U+2019 instead of apostrophe.
diff --git a/tables/en-ueb-chardefs.uti b/tables/en-ueb-chardefs.uti
index 69f93f1..942cc76 100644
--- a/tables/en-ueb-chardefs.uti
+++ b/tables/en-ueb-chardefs.uti
@@ -483,6 +483,7 @@
punctuation \x2015 5-6-36 ―
noback punctuation \x2018 6-236 ‘
noback punctuation \x2019 6-356 ’
+match %a \x2019 %a 3 # single quote between letters is really apostrophe
punctuation \x201c 236 “
punctuation \x201d 356 ”
sign \x2020 4-6-1456 † dagger
diff --git a/tables/en-ueb-g2.ctb b/tables/en-ueb-g2.ctb
index 7a8af7c..f280a0d 100644
--- a/tables/en-ueb-g2.ctb
+++ b/tables/en-ueb-g2.ctb
@@ -1367,6 +1367,7 @@
always where 5-156
sufword where'er 156-12456-15-3-12456
+sufword where’er 156-12456-15-3-12456
sufword whereupon 5-156-45-136
sufword wherever 156-12456-5-15
diff --git a/tests/braille-specs/en-ueb-g2-dictionary_harness.yaml b/tests/braille-specs/en-ueb-g2-dictionary_harness.yaml
index d61d33d..4730a2f 100644
--- a/tests/braille-specs/en-ueb-g2-dictionary_harness.yaml
+++ b/tests/braille-specs/en-ueb-g2-dictionary_harness.yaml
@@ -40449,6 +40449,7 @@
- [dérailleurs, ⠙⠘⠌⠑⠗⠁⠊⠇⠇⠑⠥⠗⠎]
- [détente, ⠙⠘⠌⠑⠞⠢⠞⠑]
- [e, ⠰⠑]
+ - [e'en, ⠑⠄⠢]
- [e'er, ⠑⠄⠻]
- [eBay, ⠑⠠⠃⠁⠽]
- [eBay's, ⠑⠠⠃⠁⠽⠄⠎]
@@ -64629,6 +64630,7 @@
- [mordant's, ⠍⠕⠗⠙⠁⠝⠞⠄⠎]
- [mordants, ⠍⠕⠗⠙⠁⠝⠞⠎]
- [more, ⠍]
+ - [more'n, ⠍⠕⠗⠑⠄⠝]
- [more's, ⠍⠄⠎]
- [moreover, ⠍⠕⠗⠑⠕⠧⠻]
- [mores, ⠍⠕⠗⠑⠎]
@@ -93830,6 +93832,7 @@
- [this, ⠹]
- [this'd, ⠹⠄⠙]
- [this'll, ⠹⠄⠇⠇]
+ - [this'n, ⠹⠊⠎⠄⠝]
- [this's, ⠹⠄⠎]
- [thistle, ⠹⠊⠌⠇⠑]
- [thistle's, ⠹⠊⠌⠇⠑⠄⠎]
@@ -101172,6 +101175,7 @@
- [whens, ⠱⠢⠎]
- [whensomever, ⠱⠢⠎⠕⠍⠐⠑]
- [where, ⠐⠱]
+ - [where'er, ⠱⠻⠑⠄⠻]
- [where's, ⠐⠱⠄⠎]
- [whereabouts, ⠐⠱⠁⠃⠎]
- [whereabouts's, ⠐⠱⠁⠃⠎⠄⠎]
@@ -102928,4 +102932,47 @@
- [épées, ⠘⠌⠑⠏⠘⠌⠑⠑⠎]
- [étude, ⠘⠌⠑⠞⠥⠙⠑]
- [études, ⠘⠌⠑⠞⠥⠙⠑⠎]
-
\ No newline at end of file
+# The following words are copies of the above with \x2019 as the apostrophe
+flags: {testmode: forward}
+tests:
+ - [I’d, ⠠⠊⠄⠙]
+ - [I’ll, ⠠⠊⠄⠇⠇]
+ - [I’m, ⠠⠊⠄⠍]
+ - [I’s, ⠠⠊⠄⠎]
+ - [I’ve, ⠠⠊⠄⠧⠑]
+ - [L’s, ⠰⠠⠇⠄⠎]
+ - [O’Brien, ⠠⠕⠄⠠⠃⠗⠊⠢]
+ - [O’Hara, ⠠⠕⠄⠠⠓⠜⠁]
+ - [bo’s’n, ⠃⠕⠄⠎⠄⠝]
+ - [bo’s’n’s, ⠃⠕⠄⠎⠄⠝⠄⠎]
+ - [bo’s’ns, ⠃⠕⠄⠎⠄⠝⠎]
+ - [d’Arezzo, ⠙⠄⠠⠜⠑⠵⠵⠕]
+ - [d’Estaing, ⠙⠄⠠⠑⠌⠁⠬]
+ - [d’you, ⠙⠄⠽⠳]
+ - [e’en, ⠑⠄⠢]
+ - [e’er, ⠑⠄⠻]
+ - [ma’am, ⠍⠁⠄⠁⠍]
+ - [more’n, ⠍⠕⠗⠑⠄⠝]
+ - [ne’er, ⠝⠑⠄⠻]
+ - [o’clock, ⠕⠄⠉⠇⠕⠉⠅]
+ - [o’er, ⠕⠄⠻]
+ - [that’d, ⠞⠄⠙]
+ - [that’ll, ⠞⠄⠇⠇]
+ - [that’re, ⠞⠄⠗⠑]
+ - [that’s, ⠞⠄⠎]
+ - [that’ve, ⠞⠄⠧⠑]
+ - [this’d, ⠹⠄⠙]
+ - [this’ll, ⠹⠄⠇⠇]
+ - [this’n, ⠹⠊⠎⠄⠝]
+ - [this’s, ⠹⠄⠎]
+ - [where’er, ⠱⠻⠑⠄⠻]
+ - [where’s, ⠐⠱⠄⠎]
+ - [would’ve, ⠺⠙⠄⠧⠑]
+ - [wouldn’t, ⠺⠙⠝⠄⠞]
+ - [y’all, ⠽⠄⠁⠇⠇]
+ - [you’d, ⠽⠄⠙]
+ - [you’ll, ⠽⠄⠇⠇]
+ - [you’m, ⠽⠳⠄⠍]
+ - [you’re, ⠽⠄⠗⠑]
+ - [you’s, ⠽⠄⠎]
+ - [you’ve, ⠽⠄⠧⠑]