W3C home > Mailing lists > Public > public-ws-desc-eds@w3.org > November 2005

2002/ws/desc/wsdl20 xmlspec.dtd,1.20,1.21 xmlspec.rnc,1.3,1.4

From: Hugo Haas via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 10 Nov 2005 09:21:22 +0000
To: public-ws-desc-eds@w3.org
Message-Id: <20051110092122.B9F6E4EF4B@homer.w3.org>

Update of /sources/public/2002/ws/desc/wsdl20
In directory homer:/tmp/cvs-serv13559

Modified Files:
	xmlspec.dtd xmlspec.rnc 
Log Message:
Added wsdldef to termdef

Index: xmlspec.dtd
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/xmlspec.dtd,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** xmlspec.dtd	1 Nov 2005 14:04:58 -0000	1.20
--- xmlspec.dtd	10 Nov 2005 09:21:20 -0000	1.21
***************
*** 200,204 ****
          "%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;">
  
  <!-- ............................................................... -->

Index: xmlspec.rnc
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/xmlspec.rnc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xmlspec.rnc	2 Aug 2005 05:06:50 -0000	1.3
--- xmlspec.rnc	10 Nov 2005 09:21:20 -0000	1.4
***************
*** 1,18 ****
- #  comment this entity for publication
- # <!ENTITY % sub.entities SYSTEM "entitiesedcopy.dtd" >
- 
- # uncomment the following entity for publication, and change the date
- # in entitieswd.dtd
- 
- # Titles
- 
- # Latest version links. don't touch
- 
- # Acknowledgements
- 
- # XML Namespaces used in the drafts
- 
- # Misc entities. Feel free to add more
- 
  # ...............................................................
  
--- 1,2 ----
***************
*** 25,30 ****
  # TYPICAL INVOCATION:
  # #  <!DOCTYPE spec PUBLIC
! # #       "-//W3C//DTD Specification V2.2//EN"
! # #       "http://www.w3.org/XML/1998/06/xmlspec-v22.dtd">
  # 
  # PURPOSE:
--- 9,14 ----
  # TYPICAL INVOCATION:
  # #  <!DOCTYPE spec PUBLIC
! # #       "-//W3C//DTD Specification V2.2+WSDL//EN"
! # #       "xmlspec.dtd">
  # 
  # PURPOSE:
***************
*** 77,80 ****
--- 61,75 ----
  # #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     "&#38;#60;">
+ 
+ # <!ENTITY gt     "&#62;">
+ 
+ # <!ENTITY amp    "&#38;#38;">
+ 
+ # <!ENTITY apos   "&#39;">
+ 
+ # <!ENTITY quot   "&#34;">
  
  # ...............................................................
***************
*** 209,213 ****
  p.mix = list.class | speclist.class | note.class | illus.class
  hdr.mix = p.class | list.class | ednote.class
! termdef.mix = note.class | illus.class
  # ...............................................................
  
--- 204,208 ----
  p.mix = list.class | speclist.class | note.class | illus.class
  hdr.mix = p.class | list.class | ednote.class
! termdef.mix = note.class | illus.class | wsdldef.class
  # ...............................................................
  
***************
*** 230,234 ****
  # #                   %tech.pcd.mix; (net: all PCD mixes have it).
  # #                   Removed unused %loc.pcd.mix;.
! p.pcd.mix =
    text
    | annot.class
--- 225,231 ----
  # #                   %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.
! p.pcd.mix.noassert =
    text
    | annot.class
***************
*** 241,244 ****
--- 238,242 ----
    | z.math
    | z.i
+ p.pcd.mix = p.pcd.mix.noassert | assert | assert-summary
  head.pcd.mix =
    text
***************
*** 1486,1489 ****
--- 1484,1496 ----
  # Change Log:
  # 
+ # 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
***************
*** 1498,1501 ****
--- 1505,1514 ----
  # - created a DTD approximation to the Z Notation schema with namespaces
  #
+ assert = element assert { assert.attlist, p.pcd.mix.noassert* }
+ assert.attlist &= attribute class { text }
+ assert.attlist &= attribute id { xsd:ID }
+ assert-summary =
+   element assert-summary { assert-summary.attlist, p.pcd.mix.noassert* }
+ assert-summary.attlist &= attribute ref { xsd:IDREF }
  compdef = element compdef { compdef.attlist, text }
  compdef.attlist &= empty
***************
*** 1527,1591 ****
  axdef = element axdef { axdef.attlist, any }
  axdef.attlist &= empty
- forall = element forall { forall.attlist, empty }
- forall.attlist &= empty
- t1 = element t1 { t1.attlist, empty }
- t1.attlist &= empty
- t2 = element t2 { t2.attlist, empty }
- t2.attlist &= empty
- t3 = element t3 { t3.attlist, empty }
- t3.attlist &= empty
- ldata = element ldata { ldata.attlist, empty }
- ldata.attlist &= empty
- rdata = element rdata { rdata.attlist, empty }
- rdata.attlist &= empty
- fun = element fun { fun.attlist, empty }
- fun.attlist &= empty
- nl = element nl { nl.attlist, empty }
- nl.attlist &= empty
- where = element where { where.attlist, empty }
- where.attlist &= empty
- power = element power { power.attlist, empty }
- power.attlist &= empty
- power_1 = element power_1 { power_1.attlist, empty }
- power_1.attlist &= empty
- implies = element implies { implies.attlist, empty }
- implies.attlist &= empty
- in = element in { in.attlist, empty }
- in.attlist &= empty
  also = element also { also.attlist, empty }
  also.attlist &= empty
  defs = element defs { defs.attlist, empty }
  defs.attlist &= empty
