From b01a78c29ea39ba630a270e81f80b00688b74309 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Tue, 23 May 2023 13:42:28 +0200 Subject: [PATCH] Don't test en-us-mathtext.yaml because that is not the table we are interested in We don't even know what this table is used for and how it is supposed to behave. The table we are actually interested in is nemeth.ctb. We can't test it directly in Liblouis however because it is not part of Liblouis (anymore). It is part of Liblouistdml. The solution is to test nemethdefs.cti for now and add a note that we should change this to nemeth.ctb (which requires that we move the table back to Liblouis, see https://github.com/liblouis/liblouis/issues/815). Also revert the changes in en-us-mathtext.ctb. --- tables/en-us-mathtext.ctb | 3 +- tests/Makefile.am | 2 +- tests/braille-specs/Makefile.am | 2 +- tests/braille-specs/en-us-mathtext.yaml | 143 --------------------- tests/braille-specs/nemeth.yaml | 158 ++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 146 deletions(-) delete mode 100644 tests/braille-specs/en-us-mathtext.yaml create mode 100644 tests/braille-specs/nemeth.yaml diff --git a/tables/en-us-mathtext.ctb b/tables/en-us-mathtext.ctb index 519228118a..27a3686717 100644 --- a/tables/en-us-mathtext.ctb +++ b/tables/en-us-mathtext.ctb @@ -22,8 +22,9 @@ # liblouis comes with ABSOLUTELY NO WARRANTY. # Maintained by John J. Boyer, director@chpi.org, www.chpi.org -include nemethdefs.cti + include en-chardefs.cti All character definition opcodes +include nemethdefs.cti # Braille indicators numsign 3456 number sign, just a dots operand diff --git a/tests/Makefile.am b/tests/Makefile.am index 02ccb0e29c..8aa405fc03 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -132,7 +132,6 @@ dist_braille_specs_TESTS = \ braille-specs/en-us-emphasis_harness.yaml \ braille-specs/en-us-g2.yaml \ braille-specs/en-us-g2-dictionary_harness.yaml \ - braille-specs/en-us-mathtext.yaml \ braille-specs/eo-g1_harness.yaml \ braille-specs/es-comp.yaml \ braille-specs/es-g2.yaml \ @@ -175,6 +174,7 @@ dist_braille_specs_TESTS = \ braille-specs/ml.yaml \ braille-specs/mn-MN_harness.yaml \ braille-specs/ms-my-g2.yaml \ + braille-specs/nemeth.yaml \ braille-specs/nl-comp8_harness.yaml \ braille-specs/nl-g0_harness.yaml \ braille-specs/no_8dot_harness.yaml \ diff --git a/tests/braille-specs/Makefile.am b/tests/braille-specs/Makefile.am index ecb5d232c3..5817838218 100644 --- a/tests/braille-specs/Makefile.am +++ b/tests/braille-specs/Makefile.am @@ -61,7 +61,6 @@ EXTRA_DIST = \ en-us-comp8-ext-for_harness.yaml \ en-us-g2.yaml \ en-us-g2-dictionary_harness.yaml \ - en-us-mathtext.yaml \ eo-g1_harness.yaml \ es-comp.yaml \ es-g2.yaml \ @@ -105,6 +104,7 @@ EXTRA_DIST = \ ml.yaml \ mn-MN_harness.yaml \ ms-my-g2.yaml \ + nemeth.yaml \ nl-comp8_harness.yaml \ nl-g0_harness.yaml \ no_8dot_harness.yaml \ diff --git a/tests/braille-specs/en-us-mathtext.yaml b/tests/braille-specs/en-us-mathtext.yaml deleted file mode 100644 index a98440336a..0000000000 --- a/tests/braille-specs/en-us-mathtext.yaml +++ /dev/null @@ -1,143 +0,0 @@ -# This yaml file tests the Braille display of the math symbols in the -# en-us-mathtext.ctb table and the nemethdefs.cti subtable. -# Copyright (C) 2023 Attila Hammer from IT Foundation for the Visually Impaired - Hungary. www.infoalap.hu -# -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. -display: | - include unicode.dis - display 9 9 - display a a -table: en-us-mathtext.ctb -flags: {testmode: forward} -tests: - - ["^", ⠸⠣] - - [\x00ac, ⠈⠹] - - [\x2213, ⠤⠬] - - [\x27e6, ⠈⠸⠷] - - [\x27e7, ⠈⠸⠾] - - [\x2983, ⠨⠸⠷] - - [\x2984, ⠨⠸⠾] - - [\x2af4, ⠳⠳⠳] - - [\x02D9, ⠡] - - [\x2216, ⠸⠡] - - [\x27E8, ⠨⠨⠷] - - [\x27E9, ⠨⠨⠾] - - [\x0396, ⠨⠠⠵] - - [\x0397, ⠨⠠⠱] - - [\x03A4, ⠨⠠⠞] - - [\x03A8, ⠨⠠⠽] - - [\x03B6, ⠨⠵] - - [\x03B7, ⠨⠱] - - [\x03C2, ⠨⠒] - - [\x03C8, ⠨⠽] - - [\x03C9, ⠨⠺] - - [\x03D1, ⠨⠈⠹] - - [\x03D5, ⠨⠈⠋] - - [\x03D6, ⠨⠈⠏] - - [\x03F0, ⠨⠈⠅] - - [\x03F1, ⠨⠈⠗] - - [\x03F5, ⠨⠈⠑] - - [\x2015, ⠱] - - [\x2016, ⠳⠳] - - [\x2020, ⠸⠻] - - [\x2021, ⠸⠸⠻] - - [\x2030, ⠈⠴⠴] - - [\x2031, ⠈⠴⠴⠴] - - [\x2102, ⠈⠰⠠⠉] - - [\x2113, ⠰⠈⠇] - - [\x211D, ⠈⠰⠠⠗] - - [\x2147, ⠑] - - [\x2308, ⠈⠘⠷] - - [\x2309, ⠈⠘⠾] - - [\x230A, ⠈⠰⠷] - - [\x230B, ⠈⠰⠾] - - [\x22EE, ⠀⠩⠒⠒⠒⠀] - - [\x22EF, ⠀⠒⠒⠒⠀] - - [\x22F0, ⠀⠘⠒⠒⠒⠀] - - [\x22F1, ⠀⠰⠒⠒⠒⠀] - - [\x21AE, a⠳⠈⠫⠪⠒⠒⠕⠻a] - - [\x21CA, a⠫⠩⠒⠒⠕⠐⠫⠩⠒⠒⠕a] - - [\x21CB, a⠫⠈⠪⠒⠒⠫⠒⠒⠈⠕a] - - [\x21CC, a⠫⠒⠒⠈⠕⠫⠈⠪⠒⠒a] - - [\x21CD, a⠳⠈⠫⠪⠶⠶⠻a] - - [\x21CE, a⠳⠈⠫⠪⠶⠶⠕⠻a] - - [\x21CF, a⠳⠈⠫⠶⠶⠕⠻a] - - [\x21D0, a⠫⠪⠶⠶a] - - [\x21D1, a⠫⠣⠶⠶⠕a] - - [\x21d2, a⠫⠶⠶⠕a] - - [\x21D3, a⠫⠣⠶⠶⠕a] - - [\x21D4, a⠫⠪⠶⠶⠕a] - - [\x21D5, a⠫⠣⠪⠶⠶⠕a] - - [\x21D6, a⠫⠘⠪⠶⠶a] - - [\x21d7, a⠫⠘⠶⠶⠕a] - - [\x21D8, a⠫⠰⠶⠶⠕a] - - [\x21D9, a⠫⠰⠪⠶⠶a] - - [\x21DA, a⠫⠪⠸⠸a] - - [\x21DB, a⠫⠸⠸⠕a] - - [\x21F4, a⠨⠡⠈⠫⠒⠒⠕⠻a] - - [\x223C, a⠈⠱a] - - [\x220B, a⠈⠢a] - - [\x220C, a⠌⠈⠢a] - - [\x2227, ⠈⠩] - - [\x2228, ⠈⠬] - - [\x2260, a⠌⠨⠅a] - - [\x2261, a⠸⠇a] - - [\x2262, a⠌⠸⠇a] - - [\x203E, ⠱] - - [\x2044, ⠸⠌] - - [\x2215, ⠸⠌] - - [\x2124, ⠈⠰⠠⠵] - - [\x23de, ⠨⠷] - - [\x23DF, ⠨⠾] - - [\x2208, a⠈⠑a] - - [\x2209, a⠌⠈⠑a] - - [\x2245, a⠈⠱⠨⠅a] - - [\x2248, a⠈⠱⠈⠱a] - - [\x22D8, a⠐⠅⠈⠐⠅⠈⠐⠅⠻a] - - [\x22d9, a⠨⠂⠈⠨⠂⠈⠨⠂⠻a] - - [\x226A, a⠐⠅⠈⠐⠅⠻a] - - [\x226B, a⠨⠂⠈⠨⠂⠻a] - - [\x226E, a⠌⠐⠅a] - - [\x2282, a⠸⠐⠅a] - - [\x2283, a⠸⠨⠂a] - - [\x2284, a⠌⠸⠐⠅a] - - [\x2285, a⠌⠸⠨⠂a] - - [\x2286, a⠸⠐⠅⠱a] - - [\x2287, a⠸⠨⠂⠱a] - - [\x2288, a⠌⠸⠐⠅⠱a] - - [\x2289, a⠌⠸⠨⠂⠱a] - - [\x228A, a⠸⠐⠅⠌⠨⠅a] - - [\x228B, a⠸⠨⠂⠌⠨⠅a] - - [\x23E2, ⠫⠵] - - [\x25B2, ⠫⠸⠞] - - [\x25B3, ⠫⠞] - - [\x25B5, ⠫⠞] - - [\x25cb, ⠫⠉] - - [\x25CF, ⠫⠸⠉] - - [\x25A0, ⠫⠸⠲] - - [\x25A1, ⠫⠲] - - [\x25AC, ⠫⠸⠗] - - [\x25AD, ⠫⠗] - - [\x25b0, ⠫⠸⠛] - - [\x25B1, ⠫⠛] - - [\x25B2, ⠫⠸⠞] - - [\x25EF, ⠫⠉] - - [\x2221, ⠫⠪⠈⠫⠁⠻] - - [\x2222, ⠫⠪⠸⠫⠫⠁⠻] - - [\x2223, a⠳a] - - [\x2224, a⠌⠳a] - - [\x22FE, ⠫⠸⠲] - - [\x221D, a⠸⠿a] - - [\x2237, a⠰⠆a] - - ["ő", ⠰⠈⠕] - - ["ű", ⠰⠈⠥] - - ["Ő", ⠰⠠⠈⠕] - - ["Ű", ⠰⠠⠈⠥] - - [\x00BE, ⠹⠒⠌⠲⠼] - - [\x00A5, ⠈⠽] - - [\x20A3, ⠈⠋] - - [\x20A6, ⠈⠝] - - [\x20AC, ⠈⠑] diff --git a/tests/braille-specs/nemeth.yaml b/tests/braille-specs/nemeth.yaml new file mode 100644 index 0000000000..37d4af5a98 --- /dev/null +++ b/tests/braille-specs/nemeth.yaml @@ -0,0 +1,158 @@ +# Test file for nemethdefs.cti, based on: +# 1. Official Nemeth braille specification (1972 revision): https://nfb.org/images/nfb/documents/pdf/nemeth_1972.pdf +# 2. Unicode Nemeth braille symbols collection: https://devblogs.microsoft.com/math-in-office/unicode-math-braille-sequences/ +# 3. Arrows related NFB tutorial lesson: https://nfb.org/sites/www.nfb.org/files/files-pdf/braille-certification/lesson-10--provisional-5-9-20.pdf + +# FIXME: This test should be changed so that it tests a top-level +# table (i.e. a table that can be discovered based on metadata). For +# instance, the table could be nemeth.ctb, and the test would document +# the math symbols as well as the "semantic" characters used for the +# linearization of MathML (see also +# https://github.com/liblouis/liblouis/issues/815). + +# Copyright © 2023 Attila Hammer from IT Foundation for the Visually Impaired - Hungary +# +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. + +display: | + include unicode.dis + display \x00A0 a +table: | + include nemethdefs.cti + include en-chardefs.cti + letsign 56 + capsletter 6 +flags: {testmode: forward} + +tests: + - ["^", ⠸⠣] + - [\x00ac, ⠈⠹] + - [\x2213, ⠤⠬] + - [\x27e6, ⠈⠸⠷] + - [\x27e7, ⠈⠸⠾] + - [\x2983, ⠨⠸⠷] + - [\x2984, ⠨⠸⠾] + - [\x2af4, ⠳⠳⠳] + - [\x02D9, ⠡] + - [\x2216, ⠸⠡] + - [\x27E8, ⠨⠨⠷] + - [\x27E9, ⠨⠨⠾] + - [\x0396, ⠨⠠⠵] + - [\x0397, ⠨⠠⠱] + - [\x03A4, ⠨⠠⠞] + - [\x03A8, ⠨⠠⠽] + - [\x03B6, ⠨⠵] + - [\x03B7, ⠨⠱] + - [\x03C2, ⠨⠒] + - [\x03C8, ⠨⠽] + - [\x03C9, ⠨⠺] + - [\x03D1, ⠨⠈⠹] + - [\x03D5, ⠨⠈⠋] + - [\x03D6, ⠨⠈⠏] + - [\x03F0, ⠨⠈⠅] + - [\x03F1, ⠨⠈⠗] + - [\x03F5, ⠨⠈⠑] + - [\x2015, ⠱] + - [\x2016, ⠳⠳] + - [\x2020, ⠸⠻] + - [\x2021, ⠸⠸⠻] + - [\x2030, ⠈⠴⠴] + - [\x2031, ⠈⠴⠴⠴] + - [\x2102, ⠈⠰⠠⠉] + - [\x2113, ⠰⠈⠇] + - [\x211D, ⠈⠰⠠⠗] + - [\x2147, ⠑] + - [\x2308, ⠈⠘⠷] + - [\x2309, ⠈⠘⠾] + - [\x230A, ⠈⠰⠷] + - [\x230B, ⠈⠰⠾] + - [\x22EE, ⠀⠩⠒⠒⠒⠀] + - [\x22EF, ⠀⠒⠒⠒⠀] + - [\x22F0, ⠀⠘⠒⠒⠒⠀] + - [\x22F1, ⠀⠰⠒⠒⠒⠀] + - [\x21AE,  ⠳⠈⠫⠪⠒⠒⠕⠻ ] + - [\x21CA,  ⠫⠩⠒⠒⠕⠐⠫⠩⠒⠒⠕ ] + - [\x21CB,  ⠫⠈⠪⠒⠒⠫⠒⠒⠈⠕ ] + - [\x21CC,  ⠫⠒⠒⠈⠕⠫⠈⠪⠒⠒ ] + - [\x21CD,  ⠳⠈⠫⠪⠶⠶⠻ ] + - [\x21CE,  ⠳⠈⠫⠪⠶⠶⠕⠻ ] + - [\x21CF,  ⠳⠈⠫⠶⠶⠕⠻ ] + - [\x21D0,  ⠫⠪⠶⠶ ] + - [\x21D1,  ⠫⠣⠶⠶⠕ ] + - [\x21d2,  ⠫⠶⠶⠕ ] + - [\x21D3,  ⠫⠣⠶⠶⠕ ] + - [\x21D4,  ⠫⠪⠶⠶⠕ ] + - [\x21D5,  ⠫⠣⠪⠶⠶⠕ ] + - [\x21D6,  ⠫⠘⠪⠶⠶ ] + - [\x21d7,  ⠫⠘⠶⠶⠕ ] + - [\x21D8,  ⠫⠰⠶⠶⠕ ] + - [\x21D9,  ⠫⠰⠪⠶⠶ ] + - [\x21DA,  ⠫⠪⠸⠸ ] + - [\x21DB,  ⠫⠸⠸⠕ ] + - [\x21F4,  ⠨⠡⠈⠫⠒⠒⠕⠻ ] + - [\x223C,  ⠈⠱ ] + - [\x220B,  ⠈⠢ ] + - [\x220C,  ⠌⠈⠢ ] + - [\x2227, ⠈⠩] + - [\x2228, ⠈⠬] + - [\x2260,  ⠌⠨⠅ ] + - [\x2261,  ⠸⠇ ] + - [\x2262,  ⠌⠸⠇ ] + - [\x203E, ⠱] + - [\x2044, ⠸⠌] + - [\x2215, ⠸⠌] + - [\x2124, ⠈⠰⠠⠵] + - [\x23de, ⠨⠷] + - [\x23DF, ⠨⠾] + - [\x2208,  ⠈⠑ ] + - [\x2209,  ⠌⠈⠑ ] + - [\x2245,  ⠈⠱⠨⠅ ] + - [\x2248,  ⠈⠱⠈⠱ ] + - [\x22D8,  ⠐⠅⠈⠐⠅⠈⠐⠅⠻ ] + - [\x22d9,  ⠨⠂⠈⠨⠂⠈⠨⠂⠻ ] + - [\x226A,  ⠐⠅⠈⠐⠅⠻ ] + - [\x226B,  ⠨⠂⠈⠨⠂⠻ ] + - [\x226E,  ⠌⠐⠅ ] + - [\x2282,  ⠸⠐⠅ ] + - [\x2283,  ⠸⠨⠂ ] + - [\x2284,  ⠌⠸⠐⠅ ] + - [\x2285,  ⠌⠸⠨⠂ ] + - [\x2286,  ⠸⠐⠅⠱ ] + - [\x2287,  ⠸⠨⠂⠱ ] + - [\x2288,  ⠌⠸⠐⠅⠱ ] + - [\x2289,  ⠌⠸⠨⠂⠱ ] + - [\x228A,  ⠸⠐⠅⠌⠨⠅ ] + - [\x228B,  ⠸⠨⠂⠌⠨⠅ ] + - [\x23E2, ⠫⠵] + - [\x25B2, ⠫⠸⠞] + - [\x25B3, ⠫⠞] + - [\x25B5, ⠫⠞] + - [\x25cb, ⠫⠉] + - [\x25CF, ⠫⠸⠉] + - [\x25A0, ⠫⠸⠲] + - [\x25A1, ⠫⠲] + - [\x25AC, ⠫⠸⠗] + - [\x25AD, ⠫⠗] + - [\x25b0, ⠫⠸⠛] + - [\x25B1, ⠫⠛] + - [\x25B2, ⠫⠸⠞] + - [\x25EF, ⠫⠉] + - [\x2221, ⠫⠪⠈⠫⠁⠻] + - [\x2222, ⠫⠪⠸⠫⠫⠁⠻] + - [\x2223,  ⠳ ] + - [\x2224,  ⠌⠳ ] + - [\x22FE, ⠫⠸⠲] + - [\x221D,  ⠸⠿ ] + - [\x2237,  ⠰⠆ ] + - ["ő", ⠰⠈⠕] + - ["ű", ⠰⠈⠥] + - ["Ő", ⠰⠠⠈⠕] + - ["Ű", ⠰⠠⠈⠥] + - [\x00BE, ⠹⠒⠌⠲⠼] + - [\x00A5, ⠈⠽] + - [\x20A3, ⠈⠋] + - [\x20A6, ⠈⠝] + - [\x20AC, ⠈⠑]