Skip to content

Commit

Permalink
Merge pull request liblouis#1404 from BAUM-Engineering/romanian-6-dot…
Browse files Browse the repository at this point in the history
…-table

Romanian 6 dot table
  • Loading branch information
egli authored Sep 12, 2023
2 parents e997401 + d99e3d2 commit 682c93b
Show file tree
Hide file tree
Showing 7 changed files with 159 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/fuzzing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ jobs:
matrix:
ucs: [ucs2]
# ucs4
table: [ afr-za-g1.ctb, afr-za-g2.ctb, ar-ar-comp8.utb, ar-ar-g1.utb, ar-ar-g2.ctb, as-in-g1.utb, aw-in-g1.utb, ba.utb, be-in-g1.utb, bel.utb, bel-comp.utb, bg.ctb, bg.utb, bh.ctb, bo.ctb, boxes.ctb, br-in-g1.utb, ca-g1.ctb, chr-us-g1.ctb, ckb-g1.ctb, cop-eg-comp8.utb, cs-comp8.utb, cs-g1.ctb, cy-cy-g1.utb, cy-cy-g2.ctb, da-dk-g08_1993.ctb, da-dk-g08.ctb, da-dk-g16_1993.ctb, da-dk-g16.ctb, da-dk-g16-lit_1993.ctb, da-dk-g18_1993.ctb, da-dk-g18.ctb, da-dk-g26_1993.ctb, da-dk-g26.ctb, da-dk-g26l_1993.ctb, da-dk-g26-lit_1993.ctb, da-dk-g26l-lit_1993.ctb, da-dk-g28_1993.ctb, da-dk-g28.ctb, da-dk-g28l_1993.ctb, de-chess.ctb, de-comp6.utb, de-de-comp8.ctb, de-g0.utb, de-g0-detailed.utb, de-g1.ctb, de-g1-detailed.ctb, de-g2.ctb, de-g2-detailed.ctb, dra.ctb, el.ctb, en_CA.ctb, en-chess.ctb, en-gb-comp8.ctb, en-gb-g1.utb, en-GB-g2.ctb, en-in-g1.ctb, en-nabcc.utb, en-ueb-g1.ctb, en-ueb-g2.ctb, en-ueb-math.ctb, en-us-comp6.ctb, en-us-comp8.ctb, en-us-comp8-ext.utb, en-us-g1.ctb, en-us-g2.ctb, en-us-interline.ctb, en-us-mathtext.ctb, eo-g1.ctb, eo-g1-x-system.ctb, Es-Es-G0.utb, es-g1.ctb, es-g2.ctb, et.ctb, et-g0.utb, ethio-g1.ctb, fa-ir-comp8.ctb, fa-ir-g1.utb, fi-fi-8dot.ctb, fi.utb, fr-bfu-comp6.utb, fr-bfu-comp8.utb, fr-bfu-g2.ctb, ga-g1.utb, ga-g2.ctb, gd.ctb, gon.ctb, grc-international-en.utb, gu-in-g1.utb, haw-us-g1.ctb, he-IL.utb, he-IL-comp8.utb, hi-in-g1.utb, hr-comp8.utb, hr-g1.ctb, hu-hu-comp8.ctb, hu-hu-g1.ctb, hu-hu-g2.ctb, hy.ctb, IPA.utb, is.ctb, it-it-comp6.utb, it-it-comp8.utb, iu-ca-g1.ctb, ja-kantenji.utb, ka.utb, ka-in-g1.utb, kh-in-g1.utb, kk.utb, km-g1.utb, ko-2006-g1.ctb, ko-2006-g2.ctb, ko-g1.ctb, ko-g2.ctb, kok.ctb, kru.ctb, ks-in-g1.utb, lg-ug-g1.utb, lt-6dot.utb, lt.ctb, Lv-Lv-g1.utb, mao-nz-g1.ctb, ml-in-g1.utb, mn-in-g1.utb, mn-MN-g1.utb, mn-MN-g2.ctb, mr-in-g1.utb, ms-my-g2.ctb, mt.ctb, mun.ctb, mwr.ctb, my-g1.utb, my-g2.ctb, ne.ctb, nl-comp8.utb, nl-NL-g0.utb, no-no-8dot-fallback-6dot-g0.utb, no-no-8dot.utb, no-no-comp8.ctb, no-no-g0.utb, no-no-g1.ctb, no-no-g2.ctb, no-no-g3.ctb, no-no-generic.ctb, np-in-g1.utb, nso-za-g1.utb, nso-za-g2.ctb, ny-mw.utb, or-in-g1.utb, pi.ctb, pl-pl-comp8.ctb, Pl-Pl-g1.utb, pt-pt-comp8.ctb, pt-pt-g1.utb, pt-pt-g2.ctb, pu-in-g1.utb, ro.ctb, ru-compbrl.ctb, ru.ctb, ru-litbrl.ctb, ru-litbrl-detailed.utb, ru-ru-g1.ctb, rw-rw-g1.utb, sa-in-g1.utb, sah.utb, se-se.ctb, si-in-g1.utb, sin.utb, sk-g1.ctb, sk-sk-g1.utb, sk-sk.utb, sl-si-comp8.ctb, sl-si-g1.utb, sot-za-g1.ctb, sot-za-g2.ctb, sr-g1.ctb, sv-1989.ctb, sv-1996.ctb, sv-g0.utb, sv-g1.ctb, sv-g2.ctb, sw-ke-g1-2.ctb, sw-ke-g1-3.ctb, sw-ke-g1-4.ctb, sw-ke-g1-5.ctb, sw-ke-g1.utb, sw-ke-g2.ctb, ta.ctb, ta-ta-g1.ctb, te-in-g1.utb, th-g0.utb, th-comp8-backward.utb, tr.ctb, tr-g1.ctb, tr-g2.ctb, tsn-za-g1.ctb, tsn-za-g2.ctb, tt.utb, uk.utb, uk-comp.utb, unicode-braille.utb, ur-pk-g1.utb, ur-pk-g2.ctb, uz-g1.utb, ve-za-g1.utb, ve-za-g2.ctb, vi-cb8.utb, vi-saigon-g1.ctb, vi-vn-g0.utb, vi-vn-g1.ctb, vi-vn-g2.ctb, xh-za-g1.utb, xh-za-g2.ctb, zh-chn.ctb, zhcn-cbs.ctb, zhcn-g1.ctb, zhcn-g2.ctb, zh-hk.ctb, zh-tw.ctb, zu-za-g1.utb, zu-za-g2.ctb, ]

