xsddoc/src/net/sf/xframe/xsddoc/xslt model.xsl,1.25,1.26 xml2html.xsl,1.31,1.32 util.xsl,1.12,1.13
Kurt Riede <[email protected]> Thu, 07 Oct 2004 22:55:14 +0000
| Newsgroups | gmane.text.xml.xframe.xsddoc.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24810/src/net/sf/xframe/xsddoc/xslt
Modified Files:
model.xsl xml2html.xsl util.xsl
Log Message:
multiple updates to fix many small problems with link generation
Index: xml2html.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/xml2html.xsl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** xml2html.xsl 28 Sep 2004 13:30:53 -0000 1.31
--- xml2html.xsl 7 Oct 2004 22:55:12 -0000 1.32
***************
*** 1188,1191 ****
--- 1188,1196 ----
</xsl:template>
<!--
+ Ignore documentation inside of compositors.
+ -->
+ <xsl:template match="doc:documentation" mode="particle">
+ </xsl:template>
+ <!--
Format simpleType model.
-->
***************
*** 1198,1202 ****
<xsl:template match="doc:sequence | doc:group" mode="particle">
<xsl:param name="indent" select="string('')"/>
! <xsl:variable name="count" select="count(*)"/>
<xsl:value-of select="$indent"/>
<xsl:if test="$count > 1">
--- 1203,1207 ----
<xsl:template match="doc:sequence | doc:group" mode="particle">
<xsl:param name="indent" select="string('')"/>
! <xsl:variable name="count" select="count(*[local-name() != 'documentation'])"/>
<xsl:value-of select="$indent"/>
<xsl:if test="$count > 1">
***************
*** 1220,1224 ****
<xsl:template match="doc:choice" mode="particle">
<xsl:param name="indent" select="string('')"/>
! <xsl:variable name="count" select="count(*)"/>
<xsl:value-of select="$indent"/>
<xsl:if test="$count > 1">
--- 1225,1229 ----
<xsl:template match="doc:choice" mode="particle">
<xsl:param name="indent" select="string('')"/>
! <xsl:variable name="count" select="count(*[local-name() != 'documentation'])"/>
<xsl:value-of select="$indent"/>
<xsl:if test="$count > 1">
***************
*** 1242,1246 ****
<xsl:template match="doc:all" mode="particle">
<xsl:param name="indent" select="string('')"/>
! <xsl:variable name="count" select="count(*)"/>
<xsl:value-of select="$indent"/>
<xsl:if test="$count > 1">
--- 1247,1251 ----
<xsl:template match="doc:all" mode="particle">
<xsl:param name="indent" select="string('')"/>
! <xsl:variable name="count" select="count(*[local-name() != 'documentation'])"/>
<xsl:value-of select="$indent"/>
<xsl:if test="$count > 1">
***************
*** 1800,1806 ****
<font size="-1">
<xsl:text>Submit a </xsl:text>
! <a href="http://sourceforge.net/tracker/?atid=454391&group_id=48863&func=browse" target="_blank">bug</a>
<xsl:text> or a </xsl:text>
! <a href="http://sourceforge.net/tracker/?atid=454394&group_id=48863&func=browse" target="_blank">feature</a>
<xsl:text>.</xsl:text>
<br/>
--- 1805,1817 ----
<font size="-1">
<xsl:text>Submit a </xsl:text>
! <a target="_blank">
! <xsl:attribute name="href"><xsl:text disable-output-escaping="yes">http://sourceforge.net/tracker/?atid=454391&amp;group_id=48863&amp;func=browse</xsl:text></xsl:attribute>
! <xsl:text>bug</xsl:text>
! </a>
<xsl:text> or a </xsl:text>
! <a target="_blank">
! <xsl:attribute name="href"><xsl:text disable-output-escaping="yes">http://sourceforge.net/tracker/?atid=454394&amp;group_id=48863&amp;func=browse</xsl:text></xsl:attribute>
! <xsl:text>feature</xsl:text>
! </a>
<xsl:text>.</xsl:text>
<br/>
***************
*** 1810,1814 ****
<a href="http://xframe.sourceforge.net" target="_blank">xframe</a>
<xsl:text>, hosted at </xsl:text>
! <a href="http://www.sourceforge.net" target="_blank">http://www.sourceforge.net</a>
<xsl:text>.</xsl:text>
</font>
--- 1821,1825 ----
<a href="http://xframe.sourceforge.net" target="_blank">xframe</a>
<xsl:text>, hosted at </xsl:text>
! <a href="http://xframe.sourceforge.net" target="_blank">http://xframe.sourceforge.net</a>
<xsl:text>.</xsl:text>
</font>
Index: model.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/model.xsl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** model.xsl 28 Sep 2004 13:30:53 -0000 1.25
--- model.xsl 7 Oct 2004 22:55:12 -0000 1.26
***************
*** 888,895 ****
</xsl:apply-templates>
</xsl:when>
- <!-- try local redefined group definitions
- <xsl:when test="xs:redefine/xs:group[@name = '']">
- </xsl:when>
- -->
<!-- not found in this schema: recurse into all imported, included or redefined schema -->
<xsl:otherwise>
--- 888,891 ----
Index: util.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/util.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** util.xsl 10 Jun 2004 18:54:24 -0000 1.12
--- util.xsl 7 Oct 2004 22:55:12 -0000 1.13
***************
*** 182,186 ****
</xsl:choose>
</xsl:variable>
! <!-- if not found: recurse included and imported schemas -->
<xsl:choose>
<xsl:when test="string($result) != ''">
--- 182,186 ----
</xsl:choose>
</xsl:variable>
! <!-- if not found: recurse included schemas -->
<xsl:choose>
<xsl:when test="string($result) != ''">
***************
*** 188,192 ****
--- 188,224 ----
</xsl:when>
<xsl:otherwise>
+ <xsl:variable name="includeResult">
+ <xsl:for-each select="xs:include">
+ <xsl:if test="not(contains($processedLocations, @schemaLocation))">
+ <xsl:apply-templates select="document(@schemaLocation, .)/xs:schema" mode="referenceType">
+ <xsl:with-param name="qname" select="$qname"/>
+ <xsl:with-param name="referer" select="$referer"/>
+ <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', @schemaLocation)"/>
+ </xsl:apply-templates>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:variable>
+ <xsl:choose>
+ <!-- if not found: recurse imported schemas -->
+ <xsl:when test="$includeResult">
+ <xsl:value-of select="$includeResult"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="xs:import">
+ <xsl:if test="not(contains($processedLocations, @schemaLocation))">
+ <xsl:apply-templates select="document(@schemaLocation, .)/xs:schema" mode="referenceType">
+ <xsl:with-param name="qname" select="$qname"/>
+ <xsl:with-param name="referer" select="$referer"/>
+ <xsl:with-param name="processedLocations" select="concat($processedLocations, ' ', @schemaLocation)"/>
+ </xsl:apply-templates>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:otherwise>
+ </xsl:choose>
+ <!--
+ <xsl:text> XXX </xsl:text>
<xsl:for-each select="xs:import | xs:include">
+ <xsl:value-of select="@schemaLocation"/>
+ <xsl:text> YYY </xsl:text>
<xsl:if test="not(contains($processedLocations, @schemaLocation))">
<xsl:apply-templates select="document(@schemaLocation, .)/xs:schema" mode="referenceType">
***************
*** 197,200 ****
--- 229,233 ----
</xsl:if>
</xsl:for-each>
+ -->
</xsl:otherwise>
</xsl:choose>
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl