dfn

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

xep.dtd

@@ -52,7 +52,7 @@
 <!ATTLIST div 
           class CDATA ''
           style CDATA '' >
-<!ELEMENT p (#PCDATA | img | link | note | tt | em | strong | cite | span)* >
+<!ELEMENT p (#PCDATA | img | link | note | tt | dfn | em | strong | cite | span)* >
 <!ATTLIST p 
           class CDATA ''
           style CDATA '' >
@@ -66,7 +66,7 @@
 <!ATTLIST img src CDATA '' >
 <!ELEMENT link (#PCDATA)* >
 <!ATTLIST link url CDATA '' >
-<!ELEMENT note (#PCDATA | link | tt | em | strong | cite | span)* >
+<!ELEMENT note (#PCDATA | link | tt | dfn | em | strong | cite | span)* >
 <!ELEMENT example (#PCDATA)* >
 <!ATTLIST example caption CDATA '' >
 <!ELEMENT code (#PCDATA)* >
@@ -83,6 +83,7 @@
           colspan CDATA ''
           rowspan CDATA '' >
 <!ELEMENT tt (#PCDATA)* >
+<!ELEMENT dfn (#PCDATA)* >
 <!ELEMENT em (#PCDATA)* >
 <!ELEMENT strong (#PCDATA)* >
 <!ELEMENT cite (#PCDATA)* >

xep.xsd

@@ -338,6 +338,7 @@
   <xs:complexType name='markup' type='mixed'>
     <xs:choice minOccurs='0' maxOccurs='unbounded'>
       <xs:element name='cite' type='xs:token'/>
+      <xs:element name='dfn' type='xs:token'/>
       <xs:element name='em' type='xs:token'/>
       <xs:element ref='img'/>
       <xs:element ref='link'/>

xep.xsl

@@ -726,10 +726,6 @@
     </div>
   </xsl:template>
 
-  <xsl:template match='pre'>
-    <pre><xsl:apply-templates/></pre>
-  </xsl:template>
-
   <xsl:template match='img'>
     <img>
       <xsl:attribute name='src'><xsl:value-of select='@src'/></xsl:attribute>
@@ -789,31 +785,19 @@
     </p>
   </xsl:template> 
 
-  <xsl:template match='tt'>
-    <tt>
-      <xsl:apply-templates/>
-    </tt>
-  </xsl:template>
-
-  <xsl:template match='em'>
-    <span style='font-style: italic'>
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
-
-  <xsl:template match='strong'>
-    <span style='font-weight: bold'>
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
+<!-- PRESENTATIONAL ELEMENTS -->
 
   <xsl:template match='cite'>
-    <span style='font-weight: bold'>
+    <span class='cite'>
       <xsl:apply-templates/>
     </span>
   </xsl:template>
 
-<!-- PRESENTATIONAL ELEMENTS -->
+  <xsl:template match='dfn'>
+    <span class='dfn'>
+      <xsl:apply-templates/>
+    </span>
+  </xsl:template>
 
   <xsl:template match='div'>
     <div>
@@ -829,6 +813,16 @@
     </div>
   </xsl:template>
 
+  <xsl:template match='em'>
+    <span class='em'>
+      <xsl:apply-templates/>
+    </span>
+  </xsl:template>
+
+  <xsl:template match='pre'>
+    <pre><xsl:apply-templates/></pre>
+  </xsl:template>
+
   <xsl:template match='span'>
     <span>
       <xsl:variable name='class.count' select='count(@class)'/>
@@ -843,6 +837,18 @@
     </span>
   </xsl:template>
 
+  <xsl:template match='strong'>
+    <span class='strong'>
+      <xsl:apply-templates/>
+    </span>
+  </xsl:template>
+
+  <xsl:template match='tt'>
+    <tt>
+      <xsl:apply-templates/>
+    </tt>
+  </xsl:template>
+
 <!-- END OF PRESENTATIONAL ELEMENTS -->
 
 </xsl:stylesheet>