table: [ afr-za-g1.ctb, afr-za-g2.ctb, ar-ar-comp8.utb, ar-ar-g1.utb, ar-ar-g2.ctb, as-in-g1.utb, aw-in-g1.utb, ba.utb, be-in-g1.utb, bel.utb, bel-comp.utb, bg.ctb, bg.utb, bh.ctb, bo.ctb, boxes.ctb, br-in-g1.utb, ca-g1.ctb, chr-us-g1.ctb, ckb-g1.ctb, cop-eg-comp8.utb, cs-comp8.utb, cs-g1.ctb, cy-cy-g1.utb, cy-cy-g2.ctb, da-dk-g08_1993.ctb, da-dk-g08.ctb, da-dk-g16_1993.ctb, da-dk-g16.ctb, da-dk-g16-lit_1993.ctb, da-dk-g18_1993.ctb, da-dk-g18.ctb, da-dk-g26_1993.ctb, da-dk-g26.ctb, da-dk-g26l_1993.ctb, da-dk-g26-lit_1993.ctb, da-dk-g26l-lit_1993.ctb, da-dk-g28_1993.ctb, da-dk-g28.ctb, da-dk-g28l_1993.ctb, de-chess.ctb, de-comp6.utb, de-de-comp8.ctb, de-g0.utb, de-g0-detailed.utb, de-g1.ctb, de-g1-detailed.ctb, de-g2.ctb, de-g2-detailed.ctb, dra.ctb, el.ctb, en_CA.ctb, en-chess.ctb, en-gb-comp8.ctb, en-gb-g1.utb, en-GB-g2.ctb, en-in-g1.ctb, en-nabcc.utb, en-ueb-g1.ctb, en-ueb-g2.ctb, en-ueb-math.ctb, en-us-comp6.ctb, en-us-comp8.ctb, en-us-comp8-ext.utb, en-us-g1.ctb, en-us-g2.ctb, en-us-interline.ctb, en-us-mathtext.ctb, eo-g1.ctb, eo-g1-x-system.ctb, Es-Es-G0.utb, es-g1.ctb, es-g2.ctb, et.ctb, et-g0.utb, ethio-g1.ctb, fa-ir-comp8.ctb, fa-ir-g1.utb, fi-fi-8dot.ctb, fi.utb, fr-bfu-comp6.utb, fr-bfu-comp8.utb, fr-bfu-g2.ctb, ga-g1.utb, ga-g2.ctb, gd.ctb, gon.ctb, grc-international-en.utb, gu-in-g1.utb, haw-us-g1.ctb, he-IL.utb, he-IL-comp8.utb, hi-in-g1.utb, hr-comp8.utb, hr-g1.ctb, hu-hu-comp8.ctb, hu-hu-g1.ctb, hu-hu-g2.ctb, hy.ctb, IPA.utb, is.ctb, it-it-comp6.utb, it-it-comp8.utb, iu-ca-g1.ctb, ja-kantenji.utb, ka.utb, ka-in-g1.utb, kh-in-g1.utb, kk.utb, km-g1.utb, ko-2006-g1.ctb, ko-2006-g2.ctb, ko-g1.ctb, ko-g2.ctb, kok.ctb, kru.ctb, ks-in-g1.utb, lg-ug-g1.utb, lt-6dot.utb, lt.ctb, Lv-Lv-g1.utb, mao-nz-g1.ctb, ml-in-g1.utb, mn-in-g1.utb, mn-MN-g1.utb, mn-MN-g2.ctb, mr-in-g1.utb, ms-my-g2.ctb, mt.ctb, mun.ctb, mwr.ctb, my-g1.utb, my-g2.ctb, ne.ctb, nl-comp8.utb, nl-NL-g0.utb, no-no-8dot-fallback-6dot-g0.utb, no-no-8dot.utb, no-no-comp8.ctb, no-no-g0.utb, no-no-g1.ctb, no-no-g2.ctb, no-no-g3.ctb, no-no-generic.ctb, np-in-g1.utb, nso-za-g1.utb, nso-za-g2.ctb, ny-mw.utb, or-in-g1.utb, pi.ctb, pl-pl-comp8.ctb, Pl-Pl-g1.utb, pt-pt-comp8.ctb, pt-pt-g1.utb, pt-pt-g2.ctb, pu-in-g1.utb, ro.ctb, ro-g0.utb, ru-compbrl.ctb, ru.ctb, ru-litbrl.ctb, ru-litbrl-detailed.utb, ru-ru-g1.ctb, rw-rw-g1.utb, sa-in-g1.utb, sah.utb, se-se.ctb, si-in-g1.utb, sin.utb, sk-g1.ctb, sk-sk-g1.utb, sk-sk.utb, sl-si-comp8.ctb, sl-si-g1.utb, sot-za-g1.ctb, sot-za-g2.ctb, sr-g1.ctb, sv-1989.ctb, sv-1996.ctb, sv-g0.utb, sv-g1.ctb, sv-g2.ctb, sw-ke-g1-2.ctb, sw-ke-g1-3.ctb, sw-ke-g1-4.ctb, sw-ke-g1-5.ctb, sw-ke-g1.utb, sw-ke-g2.ctb, ta.ctb, ta-ta-g1.ctb, te-in-g1.utb, th-g0.utb, th-comp8-backward.utb, tr.ctb, tr-g1.ctb, tr-g2.ctb, tsn-za-g1.ctb, tsn-za-g2.ctb, tt.utb, uk.utb, uk-comp.utb, unicode-braille.utb, ur-pk-g1.utb, ur-pk-g2.ctb, uz-g1.utb, ve-za-g1.utb, ve-za-g2.ctb, vi-cb8.utb, vi-saigon-g1.ctb, vi-vn-g0.utb, vi-vn-g1.ctb, vi-vn-g2.ctb, xh-za-g1.utb, xh-za-g2.ctb, zh-chn.ctb, zhcn-cbs.ctb, zhcn-g1.ctb, zhcn-g2.ctb, zh-hk.ctb, zh-tw.ctb, zu-za-g1.utb, zu-za-g2.ctb, ]
steps:
- name: Harden Runner
uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
Expand Down
1 change: 1 addition & 0 deletions extra/generate-display-names/display-names
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
* ../../tables/pt-pt-g1.utb Portuguese, uncontracted Portuguese uncontracted braille
* ../../tables/pt-pt-comp8.ctb Portuguese, computer Portuguese computer braille
* ../../tables/ro.tbl Romanian, computer Romanian computer braille
* ../../tables/ro-g0.utb Romanian, uncontracted Romanian braille
* ../../tables/ru.ctb Russian, computer Russian computer braille
../../tables/ru-litbrl.ctb Russian Russian braille
../../tables/ru-litbrl-detailed.utb Russian, with capitals Russian braille with indication of capitals
Expand Down
1 change: 1 addition & 0 deletions tables/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ table_files = \
pu-in-g1.utb \
ro.ctb \
ro.tbl \
ro-g0.utb \
ru-brf.dis \
ru-compbrl.ctb \
ru.ctb \
Expand Down
85 changes: 85 additions & 0 deletions tables/ro-g0.utb
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
#
# liblouis: Uncontracted braille table for Romanian.
#
# Copyright (C) 2023 by BAUM Engineering <[email protected]>
#
# This file is part of liblouis.
#
# liblouis is free software: you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as
# published by the Free Software Foundation, either version 2.1 of the
# License, or (at your option) any later version.
#
# liblouis is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with liblouis. If not, see
# <http://www.gnu.org/licenses/>.

