br element

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1976 4b5297f7-1745-476d-ba37-a9c6900126ab

xep-0001.xml

@@ -373,6 +373,30 @@ Experimental ----> Proposed ----> Active
   <code><![CDATA[
 <?xml version='1.0' encoding='UTF-8'?>
 
+<!--
+
+Copyright (c) 1999 - 2008 XMPP Standards Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-->
+
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
     targetNamespace='http://www.xmpp.org/extensions'
@@ -416,12 +440,12 @@ Experimental ----> Proposed ----> Active
         <xs:element ref='dependencies'/>
         <xs:element ref='supersedes'/>
         <xs:element ref='supersededby'/>
-        <xs:element name='shortname' type='xs:NCNAME'/>
+        <xs:element name='shortname' type='xs:NCName'/>
         <xs:element ref='schemaloc' minOccurs='0' maxOccurs='unbounded'/> 
-        <xs:element name='registry' type='empty' minOccurs='0'/> 
+        <xs:element name='registry' minOccurs='0' type='empty'/> 
-        <xs:element name='expires' type='xs:string'/>
+        <xs:element name='expires' minOccurs='0' type='xs:string'/>
-        <xs:element ref='author' minOccurs='0' maxOccurs='unbounded'/> 
+        <xs:element ref='author' minOccurs='1' maxOccurs='unbounded'/> 
-        <xs:element ref='revision' minOccurs='0' maxOccurs='unbounded'/> 
+        <xs:element ref='revision' minOccurs='1' maxOccurs='unbounded'/> 
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -440,7 +464,7 @@ Experimental ----> Proposed ----> Active
 
   <xs:element name='status'>
     <xs:simpleType>
-      <xs:restriction base='xs:NCNAME'>
+      <xs:restriction base='xs:NCName'>
         <xs:enumeration value='Active'/>
         <xs:enumeration value='Deferred'/>
         <xs:enumeration value='Deprecated'/>
@@ -724,8 +748,9 @@ Experimental ----> Proposed ----> Active
     </xs:complexType>
   </xs:element>
 
-  <xs:complexType name='markup' type='mixed'>
+  <xs:complexType name='markup' mixed='true'>
     <xs:choice minOccurs='0' maxOccurs='unbounded'>
+      <xs:element name='br' type='empty'/>
       <xs:element name='cite' type='xs:token'/>
       <xs:element name='dfn' type='xs:token'/>
       <xs:element name='em' type='xs:token'/>

xep.dtd

@@ -84,10 +84,11 @@ THE SOFTWARE.
 <!ATTLIST div 
           class CDATA ''
           style CDATA '' >
-<!ELEMENT p (#PCDATA | img | link | note | tt | dfn | em | strong | cite | span)* >
+<!ELEMENT p (#PCDATA | br | img | link | note | tt | dfn | em | strong | cite | span)* >
 <!ATTLIST p 
           class CDATA ''
           style CDATA '' >
+<!ELEMENT br EMPTY >
 <!ELEMENT ul (li+) >
 <!ATTLIST ul 
           class CDATA '' 

xep.xsd

@@ -377,6 +377,7 @@ THE SOFTWARE.
 
   <xs:complexType name='markup' mixed='true'>
     <xs:choice minOccurs='0' maxOccurs='unbounded'>
+      <xs:element name='br' type='empty'/>
       <xs:element name='cite' type='xs:token'/>
       <xs:element name='dfn' type='xs:token'/>
       <xs:element name='em' type='xs:token'/>

xep.xsl

@@ -696,6 +696,10 @@ THE SOFTWARE.
     </p>
   </xsl:template>
 
+  <xsl:template match='br'>
+    <br />
+  </xsl:template>
+
   <xsl:template match='ul'>
     <ul>
       <xsl:variable name='class.count' select='count(@class)'/>