- land = element land { land.attlist, empty }
- land.attlist &= empty
  emptyset = element emptyset { emptyset.attlist, empty }
  emptyset.attlist &= empty
  z.emptyset = element z:emptyset { z.emptyset.attlist, empty }
  z.emptyset.attlist &= empty
! cup = element cup { cup.attlist, empty }
! cup.attlist &= empty
! subset = element subset { subset.attlist, empty }
! subset.attlist &= empty
! subseteq = element subseteq { subseteq.attlist, empty }
! subseteq.attlist &= empty
! notin = element notin { notin.attlist, empty }
! notin.attlist &= empty
  iff = element iff { iff.attlist, empty }
  iff.attlist &= empty
! neq = element neq { neq.attlist, empty }
! neq.attlist &= empty
! theta = element theta { theta.attlist, empty }
! theta.attlist &= empty
! rel = element rel { rel.attlist, empty }
! rel.attlist &= empty
  mapsto = element mapsto { mapsto.attlist, empty }
  mapsto.attlist &= empty
  plus = element plus { plus.attlist, empty }
  plus.attlist &= empty
  star = element star { star.attlist, empty }
  star.attlist &= empty
  start =
    iff
    | where
    | z.schema
    | z.see
--- 1540,1618 ----
  axdef = element axdef { axdef.attlist, any }
  axdef.attlist &= empty
  also = element also { also.attlist, empty }
  also.attlist &= empty
+ cup = element cup { cup.attlist, empty }
+ cup.attlist &= empty
  defs = element defs { defs.attlist, empty }
  defs.attlist &= empty
  emptyset = element emptyset { emptyset.attlist, empty }
  emptyset.attlist &= empty
  z.emptyset = element z:emptyset { z.emptyset.attlist, empty }
  z.emptyset.attlist &= empty
! forall = element forall { forall.attlist, empty }
! forall.attlist &= empty
! fun = element fun { fun.attlist, empty }
! fun.attlist &= empty
! implies = element implies { implies.attlist, empty }
! implies.attlist &= empty
  iff = element iff { iff.attlist, empty }
  iff.attlist &= empty
! in = element in { in.attlist, empty }
! in.attlist &= empty
! iseq = element iseq { iseq.attlist, empty }
! iseq.attlist &= empty
! ldata = element ldata { ldata.attlist, empty }
! ldata.attlist &= empty
! land = element land { land.attlist, empty }
! land.attlist &= empty
  mapsto = element mapsto { mapsto.attlist, empty }
  mapsto.attlist &= empty
+ nl = element nl { nl.attlist, empty }
+ nl.attlist &= empty
+ nat = element nat { nat.attlist, empty }
+ nat.attlist &= empty
+ nat_1 = element nat_1 { nat_1.attlist, empty }
+ nat_1.attlist &= empty
+ num = element num { num.attlist, empty }
+ num.attlist &= empty
+ neq = element neq { neq.attlist, empty }
+ neq.attlist &= empty
+ notin = element notin { notin.attlist, empty }
+ notin.attlist &= empty
  plus = element plus { plus.attlist, empty }
  plus.attlist &= empty
+ power = element power { power.attlist, empty }
+ power.attlist &= empty
+ power_1 = element power_1 { power_1.attlist, empty }
+ power_1.attlist &= empty
+ rel = element rel { rel.attlist, empty }
+ rel.attlist &= empty
+ rdata = element rdata { rdata.attlist, empty }
+ rdata.attlist &= empty
+ seq = element seq { seq.attlist, empty }
+ seq.attlist &= empty
+ seq_1 = element seq_1 { seq_1.attlist, empty }
+ seq_1.attlist &= empty
  star = element star { star.attlist, empty }
  star.attlist &= empty
+ subset = element subset { subset.attlist, empty }
+ subset.attlist &= empty
+ subseteq = element subseteq { subseteq.attlist, empty }
+ subseteq.attlist &= empty
+ t1 = element t1 { t1.attlist, empty }
+ t1.attlist &= empty
+ t2 = element t2 { t2.attlist, empty }
+ t2.attlist &= empty
+ t3 = element t3 { t3.attlist, empty }
+ t3.attlist &= empty
+ theta = element theta { theta.attlist, empty }
+ theta.attlist &= empty
+ where = element where { where.attlist, empty }
+ where.attlist &= empty
  start =
    iff
    | where
+   | seq_1
+   | nat_1
    | z.schema
    | z.see
***************
*** 1595,1598 ****
--- 1622,1626 ----
    | in
    | subset
+   | num
    | emptyset
    | z.emptyset
***************
*** 1622,1632 ****
--- 1650,1663 ----
    | defs
    | star
+   | iseq
    | theta
    | forall
    | nl
    | cup
+   | nat
    | land
    | htable
    | itemizedlist
+   | seq
    | subseteq
  any =
Received on Thursday, 10 November 2005 09:21:32 GMT

This archive was generated by hypermail 2.2.0 + w3c-0.30 : Thursday, 10 November 2005 09:21:33 GMT