* lisp/nxml/nxml-mode.el (nxml-parent-document): Add a variable.

(nxml-parent-document-set): A function to set `nxml-parent-document'.
(nxml-mode): Define using `define-derived-mode' instead of `defun'.
(nxml-mode-hook): Remove `defcustom' (auto-defined by
define-derived-mode').
* lisp/nxml/rng-valid.el (rng-dtd-trivial-p): Add a helper function for
users who want to call `nxml-parent-document-set'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f41e7df61a1c9f760c8e9cf976c361bdddd555c..4795e0eda5881e85ec202528e52013bb9d7ebe96 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-30  Sam Steingold  <sds@gnu.org>
+
+       * nxml/nxml-mode.el (nxml-parent-document): Add a variable.
+       (nxml-parent-document-set): A function to set `nxml-parent-document'.
+       (nxml-mode): Define using `define-derived-mode' instead of `defun'.
+       (nxml-mode-hook): Remove `defcustom' (auto-defined by
+       define-derived-mode').
+       * nxml/rng-valid.el (rng-dtd-trivial-p): Add a helper function for
+       users who want to call `nxml-parent-document-set'.
+
 2010-11-27  Chong Yidong  <cyd@stupidchicken.com>
 
        * log-edit.el (log-edit-font-lock-keywords): Don't try matching

diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 290e660cf5bd81e79161822c8395b6f362038ca5..0d75c092fd36c24259eb3a4a5b705a016c63c71c 100644 (file)
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -59,11 +59,6 @@ glyphs are displayed."
   :group 'nxml
   :type 'boolean)
 
-(defcustom nxml-mode-hook nil
-  "Hook run by command `nxml-mode'."
-  :group 'nxml
-  :type 'hook)
-
 (defcustom nxml-sexp-element-flag nil
   "*Non-nil means sexp commands treat an element as a single expression."
   :group 'nxml
@@ -354,6 +349,12 @@ The delimiters are <! and >."
 
 ;;; Global variables
 
+(defvar nxml-parent-document nil
+  "The parent document for a part of a modular document.
+Use `nxml-parent-document-set' to set it.")
+(make-variable-buffer-local 'nxml-parent-document)
+(put 'nxml-parent-document 'safe-local-variable 'stringp)
+
 (defvar nxml-prolog-regions nil
   "List of regions in the prolog to be fontified.
 See the function `xmltok-forward-prolog' for more information.")
@@ -430,8 +431,40 @@ reference.")
   (when (and face (< start end))
     (font-lock-append-text-property start end 'face face)))
 
+(defun nxml-parent-document-set (parent-document)
+  "Set `nxml-parent-document' and inherit the DTD &c."
+  ;; FIXME: this does not work.
+  ;;  the idea is that by inheriting some variables from the parent,
+  ;;  `rng-validate-mode' will validate entities declared in the parent.
+  ;;  alas, the most interesting variables (`rng-compile-table' et al)
+  ;;  are circular and cannot be printed even with `print-circle'.
+  (interactive "fParent document")
+  (let (dtd current-schema current-schema-file-name compile-table
+        ipattern-table last-ipattern-index)
+    (when (string= (file-truename parent-document)
+                   (file-truename buffer-file-name))
+      (error "Parent document cannot be the same as the document"))
+    (with-current-buffer (find-file-noselect parent-document)
+      (setq dtd rng-dtd
+            current-schema rng-current-schema
+            current-schema-file-name rng-current-schema-file-name
+            compile-table rng-compile-table
+            ipattern-table rng-ipattern-table
+            last-ipattern-index rng-last-ipattern-index
+            parent-document buffer-file-name))
+    (setq rng-dtd dtd
+          rng-current-schema current-schema
+          rng-current-schema-file-name current-schema-file-name
+          rng-compile-table compile-table
+          rng-ipattern-table ipattern-table
+          rng-last-ipattern-index last-ipattern-index
+          nxml-parent-document parent-document)
+    (message "Set parent document to %s" parent-document)
+    (when rng-validate-mode
+      (rng-validate-while-idle (current-buffer)))))
+
 ;;;###autoload
-(defun nxml-mode ()
+(define-derived-mode nxml-mode text-mode "nXML"
   ;; We use C-c C-i instead of \\[nxml-balanced-close-start-tag-inline]
   ;; because Emacs turns C-c C-i into C-c TAB which is hard to type and
   ;; not mnemonic.
@@ -485,10 +518,7 @@ be treated as a single markup item, set the variable
 
 Many aspects this mode can be customized using
 \\[customize-group] nxml RET."
-  (interactive)
-  (kill-all-local-variables)
-  (setq major-mode 'nxml-mode)
-  (setq mode-name "nXML")
+  ;; (kill-all-local-variables)
   (set (make-local-variable 'mode-line-process) '((nxml-degraded "/degraded")))
   ;; We'll determine the fill prefix ourselves
   (make-local-variable 'adaptive-fill-mode)
@@ -552,8 +582,7 @@ Many aspects this mode can be customized using
           (font-lock-unfontify-region-function . nxml-unfontify-region)))
 
   (rng-nxml-mode-init)
-  (nxml-enable-unicode-char-name-sets)
-  (run-mode-hooks 'nxml-mode-hook))
+  (nxml-enable-unicode-char-name-sets))
 
 (defun nxml-cleanup ()
   "Clean up after nxml-mode."

diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 4756b50dcc77fd2f482e818209e8a0742f4697d6..42c741bdaca94e5fd6b5a9986bf3dd59e08e0ade 100644 (file)
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -518,6 +518,9 @@ Return t if there is work to do, nil otherwise."
                             (goto-char pos))
                            (t (rng-set-initial-state))))))))))
 
+(defun rng-dtd-trivial-p (dtd)
+  "Check whether the current dtd is different from the trivial default."
+  (or (null dtd) (eq dtd xmltok-predefined-entity-alist)))
 
 (defun rng-do-some-validation-1 (&optional continue-p-function)
   (let ((limit (+ rng-validate-up-to-date-end