#-index-name: Romanian, uncontracted
#-display-name: Romanian braille

#+language: ro
#+type: literary
#+dots: 6
#+contraction: no
#+grade: 0
#+direction:both

#-license: LGPLv2.1
#-author: BAUM Engineering <[email protected]>
#-maintainer: BAUM Engineering <[email protected]>

# This table is based on the French uncontracted braille table and was
# created with the help of Gosa Tudor, Papp Levente, Trutiu Florin and
# Patru Aurel from BAUM Engineering Romania. It has been tested and
# used in multiple schools and associations.

# Unfortunately there is no official documentation for Romanian braille as there
# are no universal rules that apply. There are different rules based on
# different regions or schools.

# This table was made by us in collaboration with a local blind teacher and we
# also distributed it for the last 2 years.

# Romanian characters
lowercase \x00e2 126 LATIN LETTER A WITH CIRCUMFLEX
lowercase \x00ee 146 LATIN LETTER I WITH CIRCUMFLEX
lowercase \x0103 16 LATIN LETTER A WITH BREVE
lowercase \x0219 156 LATIN LETTER S WITH COMMA BELOW
lowercase \x021b 246 LATIN LETTER T WITH COMMA BELOW
lowercase \x015f 156 LATIN LETTER S WITH CEDILLA
lowercase \x0163 246 LATIN LETTER T WITH CEDILLA

