Revision: 4566 Author: hans URL: http://bknr.net/trac/changeset/4566
pull from upstream git U trunk/thirdparty/cxml/.git/FETCH_HEAD U trunk/thirdparty/cxml/.git/ORIG_HEAD U trunk/thirdparty/cxml/.git/index U trunk/thirdparty/cxml/.git/logs/HEAD U trunk/thirdparty/cxml/.git/logs/refs/heads/master U trunk/thirdparty/cxml/.git/logs/refs/remotes/origin/master U trunk/thirdparty/cxml/.git/refs/heads/master U trunk/thirdparty/cxml/.git/refs/remotes/origin/master U trunk/thirdparty/cxml/cxml.asd U trunk/thirdparty/cxml/xml/xmlns-normalizer.lisp
Modified: trunk/thirdparty/cxml/.git/FETCH_HEAD =================================================================== --- trunk/thirdparty/cxml/.git/FETCH_HEAD 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/FETCH_HEAD 2010-07-09 09:43:49 UTC (rev 4566) @@ -1,3 +1,3 @@ 944c177ddfff2ec18666bffbe918bb6632d36863 not-for-merge branch 'dlichteblau' of git://repo.or.cz/cxml -401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 branch 'master' of git://repo.or.cz/cxml +7f4ed3cd4152206d8e5855d8baa933a1d931636c branch 'master' of git://repo.or.cz/cxml 6a4a3be00fb65bed9eb5754f3ca747e96bc6a466 not-for-merge branch 'origin' of git://repo.or.cz/cxml
Modified: trunk/thirdparty/cxml/.git/ORIG_HEAD =================================================================== --- trunk/thirdparty/cxml/.git/ORIG_HEAD 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/ORIG_HEAD 2010-07-09 09:43:49 UTC (rev 4566) @@ -1 +1 @@ -a1a95a4d03701050f71044fd9305d50cd6480c98 +401d6e4e5d82ef880a02aed1f9226aa6dbc565c8
Modified: trunk/thirdparty/cxml/.git/index =================================================================== (Binary files differ)
Modified: trunk/thirdparty/cxml/.git/logs/HEAD =================================================================== --- trunk/thirdparty/cxml/.git/logs/HEAD 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/logs/HEAD 2010-07-09 09:43:49 UTC (rev 4566) @@ -1,3 +1,4 @@ 0000000000000000000000000000000000000000 77d915505eac84c267f89ab308c61e937a367f45 Hans Hübner hans@hertha.local 1210160156 +0200 77d915505eac84c267f89ab308c61e937a367f45 a1a95a4d03701050f71044fd9305d50cd6480c98 Hans Huebner hans@jasmin.headcraft.de 1214327116 +0000 pull : Fast forward a1a95a4d03701050f71044fd9305d50cd6480c98 401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 Hans Hübner hans@hertha.local 1238849599 +0200 pull : Fast forward +401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 7f4ed3cd4152206d8e5855d8baa933a1d931636c Hans Huebner hans.huebner@gmail.com 1278671001 +0000 pull : Fast-forward
Modified: trunk/thirdparty/cxml/.git/logs/refs/heads/master =================================================================== --- trunk/thirdparty/cxml/.git/logs/refs/heads/master 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/logs/refs/heads/master 2010-07-09 09:43:49 UTC (rev 4566) @@ -1,3 +1,4 @@ 0000000000000000000000000000000000000000 77d915505eac84c267f89ab308c61e937a367f45 Hans Hübner hans@hertha.local 1210160156 +0200 77d915505eac84c267f89ab308c61e937a367f45 a1a95a4d03701050f71044fd9305d50cd6480c98 Hans Huebner hans@jasmin.headcraft.de 1214327116 +0000 pull : Fast forward a1a95a4d03701050f71044fd9305d50cd6480c98 401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 Hans Hübner hans@hertha.local 1238849599 +0200 pull : Fast forward +401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 7f4ed3cd4152206d8e5855d8baa933a1d931636c Hans Huebner hans.huebner@gmail.com 1278671001 +0000 pull : Fast-forward
Modified: trunk/thirdparty/cxml/.git/logs/refs/remotes/origin/master =================================================================== --- trunk/thirdparty/cxml/.git/logs/refs/remotes/origin/master 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/logs/refs/remotes/origin/master 2010-07-09 09:43:49 UTC (rev 4566) @@ -1,3 +1,4 @@ 0000000000000000000000000000000000000000 77d915505eac84c267f89ab308c61e937a367f45 Hans Hübner hans@hertha.local 1210160155 +0200 clone: from git://repo.or.cz/cxml.git 77d915505eac84c267f89ab308c61e937a367f45 a1a95a4d03701050f71044fd9305d50cd6480c98 Hans Huebner hans@jasmin.headcraft.de 1214327096 +0000 pull : fast forward a1a95a4d03701050f71044fd9305d50cd6480c98 401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 Hans Hübner hans@hertha.local 1238849598 +0200 pull : fast forward +401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 7f4ed3cd4152206d8e5855d8baa933a1d931636c Hans Huebner hans.huebner@gmail.com 1278671001 +0000 pull : fast-forward
Modified: trunk/thirdparty/cxml/.git/refs/heads/master =================================================================== --- trunk/thirdparty/cxml/.git/refs/heads/master 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/refs/heads/master 2010-07-09 09:43:49 UTC (rev 4566) @@ -1 +1 @@ -401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 +7f4ed3cd4152206d8e5855d8baa933a1d931636c
Modified: trunk/thirdparty/cxml/.git/refs/remotes/origin/master =================================================================== --- trunk/thirdparty/cxml/.git/refs/remotes/origin/master 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/.git/refs/remotes/origin/master 2010-07-09 09:43:49 UTC (rev 4566) @@ -1 +1 @@ -401d6e4e5d82ef880a02aed1f9226aa6dbc565c8 +7f4ed3cd4152206d8e5855d8baa933a1d931636c
Modified: trunk/thirdparty/cxml/cxml.asd =================================================================== --- trunk/thirdparty/cxml/cxml.asd 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/cxml.asd 2010-07-09 09:43:49 UTC (rev 4566) @@ -7,13 +7,31 @@ (defmethod asdf:component-name ((c dummy-cxml-component)) :cxml)
-;; force loading of closure-common.asd, which installs *FEATURES* this -;; file depends on. Use MISSING-DEPENDENCY for asdf-install. -(unless (find-system :closure-common nil) - (error 'missing-dependency - :required-by (make-instance 'dummy-cxml-component) - :version nil - :requires :closure-common)) +(progn + (format t "~&;;; Checking for wide character support...") + (force-output) + (flet ((test (code) + (and (< code char-code-limit) (code-char code)))) + (cond + ((not (test 50000)) + (format t " no, reverting to octet strings.~%") + #+rune-is-character + (error "conflicting unicode configuration. Please recompile.") + (pushnew :rune-is-integer *features*)) + ((code-char 70000) + (when (test #xD800) + (format t " WARNING: Lisp implementation doesn't use UTF-16, ~ + but accepts surrogate code points.~%")) + (format t " yes, using code points.~%") + #+(or rune-is-integer rune-is-utf-16) + (error "conflicting unicode configuration. Please recompile.") + (pushnew :rune-is-character *features*)) + (t + (format t " yes, using UTF-16.~%") + #+(or rune-is-integer (and rune-is-character (not rune-is-utf-16))) + (error "conflicting unicode configuration. Please recompile.") + (pushnew :rune-is-utf-16 *features*) + (pushnew :rune-is-character *features*)))))
(defclass closure-source-file (cl-source-file) ())
@@ -29,9 +47,10 @@
(asdf:defsystem :cxml-xml :default-component-class closure-source-file - :pathname (merge-pathnames - "xml/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "xml/" + #-asdf2 (merge-pathnames + "xml/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "package") (:file "util" :depends-on ("package")) @@ -74,9 +93,10 @@
(asdf:defsystem :cxml-dom :default-component-class closure-source-file - :pathname (merge-pathnames - "dom/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "dom/" + #-asdf2 (merge-pathnames + "dom/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "package") (:file rune-impl :pathname "dom-impl" :depends-on ("package")) @@ -90,9 +110,10 @@
(asdf:defsystem :cxml-klacks :default-component-class closure-source-file - :pathname (merge-pathnames - "klacks/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "klacks/" + #-asdf2 (merge-pathnames + "klacks/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :serial t :components ((:file "package") @@ -103,9 +124,10 @@
(asdf:defsystem :cxml-test :default-component-class closure-source-file - :pathname (merge-pathnames - "test/" - (make-pathname :name nil :type nil :defaults *load-truename*)) + :pathname #+asdf2 "test/" + #-asdf2 (merge-pathnames + "test/" + (make-pathname :name nil :type nil :defaults *load-truename*)) :components ((:file "domtest") (:file "xmlconf")) :depends-on (:cxml-xml :cxml-klacks :cxml-dom))
Modified: trunk/thirdparty/cxml/xml/xmlns-normalizer.lisp =================================================================== --- trunk/thirdparty/cxml/xml/xmlns-normalizer.lisp 2010-07-05 09:21:40 UTC (rev 4565) +++ trunk/thirdparty/cxml/xml/xmlns-normalizer.lisp 2010-07-09 09:43:49 UTC (rev 4566) @@ -137,6 +137,5 @@ (sax:start-element (proxy-chained-handler handler) uri lname qname attrs))
(defmethod sax:end-element ((handler namespace-normalizer) uri lname qname) - (declare (ignore qname)) (pop (xmlns-stack handler)) (sax:end-element (proxy-chained-handler handler) (or uri #"") lname qname))