CLDR-18318 kbd: escaping: update to EBNF/ABNF

- update ebnf in the spec
- update abnf in data files
- update test cases

Author: srl295

docs/ldml/tr35-keyboards.md

@@ -2233,7 +2233,7 @@ _Attribute:_ `from` (required)
     `{x,y}`
 
     `x` and `y` are required single digits (`1` to `9`) representing the minimum and maximum number of occurrences.
-    
+
     `x` must be ≥ 0, `y` must be ≥ x and ≥ 1. 
 
     Unbounded quantifiers such as `{3,}` are not allowed.
@@ -2515,20 +2515,17 @@ fixed-class-char
            | 'n'
            | 'f'
            | 'v'
-           | '\'
-           | '$'
            | 'd'
            | 'w'
            | 'D'
            | 'W'
-           | '0'
 set-class
          ::= '[' set-negator set-members ']'
 set-members
          ::= set-member+
 set-member
-         ::= text-char
-           | char-range
+         ::= char-range
+           | range-char
            | match-marker
            | escaped-codepoint
 char-range
@@ -2547,7 +2544,7 @@ text-char
 range-char
          ::= content-char
            | ws
-           | escaped-char
+           | escaped-range-char
            | '.'
            | '|'
            | '{'
@@ -2558,7 +2555,28 @@ content-char
            | DIGIT
            | NON-ASCII
 escaped-char
-         ::= '\' ( '\' | '{' | '|' | '}' )
+         ::= '\' escapable-char
+escapable-char
+         ::= '\'
+           | '$'
+           | '{'
+           | '|'
+           | '}'
+           | '('
+           | ')'
+           | '*'
+           | '+'
+           | '.'
+           | '/'
+           | '?'
+           | '['
+           | ']'
+           | '^'
+escaped-range-char
+         ::= '\' escapable-range-char
+escapable-range-char
+         ::= escapable-char
+           | '-'
 ws       ::= [ #x3000]
            | HTAB
            | CR

keyboards/abnf/transform-from-required.abnf

@@ -81,11 +81,11 @@ class = fixed-class / set-class
 
 fixed-class = backslash fixed-class-char
 
-fixed-class-char = "s" / "S" / "t" / "r" / "n" / "f" / "v" / backslash / "$" / "d" / "w" / "D" / "W" / "0"
+fixed-class-char = "s" / "S" / "t" / "r" / "n" / "f" / "v" / "d" / "w" / "D" / "W"
 
 set-class = "[" set-negator set-members "]"
 set-members = set-member *(set-member)
-set-member = text-char / char-range / match-marker / escaped-codepoint
+set-member = char-range / range-char / match-marker / escaped-codepoint
 char-range = range-edge "-" range-edge
 range-edge = escaped-codepoint / range-char
 set-negator = "^" / ""
@@ -95,12 +95,16 @@ set-negator = "^" / ""
 ; normal text
 text-char         = content-char / ws / escaped-char / "-" / ":"
 ; text in a range sequence
-range-char        = content-char / ws / escaped-char / "."/ "|" / "{" / "}"
+range-char        = content-char / ws / escaped-range-char / "." / "|" / "{" / "}"
 ; group for everything BUT syntax chars.
 content-char      = ASCII-PUNCT / ALPHA / DIGIT / NON-ASCII
 
 ; Character escapes
-escaped-char = backslash ( backslash / "{" / "|" / "}" )
+escaped-char = backslash ( escapable-char )
+escapable-char = backslash / "$" / "{" / "|" / "}" / "(" / ")" / "*" / "+" / "." / "/" / "?" / "[" / "]" / "^"
+
+escaped-range-char = backslash escapable-range-char
+escapable-range-char = escapable-char / "-"
 
 backslash    = %x5C ; U+005C REVERSE SOLIDUS "\"
 ws = SP / HTAB / CR / LF / %x3000

tools/scripts/keyboard-abnf-tests/transform-from-required.d/from-match.fail.txt

@@ -33,3 +33,6 @@ e(abc)+g
 # end marker
 Foo$
 ^Foo$
+\0
+\a
+\1

tools/scripts/keyboard-abnf-tests/transform-from-required.d/from-match.pass.txt

@@ -20,3 +20,22 @@ abc|def
 ##(?:foo(?:bar(baz(bat))?))
 \m{q}:
 \m{q}ড\m{.}
+\$
+\(
+\)
+\*
+\+
+\.
+\/
+\?
+\[
+\\
+\]
+\^
+\{
+\|
+\}
+z[0-9]?
+z[0-9\-]?
+z[^0-9]?
+z[^0-9\-]?