sink reorganization

test/domtest.lisp

@@ -680,7 +680,7 @@
 			      (dom:get-attribute member "href"))))
 		   (unless (or (runes:rod= (dom:tag-name member) #"metadata")
 			       (member href *bad-tests* :test 'equal))
-		     (format t "~&~D/~D ~A~%" i #+nil n 808 href)
+		     (format t "~&~D/~D ~A~%" i n href)
 		     (let ((lisp (slurp-test
 				  (merge-pathnames href test-directory))))
 		       (when verbose

test/xmlconf.lisp

@@ -54,9 +54,10 @@
               (merge-pathnames output sub-directory)))))
 
 (defun serialize-document (document)
-  (map 'vector #'char-code
-       (with-output-to-string (s)
-         (cxml:unparse-document document s :canonical 2))))
+  (dom:map-document (cxml:make-octet-vector-sink :canonical 2)
+		    document
+		    :include-doctype :canonical-notations
+		    :include-default-values t))
 
 (defun file-contents (pathname)
   (with-open-file (s pathname :element-type '(unsigned-byte 8))