base uppercase \x00c2 \x00e2 LATIN LETTER A WITH CIRCUMFLEX
base uppercase \x00ce \x00ee LATIN LETTER I WITH CIRCUMFLEX
base uppercase \x0102 \x0103 LATIN LETTER A WITH BREVE
base uppercase \x0218 \x0219 LATIN LETTER S WITH COMMA BELOW
base uppercase \x021a \x021b LATIN LETTER T WITH COMMA BELOW
base uppercase \x015e \x015f LATIN LETTER S WITH CEDILLA
base uppercase \x0162 \x0163 LATIN LETTER T WITH CEDILLA

# Differences with French
punctuation " 236
punctuation # 3456
punctuation ( 126
punctuation ) 345
punctuation « 236
punctuation » 236
punctuation [ 45-2356
comp6 [ 45-2356
punctuation ] 2356-12
comp6 ] 2356-12
punctuation { 6-2356
punctuation } 2356-3

include latinLetterDef6Dots.uti
include digits6Dots.uti
include litdigits6Dots.uti

include fr-bfu-comp6.utb

numsign 3456
1 change: 1 addition & 0 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ dist_braille_specs_TESTS = \
braille-specs/pl-g1.yaml \
braille-specs/pl-pl-comp8_harness.yaml \
braille-specs/pt-g1.yaml \
braille-specs/ro-g0.yaml \
braille-specs/ru.yaml \
braille-specs/rw-rw-g1.yaml \
braille-specs/sah.yaml \
Expand Down
1 change: 1 addition & 0 deletions tests/braille-specs/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ EXTRA_DIST = \
pl-g1.yaml \
pl-pl-comp8_harness.yaml \
pt-g1.yaml \
ro-g0.yaml \
ru.yaml \
rw-rw-g1.yaml \
sah.yaml \
Expand Down
69 changes: 69 additions & 0 deletions tests/braille-specs/ro-g0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Copyright © 2023 by BAUM Engineering <[email protected]>
#
# 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.
#
# ----------------------------------------------------------------------------------------------
#
# The Romanian uncontracted braille table is based on the French uncontracted
# braille table and was created with the help of Gosa Tudor, Papp Levente,
# Trutiu Florin and Patru Aurel from BAUM Engineering Romania. It has been
# tested and used in multiple schools and associations.

