Merge pull request liblouis#1514 from liblouis/nl_unicode_braille

nl-g0: Do not filter out Unicode braille dot 6
hammera · Feb 28, 2024 · c6adbf6 · c6adbf6
2 parents 5b28733 + 5ebac22
commit c6adbf6
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/tables/nl-BE.dis b/tables/nl-BE.dis
@@ -1,5 +1,6 @@
 #
 #  Copyright (C) 2012 Bert Frees <[email protected]>
+#  Copyright (C) 2024 Davy Kager
 #
 #  This file is part of liblouis.
 #
@@ -95,7 +96,8 @@ display n 1345b     ν
 display t 2345      t
 display t 2345b     τ
 display q 12345     q
-display ' 6         ⠠ (herstelteken eerste betekenis)
+display ' 6         ⠠ (einde hoofdletters/nadruk)
+display ' 6a        ⠠ (herstelteken eerste betekenis)
 display 1 16        \ 
 display 1 169       â
 display ? 26        ?

diff --git a/tables/nl-NL-g0.utb b/tables/nl-NL-g0.utb
@@ -3,6 +3,7 @@
 #  Copyright (C) 2014-2015, 2019 by Bert Frees
 #  Copyright (C) 2014 by CBB <http://www.cbb.nl>
 #  Copyright (C) 2015, 2016, 2018 by Dedicon <http://www.dedicon.nl>
+#  Copyright (C) 2024 by Davy Kager
 #
 #  This file is part of liblouis.
 #
@@ -138,16 +139,17 @@ replace  \\_
 # numericnocontchars abcdefghij
 
 attribute digitletter abcdefghijABCDEFGHIJ    # 1st class = $w
-noback context     $d[]%digitletter       @6
-noback context     $d","[]%digitletter    @6
-noback context     $d"."[]%digitletter    @6
-noback context     $d":"[]%digitletter    @6
+noback context     $d[]%digitletter       @6a
+noback context     $d","[]%digitletter    @6a
+noback context     $d"."[]%digitletter    @6a
+noback context     $d":"[]%digitletter    @6a
 # Multiple dots 6 are collapsed into a single dot 6.
-noback pass2       [@6]@6                 ?
-# A dot 6 is not needed when the number is already cancelled by a capital or emphasis sign
-noback pass3       $d[@6]@45              ?
-noback pass3       $d[@6]@46              ?
-noback pass3       $d[@6]@456             ?
+noback pass2       [@6a]@6a                 ?
+# A dot 6 is not needed when the number is already cancelled by a capital, emphasis or foreign language sign
+noback pass3       $d[@6a]@45              ?
+noback pass3       $d[@6a]@46              ?
+noback pass3       $d[@6a]@456             ?
+noback pass3       $d[@6a]@56              ?
 
 # §2.20 Sleutelteken tweede betekenis [1]
 
@@ -204,9 +206,9 @@ emphletter underline 456
 # and ’ (RIGHT SINGLE QUOTATION MARK).
 capsmodechars +&.'‘’
 # The same goes for the emphasis "state".
-emphmodechars italic +&.'
-emphmodechars bold +&.'
-emphmodechars underline +&.'
+emphmodechars italic +&.'‘’
+emphmodechars bold +&.'‘’
+emphmodechars underline +&.'‘’
 
 # These are the characters for which emphasis is not indicated
 noemphchars italic \s'()

diff --git a/tables/nl-print.dis b/tables/nl-print.dis
@@ -1,4 +1,5 @@
 #  Copyright (C) 2023 Bert Frees <[email protected]>
+#  Copyright (C) 2024 Davy Kager
 #
 #  This file is part of liblouis.
 #
@@ -103,7 +104,8 @@ display ν 1345b
 display t 2345
 display τ 2345b
 display q 12345
-display ⠠ 6         (herstelteken eerste betekenis)
+display ⠠ 6         (einde hoofdletters/nadruk)
+display ⠠ 6a        (herstelteken eerste betekenis)
 display \\ 16
 display â 169
 display ? 26

diff --git a/tables/nl-unicode.dis b/tables/nl-unicode.dis
@@ -1,4 +1,5 @@
 #  Copyright (C) 2023 Bert Frees <[email protected]>
+#  Copyright (C) 2024 Davy Kager
 #
 #  This file is part of liblouis.
 #
@@ -105,7 +106,8 @@ display \x281D 1345b      ν
 display \x281E 2345       t
 display \x281E 2345b      τ
 display \x281F 12345      q
-display \x2820 6          ⠠ (herstelteken eerste betekenis)
+display \x2820 6          ⠠ (einde hoofdletters/nadruk)
+display \x2820 6a         ⠠ (herstelteken eerste betekenis)
 display \x2821 16         \ 
 display \x2821 169        â
 display \x2822 26         ?

diff --git a/tests/braille-specs/nl-g0_harness.yaml b/tests/braille-specs/nl-g0_harness.yaml
@@ -10,6 +10,7 @@
 # Copyright © 2019 by Braille Autoriteit <https://braille-autoriteit.org>
 # Copyright © 2019 by Licht en Liefde <https://www.blindenzorglichtenliefde.be>
 # Copyright © 2019 by Luisterpuntbibliotheek <https://www.luisterpuntbibliotheek.be>
+# Copyright © 2024 by Davy Kager
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -367,6 +368,9 @@ tests:
   - - Accolades (RFC-000390 - https://braille-autoriteit.org/changerequest/accolades)
     - "{ }"
     - ⠐⠷ ⠐⠾
+  - - Do not suppress multiple Unicode braille dots 6 (U+2820)
+    - ⠠ ⠠⠠ 1e 1⠠e 1⠠⠠e
+    - ⠠ ⠠⠠ ⠼⠁⠠⠑ ⠼⠁⠠⠑ ⠼⠁⠠⠠⠑
 
 flags: {testmode: backward}
 tests: