Skip to content

Commit

Permalink
New table for Bashkir literary braille
Browse files Browse the repository at this point in the history
see liblouis#1005

Note that the pull requests also contained a new computer braille
table, but it was decided to drop it and improve the Russian computer
braille table instead.

Changes by Bert:
- Include new dot patterns (with dot 9) in ru-unicode.dis
- Include new table in extra/generate-display-names/display-names
- Add a paragraph in the table header about missing documentation
- Update Makefiles
- Enable test
- Add NEWS entry
- Update AUTHORS
  • Loading branch information
JuniGobi authored and bertfrees committed Nov 25, 2020
1 parent a61f7e5 commit 5a5e1f1
Show file tree
Hide file tree
Showing 7 changed files with 89 additions and 16 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ TABLE AND TEST CONTRIBUTORS
Erez Kugler <[email protected]> from TSR GAASH <www.tsr-gaash.com>
Eric Yip
Frédéric Schwebel
Gabidullin Yunir <https://bspu.ru/users/221>
Gatis Grintals
Greg Kearney <[email protected]>
Halim Sahin <[email protected]>
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ issues]].
- Improvements to Urdu Braille and Malayalam thanks to Jake Kyle
- Add characters for Bashkir and Uzbek languages to the Russian
computer braille table. Thanks to Andrey Yakuboy.
- New table for Bashkir uncontracted braille thanks to Rustam
Churagulov and Gabidullin Yunir.
** Other changes
- Support for Python 2 has been removed. The python bindings now only
support Python 3. The deprecation notice was announced in Release
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 @@ -5,6 +5,7 @@
* ../../tables/ar-ar-comp8.utb Arabic, computer Arabic computer braille
* ../../tables/as.tbl Assamese Assamese braille
* ../../tables/awa.tbl Awadhi Awadhi braille
* ../../tables/ba.utb Bashkir Bashkir braille
* ../../tables/bg.tbl Bulgarian, computer Bulgarian computer braille
* ../../tables/bh.tbl Bihari Bihari braille
* ../../tables/bn.tbl Bengali Bengali braille
Expand Down
1 change: 1 addition & 0 deletions tables/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ table_files = \
as.tbl \
awa.tbl \
aw-in-g1.utb \
ba.utb \
be-in-g1.utb \
bengali.cti \
bg.ctb \
Expand Down
55 changes: 55 additions & 0 deletions tables/ba.utb
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
#-index-name: Bashkir
#-display-name: Bashkir braille

#+locale: ba
#+type: literary

#-license: LGPLv2.1

# Copyright (C) 2020 Rustam Churagulov <[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/>.

# The Bashkir braille code was created by Makarim Tukhvatshin in the
# early 60's. There is no official documentation on the braille code
# that we know of.

# Bashkir braille is largely the same as Russian braille
include ru-litbrl.ctb


# The Bashkir alphabet has 9 letters that are not in the Russian
# alphabet, namely Ә, Ө, Ҡ, Ғ, Ҫ, Ҙ, Һ, Ү and Ң. Like in ru-chardefs.cti, the
# following definitions have dot 9 set to make them distinguishable
# from the Latin letters. Dot 7 indicates uppercase letters.
uplow \x04D8\x04D9 34579,3459 CYRILLIC LETTER æ Әә
uplow \x04E8\x04E9 12679,1269 CYRILLIC LETTER ø Өө
uplow \x04A0\x04A1 14679,1469 CYRILLIC LETTER q Ҡҡ
uplow \x0492\x0493 1245679,124569 CYRILLIC LETTER ɣ Ғғ
uplow \x04AA\x04AB 3479,349 CYRILLIC LETTER θ Ҫҫ
uplow \x0498\x0499 34679,3469 CYRILLIC LETTER ð Ҙҙ
uplow \x04BA\x04BB 123679,12369 CYRILLIC LETTER h Һһ
uplow \x04AE\x04AF 1345679,134569 CYRILLIC LETTER y Үү
uplow \x04A2\x04A3 145679,14569 CYRILLIC LETTER ŋ Ңң