# Unfortunately there is no official documentation for Romanian braille as there
# are no universal rules that apply. There are different rules based on
# different regions or schools.

# This table was made by us in collaboration with a local blind teacher and we
# also distributed it for the last 2 years.


display: |
include unicode-without-blank.dis
display 9 9
display a a
# Test for uncontracted braille
table:
language: ro
grade: 0
dots: 6
__assert-match: ro-g0.utb
flags: {testmode: bothDirections}
tests:
- # Test 1
- Acesta este un test pentru limba română
- ⠨⠁⠉⠑⠎⠞⠁ ⠑⠎⠞⠑ ⠥⠝ ⠞⠑⠎⠞ ⠏⠑⠝⠞⠗⠥ ⠇⠊⠍⠃⠁ ⠗⠕⠍⠣⠝⠡
- # Test 2
- Vom testa și caractere speciale [](){}!?.
- ⠨⠧⠕⠍ ⠞⠑⠎⠞⠁ ⠱⠊ ⠉⠁⠗⠁⠉⠞⠑⠗⠑ ⠎⠏⠑⠉⠊⠁⠇⠑ ⠘⠶⠶⠃⠣⠜⠠⠶⠶⠄⠖⠢⠲
- xfail: {backward: "â instead of ("}
- # Test 3
- Vom testa și caractere matematice +-×÷<>=
- ⠨⠧⠕⠍ ⠞⠑⠎⠞⠁ ⠱⠊ ⠉⠁⠗⠁⠉⠞⠑⠗⠑ ⠍⠁⠞⠑⠍⠁⠞⠊⠉⠑ ⠠⠖⠤⠐⠔⠒⠐⠣⠐⠜⠶
- xfail: {backward: "* instead of ×"}
- # Test 4
- Vom testa și numere 1 2 3 4 5 6 7 8 9 10
- ⠨⠧⠕⠍ ⠞⠑⠎⠞⠁ ⠱⠊ ⠝⠥⠍⠑⠗⠑ ⠼⠁ ⠼⠃ ⠼⠉ ⠼⠙ ⠼⠑ ⠼⠋ ⠼⠛ ⠼⠓ ⠼⠊ ⠼⠁⠚
- # Test 5
- doar litere mici
- ⠙⠕⠁⠗ ⠇⠊⠞⠑⠗⠑ ⠍⠊⠉⠊
- # Test 6
- DOAR LITERE MARI
- ⠨⠨⠙⠕⠁⠗ ⠨⠨⠇⠊⠞⠑⠗⠑ ⠨⠨⠍⠁⠗⠊

# spaces
flags: {testmode: bothDirections}
tests:
- ['\x0009', '9']
- ['\x0020', '\x0020']
- ['\x00a0', 'a']
flags: {testmode: forward}
tests:
- ['\x000a', '\x0020']
- ['\x000c', '\x0020']
- ['\x000d', '\x0020']
- ['\x2060', '']
- ['\xfeff', '']

0 comments on commit 682c93b

Please sign in to comment.