cxml-cvs August 2006

cxml-cvs@common-lisp.net

1 participants
16 discussions

[cxml-cvs] CVS cxml/xml
by dlichteblau 28 Aug '06

28 Aug '06

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv28965 Modified Files: sax-handler.lisp unparse.lisp Log Message: Sonderzeichen raus --- /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2005/12/29 00:31:36 1.4 +++ /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2006/08/28 13:41:41 1.5 @@ -6,8 +6,8 @@ ;;; Author: David Lichteblau (DTD-related changes) ;;; License: BSD ;;; --------------------------------------------------------------------------- -;;; © copyright 2003 by Henrik Motakef -;;; © copyright 2004 knowledgeTools Int. GmbH +;;; (c) copyright 2003 by Henrik Motakef +;;; (c) copyright 2004 knowledgeTools Int. GmbH ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions are --- /project/cxml/cvsroot/cxml/xml/unparse.lisp 2006/05/05 09:05:22 1.10 +++ /project/cxml/cvsroot/cxml/xml/unparse.lisp 2006/08/28 13:41:41 1.11 @@ -7,9 +7,9 @@ ;;; Author: David Lichteblau <david(a)lichteblau.com> ;;; License: Lisp-LGPL (See file COPYING for details). ;;; --------------------------------------------------------------------------- -;;; Â© copyright 1999 by Gilbert Baumann -;;; Â© copyright 2004 by knowledgeTools Int. GmbH -;;; Â© copyright 2004 by David Lichteblau (for headcraft.de) +;;; (c) copyright 1999 by Gilbert Baumann +;;; (c) copyright 2004 by knowledgeTools Int. GmbH +;;; (c) copyright 2004 by David Lichteblau (for headcraft.de) ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 28 Aug '06

28 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv7505/dom Modified Files: dom-impl.lisp Log Message: fix importing attributes to -really- copy all their slots --- /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/27 17:29:39 1.40 +++ /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/28 09:04:51 1.41 @@ -1349,6 +1349,7 @@ (import-node-internal 'attribute document node t + :specified-p (dom:specified node) :name (dom:name node) :namespace-uri (dom:namespace-uri node) :local-name (dom:local-name node) @@ -1371,14 +1372,10 @@ (setf (slot-value attributes 'element) result) (dolist (attribute (dom:items (dom:attributes node))) (when (or (dom:specified attribute) *clone-not-import*) - (if (dom:namespace-uri attribute) - (dom:set-attribute-ns result - (dom:namespace-uri attribute) - (dom:local-name attribute) - (dom:value attribute)) - (dom:set-attribute result - (dom:name attribute) - (dom:value attribute))))) + (let ((attr (dom:import-node document attribute t))) + (if (dom:namespace-uri attribute) + (dom:set-attribute-node-ns result attr) + (dom:set-attribute-node result attr))))) (add-default-attributes result) result))

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 27 Aug '06

