Skip to content

Commit

Permalink
Update the Dutch tables to the braille standard 2017.1, as published …
Browse files Browse the repository at this point in the history 
…by the Braille Autoriteit.

[http://braille-autoriteit.org/algemeen-gebruik/versie-2017-van-zespunts-standaard/]
  • Loading branch information
@dkager @bertfrees
dkager authored and bertfrees committed Nov 21, 2018
1 parent 552d948 commit 507637b
Show file tree
Hide file tree
Showing 5 changed files with 126 additions and 94 deletions.
18 changes: 5 additions & 13 deletions tables/nl-BE-g0.utb
View file
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2010, 2011 by DocArch <http://www.docarch.be>
# Copyright (C) 2014 by Bert Frees
# Copyright (C) 2014 by CBB <http://www.cbb.nl>
# Copyright (C) 2015, 2016 by Dedicon <http://www.dedicon.nl>
# Copyright (C) 2015, 2016, 2018 by Dedicon <http://www.dedicon.nl>
#
# This file is part of liblouis.
#
Expand All @@ -22,17 +22,16 @@
#
# -------------------------------------------------------------------------------
#
# Dutch Braille as used in the Netherlands
# Dutch Braille as used in Belgium
#
# Created by Bert Frees <bertfrees@gmail.com>
# Modified by Henri Apperloo <h.apperloo@cbb.nl>
# Modified by Davy Kager <DavyKager@dedicon.nl>
#
# See also: « Braillestandaard voor algemeen gebruik in het Nederlandse taalgebied,
# Van toepassing vanaf 1 september 2005 »
# (Federatie Slechtzienden- en Blindenbelang en
# Belgische Confederatie voor Blinden en Slechtzienden, 2005)
# [https://cdn.rawgit.com/liblouis/braille-specs/master/Belgium/Eindtekst-zonder-voorblad-dec-2005.doc][1]
# Van toepassing vanaf 19 april 2018 »
# (Braille Autoriteit, 2018)
# [http://braille-autoriteit.org/algemeen-gebruik/versie-2017-van-zespunts-standaard/][1]
# and: « World Braille Usage (3rd edition) »
# [https://cdn.rawgit.com/liblouis/braille-specs/master/world-braille-usage-third-edition.pdf][2]
#
Expand Down Expand Up @@ -64,13 +63,6 @@ uplow \x00D5\x00F5 246,246 Õõ LATIN CAPITA
punctuation \x007B 12356 { LEFT CURLY BRACKET
punctuation \x007D 23456 } RIGHT CURLY BRACKET

# Middle dot
# Definition missing from standard
# Belgium uses "5-256"
# The Netherlands use "56"

math \x00B7 5-256 · MIDDLE DOT

# Greek letters
# Clear definition missing from standard
# The Netherlands use the definitions from Greek (International), p. 185 [2] and rule §2.2 Alfabetwisselingsteken [1]
Expand Down
24 changes: 4 additions & 20 deletions tables/nl-NL-g0.utb
View file
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2010, 2011 by DocArch <http://www.docarch.be>
# Copyright (C) 2014 by Bert Frees
# Copyright (C) 2014 by CBB <http://www.cbb.nl>
# Copyright (C) 2015, 2016 by Dedicon <http://www.dedicon.nl>
# Copyright (C) 2015, 2016, 2018 by Dedicon <http://www.dedicon.nl>
#
# This file is part of liblouis.
#
Expand All @@ -29,10 +29,9 @@
# Modified by Davy Kager <DavyKager@dedicon.nl>
#
# See also: « Braillestandaard voor algemeen gebruik in het Nederlandse taalgebied,
# Van toepassing vanaf 1 september 2005 »
# (Federatie Slechtzienden- en Blindenbelang en
# Belgische Confederatie voor Blinden en Slechtzienden, 2005)
# [https://cdn.rawgit.com/liblouis/braille-specs/master/Belgium/Eindtekst-zonder-voorblad-dec-2005.doc][1]
# Van toepassing vanaf 19 april 2018 »
# (Braille Autoriteit, 2018)
# [http://braille-autoriteit.org/algemeen-gebruik/versie-2017-van-zespunts-standaard/][1]
# and: « World Braille Usage (3rd edition) »
# [https://cdn.rawgit.com/liblouis/braille-specs/master/world-braille-usage-third-edition.pdf][2]
#
Expand Down Expand Up @@ -69,21 +68,6 @@ punctuation \x007D 23456 } RIGHT CURLY BR
# punctuation \x007D 3456 } RIGHT CURLY BRACKET
# punctuation \x007D 6-23456 } RIGHT CURLY BRACKET

# Vertical line
# Definition missing from standard
# Dedicon uses dots "1456"
# CBB uses dots "123456"

sign \x007C 1456 | VERTICAL LINE
# sign \x007C 123456 | VERTICAL LINE

# Middle dot
# Definition missing from standard
# Belgium uses "5-256"
# The Netherlands use "56"

sign \x00B7 56 · MIDDLE DOT

