Merge remote-tracking branch 'origin/master'

DHParser/ebnf.py

@@ -436,7 +436,7 @@ class EBNFCompiler(CompilerBase):
             arg = node.result[-1]
             argstr = str(arg)
             if arg.parser.name != 'symbol':
-                node.add_error(('Retrieve Operator "%s" requires a symbols, '
+                node.add_error(('Retrieve Operator "%s" requires a symbol, '
                                 'and not a %s.') % (prefix, str(arg.parser)))
                 return str(arg.result)
             if str(arg) in self.directives['complement']:

examples/LaTeX/LaTeX.ebnf

@@ -25,9 +25,9 @@ partext    = text | PARSEP
 text       = cfgtext | brackets
 cfgtext    = chunk | escaped | WSPC
 
-escaped    = /\\[%$&]/
-brackets   = /[\[\]]/                   # left and right square brackets: [ ]
-chunk      = /[^\\%$&\{\}\[\]\s\n]+/    # some piece of text excluding whitespace,
+ESCAPED    = /\\[%$&]/
+BRACKET    = /[\[\]]/                   # left or right square bracket: [ ]
+TEXTCHUNK  = /[^\\%$&\{\}\[\]\s\n]+/    # some piece of text excluding whitespace,
                                         # linefeed and special characters
 WSPC       = /[ \t]*\n?(?!\s*\n)[ \t]*/ # whitespace, including at most one linefeed
 LF         = /[ \t]*\n(?!\s*\n)/        # a linefeed, but not an empty line (i.e. par)