27 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv30679 Modified Files: dom-impl.lisp Log Message: repaired clone-node of a document without an internal subset --- /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/20 12:55:30 1.39 +++ /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/27 17:29:39 1.40 @@ -1452,7 +1452,7 @@ (slot-value node 'entity-resolver)) (setf (slot-value (dom:entities doctype) 'read-only-p) t) (setf (slot-value (dom:notations doctype) 'read-only-p) t) - (when doctype + (when (and doctype (slot-boundp doctype 'dom::%internal-subset)) (setf (dom::%internal-subset doctype) (dom::%internal-subset original-doctype))) (when (and (dom:document-element node) deep)

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv15190/xml Modified Files: xmlns-normalizer.lisp Log Message: namespace fixes --- /project/cxml/cvsroot/cxml/xml/xmlns-normalizer.lisp 2005/12/27 20:01:32 1.2 +++ /project/cxml/cvsroot/cxml/xml/xmlns-normalizer.lisp 2006/08/20 14:59:35 1.3 @@ -38,6 +38,8 @@ :chained-handler chained-handler)) (defun normalizer-find-prefix (handler prefix) + (when (zerop (length prefix)) + (setf prefix #"xmlns")) (block t (dolist (bindings (xmlns-stack handler)) (dolist (attribute bindings) @@ -54,7 +56,7 @@ (return-from t attribute)))))) (defun make-xmlns-attribute (prefix uri) - (if prefix + (if (and (plusp (length prefix)) (not (equal prefix #"xmlns"))) (sax:make-attribute :qname (concatenate 'rod #"xmlns:" prefix) :namespace-uri *xmlns-namespace* @@ -112,7 +114,7 @@ (rename-attribute a (sax:attribute-local-name uri-binding))) - ((null prefix-binding) + ((and prefix (null prefix-binding)) (push-namespace prefix u)) (t (loop

1 0

[cxml-cvs] CVS cxml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml In directory clnet:/tmp/cvs-serv15190 Modified Files: README.html Log Message: namespace fixes --- /project/cxml/cvsroot/cxml/README.html 2006/08/20 13:58:30 1.24 +++ /project/cxml/cvsroot/cxml/README.html 2006/08/20 14:59:34 1.25 @@ -111,8 +111,10 @@ <ul class="nomargin"> <li>Serialization fixes (thanks to Nathan Bird, Donavon Keithley).</li> <li>characters.lisp cleanup (thanks to Nathan Bird).</li> + <li>Namespace normalizer bugfixes.</li> <li>Minor changes: clone-node on document as an extension. DOM - class hierarchy reworked. New function parse-empty-document.</li> + class hierarchy reworked. New function parse-empty-document. + Fixed the DOM serializer to not throw away local names.</li> </ul> <p class="nomargin"><tt>rel-2006-01-05</tt></p> <ul class="nomargin">

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv15190/dom Modified Files: dom-sax.lisp Log Message: namespace fixes --- /project/cxml/cvsroot/cxml/dom/dom-sax.lisp 2005/12/27 20:01:13 1.6 +++ /project/cxml/cvsroot/cxml/dom/dom-sax.lisp 2006/08/20 14:59:34 1.7 @@ -88,6 +88,7 @@ (push (sax:make-attribute :qname (dom:name a) :value (dom:value a) + :local-name (dom:local-name a) :namespace-uri (dom:namespace-uri a) :specified-p (dom:specified a)) results)))

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv6540/xml Modified Files: package.lisp xml-parse.lisp Log Message: new function parse-empty-document --- /project/cxml/cvsroot/cxml/xml/package.lisp 2005/12/29 00:31:36 1.11 +++ /project/cxml/cvsroot/cxml/xml/package.lisp 2006/08/20 13:58:31 1.12 @@ -36,6 +36,7 @@ #:parse-stream #:parse-rod #:parse-octets + #:parse-empty-document #:make-octet-vector-sink #:make-octet-stream-sink --- /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/05/18 10:08:36 1.61 +++ /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/08/20 13:58:31 1.62 @@ -3005,6 +3005,64 @@ :initial-speed 1))) (apply #'parse-xstream xstream handler args))) +(defun parse-empty-document + (uri qname handler &key public-id system-id entity-resolver (recode t)) + (check-type uri (or null rod)) + (check-type qname (or null rod)) + (check-type public-id (or null rod)) + (check-type system-id (or null puri:uri)) + (check-type entity-resolver (or null function symbol)) + (check-type recode boolean) + #+rune-is-integer + (when recode + (setf handler (make-recoder handler #'rod-to-utf8-string))) + (let ((*ctx* + (make-context :handler handler :entity-resolver entity-resolver)) + (*validate* nil) + (extid + (when (or public-id system-id) + (extid-using-catalog (make-extid public-id system-id))))) + (sax:start-document handler) + (when extid + (sax:start-dtd handler + qname + (and public-id) + (and system-id (uri-rod system-id))) + (setf (dtd *ctx*) (getdtd (extid-system extid) *dtd-cache*)) + (unless (dtd *ctx*) + (with-scratch-pads () + (let ((*data-behaviour* :DTD)) + (let* ((xi2 (xstream-open-extid extid)) + (zi2 (make-zstream :input-stack (list xi2)))) + (ensure-dtd) + (p/ext-subset zi2))))) + (sax:end-dtd handler) + (let ((dtd (dtd *ctx*))) + (sax:entity-resolver handler (lambda (n h) (resolve-entity n h dtd))) + (sax::dtd handler dtd))) + (ensure-dtd) + (when (or uri qname) + (let* ((attrs + (when uri + (list (sax:make-attribute :qname #"xmlns" + :value (rod uri) + :specified-p t)))) + (*namespace-bindings* *namespace-bindings*) + new-namespaces) + (when sax:*namespace-processing* + (setf new-namespaces (declare-namespaces attrs)) + (mapc #'set-attribute-namespace attrs)) + (multiple-value-bind (uri prefix local-name) + (if sax:*namespace-processing* (decode-qname qname) nil) + (declare (ignore prefix)) + (unless (or sax:*include-xmlns-attributes* + (null sax:*namespace-processing*)) + (setf attrs nil)) + (sax:start-element (handler *ctx*) uri local-name qname attrs) + (sax:end-element (handler *ctx*) uri local-name qname)) + (undeclare-namespaces new-namespaces))) + (sax:end-document handler))) + (defun parse-dtd-file (filename &optional handler) (with-open-file (s filename :element-type '(unsigned-byte 8)) (parse-dtd-stream s handler)))

1 0

[cxml-cvs] CVS cxml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml In directory clnet:/tmp/cvs-serv6540 Modified Files: README.html Log Message: new function parse-empty-document --- /project/cxml/cvsroot/cxml/README.html 2006/08/20 12:55:30 1.23 +++ /project/cxml/cvsroot/cxml/README.html 2006/08/20 13:58:30 1.24 @@ -112,7 +112,7 @@ <li>Serialization fixes (thanks to Nathan Bird, Donavon Keithley).</li> <li>characters.lisp cleanup (thanks to Nathan Bird).</li> <li>Minor changes: clone-node on document as an extension. DOM - class hierarchy reworked.</li> + class hierarchy reworked. New function parse-empty-document.</li> </ul> <p class="nomargin"><tt>rel-2006-01-05</tt></p> <ul class="nomargin">

1 0

[cxml-cvs] CVS cxml/doc
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv6540/doc Modified Files: using.html Log Message: new function parse-empty-document --- /project/cxml/cvsroot/cxml/doc/using.html 2006/01/23 21:53:24 1.14 +++ /project/cxml/cvsroot/cxml/doc/using.html 2006/08/20 13:58:31 1.15 @@ -133,6 +133,18 @@ </p> <p> + <div class="def">Function CXML:PARSE-FILE (uri qname handler &key public-id system-id entity-resolver recode)</div> + </p> + <p> + Simulate parsing a document with a document element <tt>qname</tt> + having no attributes except for an optional namespace + declaration to <tt>uri</tt>. If an external ID is specified + (<tt>system-id</tt>, <tt>public-id</tt>), find, parse, and report + this DTD as if with <tt>parse-file</tt>, using the specified + entity resolver. + </p> + + <p> <div class="def">Function CXML:PARSE-DTD-FILE (pathname)</div> <div class="def">Function CXML:PARSE-DTD-STREAM (stream)</div> Parse <a

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv30752/dom Modified Files: dom-impl.lisp Log Message: new feature: clone-node von document bugfix: entities und notations auch in create-document-type readonly --- /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/20 12:19:01 1.38 +++ /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/20 12:55:30 1.39 @@ -282,7 +282,10 @@ (defmethod dom:create-document-type ((factory (eql 'implementation)) name publicid systemid) (safe-split-qname name #"") - (%create-document-type name publicid systemid)) + (let ((result (%create-document-type name publicid systemid))) + (setf (slot-value (dom:entities result) 'read-only-p) t) + (setf (slot-value (dom:notations result) 'read-only-p) t) + result)) (defmethod dom:create-document ((factory (eql 'implementation)) uri qname doctype) @@ -1422,6 +1425,42 @@ (let ((*clone-not-import* t)) (dom:import-node (dom:owner-document node) node deep))) +;; extension: +(defmethod dom:clone-node ((node document) deep) + (let* ((document (make-instance 'document)) + (original-doctype (dom:doctype node)) + (doctype + (when original-doctype + (make-instance 'document-type + :owner document + :name (dom:name original-doctype) + :public-id (dom:public-id original-doctype) + :system-id (dom:system-id original-doctype) + :notations (make-instance 'named-node-map + :element-type :notation + :owner document + :items (dom:items (dom:notations original-doctype))) + :entities (make-instance 'named-node-map + :element-type :entity + :owner document + :items (dom:items + (dom:entities original-doctype))))))) + (setf (slot-value document 'owner) nil) + (setf (slot-value document 'doc-type) doctype) + (setf (slot-value document 'dtd) (dtd node)) + (setf (slot-value document 'entity-resolver) + (slot-value node 'entity-resolver)) + (setf (slot-value (dom:entities doctype) 'read-only-p) t) + (setf (slot-value (dom:notations doctype) 'read-only-p) t) + (when doctype + (setf (dom::%internal-subset doctype) + (dom::%internal-subset original-doctype))) + (when (and (dom:document-element node) deep) + (let* ((*clone-not-import* t) + (clone (dom:import-node document (dom:document-element node) t))) + (dom:append-child document clone))) + document)) + ;;; Erweiterung

1 0

[cxml-cvs] CVS cxml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml In directory clnet:/tmp/cvs-serv30752 Modified Files: README.html Log Message: new feature: clone-node von document bugfix: entities und notations auch in create-document-type readonly --- /project/cxml/cvsroot/cxml/README.html 2006/05/05 09:05:22 1.22 +++ /project/cxml/cvsroot/cxml/README.html 2006/08/20 12:55:30 1.23 @@ -110,6 +110,9 @@ <p class="nomargin"><tt>rel-2006-xx-yy</tt></p> <ul class="nomargin"> <li>Serialization fixes (thanks to Nathan Bird, Donavon Keithley).</li> + <li>characters.lisp cleanup (thanks to Nathan Bird).</li> + <li>Minor changes: clone-node on document as an extension. DOM + class hierarchy reworked.</li> </ul> <p class="nomargin"><tt>rel-2006-01-05</tt></p> <ul class="nomargin">

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv26638/dom Modified Files: dom-impl.lisp package.lisp Log Message: export the DOM interface CLOS classes --- /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/01/23 21:54:07 1.37 +++ /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/20 12:19:01 1.38 @@ -40,7 +40,7 @@ (dom-exception-string c) (dom-exception-arguments c))))) -(defclass node () +(defclass node (dom:node) ((parent :initarg :parent :initform nil) (children :initarg :children :initform (make-node-list)) (owner :initarg :owner :initform nil) @@ -63,18 +63,18 @@ (dom:namespace-uri node))) (setf (slot-value node 'prefix) newval)) -(defclass document (node) +(defclass document (node dom:document) ((doc-type :initarg :doc-type :reader dom:doctype) (dtd :initform nil :reader dtd) (entity-resolver :initform nil))) -(defclass document-fragment (node) +(defclass document-fragment (node dom:document-fragment) ()) -(defclass character-data (node) +(defclass character-data (node dom:character-data) ((value :initarg :data :reader dom:data))) -(defclass attribute (namespace-mixin node) +(defclass attribute (namespace-mixin node dom:attr) ((name :initarg :name :reader dom:name) (owner-element :initarg :owner-element :reader dom:owner-element) (specified-p :initarg :specified-p :reader dom:specified))) @@ -93,7 +93,7 @@ (rod-string (dom:name object)) (rod-string (dom:value object))))) -(defclass element (namespace-mixin node) +(defclass element (namespace-mixin node dom:element) ((tag-name :initarg :tag-name :reader dom:tag-name) (attributes :initarg :attributes :reader dom:attributes))) @@ -105,16 +105,16 @@ (print-unreadable-object (object stream :type t :identity t) (princ (rod-string (dom:tag-name object)) stream))) -(defclass text (character-data) +(defclass text (character-data dom:text) ()) -(defclass comment (character-data) +(defclass comment (character-data dom:comment) ()) -(defclass cdata-section (text) +(defclass cdata-section (text dom:cdata-section) ()) -(defclass document-type (node) +(defclass document-type (node dom:document-type) ((name :initarg :name :reader dom:name) (public-id :initarg :public-id :reader dom:public-id) (system-id :initarg :system-id :reader dom:system-id) @@ -122,25 +122,25 @@ (notations :initarg :notations :reader dom:notations) (dom::%internal-subset :accessor dom::%internal-subset))) -(defclass notation (node) +(defclass notation (node dom:notation) ((name :initarg :name :reader dom:name) (public-id :initarg :public-id :reader dom:public-id) (system-id :initarg :system-id :reader dom:system-id))) -(defclass entity (node) +(defclass entity (node dom:entity) ((name :initarg :name :reader dom:name) (public-id :initarg :public-id :reader dom:public-id) (system-id :initarg :system-id :reader dom:system-id) (notation-name :initarg :notation-name :reader dom:notation-name))) -(defclass entity-reference (node) +(defclass entity-reference (node dom:entity-reference) ((name :initarg :name :reader dom:name))) -(defclass processing-instruction (node) +(defclass processing-instruction (node dom:processing-instruction) ((target :initarg :target :reader dom:target) (data :initarg :data :reader dom:data))) -(defclass named-node-map () +(defclass named-node-map (dom:named-node-map) ((items :initarg :items :reader dom:items :initform nil) (owner :initarg :owner :reader dom:owner-document) --- /project/cxml/cvsroot/cxml/dom/package.lisp 2005/12/30 14:21:46 1.5 +++ /project/cxml/cvsroot/cxml/dom/package.lisp 2006/08/20 12:19:01 1.6 @@ -95,26 +95,26 @@ #:notation-name #:target #:code - - ;; not exported: -;;; ;; protocol classes + + ;; IDL interfaces, exported "inofficially" + #:node + #:document + #:document-fragment + #:character-data + #:attr + #:element + #:text + #:comment + #:cdata-section + #:document-type + #:notation + #:entity + #:entity-reference + #:processing-instruction + #:named-node-map + ;; no classes: ;;; #:dom-implementation -;;; #:document-fragment -;;; #:document -;;; #:node ;;; #:node-list -;;; #:named-node-map -;;; #:character-data -;;; #:attr -;;; #:element -;;; #:text -;;; #:comment -;;; #:cdata-section -;;; #:document-type -;;; #:notation -;;; #:entity -;;; #:entity-reference -;;; #:processing-instruction ;; #:items @@ -142,3 +142,20 @@ #:do-node-map #:create-document #:map-document)) + +(defclass dom:node () ()) +(defclass dom:document (dom:node) ()) +(defclass dom:document-fragment (dom:node) ()) +(defclass dom:character-data (dom:node) ()) +(defclass dom:attr (dom:node) ()) +(defclass dom:element (dom:node) ()) +(defclass dom:text (dom:character-data) ()) +(defclass dom:comment (dom:character-data) ()) +(defclass dom:cdata-section (dom:text) ()) +(defclass dom:document-type (dom:node) ()) +(defclass dom:notation (dom:node) ()) +(defclass dom:entity (dom:node) ()) +(defclass dom:entity-reference (dom:node) ()) +(defclass dom:processing-instruction (dom:node) ()) + +(defclass dom:named-node-map () ())

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv18454/xml Modified Files: xml-name-rune-p.lisp Removed Files: characters.lisp Log Message: patch by Nathan Bird: [cxml-devel] characters.lisp improvements --- /project/cxml/cvsroot/cxml/xml/xml-name-rune-p.lisp 2005/11/28 22:33:47 1.6 +++ /project/cxml/cvsroot/cxml/xml/xml-name-rune-p.lisp 2006/08/20 11:56:11 1.7 @@ -11,9 +11,111 @@ (compile nil '(lambda () - (let ((+max+ #xD800)) + (let ((+max+ #xD800) + (base-char-ranges + #((#x0041 #x005A) (#x0061 #x007A) (#x00C0 #x00D6) (#x00D8 #x00F6) + (#x00F8 #x00FF) (#x0100 #x0131) (#x0134 #x013E) (#x0141 #x0148) + (#x014A #x017E) (#x0180 #x01C3) (#x01CD #x01F0) (#x01F4 #x01F5) + (#x01FA #x0217) (#x0250 #x02A8) (#x02BB #x02C1) (#x0386 #x0386) + (#x0388 #x038A) (#x038C #x038C) (#x038E #x03A1) (#x03A3 #x03CE) + (#x03D0 #x03D6) (#x03DA #x03DA) (#x03DC #x03DC) (#x03DE #x03DE) + (#x03E0 #x03E0) (#x03E2 #x03F3) (#x0401 #x040C) (#x040E #x044F) + (#x0451 #x045C) (#x045E #x0481) (#x0490 #x04C4) (#x04C7 #x04C8) + (#x04CB #x04CC) (#x04D0 #x04EB) (#x04EE #x04F5) (#x04F8 #x04F9) + (#x0531 #x0556) (#x0559 #x0559) (#x0561 #x0586) (#x05D0 #x05EA) + (#x05F0 #x05F2) (#x0621 #x063A) (#x0641 #x064A) (#x0671 #x06B7) + (#x06BA #x06BE) (#x06C0 #x06CE) (#x06D0 #x06D3) (#x06D5 #x06D5) + (#x06E5 #x06E6) (#x0905 #x0939) (#x093D #x093D) (#x0958 #x0961) + (#x0985 #x098C) (#x098F #x0990) (#x0993 #x09A8) (#x09AA #x09B0) + (#x09B2 #x09B2) (#x09B6 #x09B9) (#x09DC #x09DD) (#x09DF #x09E1) + (#x09F0 #x09F1) (#x0A05 #x0A0A) (#x0A0F #x0A10) (#x0A13 #x0A28) + (#x0A2A #x0A30) (#x0A32 #x0A33) (#x0A35 #x0A36) (#x0A38 #x0A39) + (#x0A59 #x0A5C) (#x0A5E #x0A5E) (#x0A72 #x0A74) (#x0A85 #x0A8B) + (#x0A8D #x0A8D) (#x0A8F #x0A91) (#x0A93 #x0AA8) (#x0AAA #x0AB0) + (#x0AB2 #x0AB3) (#x0AB5 #x0AB9) (#x0ABD #x0ABD) (#x0AE0 #x0AE0) + (#x0B05 #x0B0C) (#x0B0F #x0B10) (#x0B13 #x0B28) (#x0B2A #x0B30) + (#x0B32 #x0B33) (#x0B36 #x0B39) (#x0B3D #x0B3D) (#x0B5C #x0B5D) + (#x0B5F #x0B61) (#x0B85 #x0B8A) (#x0B8E #x0B90) (#x0B92 #x0B95) + (#x0B99 #x0B9A) (#x0B9C #x0B9C) (#x0B9E #x0B9F) (#x0BA3 #x0BA4) + (#x0BA8 #x0BAA) (#x0BAE #x0BB5) (#x0BB7 #x0BB9) (#x0C05 #x0C0C) + (#x0C0E #x0C10) (#x0C12 #x0C28) (#x0C2A #x0C33) (#x0C35 #x0C39) + (#x0C60 #x0C61) (#x0C85 #x0C8C) (#x0C8E #x0C90) (#x0C92 #x0CA8) + (#x0CAA #x0CB3) (#x0CB5 #x0CB9) (#x0CDE #x0CDE) (#x0CE0 #x0CE1) + (#x0D05 #x0D0C) (#x0D0E #x0D10) (#x0D12 #x0D28) (#x0D2A #x0D39) + (#x0D60 #x0D61) (#x0E01 #x0E2E) (#x0E30 #x0E30) (#x0E32 #x0E33) + (#x0E40 #x0E45) (#x0E81 #x0E82) (#x0E84 #x0E84) (#x0E87 #x0E88) + (#x0E8A #x0E8A) (#x0E8D #x0E8D) (#x0E94 #x0E97) (#x0E99 #x0E9F) + (#x0EA1 #x0EA3) (#x0EA5 #x0EA5) (#x0EA7 #x0EA7) (#x0EAA #x0EAB) + (#x0EAD #x0EAE) (#x0EB0 #x0EB0) (#x0EB2 #x0EB3) (#x0EBD #x0EBD) + (#x0EC0 #x0EC4) (#x0F40 #x0F47) (#x0F49 #x0F69) (#x10A0 #x10C5) + (#x10D0 #x10F6) (#x1100 #x1100) (#x1102 #x1103) (#x1105 #x1107) + (#x1109 #x1109) (#x110B #x110C) (#x110E #x1112) (#x113C #x113C) + (#x113E #x113E) (#x1140 #x1140) (#x114C #x114C) (#x114E #x114E) + (#x1150 #x1150) (#x1154 #x1155) (#x1159 #x1159) (#x115F #x1161) + (#x1163 #x1163) (#x1165 #x1165) (#x1167 #x1167) (#x1169 #x1169) + (#x116D #x116E) (#x1172 #x1173) (#x1175 #x1175) (#x119E #x119E) + (#x11A8 #x11A8) (#x11AB #x11AB) (#x11AE #x11AF) (#x11B7 #x11B8) + (#x11BA #x11BA) (#x11BC #x11C2) (#x11EB #x11EB) (#x11F0 #x11F0) + (#x11F9 #x11F9) (#x1E00 #x1E9B) (#x1EA0 #x1EF9) (#x1F00 #x1F15) + (#x1F18 #x1F1D) (#x1F20 #x1F45) (#x1F48 #x1F4D) (#x1F50 #x1F57) + (#x1F59 #x1F59) (#x1F5B #x1F5B) (#x1F5D #x1F5D) (#x1F5F #x1F7D) + (#x1F80 #x1FB4) (#x1FB6 #x1FBC) (#x1FBE #x1FBE) (#x1FC2 #x1FC4) + (#x1FC6 #x1FCC) (#x1FD0 #x1FD3) (#x1FD6 #x1FDB) (#x1FE0 #x1FEC) + (#x1FF2 #x1FF4) (#x1FF6 #x1FFC) (#x2126 #x2126) (#x212A #x212B) + (#x212E #x212E) (#x2180 #x2182) (#x3041 #x3094) (#x30A1 #x30FA) + (#x3105 #x312C) (#xAC00 #xD7A3))) + (ideographic-ranges #((#x3007 #x3007) (#x3021 #x3029)(#x4E00 #x9FA5))) + (combining-char-ranges + #((#x0300 #x0345) (#x0360 #x0361) (#x0483 #x0486) (#x0591 #x05A1) + (#x05A3 #x05B9) (#x05BB #x05BD) (#x05BF #x05BF) (#x05C1 #x05C2) + (#x05C4 #x05C4) (#x064B #x0652) (#x0670 #x0670) (#x06D6 #x06DC) + (#x06DD #x06DF) (#x06E0 #x06E4) (#x06E7 #x06E8) (#x06EA #x06ED) + (#x0901 #x0903) (#x093C #x093C) (#x093E #x094C) (#x094D #x094D) + (#x0951 #x0954) (#x0962 #x0963) (#x0981 #x0983) (#x09BC #x09BC) + (#x09BE #x09BE) (#x09BF #x09BF) (#x09C0 #x09C4) (#x09C7 #x09C8) + (#x09CB #x09CD) (#x09D7 #x09D7) (#x09E2 #x09E3) (#x0A02 #x0A02) + (#x0A3C #x0A3C) (#x0A3E #x0A3E) (#x0A3F #x0A3F) (#x0A40 #x0A42) + (#x0A47 #x0A48) (#x0A4B #x0A4D) (#x0A70 #x0A71) (#x0A81 #x0A83) + (#x0ABC #x0ABC) (#x0ABE #x0AC5) (#x0AC7 #x0AC9) (#x0ACB #x0ACD) + (#x0B01 #x0B03) (#x0B3C #x0B3C) (#x0B3E #x0B43) (#x0B47 #x0B48) + (#x0B4B #x0B4D) (#x0B56 #x0B57) (#x0B82 #x0B83) (#x0BBE #x0BC2) + (#x0BC6 #x0BC8) (#x0BCA #x0BCD) (#x0BD7 #x0BD7) (#x0C01 #x0C03) + (#x0C3E #x0C44) (#x0C46 #x0C48) (#x0C4A #x0C4D) (#x0C55 #x0C56) + (#x0C82 #x0C83) (#x0CBE #x0CC4) (#x0CC6 #x0CC8) (#x0CCA #x0CCD) + (#x0CD5 #x0CD6) (#x0D02 #x0D03) (#x0D3E #x0D43) (#x0D46 #x0D48) + (#x0D4A #x0D4D) (#x0D57 #x0D57) (#x0E31 #x0E31) (#x0E34 #x0E3A) + (#x0E47 #x0E4E) (#x0EB1 #x0EB1) (#x0EB4 #x0EB9) (#x0EBB #x0EBC) + (#x0EC8 #x0ECD) (#x0F18 #x0F19) (#x0F35 #x0F35) (#x0F37 #x0F37) + (#x0F39 #x0F39) (#x0F3E #x0F3E) (#x0F3F #x0F3F) (#x0F71 #x0F84) + (#x0F86 #x0F8B) (#x0F90 #x0F95) (#x0F97 #x0F97) (#x0F99 #x0FAD) + (#x0FB1 #x0FB7) (#x0FB9 #x0FB9) (#x20D0 #x20DC) (#x20E1 #x20E1) + (#x302A #x302F) (#x3099 #x3099) (#x309A #x309A)) + ) + (digit-ranges + #((#x0030 #x0039) (#x0660 #x0669) (#x06F0 #x06F9) (#x0966 #x096F) + (#x09E6 #x09EF) (#x0A66 #x0A6F) (#x0AE6 #x0AEF) (#x0B66 #x0B6F) + (#x0BE7 #x0BEF) (#x0C66 #x0C6F) (#x0CE6 #x0CEF) (#x0D66 #x0D6F) + (#x0E50 #x0E59) (#x0ED0 #x0ED9) (#x0F20 #x0F29))) + (extender-ranges + #((#x00B7 #x00B7) (#x02D0 #x02D0) (#x02D1 #x02D1) (#x0387 #x0387) + (#x0640 #x0640) (#x0E46 #x0E46) (#x0EC6 #x0EC6) (#x3005 #x3005) + (#x3031 #x3035) (#x309D #x309E) (#x30FC #x30FE)))) (labels - ((name-start-rune-p (rune) + ((rune-in-range-p (code range-vector) + (declare (type simple-vector range-vector)) + ;;we were always dealing with a sorted vector... bin search it + + (loop with start = 0 + with end = (length range-vector) + while (< start end) + for mid-index = (+ start (floor (- end start) 2)) + for (mid-item-low mid-item-high) = (aref range-vector mid-index) + if (< mid-item-high code) do (setf start (1+ mid-index)) + else if (< code mid-item-low) do (setf end mid-index) + else do (return T) + finally (return nil))) + + (name-start-rune-p (rune) (or (letter-rune-p rune) (= #.(char-code #\_) rune) (= #.(char-code #\:) rune))) @@ -33,195 +135,47 @@ (ideographic-rune-p rune))) (digit-rune-p* (rune) - (or (<= 48 rune 57) - (<= 1632 rune 1641) - (<= 1776 rune 1785) - (<= 2406 rune 2415) - (<= 2534 rune 2543) - (<= 2662 rune 2671) - (<= 2790 rune 2799) - (<= 2918 rune 2927) - (<= 3047 rune 3055) - (<= 3174 rune 3183) - (<= 3302 rune 3311) - (<= 3430 rune 3439) - (<= 3664 rune 3673) - (<= 3792 rune 3801) - (<= 3872 rune 3881))) + (rune-in-range-p rune digit-ranges)) (combining-rune-p (rune) - (or (<= 768 rune 837) - (<= 864 rune 865) - (<= 1155 rune 1158) - (<= 1425 rune 1441) - (<= 1443 rune 1465) - (<= 1467 rune 1469) - (= 1471 rune) - (<= 1473 rune 1474) - (= 1476 rune) - (<= 1611 rune 1618) - (= 1648 rune) - (<= 1750 rune 1756) - (<= 1757 rune 1759) - (<= 1760 rune 1764) - (<= 1767 rune 1768) - (<= 1770 rune 1773) - (<= 2305 rune 2307) - (= 2364 rune) - (<= 2366 rune 2380) - (= 2381 rune) - (<= 2385 rune 2388) - (<= 2402 rune 2403) - (<= 2433 rune 2435) - (= 2492 rune) - (= 2494 rune) - (= 2495 rune) - (<= 2496 rune 2500) - (<= 2503 rune 2504) - (<= 2507 rune 2509) - (= 2519 rune) - (<= 2530 rune 2531) - (= 2562 rune) - (= 2620 rune) - (= 2622 rune) - (= 2623 rune) - (<= 2624 rune 2626) - (<= 2631 rune 2632) - (<= 2635 rune 2637) - (<= 2672 rune 2673) - (<= 2689 rune 2691) - (= 2748 rune) - (<= 2750 rune 2757) - (<= 2759 rune 2761) - (<= 2763 rune 2765) - (<= 2817 rune 2819) - (= 2876 rune) - (<= 2878 rune 2883) - (<= 2887 rune 2888) - (<= 2891 rune 2893) - (<= 2902 rune 2903) - (<= 2946 rune 2947) - (<= 3006 rune 3010) - (<= 3014 rune 3016) - (<= 3018 rune 3021) - (= 3031 rune) - (<= 3073 rune 3075) - (<= 3134 rune 3140) - (<= 3142 rune 3144) - (<= 3146 rune 3149) - (<= 3157 rune 3158) - (<= 3202 rune 3203) - (<= 3262 rune 3268) - (<= 3270 rune 3272) - (<= 3274 rune 3277) - (<= 3285 rune 3286) - (<= 3330 rune 3331) - (<= 3390 rune 3395) - (<= 3398 rune 3400) - (<= 3402 rune 3405) - (= 3415 rune) - (= 3633 rune) - (<= 3636 rune 3642) - (<= 3655 rune 3662) - (= 3761 rune) - (<= 3764 rune 3769) - (<= 3771 rune 3772) - (<= 3784 rune 3789) - (<= 3864 rune 3865) - (= 3893 rune) - (= 3895 rune) - (= 3897 rune) - (= 3902 rune) - (= 3903 rune) - (<= 3953 rune 3972) - (<= 3974 rune 3979) - (<= 3984 rune 3989) - (= 3991 rune) - (<= 3993 rune 4013) - (<= 4017 rune 4023) - (= 4025 rune) - (<= 8400 rune 8412) - (= 8417 rune) - (<= 12330 rune 12335) - (= 12441 rune) - (= 12442 rune))) + (rune-in-range-p rune combining-char-ranges)) (extender-rune-p (rune) - (or - (= 183 rune) - (= 720 rune) - (= 721 rune) - (= 903 rune) - (= 1600 rune) - (= 3654 rune) - (= 3782 rune) - (= 12293 rune) - (<= 12337 rune 12341) - (<= 12445 rune 12446) - (<= 12540 rune 12542))) + (rune-in-range-p rune extender-ranges)) (base-rune-p (rune) - ;; split into two ORs for LispWorks... - (or - (or (<= 65 rune 90) (<= 97 rune 122) (<= 192 rune 214) (<= 216 rune 246) (<= 248 rune 255) (<= 256 rune 305) - (<= 308 rune 318) (<= 321 rune 328) (<= 330 rune 382) (<= 384 rune 451) (<= 461 rune 496) (<= 500 rune 501) - (<= 506 rune 535) (<= 592 rune 680) (<= 699 rune 705) (= 902 rune) (<= 904 rune 906) (= 908 rune) - (<= 910 rune 929) (<= 931 rune 974) (<= 976 rune 982) (= 986 rune) (= 988 rune) (= 990 rune) (= 992 rune) - (<= 994 rune 1011) (<= 1025 rune 1036) (<= 1038 rune 1103) (<= 1105 rune 1116) (<= 1118 rune 1153) - (<= 1168 rune 1220) (<= 1223 rune 1224) (<= 1227 rune 1228) (<= 1232 rune 1259) (<= 1262 rune 1269) - (<= 1272 rune 1273) (<= 1329 rune 1366) (= 1369 rune) (<= 1377 rune 1414) (<= 1488 rune 1514) - (<= 1520 rune 1522) (<= 1569 rune 1594) (<= 1601 rune 1610) (<= 1649 rune 1719) (<= 1722 rune 1726) - (<= 1728 rune 1742) (<= 1744 rune 1747) (= 1749 rune) (<= 1765 rune 1766) (<= 2309 rune 2361) (= 2365 rune) - (<= 2392 rune 2401) (<= 2437 rune 2444) (<= 2447 rune 2448) (<= 2451 rune 2472) (<= 2474 rune 2480) - (= 2482 rune) (<= 2486 rune 2489) (<= 2524 rune 2525) (<= 2527 rune 2529) (<= 2544 rune 2545) - (<= 2565 rune 2570) (<= 2575 rune 2576) (<= 2579 rune 2600) (<= 2602 rune 2608) (<= 2610 rune 2611) - (<= 2613 rune 2614) (<= 2616 rune 2617) (<= 2649 rune 2652) (= 2654 rune) (<= 2674 rune 2676) - (<= 2693 rune 2699) (= 2701 rune) (<= 2703 rune 2705) (<= 2707 rune 2728) (<= 2730 rune 2736) - (<= 2738 rune 2739) (<= 2741 rune 2745) (= 2749 rune) (= 2784 rune) (<= 2821 rune 2828) (<= 2831 rune 2832) - (<= 2835 rune 2856) (<= 2858 rune 2864) (<= 2866 rune 2867) (<= 2870 rune 2873) (= 2877 rune) - (<= 2908 rune 2909) (<= 2911 rune 2913) (<= 2949 rune 2954) (<= 2958 rune 2960) (<= 2962 rune 2965) - (<= 2969 rune 2970) (= 2972 rune)) - (or (<= 2974 rune 2975) (<= 2979 rune 2980) (<= 2984 rune 2986) - (<= 2990 rune 2997) (<= 2999 rune 3001) (<= 3077 rune 3084) (<= 3086 rune 3088) (<= 3090 rune 3112) - (<= 3114 rune 3123) (<= 3125 rune 3129) (<= 3168 rune 3169) (<= 3205 rune 3212) (<= 3214 rune 3216) - (<= 3218 rune 3240) (<= 3242 rune 3251) (<= 3253 rune 3257) (= 3294 rune) (<= 3296 rune 3297) - (<= 3333 rune 3340) (<= 3342 rune 3344) (<= 3346 rune 3368) (<= 3370 rune 3385) (<= 3424 rune 3425) - (<= 3585 rune 3630) (= 3632 rune) (<= 3634 rune 3635) (<= 3648 rune 3653) (<= 3713 rune 3714) (= 3716 rune) - (<= 3719 rune 3720) (= 3722 rune) (= 3725 rune) (<= 3732 rune 3735) (<= 3737 rune 3743) (<= 3745 rune 3747) - (= 3749 rune) (= 3751 rune) (<= 3754 rune 3755) (<= 3757 rune 3758) (= 3760 rune) (<= 3762 rune 3763) (= 3773 rune) - (<= 3776 rune 3780) (<= 3904 rune 3911) (<= 3913 rune 3945) (<= 4256 rune 4293) (<= 4304 rune 4342) - (= 4352 rune) (<= 4354 rune 4355) (<= 4357 rune 4359) (= 4361 rune) (<= 4363 rune 4364) (<= 4366 rune 4370) - (= 4412 rune) (= 4414 rune) (= 4416 rune) (= 4428 rune) (= 4430 rune) (= 4432 rune) (<= 4436 rune 4437) (= 4441 rune) - (<= 4447 rune 4449) (= 4451 rune) (= 4453 rune) (= 4455 rune) (= 4457 rune) (<= 4461 rune 4462) (<= 4466 rune 4467) - (= 4469 rune) (= 4510 rune) (= 4520 rune) (= 4523 rune) (<= 4526 rune 4527) (<= 4535 rune 4536) (= 4538 rune) - (<= 4540 rune 4546) (= 4587 rune) (= 4592 rune) (= 4601 rune) (<= 7680 rune 7835) (<= 7840 rune 7929) - (<= 7936 rune 7957) (<= 7960 rune 7965) (<= 7968 rune 8005) (<= 8008 rune 8013) (<= 8016 rune 8023) - (= 8025 rune) (= 8027 rune) (= 8029 rune) (<= 8031 rune 8061) (<= 8064 rune 8116) (<= 8118 rune 8124) (= 8126 rune) - (<= 8130 rune 8132) (<= 8134 rune 8140) (<= 8144 rune 8147) (<= 8150 rune 8155) (<= 8160 rune 8172) - (<= 8178 rune 8180) (<= 8182 rune 8188) (= 8486 rune) (<= 8490 rune 8491) (= 8494 rune) (<= 8576 rune 8578) - (<= 12353 rune 12436) (<= 12449 rune 12538) (<= 12549 rune 12588) (<= 44032 rune 55203)))) + (rune-in-range-p rune base-char-ranges)) (ideographic-rune-p (rune) - (or (<= 19968 rune 40869) (= 12295 rune) (<= 12321 rune 12329))) + (rune-in-range-p rune ideographic-ranges)) (predicate-to-bv (p) (let ((r (make-array +max+ :element-type 'bit :initial-element 0))) - (dotimes (i #x10000 r) + (dotimes (i +max+ r) (when (funcall p i) (setf (aref r i) 1))))) ) `(progn - (DEFINLINE NAME-RUNE-P (RUNE) - (SETF RUNE (RUNE-CODE RUNE)) - (AND (<= 0 RUNE ,+max+) - (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))) - (= 1 (SBIT ',(predicate-to-bv #'name-rune-p) - (THE FIXNUM RUNE)))))) - (DEFINLINE NAME-START-RUNE-P (RUNE) - (SETF RUNE (RUNE-CODE RUNE)) - (AND (<= 0 RUNE ,+MAX+) - (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))) - (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p) - (THE FIXNUM RUNE)))))))) )))) + (DEFINLINE NAME-RUNE-P (RUNE) + (SETF RUNE (RUNE-CODE RUNE)) + (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)) + (type fixnum rune)) + (AND (<= 0 RUNE ,+max+) + (= 1 (SBIT ',(predicate-to-bv #'name-rune-p) + RUNE))))) + (DEFINLINE NAME-START-RUNE-P (RUNE) + (SETF RUNE (RUNE-CODE RUNE)) + (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)) + (type fixnum rune)) + (AND (<= 0 RUNE ,+MAX+) + (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p) + RUNE))))) + (definline valid-name-p (rod) + (and (plusp (length rod)) + (name-start-rune-p (elt rod 0)) + (every #'name-rune-p rod))) + (definline valid-nmtoken-p (rod) + (and (plusp (length rod)) + (every #'name-rune-p rod)))))))))

1 0

[cxml-cvs] CVS cxml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml In directory clnet:/tmp/cvs-serv18454 Modified Files: cxml.asd Log Message: patch by Nathan Bird: [cxml-devel] characters.lisp improvements --- /project/cxml/cvsroot/cxml/cxml.asd 2006/01/24 19:35:58 1.11 +++ /project/cxml/cvsroot/cxml/cxml.asd 2006/08/20 11:56:11 1.12 @@ -62,10 +62,9 @@ ((:file "package") (:file "util" :depends-on ("package")) (:file "sax-handler") - (:file "characters" :depends-on ("package")) (:file "xml-name-rune-p" :depends-on ("package")) (:file "split-sequence" :depends-on ("package")) - (:file "xml-parse" :depends-on ("package" "util" "sax-handler" "split-sequence" "xml-name-rune-p" "characters")) + (:file "xml-parse" :depends-on ("package" "util" "sax-handler" "split-sequence" "xml-name-rune-p")) (:file "unparse" :depends-on ("xml-parse")) (:file "xmls-compat" :depends-on ("xml-parse")) (:file "recoder" :depends-on ("xml-parse"))

1 0

[cxml-cvs] CVS cxml/test
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/test In directory clnet:/tmp/cvs-serv18207/test Modified Files: domtest.lisp xmlconf.lisp Log Message: bla --- /project/cxml/cvsroot/cxml/test/domtest.lisp 2005/12/28 23:11:38 1.16 +++ /project/cxml/cvsroot/cxml/test/domtest.lisp 2006/08/20 11:48:58 1.17 @@ -713,8 +713,14 @@ (lisp (slurp-test (merge-pathnames href test-directory))) (cxml::*validate* nil)) (print lisp) + (fresh-line) (when lisp (funcall (compile nil lisp))))) #+(or) -(run-all-tests "~/src/2001/DOM-Test-Suite/") +(domtest::run-all-tests "/home/david/2001/DOM-Test-Suite/") + +#+(or) +(domtest::run-test "/home/david/2001/DOM-Test-Suite/" + 1 + "attrcreatedocumentfragment.xml") --- /project/cxml/cvsroot/cxml/test/xmlconf.lisp 2005/12/28 23:11:38 1.12 +++ /project/cxml/cvsroot/cxml/test/xmlconf.lisp 2006/08/20 11:48:58 1.13 @@ -206,4 +206,4 @@ t))) #+(or) -(xmlconf::dribble-tests "/home/david/2001/XML-Test-Suite/xmlconf/") +(xmlconf::run-all-tests "/home/david/2001/XML-Test-Suite/xmlconf/")

1 0

[cxml-cvs] CVS cxml/doc
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv18207/doc Modified Files: cxml.css Log Message: bla --- /project/cxml/cvsroot/cxml/doc/cxml.css 2006/01/23 21:53:24 1.5 +++ /project/cxml/cvsroot/cxml/doc/cxml.css 2006/08/20 11:48:58 1.6 @@ -2,7 +2,7 @@ float: right; min-width: 15%; padding: 0pt 5pt 5pt 5pt; - font-family: helvetica; + font-family: verdana, arial; } div.sidebar-title { @@ -56,7 +56,7 @@ margin-bottom: 10%; margin-left: 40px; padding-left: 30px; - font-family: helvetica; + font-family: verdana, arial; background-image: url(bg.png); background-position: top left; background-attachment: fixed;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cxml-cvs August 2006