# Greek letters
# Clear definition missing from standard
# The Netherlands use the definitions from Greek (International), p. 185 [2] and rule §2.2 Alfabetwisselingsteken [1]
Expand Down
39 changes: 20 additions & 19 deletions tables/nl-chardefs.uti
View file
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2010, 2011 by DocArch <http://www.docarch.be>
# Copyright (C) 2014 by Bert Frees
# Copyright (C) 2014 by CBB <http://www.cbb.nl>
# Copyright (C) 2015, 2016 by Dedicon <http://www.dedicon.nl>
# Copyright (C) 2015, 2016, 2018 by Dedicon <http://www.dedicon.nl>
#
# This file is part of liblouis.
#
Expand All @@ -22,17 +22,16 @@
#
#-------------------------------------------------------------------------------
#
# Dutch Braille based on the braille standard of 2005
# Dutch Braille based on the braille standard of 2017
#
# Created by Bert Frees <bertfrees@gmail.com>
# Modified by Henri Apperloo <h.apperloo@cbb.nl>
# Modified by Davy Kager <DavyKager@dedicon.nl>
#
# See also: « Braillestandaard voor algemeen gebruik in het Nederlandse taalgebied,
# Van toepassing vanaf 1 september 2005 »
# (Federatie Slechtzienden- en Blindenbelang en
# Belgische Confederatie voor Blinden en Slechtzienden, 2005)
# [https://cdn.rawgit.com/liblouis/braille-specs/master/Belgium/Eindtekst-zonder-voorblad-dec-2005.doc][1]
# Van toepassing vanaf 19 april 2018 »
# (Braille Autoriteit, 2018)
# [http://braille-autoriteit.org/algemeen-gebruik/versie-2017-van-zespunts-standaard/][1]
#
# ----------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -101,9 +100,10 @@ punctuation \x003F 26 ? QUESTION MARK
sign \x0040 345 @ COMMERCIAL AT
punctuation \x005B 12356 [ LEFT SQUARE BRACKET
punctuation \x005D 23456 ] RIGHT SQUARE BRACKET
sign \x005E 34 ^ CIRCUMFLEX ACCENT
sign \x005E 346 ^ CIRCUMFLEX ACCENT
sign \x005F 456 _ LOW LINE
punctuation \x0060 3 ` GRAVE ACCENT
sign \x007C 1456 | VERTICAL LINE


# ----------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -132,10 +132,11 @@ sign \x00A3 1234 £ POUND SIGN
sign \x00A5 13456 ¥ YEN SIGN
sign \x00A7 346 § SECTION SIGN
punctuation \x00AB 2356 « LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
punctuation \x00AD 367 ­ SOFT HYPHEN
punctuation \x00AD 36 ­ SOFT HYPHEN
sign \x00B1 235-36 ± PLUS-MINUS SIGN
sign \x00B4 3 ´ ACUTE ACCENT
sign \x00B5 56-134 µ MICRO SIGN
math \x00B7 236 · MIDDLE DOT
punctuation \x00BB 2356 » RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
punctuation \x00BF 26 ¿ INVERTED QUESTION MARK
math \x00D7 236 × MULTIPLICATION SIGN
Expand Down Expand Up @@ -208,10 +209,10 @@ sign \x0099 5-2345-134 ™ <control> -
sign \x00A9 5-14 © COPYRIGHT SIGN
sign \x00AE 5-1235 ® REGISTERED SIGN
sign \x00B0 4-356 ° DEGREE SIGN
math \x00B2 34-3456-12 ² SUPERSCRIPT TWO
math \x00B3 34-3456-14 ³ SUPERSCRIPT THREE
math \x00B2 346-3456-12 ² SUPERSCRIPT TWO
math \x00B3 346-3456-14 ³ SUPERSCRIPT THREE
sign \x00B8 45 ¸ CEDILLA
sign \x00B9 34-3456-1 ¹ SUPERSCRIPT ONE
sign \x00B9 346-3456-1 ¹ SUPERSCRIPT ONE
sign \x00BA 4-356 º MASCULINE ORDINAL INDICATOR
math \x00BC 3456-1-34-3456-145 ¼ VULGAR FRACTION ONE QUARTER
math \x00BD 3456-1-34-3456-12 ½ VULGAR FRACTION ONE HALF
Expand Down Expand Up @@ -251,14 +252,14 @@ sign \x2030 123456-123456 ‰ PER MILLE SI
# Unicode 2070..209F Superscripts and Subscripts
# ----------------------------------------------------------------------------------------------

math \x2070 34-3456-245 ⁰ SUPERSCRIPT ZERO
math \x2074 34-3456-145 ⁴ SUPERSCRIPT FOUR
math \x2075 34-3456-15 ⁵ SUPERSCRIPT FIVE
math \x2076 34-3456-124 ⁶ SUPERSCRIPT SIX
math \x2077 34-3456-1245 ⁷ SUPERSCRIPT SEVEN
math \x2078 34-3456-125 ⁸ SUPERSCRIPT EIGHT
math \x2079 34-3456-24 ⁹ SUPERSCRIPT NINE
math \x207F 34-1345 ⁿ SUPERSCRIPT LATIN SMALL LETTER N
math \x2070 346-3456-245 ⁰ SUPERSCRIPT ZERO
math \x2074 346-3456-145 ⁴ SUPERSCRIPT FOUR
math \x2075 346-3456-15 ⁵ SUPERSCRIPT FIVE
math \x2076 346-3456-124 ⁶ SUPERSCRIPT SIX
math \x2077 346-3456-1245 ⁷ SUPERSCRIPT SEVEN
math \x2078 346-3456-125 ⁸ SUPERSCRIPT EIGHT
math \x2079 346-3456-24 ⁹ SUPERSCRIPT NINE
math \x207F 346-1345 ⁿ SUPERSCRIPT LATIN SMALL LETTER N
math \x2080 16-356 ₀ SUBSCRIPT ZERO
math \x2081 16-2 ₁ SUBSCRIPT ONE
math \x2082 16-23 ₂ SUBSCRIPT TWO
Expand Down
33 changes: 18 additions & 15 deletions tables/nl-g0.uti
View file
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2010-2011 by DocArch <http://www.docarch.be>
# Copyright (C) 2014-2015 by Bert Frees
# Copyright (C) 2014 by CBB <http://www.cbb.nl>
# Copyright (C) 2015, 2016 by Dedicon <http://www.dedicon.nl>
# Copyright (C) 2015, 2016, 2018 by Dedicon <http://www.dedicon.nl>
#
# This file is part of liblouis.
#
Expand All @@ -22,17 +22,16 @@
#
# -------------------------------------------------------------------------------
#
# Dutch Braille based on the braille standard of 2005
# Dutch Braille based on the braille standard of 2017
#
# Created by Bert Frees <bertfrees@gmail.com>
# Modified by Henri Apperloo <h.apperloo@cbb.nl>
# Modified by Davy Kager <DavyKager@dedicon.nl>
#
# See also: « Braillestandaard voor algemeen gebruik in het Nederlandse taalgebied,
# Van toepassing vanaf 1 september 2005 »
# (Federatie Slechtzienden- en Blindenbelang en
# Belgische Confederatie voor Blinden en Slechtzienden, 2005)
# [https://cdn.rawgit.com/liblouis/braille-specs/master/Belgium/Eindtekst-zonder-voorblad-dec-2005.doc][1]
# Van toepassing vanaf 19 april 2018 »
# (Braille Autoriteit, 2018)
# [http://braille-autoriteit.org/algemeen-gebruik/versie-2017-van-zespunts-standaard/][1]
#
# ----------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -62,8 +61,8 @@ endnum \x2030 0-123456-123456

# isgelijkteken =
begword \x003D 2356-0
midword \x003D 0-2356
endword \x003D 0-2356-0
midword \x003D 0-2356-0
endword \x003D 0-2356

# plusteken +
begword \x002B 235-0
Expand Down Expand Up @@ -95,8 +94,11 @@ noback joinnum \x00A3 1234

noback joinnum \x00A5 13456

# Eén
noback context ["E"]"\x00E9" @123456
# §1.34 verticale streep | (spatie voor en na) [1]

begword \x007C 1456-0
midword \x007C 0-1456-0
endword \x007C 0-1456

# §3.6 Graad-, minuut- en secondeteken [1]
noback context $d["''"] @4-35-35
Expand Down Expand Up @@ -130,7 +132,7 @@ noback pass3 $d[@6]@456 ?
# "second meaning" sign because its first meaning is EXCLAMATION MARK.

class plusamp +& # 2nd class = $x
class noplusamp -.' # 3rd class = $y
class noplusamp .'‘’ # 3rd class = $y
noback pass4 %noplusamp[]%plusamp @5
noback pass4 $l[]%plusamp @5
noback pass4 [@235a]%plusamp @235-5
Expand Down Expand Up @@ -169,12 +171,13 @@ emphletter underline 456
# §2.12 Hoofdletters [1]

# Certain characters can appear within an uppercase string without cancelling
# the uppercase "state". These characters are - (HYPHEN MINUS), + (PLUS SIGN), &
# (AMPERSAND), . (FULL STOP) and ' (APOSTROPHE).
capsmodechars -+&.'
# the uppercase "state". These characters are + (PLUS SIGN), & (AMPERSAND),
# . (FULL STOP), ' (APOSTROPHE), ‘ (LEFT SINGLE QUOTATION MARK)
# and ’ (RIGHT SINGLE QUOTATION MARK).
capsmodechars +&.'‘’
# The same goes for the emphasis "state". This is not yet supported.
# See: https://github.com/liblouis/liblouis/issues/116
#emphmodechars -+&.'
#emphmodechars +&.'

lencapsphrase 4
begcapsword 45
Expand Down

0 comments on commit 507637b

Please sign in to comment.