Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv17375/xml Modified Files: package.lisp recoder.lisp xml-parse.lisp Log Message: utf8-dom fixes. recoding nach utf-8 jetzt der default. Date: Tue Dec 27 02:35:22 2005 Author: dlichteblau Index: cxml/xml/package.lisp diff -u cxml/xml/package.lisp:1.7 cxml/xml/package.lisp:1.8 --- cxml/xml/package.lisp:1.7 Mon Dec 12 00:56:52 2005 +++ cxml/xml/package.lisp Tue Dec 27 02:35:18 2005 @@ -75,4 +75,6 @@ #:make-recoder #:sax-proxy #:proxy-chained-handler - #:make-namespace-normalizer)) + #:make-namespace-normalizer + #:rod-to-utf8-string + #:utf8-string-to-rod)) Index: cxml/xml/recoder.lisp diff -u cxml/xml/recoder.lisp:1.3 cxml/xml/recoder.lisp:1.4 --- cxml/xml/recoder.lisp:1.3 Tue Dec 27 01:21:38 2005 +++ cxml/xml/recoder.lisp Tue Dec 27 02:35:20 2005 @@ -74,6 +74,9 @@ (%string public-id) (%string system-id)) + (defwrapper sax:start-internal-subset ()) + (defwrapper sax:end-internal-subset ()) + (defwrapper sax:end-dtd ()) (defwrapper sax:unparsed-entity-declaration Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.54 cxml/xml/xml-parse.lisp:1.55 --- cxml/xml/xml-parse.lisp:1.54 Sat Dec 17 23:43:17 2005 +++ cxml/xml/xml-parse.lisp Tue Dec 27 02:35:20 2005 @@ -2552,13 +2552,18 @@ (defun p/document (input handler - &key validate dtd root entity-resolver disallow-internal-subset) + &key validate dtd root entity-resolver disallow-internal-subset + (recode t)) ;; check types of user-supplied arguments for better error messages: (check-type validate boolean) + (check-type recode boolean) (check-type dtd (or null extid)) (check-type root (or null rod)) (check-type entity-resolver (or null function symbol)) (check-type disallow-internal-subset boolean) + #+rune-is-integer + (when recode + (setf handler (make-recoder handler #'rod-to-utf8-string))) (let ((*ctx* (make-context :handler handler :main-zstream input