xsddoc/src/net/sf/xframe/xsddoc/xslt model.xsl,1.26,1.27 xml2html.xsl,1.33,1.34 util.xsl,1.13,1.14

Update of /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18011/src/net/sf/xframe/xsddoc/xslt

Modified Files:
	model.xsl xml2html.xsl util.xsl 
Log Message:
multiple updates (fixes for several bugs, new features)

Index: xml2html.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/xml2html.xsl,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** xml2html.xsl	7 Dec 2004 14:47:51 -0000	1.33
--- xml2html.xsl	9 Dec 2004 13:09:19 -0000	1.34
***************
*** 207,210 ****
--- 207,211 ----
          <xsl:choose>
            <xsl:when test="doc:documentation">
+             <xsl:apply-templates select="doc:documentation" mode="short-documentation"/>
            </xsl:when>
            <xsl:otherwise>
***************
*** 488,495 ****
              <xsl:choose>
                <xsl:when test="@nillable = 'true'">
!                 <xsl:text>This component is not nillable.</xsl:text>
                </xsl:when>
                <xsl:otherwise>
!                 <xsl:text>This component is nillable.</xsl:text>
                </xsl:otherwise>
              </xsl:choose>
--- 489,496 ----
              <xsl:choose>
                <xsl:when test="@nillable = 'true'">
!                 <xsl:text>This component is nillable.</xsl:text>
                </xsl:when>
                <xsl:otherwise>
!                 <xsl:text>This component is not nillable.</xsl:text>
                </xsl:otherwise>
              </xsl:choose>

Index: model.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/model.xsl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** model.xsl	7 Oct 2004 22:55:12 -0000	1.26
--- model.xsl	9 Dec 2004 13:09:19 -0000	1.27
***************
*** 252,260 ****
    </xsl:template>
    <!--
    -->
    <xsl:template match="xs:attributeGroup" mode="model">
      <xsl:param name="prohibited" select="string('')"/>
      <xsl:choose>
!       <xsl:when test="@ref">
          <xsl:variable name="qname">
            <xsl:apply-templates select="." mode="resolve">
--- 252,273 ----
    </xsl:template>
    <!--
+     collect attribute group model.
    -->
    <xsl:template match="xs:attributeGroup" mode="model">
      <xsl:param name="prohibited" select="string('')"/>
+     <xsl:variable name="redefine" select="ancestor::*[name() = 'xs:redefine']"/>
      <xsl:choose>
!       <xsl:when test="$redefine and (string(@ref) != '') and position() = 1">
!         <xsl:variable name="refQName">
!           <xsl:apply-templates select="." mode="resolve">
!             <xsl:with-param name="qname" select="@ref"/>
!           </xsl:apply-templates>
!         </xsl:variable>
!         <xsl:apply-templates select="document($redefine/@schemaLocation, .)/xs:schema" mode="attributeGroup">
!           <xsl:with-param name="qname" select="$refQName"/>
!           <xsl:with-param name="prohibited" select="$prohibited"/>
!         </xsl:apply-templates>
!       </xsl:when>
!       <xsl:when test="string(@ref) != ''">
          <xsl:variable name="qname">
            <xsl:apply-templates select="." mode="resolve">

Index: util.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/util.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** util.xsl	7 Oct 2004 22:55:12 -0000	1.13
--- util.xsl	9 Dec 2004 13:09:19 -0000	1.14
***************
*** 126,130 ****
    -->
    <xsl:template match="xs:schema" mode="hasComponents">
!     <xsl:if test="count(xs:complexType | xs:simpleType | xs:element | xs:attribute | xs:group | xs:attributeGroup) > 0">
        <xsl:text>true</xsl:text>
      </xsl:if>
--- 126,130 ----
    -->
    <xsl:template match="xs:schema" mode="hasComponents">
!     <xsl:if test="count(xs:complexType | xs:simpleType | xs:element | xs:attribute | xs:group | xs:attributeGroup | xs:include | xs:redefine) > 0">
        <xsl:text>true</xsl:text>
      </xsl:if>



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/