Change URI -> IRI in remaining places.

diff --git a/v7/doc/ref-manual/io.texi b/v7/doc/ref-manual/io.texi
index e18993e2cd9e415ba99e803289c0417e24892e0f..0a089c3457c6aedabccf97a1ce1b1598dabe2ce7 100644 (file)
--- a/v7/doc/ref-manual/io.texi
+++ b/v7/doc/ref-manual/io.texi
@@ -1,5 +1,5 @@
 @c This file is part of the MIT/GNU Scheme Reference Manual.
-@c $Id: io.texi,v 1.2 2003/04/26 02:43:49 cph Exp $
+@c $Id: io.texi,v 1.3 2003/09/25 16:51:56 cph Exp $
 
 @c Copyright 1991,1992,1993,1994,1995 Massachusetts Institute of Technology
 @c Copyright 1996,1997,1999,2000,2001 Massachusetts Institute of Technology
@@ -3179,18 +3179,18 @@ The @code{xml-!notation} record represents a notation declaration.
 @code{xml-external-id} record.
 @end deftp
 
-@deftp {record type} xml-external-id id uri
+@deftp {record type} xml-external-id id iri
 @vindex <xml-external-id>
 @findex xml-external-id?
 @findex make-xml-external-id
 @findex xml-external-id-id
-@findex xml-external-id-uri
+@findex xml-external-id-iri
 @findex set-xml-external-id-id!
-@findex set-xml-external-id-uri!
+@findex set-xml-external-id-iri!
 The @code{xml-external-id} record is a reference to an external
 @acronym{DTD}.  This reference consists of two parts: @var{id} is a
 public @acronym{ID} literal, corresponding to the @samp{PUBLIC}
-keyword, while @var{uri} is a system literal, corresponding to the
+keyword, while @var{iri} is a system literal, corresponding to the
 @samp{SYSTEM} keyword.  Either or both may be present, depending on
 the context.  Each is represented as a string.
 @end deftp

diff --git a/v7/src/xml/xml-output.scm b/v7/src/xml/xml-output.scm
index 1dd22f298e6283ece792913ce2957bb5b5cc2ba5..5cbc7a5875cfb2081ca823df6c08ada220c2e278 100644 (file)
--- a/v7/src/xml/xml-output.scm
+++ b/v7/src/xml/xml-output.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml-output.scm,v 1.24 2003/08/22 15:13:19 cph Exp $
+$Id: xml-output.scm,v 1.25 2003/09/25 16:51:15 cph Exp $
 
 Copyright 2001,2002,2003 Massachusetts Institute of Technology
 
@@ -445,15 +445,15 @@ USA.
          (write-indent col ctx)
          (emit-string "PUBLIC " ctx)
          (quoted-string (xml-external-id-id id))
-         (if (xml-external-id-uri id)
+         (if (xml-external-id-iri id)
              (begin
                (write-indent col ctx)
-               (quoted-string (xml-external-id-uri id)))))
+               (quoted-string (xml-external-id-iri id)))))
        (begin
          (write-indent col ctx)
          (emit-string "SYSTEM" ctx)
          (emit-string " " ctx)
-         (quoted-string (xml-external-id-uri id))))))
+         (quoted-string (xml-external-id-iri id))))))
 \f
 (define (write-indent col ctx)
   (if col

diff --git a/v7/src/xml/xml-parser.scm b/v7/src/xml/xml-parser.scm
index 480b7d1ceb3be3f8d8f45f16361e450ef8ca5954..b39deaafed2333b9b85c668fddf26d23ef734a48 100644 (file)
--- a/v7/src/xml/xml-parser.scm
+++ b/v7/src/xml/xml-parser.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml-parser.scm,v 1.42 2003/09/24 22:39:09 cph Exp $
+$Id: xml-parser.scm,v 1.43 2003/09/25 16:51:18 cph Exp $
 
 Copyright 2001,2002,2003 Massachusetts Institute of Technology
 
@@ -966,10 +966,10 @@ USA.
 (define *general-entities*)
 (define *entity-expansion-nesting* '())
 
-(define (make-external-id id uri p)
+(define (make-external-id id iri p)
   (if *standalone?*
       (perror p "Illegal external reference in standalone document"))
-  (make-xml-external-id id uri))
+  (make-xml-external-id id iri))
 \f
 ;;;; Document-type declarations
 

diff --git a/v7/src/xml/xml-struct.scm b/v7/src/xml/xml-struct.scm
index 3994626e6a9991e6d2f8a68175d95635f1da3451..fb38b80ebc37bdfe6df361f56198076bfe248d6d 100644 (file)
--- a/v7/src/xml/xml-struct.scm
+++ b/v7/src/xml/xml-struct.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml-struct.scm,v 1.31 2003/09/25 16:48:14 cph Exp $
+$Id: xml-struct.scm,v 1.32 2003/09/25 16:51:20 cph Exp $
 
 Copyright 2001,2002,2003 Massachusetts Institute of Technology
 
@@ -489,7 +489,7 @@ USA.
   (id (lambda (object)
        (or (not object)
            (public-id? object))))
-  (uri (lambda (object)
+  (iri (lambda (object)
         (or (not object)
             (xml-char-data? object)))
        canonicalize-char-data))
@@ -648,7 +648,7 @@ USA.
 (define-xml-printer external-id
   (lambda (dtd)
     (or (xml-external-id-id dtd)
-       (xml-external-id-uri dtd))))
+       (xml-external-id-iri dtd))))
 \f
 (define (xml-attribute-value attr)
   (and (pair? (cdr attr))

diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg
index 2fc8e06b0b3157692ad6a02f715cbec7cfb88592..b7f7e210344131d5c9986854cf46a961bb9e52bd 100644 (file)
--- a/v7/src/xml/xml.pkg
+++ b/v7/src/xml/xml.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml.pkg,v 1.29 2003/09/24 22:39:05 cph Exp $
+$Id: xml.pkg,v 1.30 2003/09/25 16:51:12 cph Exp $
 
 Copyright 2001,2002,2003 Massachusetts Institute of Technology
 
@@ -135,7 +135,8 @@ USA.
          set-xml-element-name!
          set-xml-entity-ref-name!
          set-xml-external-id-id!
-         set-xml-external-id-uri!
+         set-xml-external-id-iri!
+         (set-xml-external-id-uri! set-xml-external-id-iri!)
          set-xml-parameter-!entity-name!
          set-xml-parameter-!entity-value!
          set-xml-parameter-entity-ref-name!
@@ -190,7 +191,8 @@ USA.
          xml-entity-ref-name
          xml-entity-ref?
          xml-external-id-id
-         xml-external-id-uri
+         xml-external-id-iri
+         (xml-external-id-uri xml-external-id-iri)
          xml-external-id?
          xml-intern
          xml-name-hash