From 716026b059f06472c226cd43f6e2e2cef01afd71 Mon Sep 17 00:00:00 2001 From: Bert Frees Date: Fri, 4 Sep 2015 16:52:47 +0200 Subject: [PATCH] Fall back to 6-dot definition if a character is not defined in 8-dot table by splitting of the part of no-no-g0.utb that needs to be included in no-no-8dot.utb as new file no-no-chardefs6.uti see issue https://github.com/snaekobbi/liblouis/issues/4 --- tables/no-no-8dot.utb | 3 +- tables/no-no-chardefs6.uti | 161 +++++++++++++++++++++++++++++++++++ tables/no-no-g0.utb | 166 +------------------------------------ 3 files changed, 166 insertions(+), 164 deletions(-) create mode 100644 tables/no-no-chardefs6.uti diff --git a/tables/no-no-8dot.utb b/tables/no-no-8dot.utb index da76b189f..a3952c3ef 100644 --- a/tables/no-no-8dot.utb +++ b/tables/no-no-8dot.utb @@ -262,4 +262,5 @@ sign \x00FD 12346 # LATIN SMALL LETTER Y WITH ACUTE (ý - Liten latinsk bok sign \x00FE 12468 # LATIN SMALL LETTER THORN (þ - Liten latinsk bokstav thorn) sign \x00FF 12568 # LATIN SMALL LETTER Y WITH DIAERESIS (ÿ - Liten latinsk bokstav y med trema) -#include no-no-g0.utb +# If character not defined in 8-dot standard; follow 6-dot standard instead +include no-no-chardefs6.uti diff --git a/tables/no-no-chardefs6.uti b/tables/no-no-chardefs6.uti new file mode 100644 index 000000000..764f83c90 --- /dev/null +++ b/tables/no-no-chardefs6.uti @@ -0,0 +1,161 @@ +# liblouis: Norwegian Grade 0 Braille Table, uncontracted braille +# Created June 9, 2005 by Leon Ungier with +# help and guidance from Lars Bjørndal +# Updated June 2009 by Lars Bjørndal +# Updated April 2015 by Jostein Austvik Jacobsen and Ammar Usama + +include digits8Dots.uti +include latinLetterDef6Dots.uti + +space \s 0 # blank x0020 +space \x001b 1b # escape character for html back-translation # dec 27 + +# With liblouisxml, use the following three lines instead: +space \t 9 # tab x0009 +space \x000D 0 # \r +space \x000A 0 # \n +space \x00A0 a # NO-BREAK SPACE 0020 NON-BREAKING SPACE # dec 160 + +punctuation ! 235 # exclamation mark x0021 +punctuation " 256 # double quote x0022 +punctuation ' 5 # apostrophe x0027 +punctuation ( 236 # left parenthesis x0028 +punctuation ) 356 # right parenthesis x0029 +punctuation , 2 # coma x002C +punctuation - 36 # hyphen-minus x002D +punctuation . 3 # point x002E +punctuation : 25 # colon x003A +punctuation ; 23 # semicolon x003B +punctuation ? 26 # question mark x003F +punctuation [ 12356 # left square bracket x005B +punctuation ] 23456 # right square bracket x005D +punctuation { 6-12356 # left curly bracket x007B +punctuation } 6-23456 # right curly bracket x007D +punctuation « 256 # left-pointing double angle quotation mark x00AB +punctuation » 256 # right-pointing double angle quotation mark x00BB +punctuation \x2010 36 # 8208 hyphen +punctuation \x2011 36 # 8209 non-breaking hyphen +punctuation \x2013 36-36 # en dash +punctuation \x2014 36-36 # em dash +punctuation \x2018 5 # 8216 smart single left quotation mark +punctuation \x2019 5 # 8217 smart single right quotation mark +punctuation \x201C 256 # 8220 smart opening double quote +punctuation \x201D 256 # 8221 smart closing double quote +punctuation \x201E 256 # 8222 smart double low quotation mark +punctuation \x201F 256 # 8223 smart double high reverse quotation mark +punctuation \x2026 3-3-3 # 8230 smart ellipsis + +sign # 3456 # number sign x0023 +sign $ 256 # dollar sign x0024 +sign £ 123 # pound sign +sign % 46-356 # percent sign x0025 +sign ‰ 46-356-356 # per mille sign +sign & 346 # ampersand z0026 +sign * 35 # asterisk x002A +sign @ 4 # commercial at x0040 +sign \\ 156 # reverse solidus x005C +sign ^ 46 # circumflex accent x005E (math power) +sign _ 456 # low line x005F +sign ` 45 # grave accent x0060 +sign \x00AF 45 # macron +sign \x0304 45 # combining macron +sign | 123456 # vertical line x007C +sign ~ 1456 # tilde x007E +sign \x0080 15-136-1235-135 # Euro sign x0080 +sign ¢ 4-14 # cent sign x00A2 +sign £ 45-123 # pound sign x00A3 +sign ¤ 236-134-356 # currency sign x00A4 +sign ¥ 45-13456 # yen sign x00A5 +sign § 346 # section sign x00A7 +sign © 236-14-356 # copyright x00A9 +sign ® 236-1235-356 # Registered trademark +sign ™ 236-2345-356 # Trademark +sign ° 5-356 # degree sign x00B0 +sign ² 4-6-126 # superscript 2 sign x00B2 +sign ³ 4-6-146 # superscript 3 sign x00B3 +sign \x00B4 4 # acute sign dec-180 +sign ¹ 1-27 # superscript 1 sign x00B9 +sign \x20AC 26 # Euro sign x0080 +sign ■ 123456 # Filled square +sign □ 123456 # Empty square +sign ● 2356 # Filled circle +sign ○ 2356 # Empty circle +sign • 2356 # Bullet +sign ß 35-234 # Latin Small Letter Sharp S + +uplow Αα 1 # alpha +uplow Ββ 12 # beta +uplow Γγ 1245 # gamma +uplow Δδ 145 # delta +uplow Εε 15 # epsilon +uplow Ζζ 1356 # zeta +uplow Ηη 5 # eta +uplow Θθ 4 # theta +uplow Ιι 24 # iota +uplow Κκ 13 # kappa +uplow Λλ 123 # lambda +uplow Μμ 134 # my +uplow Νν 1345 # ny +uplow Ξξ 1346 # ksi +uplow Οο 135 # omikron +uplow Ππ 1234 # pi +uplow Ρρ 1235 # rho +uplow Σς 234 # sigma +uplow Ττ 2345 # tau +uplow Υυ 136 # ypsilon +uplow Φφ 124 # fi +uplow Χχ 12346 # khi +uplow Ψψ 13456 # psi +uplow Ωω 2456 # omega + + + +uplow \x00C8\x00E8 2346 # e with grave è x00C8 / 00E8 +uplow \x00C9\x00E9 123456 # e with acute é x00C9 / 00E9 +uplow \x00CA\x00EA 126 # e with circumflex x00CA / 00EA +uplow \x010C\x010D 146 # c with caron x00CE / 00EE +uplow \x00CF\x00EF 34 # i with diaeresis x00CF / 00EF +uplow \x00D4\x00F4 46-135 # o with circumflex ô x00D4 / 00F4 +uplow \x00CD\x00ED 126 # i with acute x00CD / 00ED +uplow \x00C6\x00E6 345 # æ x00C6 / 00E6 +uplow \x00C1\x00E1 16 # a with acute x00C1 / 00E1 +uplow Øø 246 # o with stroke +uplow \X00DA\x00FA 12456 # u with acute x00DA / 00FA +uplow \x00DC\x00FC 1256 # u with diaeresis x00FC +uplow \x00DD\x00FD 12346 # y with acute x00FD +uplow Åå 16 # A with ring above x00C5 / 00E5 +uplow \x00C0\x00E0 12356 # a with grave x00C0 / 00E0 +uplow \x00C2\x00E2 46-1 # a with circumflex x00C2 / 00E2 +uplow Ää 345 # A with diaeresis x00C4 / 00E4 +uplow \x00C7\x00E7 12346 # c with cedilla ç x00C7 / 00E7 +uplow \x00D5\x00F5 1456-135 # o with tilde x00D5 / 00F5 +uplow Öö 246 # O with diaeresis x00D6 / 00F6 +uplow \x00D2\x00F2 346 # O with grave ò +uplow \x017D\x017E 2346 # z with caron +uplow \x01EA\x01EB 23456 # o with ogonek +uplow Đđ 1456 # d with stroke +uplow Ðð 156 # Eth +uplow Ŋŋ 1246 # Eng +uplow Þþ 35-2345 # Thorn +uplow Üü 1245 # u with diaeresis +uplow Ŧŧ 1256 # t with stroke + +math + 235 # plus x002B +math / 34 solidus # x002F +math < 246-3 # less-than sign x003C +math = 2356 # equal sign x003D +math > 135-2 # greater-than sign x003E +math ¼ 6-16-34-1456 # vulgar fraction one quarter x00BC +math ½ 6-16-34-126 # vulgar fraction one half x00BD +math ¾ 6-126-34-1456 # vulgar fraction 3 quarters x00BE +math × 3 # multiplication sign x00D7 +math ÷ 25 # division sign x00F7 +math \x2013 36 # 8211 en dash (smart minus sign) +math √ 146 # root sign + +lowercase \x00F3 1456 # DEC 243 ó +lowercase \x00F4 4-135 # DEC 244 ô + +# Diacritic characters + +include no-no-latinLetterDef6Dots_diacritics.uti diff --git a/tables/no-no-g0.utb b/tables/no-no-g0.utb index 7f6c269c9..3d039511b 100644 --- a/tables/no-no-g0.utb +++ b/tables/no-no-g0.utb @@ -1,176 +1,16 @@ - # liblouis: Norwegian Grade 0 Braille Table, uncontracted braille # Created June 9, 2005 by Leon Ungier with # help and guidance from Lars Bjørndal # Updated June 2009 by Lars Bjørndal # Updated April 2015 by Jostein Austvik Jacobsen and Ammar Usama -include digits8Dots.uti -include latinLetterDef6Dots.uti - -space \s 0 # blank x0020 -space \x001b 1b # escape character for html back-translation # dec 27 - -# With liblouisxml, use the following three lines instead: -space \t 9 # tab x0009 -space \x000D 0 # \r -space \x000A 0 # \n -space \x00A0 a # NO-BREAK SPACE 0020 NON-BREAKING SPACE # dec 160 - -punctuation ! 235 # exclamation mark x0021 -punctuation " 256 # double quote x0022 -punctuation ' 5 # apostrophe x0027 -punctuation ( 236 # left parenthesis x0028 -punctuation ) 356 # right parenthesis x0029 -punctuation , 2 # coma x002C -punctuation - 36 # hyphen-minus x002D -punctuation . 3 # point x002E -punctuation : 25 # colon x003A -punctuation ; 23 # semicolon x003B -punctuation ? 26 # question mark x003F -punctuation [ 12356 # left square bracket x005B -punctuation ] 23456 # right square bracket x005D -punctuation { 6-12356 # left curly bracket x007B -punctuation } 6-23456 # right curly bracket x007D -punctuation « 256 # left-pointing double angle quotation mark x00AB -punctuation » 256 # right-pointing double angle quotation mark x00BB -punctuation \x2010 36 # 8208 hyphen -punctuation \x2011 36 # 8209 non-breaking hyphen -punctuation \x2013 36-36 # en dash -punctuation \x2014 36-36 # em dash -punctuation \x2018 5 # 8216 smart single left quotation mark -punctuation \x2019 5 # 8217 smart single right quotation mark -punctuation \x201C 256 # 8220 smart opening double quote -punctuation \x201D 256 # 8221 smart closing double quote -punctuation \x201E 256 # 8222 smart double low quotation mark -punctuation \x201F 256 # 8223 smart double high reverse quotation mark -punctuation \x2026 3-3-3 # 8230 smart ellipsis - -sign # 3456 # number sign x0023 -sign $ 256 # dollar sign x0024 -sign £ 123 # pound sign -sign % 46-356 # percent sign x0025 -sign ‰ 46-356-356 # per mille sign -sign & 346 # ampersand z0026 -sign * 35 # asterisk x002A -sign @ 4 # commercial at x0040 -sign \\ 156 # reverse solidus x005C -sign ^ 46 # circumflex accent x005E (math power) -sign _ 456 # low line x005F -sign ` 45 # grave accent x0060 -sign \x00AF 45 # macron -sign \x0304 45 # combining macron -sign | 123456 # vertical line x007C -sign ~ 1456 # tilde x007E -sign \x0080 15-136-1235-135 # Euro sign x0080 -sign ¢ 4-14 # cent sign x00A2 -sign £ 45-123 # pound sign x00A3 -sign ¤ 236-134-356 # currency sign x00A4 -sign ¥ 45-13456 # yen sign x00A5 -sign § 346 # section sign x00A7 -sign © 236-14-356 # copyright x00A9 -sign ® 236-1235-356 # Registered trademark -sign ™ 236-2345-356 # Trademark -sign ° 5-356 # degree sign x00B0 -sign ² 4-6-126 # superscript 2 sign x00B2 -sign ³ 4-6-146 # superscript 3 sign x00B3 -sign \x00B4 4 # acute sign dec-180 -sign ¹ 1-27 # superscript 1 sign x00B9 -sign \x20AC 26 # Euro sign x0080 -sign ■ 123456 # Filled square -sign □ 123456 # Empty square -sign ● 2356 # Filled circle -sign ○ 2356 # Empty circle -sign • 2356 # Bullet -sign ß 35-234 # Latin Small Letter Sharp S - -uplow Αα 1 # alpha -uplow Ββ 12 # beta -uplow Γγ 1245 # gamma -uplow Δδ 145 # delta -uplow Εε 15 # epsilon -uplow Ζζ 1356 # zeta -uplow Ηη 5 # eta -uplow Θθ 4 # theta -uplow Ιι 24 # iota -uplow Κκ 13 # kappa -uplow Λλ 123 # lambda -uplow Μμ 134 # my -uplow Νν 1345 # ny -uplow Ξξ 1346 # ksi -uplow Οο 135 # omikron -uplow Ππ 1234 # pi -uplow Ρρ 1235 # rho -uplow Σς 234 # sigma -uplow Ττ 2345 # tau -uplow Υυ 136 # ypsilon -uplow Φφ 124 # fi -uplow Χχ 12346 # khi -uplow Ψψ 13456 # psi -uplow Ωω 2456 # omega - - - -uplow \x00C8\x00E8 2346 # e with grave è x00C8 / 00E8 -uplow \x00C9\x00E9 123456 # e with acute é x00C9 / 00E9 -uplow \x00CA\x00EA 126 # e with circumflex x00CA / 00EA -uplow \x010C\x010D 146 # c with caron x00CE / 00EE -uplow \x00CF\x00EF 34 # i with diaeresis x00CF / 00EF -uplow \x00D4\x00F4 46-135 # o with circumflex ô x00D4 / 00F4 -uplow \x00CD\x00ED 126 # i with acute x00CD / 00ED -uplow \x00C6\x00E6 345 # æ x00C6 / 00E6 -uplow \x00C1\x00E1 16 # a with acute x00C1 / 00E1 -uplow Øø 246 # o with stroke -uplow \X00DA\x00FA 12456 # u with acute x00DA / 00FA -uplow \x00DC\x00FC 1256 # u with diaeresis x00FC -uplow \x00DD\x00FD 12346 # y with acute x00FD -uplow Åå 16 # A with ring above x00C5 / 00E5 -uplow \x00C0\x00E0 12356 # a with grave x00C0 / 00E0 -uplow \x00C2\x00E2 46-1 # a with circumflex x00C2 / 00E2 -uplow Ää 345 # A with diaeresis x00C4 / 00E4 -uplow \x00C7\x00E7 12346 # c with cedilla ç x00C7 / 00E7 -uplow \x00D5\x00F5 1456-135 # o with tilde x00D5 / 00F5 -uplow Öö 246 # O with diaeresis x00D6 / 00F6 -uplow \x00D2\x00F2 346 # O with grave ò -uplow \x017D\x017E 2346 # z with caron -uplow \x01EA\x01EB 23456 # o with ogonek -uplow Đđ 1456 # d with stroke -uplow Ðð 156 # Eth -uplow Ŋŋ 1246 # Eng -uplow Þþ 35-2345 # Thorn -uplow Üü 1245 # u with diaeresis -uplow Ŧŧ 1256 # t with stroke - -math + 235 # plus x002B -math / 34 solidus # x002F -math < 246-3 # less-than sign x003C -math = 2356 # equal sign x003D -math > 135-2 # greater-than sign x003E -math ¼ 6-16-34-1456 # vulgar fraction one quarter x00BC -math ½ 6-16-34-126 # vulgar fraction one half x00BD -math ¾ 6-126-34-1456 # vulgar fraction 3 quarters x00BE -math × 3 # multiplication sign x00D7 -math ÷ 25 # division sign x00F7 -math \x2013 36 # 8211 en dash (smart minus sign) -math √ 146 # root sign +include no-no-chardefs6.uti +include litdigits6Dots.uti +include braille-patterns.cti # unicode braille lowword \x2013 36-36 # make double when surrounded by white spaces lowword - 36-36 # make double when hyphen surrounded by white spaces -lowercase \x00F3 1456 # DEC 243 ó -lowercase \x00F4 4-135 # DEC 244 ô - -# Diacritic characters - -include no-no-latinLetterDef6Dots_diacritics.uti - - - -# ------------------- End char definitions -------------------- - -include litdigits6Dots.uti -include braille-patterns.cti # unicode braille - numsign 3456 capsign 6 # single capital letter indicator begcaps 6-6 # a block of consecutive capital letters indicator