1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-12-22 07:38:52 -05:00
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@412 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2007-01-24 19:43:52 +00:00
parent 1a5ae1674b
commit 96dd4b2e13
3 changed files with 33 additions and 25 deletions

View File

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

View File

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

52
xep.xsl
View File

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