2004/ws/addressing xmlspec.rnc,1.1,1.2

Update of /sources/public/2004/ws/addressing
In directory homer:/tmp/cvs-serv4586

Modified Files:
	xmlspec.rnc 
Log Message:
Regenerated

Index: xmlspec.rnc
===================================================================
RCS file: /sources/public/2004/ws/addressing/xmlspec.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xmlspec.rnc	25 Oct 2004 18:21:42 -0000	1.1
--- xmlspec.rnc	21 Apr 2006 16:01:46 -0000	1.2
***************
*** 9,31 ****
  # Latest version links. don't touch
  
- # Acknowledgements
- 
  # XML Namespaces used in the drafts
  
! # 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
  # ...............................................................
  
--- 9,21 ----
  # Latest version links. don't touch
  
  # XML Namespaces used in the drafts
  
! # <!ENTITY nsuri "http://www.w3.org/&draft.year;/&draft.mm;/addressing" >
! # <!ENTITY wsa-wsdl-nsuri "&nsuri;/wsdl" >
  
! # Misc entities. Feel free to add more
  
! # Acknowledgements
  
  # ...............................................................
  
***************
*** 91,94 ****
--- 81,90 ----
  # #1998-12-03: maler: Escaped the leading ampersands.
  
+ # <!ENTITY lt     "&#38;#60;">
+ # <!ENTITY gt     "&#62;">
+ # <!ENTITY amp    "&#38;#38;">
+ # <!ENTITY apos   "&#39;">
+ # <!ENTITY quot   "&#34;">
+ 
  # ...............................................................
  
***************
*** 108,111 ****
--- 104,111 ----
  # #                   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"
+ 
  local.p.class = notAllowed
  p.class = p | local.p.class
***************
*** 143,147 ****
  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 =
--- 143,155 ----
  local.termdef.class = notAllowed
  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 =
***************
*** 292,295 ****
--- 300,304 ----
    authlist,
    copyright?,
+   errata?,
    ((status, abstract) | (abstract, status)),
    pubstmt?,
***************
*** 297,300 ****
--- 306,311 ----
    langusage,
    revisiondesc
+ errata = element errata { errata.attlist, text }
+ errata.attlist &= empty
  pubdate.mdl = day?, month, year
  # ...............................................................
***************
*** 447,450 ****
--- 458,462 ----
      | "issues"
      | "note"
+     | "wgnote"
      | "other"
      | "pr"
***************
*** 453,457 ****
    }?,
    attribute other-doctype { text }?,
!   attribute status { "int-review" | "ext-review" | "final" }?
  front = element front { front.attlist, div1+ }
  front.attlist &= common.att
--- 465,470 ----
    }?,
    attribute other-doctype { text }?,
!   attribute status { "int-review" | "ext-review" | "final" }?,
!   attribute shortname { text }?
  front = element front { front.attlist, div1+ }
  front.attlist &= common.att

Received on Friday, 21 April 2006 16:03:15 UTC