Add support for XHTML 1.1.

diff --git a/v7/src/xml/xhtml.scm b/v7/src/xml/xhtml.scm
index 04973afcf77d2afb310e6a3bc2e92d4115840ff8..43d790b550b1db04b8b99f6ecdf27b649fe1f074 100644 (file)
--- a/v7/src/xml/xhtml.scm
+++ b/v7/src/xml/xhtml.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xhtml.scm,v 1.7 2004/07/19 17:36:28 cph Exp $
+$Id: xhtml.scm,v 1.8 2004/07/24 02:12:14 cph Exp $
 
 Copyright 2002,2003,2004 Massachusetts Institute of Technology
 
@@ -27,12 +27,19 @@ USA.
 
 (declare (usual-integrations))
 \f
-(define html-external-dtd
+(define html-1.0-external-dtd
   (make-xml-external-id "-//W3C//DTD XHTML 1.0 Strict//EN"
                        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"))
 
-(define html-dtd
-  (make-xml-dtd 'html html-external-dtd '()))
+(define html-1.0-dtd
+  (make-xml-dtd 'html html-1.0-external-dtd '()))
+
+(define html-1.1-external-dtd
+  (make-xml-external-id "-//W3C//DTD XHTML 1.1//EN"
+                       "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"))
+
+(define html-1.1-dtd
+  (make-xml-dtd 'html html-1.1-external-dtd '()))
 
 (define html-iri
   (make-xml-namespace-iri "http://www.w3.org/1999/xhtml"))
@@ -145,6 +152,12 @@ USA.
 (define-html-element param     object empty)
 (define-html-element pre       block)
 (define-html-element q         inline)
+(define-html-element rb                ruby)
+(define-html-element rbc       ruby)
+(define-html-element rp                ruby)
+(define-html-element rt                ruby)
+(define-html-element rtc       ruby)
+(define-html-element ruby      inline)
 (define-html-element samp      inline)
 (define-html-element script    hybrid)
 (define-html-element select    inline)

diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg
index d48510333fcb6350e2a2a2ca3e53ee6b38636964..40920fd8bb3879cd3c1eb84f198c624bbf6d0442 100644 (file)
--- a/v7/src/xml/xml.pkg
+++ b/v7/src/xml/xml.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml.pkg,v 1.47 2004/07/19 17:36:35 cph Exp $
+$Id: xml.pkg,v 1.48 2004/07/24 02:12:20 cph Exp $
 
 Copyright 2001,2002,2003,2004 Massachusetts Institute of Technology
 
@@ -301,15 +301,19 @@ USA.
   (files "xhtml")
   (parent (runtime xml))
   (export ()
+         (html-dtd html-1.0-dtd)
+         (html-external-dtd html-1.0-external-dtd)
          guarantee-html-element
          guarantee-html-element-name
-         html-dtd
-         html-element?
+         html-1.0-dtd
+         html-1.0-external-dtd
+         html-1.1-dtd
+         html-1.1-external-dtd
          html-element-context
-         html-element-name?
          html-element-name-context
+         html-element-name?
          html-element-names
-         html-external-dtd
+         html-element?
          html-iri
          html:a
          html:a?
@@ -427,7 +431,19 @@ USA.
          html:pre?
          html:q
          html:q?
+         html:rb
+         html:rb?
+         html:rbc
+         html:rbc?
          html:rel-link
+         html:rp
+         html:rp?
+         html:rt
+         html:rt?
+         html:rtc
+         html:rtc?
+         html:ruby
+         html:ruby?
          html:samp
          html:samp?
          html:script