# Remove dot 7 from uppercase letters
# Note that we can use the same name for the swapdd rule, but the pass4 rule needs to be repeated
swapdd uppertolower 34579,12679,14679,1245679,3479,34679,123679,1345679,145679 3459,1269,1469,124569,349,3469,12369,134569,14569
noback pass4 %uppertolower %uppertolower
# Unicode braille patterns
include braille-patterns.cti
16 changes: 15 additions & 1 deletion tables/ru-unicode.dis
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ display \x282A 2469
display \x2833 12569
display \x282B 12469

# For Ukrainian letters (defined in uk.utb)
# For Ukrainian and Bashkir letters (defined in uk.utb and ba.utb)
display \x285C 34579
display \x287D 1345679
display \x2879 145679
Expand All @@ -105,3 +105,17 @@ display \x281C 3459
display \x283D 134569
display \x2839 14569
display \x283B 124569

# For Bashkir letters (defined in ba.utb)

display \x2863 12679
display \x2869 14679
display \x284C 3479
display \x286C 34679
display \x2867 123679

display \x2823 1269
display \x2829 1469
display \x280C 349
display \x282C 3469
display \x2827 12369
29 changes: 14 additions & 15 deletions tests/braille-specs/ba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,20 @@
# without any warranty.
# ----------------------------------------------------------------------------------------------

# FIXME: no table for literary braille yet

# display: unicode-without-blank.dis,ru-unicode.dis
# table:
# locale: ba
# type: literary
# tests:
# - - Айгөл арып, хәлдән тайып мәктәптән ҡайтып керҙе.
# - ⠁⠯⠛⠣⠇⠀⠁⠗⠮⠏⠂⠓⠜⠇⠙⠜⠝⠀⠞⠁⠯⠮⠏⠀⠍⠜⠅⠞⠜⠏⠞⠜⠝⠀⠩⠁⠯⠞⠮⠏⠀⠅⠑⠗⠬⠑⠲
# - - Этот подъём был круче, тяжелее прежнего.
# - ⠪⠞⠕⠞ ⠏⠕⠙⠷⠡⠍ ⠃⠮⠇ ⠅⠗⠥⠟⠑⠂⠞⠫⠚⠑⠇⠑⠑ ⠏⠗⠑⠚⠝⠑⠛⠕⠲
# - - 123,5+46=169,5
# - ⠼⠁⠃⠉⠂⠑ ⠖⠼⠙⠋ ⠶⠼⠁⠋⠊⠂⠑
# - - 1, 3, 5, 7, 11, 13, 17, 19, 23
# - ⠼⠁⠂⠼⠉⠂⠼⠑⠂⠼⠛⠂⠼⠁⠁⠂⠼⠁⠉⠂⠼⠁⠛⠂⠼⠁⠊⠂⠼⠃⠉
display: unicode-without-blank.dis,ru-unicode.dis
table:
locale: ba
type: literary
__assert-match: ba.utb
tests:
- - Айгөл арып, хәлдән тайып мәктәптән ҡайтып керҙе.
- ⠁⠯⠛⠣⠇ ⠁⠗⠮⠏⠂⠓⠜⠇⠙⠜⠝ ⠞⠁⠯⠮⠏ ⠍⠜⠅⠞⠜⠏⠞⠜⠝ ⠩⠁⠯⠞⠮⠏ ⠅⠑⠗⠬⠑⠲
- - Этот подъём был круче, тяжелее прежнего.
- ⠪⠞⠕⠞ ⠏⠕⠙⠷⠡⠍ ⠃⠮⠇ ⠅⠗⠥⠟⠑⠂⠞⠫⠚⠑⠇⠑⠑ ⠏⠗⠑⠚⠝⠑⠛⠕⠲
- - 123,5+46=169,5
- ⠼⠁⠃⠉⠂⠑ ⠖⠼⠙⠋ ⠶⠼⠁⠋⠊⠂⠑
- - 1, 3, 5, 7, 11, 13, 17, 19, 23
- ⠼⠁⠂⠼⠉⠂⠼⠑⠂⠼⠛⠂⠼⠁⠁⠂⠼⠁⠉⠂⠼⠁⠛⠂⠼⠁⠊⠂⠼⠃⠉

# computer braille
display: |
Expand Down

0 comments on commit 5a5e1f1

Please sign in to comment.