- From: Hugo Haas via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 02 Aug 2005 05:06:52 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/wsdl20
In directory homer:/tmp/cvs-serv20925
Modified Files:
xmlspec.dtd entities.dtd xmlspec.rnc
Log Message:
Updated DTD
Index: xmlspec.dtd
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/xmlspec.dtd,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** xmlspec.dtd 15 Jun 2005 10:59:22 -0000 1.13
--- xmlspec.dtd 2 Aug 2005 05:06:50 -0000 1.14
***************
*** 139,145 ****
<!ENTITY % local.emph.class "">
! <!ENTITY % emph.class "emph|phrase|quote|sub|sup
%local.emph.class;">
<!ENTITY % local.ref.class "">
<!ENTITY % ref.class "bibref|specref|termref|titleref
--- 139,149 ----
<!ENTITY % local.emph.class "">
! <!ENTITY % emph.class "emph|phrase|quote|sub|sup|b|u|i
%local.emph.class;">
+ <!ELEMENT b (#PCDATA|u|i)*>
+ <!ELEMENT i (#PCDATA|b|u)*>
+ <!ELEMENT u (#PCDATA|b|i)*>
+
<!ENTITY % local.ref.class "">
<!ENTITY % ref.class "bibref|specref|termref|titleref
***************
*** 449,453 ****
|dispcmts
|issues
! |note
|other
|pr
--- 453,457 ----
|dispcmts
|issues
! |wgnote
|other
|pr
Index: xmlspec.rnc
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/xmlspec.rnc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xmlspec.rnc 1 Oct 2004 11:20:18 -0000 1.2
--- xmlspec.rnc 2 Aug 2005 05:06:50 -0000 1.3
***************
*** 1,7 ****
! # comment this entity for publication
! # uncomment the following entity for publication, and change the date
! # in entitieswd.dtd
! # <!ENTITY % sub.entities SYSTEM "entitieswd.dtd" >
# Titles
--- 1,7 ----
! # 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
***************
*** 15,31 ****
# Misc entities. Feel free to add more
- # add b,u,i
-
- namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
- namespace xlink = "http://www.w3.org/1999/xlink"
-
- local.emph.class = b | u | i
- # cannot use common.att :-/
- b = element b { b.attlist, (text | u | i)* }
- b.attlist &= empty
- i = element i { i.attlist, (text | b | u)* }
- i.attlist &= empty
- u = element u { u.attlist, (text | b | i)* }
- u.attlist &= empty
# ...............................................................
--- 15,18 ----
***************
*** 108,111 ****
--- 95,103 ----
# # Added definitions to %illus.class;.
# #2000-03-07: maler: Added proto and example to %illus.class;.
+
+ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+ namespace xlink = "http://www.w3.org/1999/xlink"
+ namespace z = "http://www.w3.org/2004/zml"
+
local.p.class = notAllowed
p.class = p | local.p.class
***************
*** 141,147 ****
local.annot.class = notAllowed
annot.class = footnote | local.annot.class
! local.termdef.class = notAllowed
termdef.class = termdef | term | local.termdef.class
! emph.class = emph | phrase | quote | sub | sup | local.emph.class
local.ref.class = notAllowed
ref.class =
--- 133,149 ----
local.annot.class = notAllowed
annot.class = footnote | local.annot.class
! # #2005-06-08: ryman: Created %wsdldef.class and added it to %local.termdef.class
! wsdldef.class = compdef | comp | propdef | prop
! local.termdef.class = wsdldef.class
termdef.class = termdef | term | local.termdef.class
! local.emph.class = notAllowed
! emph.class =
! emph | phrase | quote | sub | sup | b | u | i | local.emph.class
! b = element b { b.attlist, (text | u | i)* }
! b.attlist &= empty
! i = element i { i.attlist, (text | b | u)* }
! i.attlist &= empty
! u = element u { u.attlist, (text | b | i)* }
! u.attlist &= empty
local.ref.class = notAllowed
ref.class =
***************
*** 197,200 ****
--- 199,203 ----
| illus.class
| ednote.class
+ | z.notation
obj.mix =
p.class
***************
*** 236,239 ****
--- 239,244 ----
| loc.class
| ednote.class
+ | z.math
+ | z.i
head.pcd.mix =
text
***************
*** 446,450 ****
| "dispcmts"
| "issues"
! | "note"
| "other"
| "pr"
--- 451,455 ----
| "dispcmts"
| "issues"
! | "wgnote"
| "other"
| "pr"
***************
*** 1336,1348 ****
para = element para { para.attlist, text }
para.attlist &= empty
- start =
- statusp
- | spec
- | pre
- | orderedlist
- | key-term
- | htbody
- | htable
- | itemizedlist
# ...............................................................
--- 1341,1344 ----
***************
*** 1479,1480 ****
--- 1475,1637 ----
# ...............................................................
+
+ #
+ # Additions to XML specification DTD for Z Notation and WSDL
+ #
+ # Maintainers:
+ #
+ # Hugo Haas <hugo@w3.org>
+ # Arthur Ryman <ryman@ca.ibm.com>
+ #
+ # Change Log:
+ #
+ # 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
+ #
+ compdef = element compdef { compdef.attlist, text }
+ compdef.attlist &= empty
+ comp = element comp { comp.attlist, text }
+ comp.attlist &= attribute href { text }?
+ propdef = element propdef { propdef.attlist, text }
+ propdef.attlist &= attribute comp { text }?
+ prop = element prop { prop.attlist, text }
+ prop.attlist &= attribute comp { text }?
+ prop.attlist &= attribute href { text }?
+ z.math = element z:math { z.math.attlist, any }
+ z.math.attlist &= empty
+ z.i = element z:i { z.i.attlist, any }
+ z.i.attlist &= empty
+ z.notation = element z:notation { z.notation.attlist, any }
+ z.notation.attlist &= attribute name { text }?
+ z.see = element z:see { z.see.attlist, any }
+ z.see.attlist &= attribute names { text }?
+ z.schema = element z:schema { z.schema.attlist, any }
+ z.schema.attlist &= attribute name { text }?
+ schema = element schema { schema.attlist, any }
+ schema.attlist &= attribute name { text }?
+ gendef = element gendef { gendef.attlist, any }
+ gendef.attlist &= attribute params { text }?
+ z.zed = element z:zed { z.zed.attlist, any }
+ z.zed.attlist &= empty
+ zed = element zed { zed.attlist, any }
+ zed.attlist &= attribute name { text }?
+ 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
+ | ldata
+ | notin
+ | statusp
+ | in
+ | subset
+ | emptyset
+ | z.emptyset
+ | axdef
+ | mapsto
+ | fun
+ | schema
+ | power
+ | also
+ | zed
+ | spec
+ | t3
+ | t2
+ | t1
+ | pre
+ | rdata
+ | orderedlist
+ | rel
+ | power_1
+ | plus
+ | neq
+ | gendef
+ | key-term
+ | z.zed
+ | implies
+ | htbody
+ | defs
+ | star
+ | theta
+ | forall
+ | nl
+ | cup
+ | land
+ | htable
+ | itemizedlist
+ | subseteq
+ any =
+ (element * {
+ attribute * { text }*,
+ any
+ }
+ | text)*
Index: entities.dtd
===================================================================
RCS file: /sources/public/2002/ws/desc/wsdl20/entities.dtd,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** entities.dtd 1 Aug 2005 08:30:49 -0000 1.30
--- entities.dtd 2 Aug 2005 05:06:50 -0000 1.31
***************
*** 115,125 ****
<!ENTITY AD-FEATURE-DATA-P "http://www.w3.org/&draft.year;/&draft.mm;/wsdl/feature/AD/data">
- <!-- add b,u,i -->
-
- <!ENTITY % local.emph.class "|b|u|i">
-
- <!-- cannot use common.att :-/ -->
- <!ELEMENT b (#PCDATA|u|i)*>
- <!ELEMENT i (#PCDATA|b|u)*>
- <!ELEMENT u (#PCDATA|b|i)*>
--- 115,117 ----
Received on Tuesday, 2 August 2005 05:07:05 UTC