From 96683a3329dad65a945833c90b59d085b8313f00 Mon Sep 17 00:00:00 2001 From: Jan Hegr Date: Fri, 30 Mar 2018 17:15:15 +0200 Subject: [PATCH] Dropped multiple include; fixed curly brackets and number sign representation; added copyright sign; added tests. --- tables/cs-chardefs.cti | 7 +++--- tables/cs.tbl | 1 - tests/Makefile.am | 1 + tests/braille-specs/Makefile.am | 1 + tests/braille-specs/cs_harness.yaml | 38 +++++++++++++++++++++++++++++ 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 tests/braille-specs/cs_harness.yaml diff --git a/tables/cs-chardefs.cti b/tables/cs-chardefs.cti index c994381f8e..d859859053 100644 --- a/tables/cs-chardefs.cti +++ b/tables/cs-chardefs.cti @@ -50,7 +50,7 @@ space \x0020 0 SPACE punctuation \x0021 235 ! EXCLAMATION MARK punctuation \x0022 2356 " QUOTATION MARK -sign \x0023 3456 # NUMBER SIGN +sign \x0023 6-3456 # NUMBER SIGN punctuation \x0027 4 ' APOSTROPHE punctuation \x0028 236 ( LEFT PARENTHESIS punctuation \x0029 356 ) RIGHT PARENTHESIS @@ -76,6 +76,7 @@ sign \x007C 456 | VERTICAL LINE # ---------------------------------------------------------------------------------------------- space \x00A0 a   NO-BREAK SPACE +sign \x00A9 1246-2456-6-14 © COPYRIGHT SIGN punctuation \x00AD 36 ­ SOFT HYPHEN math \x00B1 256-36 ± PLUS-MINUS SIGN sign \x00B4 4 ´ ACUTE ACCENT @@ -120,8 +121,8 @@ sign \x005C 3456-1256 \ REVERSE SOLIDU punctuation \x005D 6-356 ] RIGHT SQUARE BRACKET sign \x005E 6-45 ^ CIRCUMFLEX ACCENT sign \x005F 6-36 _ LOW LINE -math \x007B 45-236 { LEFT CURLY BRACKET -math \x007D 45-356 } RIGHT CURLY BRACKET +math \x007B 46-236 { LEFT CURLY BRACKET +math \x007D 46-356 } RIGHT CURLY BRACKET math \x007E 6-5 ~ TILDE diff --git a/tables/cs.tbl b/tables/cs.tbl index 50335d58c2..c235852c4e 100644 --- a/tables/cs.tbl +++ b/tables/cs.tbl @@ -16,4 +16,3 @@ include cs-g1.ctb include hyph_cs_CZ.dic -include braille-patterns.cti diff --git a/tests/Makefile.am b/tests/Makefile.am index 633d5e7d64..93095660bd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -112,6 +112,7 @@ dist_braille_specs_TESTS = \ braille-specs/ar-ar-g1_harness.yaml \ braille-specs/ar-fa_harness.yaml \ braille-specs/chr-us-g1_harness.yaml \ + braille-specs/cs_harness.yaml \ braille-specs/cs-comp8_harness.yaml \ braille-specs/da-dk-g08.yaml \ braille-specs/da-dk-g16.yaml \ diff --git a/tests/braille-specs/Makefile.am b/tests/braille-specs/Makefile.am index fdd8d64773..44fb74926a 100644 --- a/tests/braille-specs/Makefile.am +++ b/tests/braille-specs/Makefile.am @@ -2,6 +2,7 @@ EXTRA_DIST = \ ar-ar-g1_harness.yaml \ ar-fa_harness.yaml \ chr-us-g1_harness.yaml \ + cs_harness.yaml \ cs-comp8_harness.yaml \ da-dk-g08.yaml \ da-dk-g16.yaml \ diff --git a/tests/braille-specs/cs_harness.yaml b/tests/braille-specs/cs_harness.yaml new file mode 100644 index 0000000000..fd3846c158 --- /dev/null +++ b/tests/braille-specs/cs_harness.yaml @@ -0,0 +1,38 @@ +display: unicode.dis +table: + locale: cs + type: literary + grade: 1 +tests: + - # Czech alphabet + - příliš žluťoučký kůň úpěl ďábelské ódy + - ⠏⠺⠌⠇⠊⠱ ⠮⠇⠥⠳⠕⠥⠩⠅⠯ ⠅⠾⠫ ⠬⠏⠣⠇ ⠹⠡⠃⠑⠇⠎⠅⠜ ⠪⠙⠽ + + - ['www.', '⠷⠷⠷⠄'] + - ['a, b. c? d!', '⠁⠂ ⠃⠄ ⠉⠢ ⠙⠖'] + - ['a: b; "c"', '⠁⠒ ⠃⠆ ⠶⠉⠶'] + - ['(a) [b] {c}', '⠦⠁⠴ ⠠⠦⠃⠠⠴ ⠨⠦⠉⠨⠴'] + - ['name@mail', '⠝⠁⠍⠑⠼⠻⠍⠁⠊⠇'] + - ['H&M', '⠠⠓⠼⠯⠠⠍'] + - ['100%', '⠼⠁⠚⠚⠼⠏'] + - ['$5', '⠼⠫⠼⠑'] + - ['# comment', '⠠⠼ ⠉⠕⠍⠍⠑⠝⠞'] + - ['C:\\>', '⠠⠉⠒⠼⠳⠜'] + - ['x +y *z', '⠭ ⠲⠽ ⠔⠵'] + - ['n -n =0', '⠝ ⠤⠝ ⠶⠼⠚'] + - ['1/4', '⠼⠁⠻⠼⠙'] + - ['1x', '⠼⠁⠭'] + - ['1b', '⠼⠁⠐⠃'] + - ['1X', '⠼⠁⠠⠭'] + - ['1B', '⠼⠁⠠⠃'] + - ['1XY', '⠼⠁⠰⠭⠽'] + - ['1bc', '⠼⠁⠐⠃⠉'] + - ['ABC', '⠰⠁⠃⠉'] + - ['ABc', '⠰⠁⠃⠐⠉'] + - ['XYz', '⠰⠭⠽⠐⠵'] + - ['XyZ', '⠠⠭⠽⠠⠵'] + - ['xYZ', '⠭⠰⠽⠵'] + - ['1,5', '⠼⠁⠂⠑'] + - ['1.123', '⠼⠁⠄⠁⠃⠉'] + - ['1,5j', '⠼⠁⠂⠑⠐⠚'] + - ['1.123x', '⠼⠁⠄⠁⠃⠉⠭']