2 files changed, 33 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b1562ca9d4..b1675af3216 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,13 @@
         * progmodes/ebnf-ebx.el: New file, implement a parser for EBNF used to
         specify XML (EBNFX).
 
+        * progmodes/ebnf2ps.el: Doc fix.
+        (ebnf-version): New version number (4.1).
+        (ebnf-syntax): Adjust customization.
+        (ebnf-style-database): Add ebnfx entry.
+        (ebnf-syntax-alist): Add ebnfx initialization.
+        (ebnf-ebx-parser, ebnf-ebx-initialize): Autoloaded funs from ebnf-ebx.
+
 2004-03-28  Nick Roberts  <nick@nick.uklinux.net>
 
         * progmodes/gdb-ui.el (gdb-ann3, gdb-send-item)
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 96ec53ac501..fa4e46677b7 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -5,9 +5,9 @@
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
-;; Time-stamp: <2004/02/29 14:06:59 vinicius>
+;; Time-stamp: <2004/03/28 19:56:21 vinicius>
 ;; Keywords: wp, ebnf, PostScript
-;; Version: 4.0
+;; Version: 4.1
 ;; X-URL: http://www.cpqd.com.br/~vinicius/emacs/
 
 ;; This file is part of GNU Emacs.
@@ -27,8 +27,8 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-(defconst ebnf-version "4.0"
-  "ebnf2ps.el, v 4.0 <2004/02/28 vinicius>
+(defconst ebnf-version "4.1"
+  "ebnf2ps.el, v 4.1 <2004/03/18 vinicius>
 
 Vinicius's last change version.  When reporting bugs, please also
 report the version of Emacs, if any, that ebnf2ps was running with.
@@ -320,6 +320,10 @@ Please send all bug fixes and enhancements to
 ;;                      setting:
 ;;                      `ebnf-yac-ignore-error-recovery'.
 ;;
+;;    `ebnfx'           ebnf2ps recognizes the syntax described in the URL:
+;;                   `http://www.w3.org/TR/2004/REC-xml-20040204/#sec-notation'
+;;                   ("Extensible Markup Language (XML) 1.0 (Third Edition)")
+;;
 ;; Any other value is treated as `ebnf'.
 ;;
 ;; The default value is `ebnf'.
@@ -1679,9 +1683,14 @@ Valid values are:
                 setting:
                 `ebnf-yac-ignore-error-recovery'.
 
+   `ebnfx'      ebnf2ps recognizes the syntax described in the URL:
+                `http://www.w3.org/TR/2004/REC-xml-20040204/#sec-notation'
+                (\"Extensible Markup Language (XML) 1.0 (Third Edition)\")
+
 Any other value is treated as `ebnf'."
   :type '(radio :tag "Syntax"
-                (const ebnf) (const abnf) (const iso-ebnf) (const yacc))
+                (const ebnf) (const abnf)  (const iso-ebnf)
+                (const yacc) (const ebnfx))
   :group 'ebnf-syntactic)
 
 
@@ -2393,6 +2402,10 @@ See also `ebnf-syntax-buffer'."
     (yacc
      default
      (ebnf-syntax                      . 'yacc))
+    ;; ebnfx default
+    (ebnfx
+     default
+     (ebnf-syntax                      . 'ebnfx))
     )
   "Style database.
 
@@ -4650,7 +4663,8 @@ killed after process termination."
   '((iso-ebnf  ebnf-iso-parser  ebnf-iso-initialize)
     (yacc      ebnf-yac-parser  ebnf-yac-initialize)
     (abnf      ebnf-abn-parser  ebnf-abn-initialize)
-    (ebnf      ebnf-bnf-parser  ebnf-bnf-initialize))
+    (ebnf      ebnf-bnf-parser  ebnf-bnf-initialize)
+    (ebnfx     ebnf-ebx-parser  ebnf-ebx-initialize))
   "Alist associating ebnf syntax with a parser and a initializer.")
 
 
@@ -5688,6 +5702,12 @@ killed after process termination."
 (autoload 'ebnf-yac-initialize        "ebnf-yac"
   "Initializations for Yacc/Bison parser.")
 
+(autoload 'ebnf-ebx-parser            "ebnf-ebx"
+  "EBNFX parser.")
+
+(autoload 'ebnf-ebx-initialize        "ebnf-ebx"
+  "Initializations for EBNFX parser.")
+
 (autoload 'ebnf-eliminate-empty-rules "ebnf-otz"
   "Eliminate empty rules.")