- From: Philippe Le Hegaret via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 28 Aug 2007 15:10:54 +0000
- To: public-ws-addressing-eds@w3.org
Update of /sources/public/2004/ws/addressing
In directory hutz:/tmp/cvs-serv21278
Modified Files:
xmlspec.dtd
Log Message:
New version that includes errataloc
Index: xmlspec.dtd
===================================================================
RCS file: /sources/public/2004/ws/addressing/xmlspec.dtd,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** xmlspec.dtd 21 Apr 2006 16:00:52 -0000 1.6
--- xmlspec.dtd 28 Aug 2007 15:10:51 -0000 1.7
***************
*** 8,13 ****
TYPICAL INVOCATION:
# <!DOCTYPE spec PUBLIC
! # "-//W3C//DTD Specification V2.2//EN"
! # "http://www.w3.org/XML/1998/06/xmlspec-v22.dtd">
PURPOSE:
--- 8,13 ----
TYPICAL INVOCATION:
# <!DOCTYPE spec PUBLIC
! # "-//W3C//DTD Specification V2.2+WSDL//EN"
! # "xmlspec.dtd">
PURPOSE:
***************
*** 60,72 ****
#1998-05-14: maler: Fixed ldquo and rdquo. Gave mdash a real number.
#1998-12-03: maler: Escaped the leading ampersands.
-->
! <!--
! <!ENTITY lt "&#60;">
! <!ENTITY gt ">">
! <!ENTITY amp "&#38;">
! <!ENTITY apos "'">
! <!ENTITY quot """>
! -->
<!ENTITY nbsp " ">
<!ENTITY mdash "&#x2014;">
--- 60,71 ----
#1998-05-14: maler: Fixed ldquo and rdquo. Gave mdash a real number.
#1998-12-03: maler: Escaped the leading ampersands.
+ #2005-09-24: ryman: Removed redefinitions of lt, gt, amp, apos, and quot.
-->
! <!--<!ENTITY lt "&#60;">-->
! <!--<!ENTITY gt ">">-->
! <!--<!ENTITY amp "&#38;">-->
! <!--<!ENTITY apos "'">-->
! <!--<!ENTITY quot """>-->
<!ENTITY nbsp " ">
<!ENTITY mdash "&#x2014;">
***************
*** 129,134 ****
<!ENTITY % annot.class "footnote
%local.annot.class;">
! <!ENTITY % local.termdef.class "">
<!ENTITY % termdef.class "termdef|term
%local.termdef.class;">
--- 128,139 ----
<!ENTITY % annot.class "footnote
%local.annot.class;">
+
+ <!--
+ #2005-06-08: ryman: Created %wsdldef.class and added it to %local.termdef.class
+ -->
! <!ENTITY % wsdldef.class "compdef|comp|propdef|prop">
!
! <!ENTITY % local.termdef.class "|%wsdldef.class;">
<!ENTITY % termdef.class "termdef|term
%local.termdef.class;">
***************
*** 138,142 ****
%local.emph.class;">
-
<!ELEMENT b (#PCDATA|u|i)*>
<!ELEMENT i (#PCDATA|b|u)*>
--- 143,146 ----
***************
*** 185,189 ****
<!ENTITY % div.mix
"%p.class;|%list.class;|%speclist.class;|%note.class;
! |%illus.class;|%ednote.class;">
<!ENTITY % obj.mix
"%p.class;|%list.class;|%speclist.class;|%note.class;
--- 189,193 ----
<!ENTITY % div.mix
"%p.class;|%list.class;|%speclist.class;|%note.class;
! |%illus.class;|%ednote.class;|z:notation">
<!ENTITY % obj.mix
"%p.class;|%list.class;|%speclist.class;|%note.class;
***************
*** 196,200 ****
"%p.class;|%list.class;|%ednote.class;">
<!ENTITY % termdef.mix
! "%note.class;|%illus.class;">
<!-- ............................................................... -->
--- 200,204 ----
"%p.class;|%list.class;|%ednote.class;">
<!ENTITY % termdef.mix
! "%note.class;|%illus.class;|%wsdldef.class;">
<!-- ............................................................... -->
***************
*** 217,225 ****
# %tech.pcd.mix; (net: all PCD mixes have it).
# Removed unused %loc.pcd.mix;.
-->
! <!ENTITY % p.pcd.mix
"#PCDATA|%annot.class;|%termdef.class;|%emph.class;
! |%ref.class;|%tech.class;|%loc.class;|%ednote.class;">
<!ENTITY % head.pcd.mix
"#PCDATA|%annot.class;|%emph.class;|%tech.class;
--- 221,233 ----
# %tech.pcd.mix; (net: all PCD mixes have it).
# Removed unused %loc.pcd.mix;.
+ #2005-09-24: ryman: Add assert to %p.pcd.mix and defined %p.pcd.mix.noassert.
+ #2005-10-27: ryman: Add assert-summary to %.pcd.mix.
-->
! <!ENTITY % p.pcd.mix.noassert
"#PCDATA|%annot.class;|%termdef.class;|%emph.class;
! |%ref.class;|%tech.class;|%loc.class;|%ednote.class;|z:math|z:i">
! <!ENTITY % p.pcd.mix
! "%p.pcd.mix.noassert;|assert|assert-summary">
<!ENTITY % head.pcd.mix
"#PCDATA|%annot.class;|%emph.class;|%tech.class;
***************
*** 256,264 ****
"title, subtitle?, version?, w3c-designation, w3c-doctype,
pubdate, notice*, publoc, altlocs?, ((prevlocs, latestloc?) |
! (latestloc, prevlocs?))?, authlist, copyright?,
! errata?,
((status, abstract) | (abstract, status)), pubstmt?,
sourcedesc?, langusage, revisiondesc">
- <!ELEMENT errata (#PCDATA)>
<!ENTITY % pubdate.mdl
--- 264,270 ----
"title, subtitle?, version?, w3c-designation, w3c-doctype,
pubdate, notice*, publoc, altlocs?, ((prevlocs, latestloc?) |
! (latestloc, prevlocs?))?, authlist, errataloc?, copyright?,
((status, abstract) | (abstract, status)), pubstmt?,
sourcedesc?, langusage, revisiondesc">
<!ENTITY % pubdate.mdl
***************
*** 396,399 ****
--- 402,406 ----
<!ENTITY % common.att
'id ID #IMPLIED
+ xml:space (default|preserve) "default"
%role.att;
%diff.att;'>
***************
*** 452,456 ****
|dispcmts
|issues
- |note
|wgnote
|other
--- 459,462 ----
***************
*** 459,468 ****
|wd) #IMPLIED
other-doctype CDATA #IMPLIED
status (int-review
|ext-review
|final) #IMPLIED
- shortname CDATA #IMPLIED
xmlns:xlink CDATA #FIXED
"http://www.w3.org/1999/xlink"
>
]]>
--- 465,476 ----
|wd) #IMPLIED
other-doctype CDATA #IMPLIED
+ shortname CDATA #IMPLIED
status (int-review
|ext-review
|final) #IMPLIED
xmlns:xlink CDATA #FIXED
"http://www.w3.org/1999/xlink"
+ xmlns:z CDATA #FIXED
+ "http://www.w3.org/2004/zml"
>
]]>
***************
*** 1193,1198 ****
<![%eg.attlist;[
<!ATTLIST eg
! %common.att;
! %xmlspace.att;>
]]>
--- 1201,1205 ----
<![%eg.attlist;[
<!ATTLIST eg
! %common.att;>
]]>
***************
*** 1443,1448 ****
<![%bnf.attlist;[
<!ATTLIST bnf
! %common.att;
! %xmlspace.att;>
]]>
--- 1450,1454 ----
<![%bnf.attlist;[
<!ATTLIST bnf
! %common.att;>
]]>
***************
*** 2134,2137 ****
--- 2140,2150 ----
-->
+ <!ELEMENT errataloc (#PCDATA)>
+ <!ATTLIST errataloc
+ %common.att;
+ %simple-xlink.att;
+ %href-req.att;
+ %user-replace.att;>
+
<!-- loc: Generic link to a Web resource, similar to HTML's A. -->
<!ENTITY % loc.element "INCLUDE">
***************
*** 2660,2661 ****
--- 2673,2815 ----
<!-- End of XML specification DTD .................................. -->
<!-- ............................................................... -->
+
+ <!--
+
+ Additions to XML specification DTD for Z Notation and WSDL
+
+ Maintainers:
+
+ Hugo Haas <hugo@w3.org>
+ Arthur Ryman <ryman@ca.ibm.com>
+
+ Change Log:
+
+ 2007-02-25 ryman
+ - added cr-id attribute to assert
+
+ 2006-02-26 ryman
+ - added required attribute to assert element
+ - specified enumerated values for class attribute of assert element
+
+ 2005-11-16 ryman
+ - added more Z elements
+
+ 2005-11-01 ryman
+ - added more Z elements
+
+ 2005-10-27 ryman
+ - added markup for assertion references: assert-summary
+
+ 2005-09-24 ryman
+ - added markup for assertions: assert
+
+ 2005-06-08 ryman
+ - added markup for components and properties: compdef, comp, propdef, prop
+
+ 2005-05-22 ryman
+ - changed content model to EMPTY on several Z Notation elements
+
+ 2005-04-17 ryman
+ - added xmlns attribute to z:math
+
+ 2005-02-11 hugo
+ - created a DTD approximation to the Z Notation schema with namespaces
+
+ -->
+
+ <!ELEMENT assert (%p.pcd.mix.noassert;)*>
+ <!ATTLIST assert class (component | document | exchange | message) #REQUIRED>
+ <!ATTLIST assert id ID #REQUIRED>
+ <!ATTLIST assert cr-id CDATA #REQUIRED>
+ <!ATTLIST assert required (false | true) "true">
+
+ <!ELEMENT assert-summary (%p.pcd.mix.noassert;)*>
+ <!ATTLIST assert-summary ref IDREF #REQUIRED>
+
+ <!ELEMENT compdef (#PCDATA)>
+
+ <!ELEMENT comp (#PCDATA)>
+ <!ATTLIST comp href CDATA #IMPLIED>
+
+ <!ELEMENT propdef (#PCDATA)>
+ <!ATTLIST propdef comp CDATA #IMPLIED>
+
+ <!ELEMENT prop (#PCDATA)>
+ <!ATTLIST prop comp CDATA #IMPLIED>
+ <!ATTLIST prop href CDATA #IMPLIED>
+
+ <!ELEMENT z:math ANY>
+ <!ATTLIST z:math
+ xmlns CDATA #IMPLIED>
+
+ <!ELEMENT z:i ANY>
+
+ <!ELEMENT z:notation ANY>
+ <!ATTLIST z:notation name CDATA #IMPLIED>
+
+ <!ELEMENT z:see ANY>
+ <!ATTLIST z:see names CDATA #IMPLIED>
+
+ <!ELEMENT axdef ANY>
+ <!ATTLIST axdef xmlns CDATA #IMPLIED>
+
+ <!ELEMENT gendef ANY>
+ <!ATTLIST gendef
+ xmlns CDATA #IMPLIED
+ params CDATA #IMPLIED>
+
+ <!ELEMENT z:schema ANY>
+ <!ATTLIST z:schema name CDATA #IMPLIED>
+
+ <!ELEMENT schema ANY>
+ <!ATTLIST schema
+ xmlns CDATA #IMPLIED
+ name CDATA #IMPLIED>
+
+ <!ELEMENT z:zed ANY>
+
+ <!ELEMENT zed ANY>
+ <!ATTLIST zed
+ name CDATA #IMPLIED
+ xmlns CDATA #IMPLIED>
+
+ <!ELEMENT also EMPTY>
+ <!ELEMENT cap EMPTY>
+ <!ELEMENT cross EMPTY>
+ <!ELEMENT cup EMPTY>
+ <!ELEMENT defs EMPTY>
+ <!ELEMENT dom EMPTY>
+ <!ELEMENT emptyset EMPTY>
+ <!ELEMENT z:emptyset EMPTY>
+ <!ELEMENT forall EMPTY>
+ <!ELEMENT fun EMPTY>
+ <!ELEMENT implies EMPTY>
+ <!ELEMENT iff EMPTY>
+ <!ELEMENT in EMPTY>
+ <!ELEMENT iseq EMPTY>
+ <!ELEMENT ldata EMPTY>
+ <!ELEMENT land EMPTY>
+ <!ELEMENT mapsto EMPTY>
+ <!ELEMENT mu EMPTY>
+ <!ELEMENT nl EMPTY>
+ <!ELEMENT nat EMPTY>
+ <!ELEMENT nat_1 EMPTY>
+ <!ELEMENT num EMPTY>
+ <!ELEMENT neq EMPTY>
+ <!ELEMENT notin EMPTY>
+ <!ELEMENT plus EMPTY>
+ <!ELEMENT power EMPTY>
+ <!ELEMENT power_1 EMPTY>
+ <!ELEMENT ran EMPTY>
+ <!ELEMENT rel EMPTY>
+ <!ELEMENT rdata EMPTY>
+ <!ELEMENT seq EMPTY>
+ <!ELEMENT seq_1 EMPTY>
+ <!ELEMENT star EMPTY>
+ <!ELEMENT subset EMPTY>
+ <!ELEMENT subseteq EMPTY>
+ <!ELEMENT t1 EMPTY>
+ <!ELEMENT t2 EMPTY>
+ <!ELEMENT t3 EMPTY>
+ <!ELEMENT theta EMPTY>
+ <!ELEMENT where EMPTY>
Received on Tuesday, 28 August 2007 15:10:57 UTC