[xframe-xsddoc-dev] xsddoc/src/net/sf/xframe/xsddoc/xslt model.xsl, 1.31, 1.32 component.xsl, 1.30, 1.31 xml2html.xsl, 1.39, 1.40

[Kurt R. <kr...@us...>]

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

Modified Files:
	model.xsl component.xsl xml2html.xsl 
Log Message:
applied patch [1601824] xsddoc: improved enumeration support

Index: xml2html.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/xml2html.xsl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** xml2html.xsl	19 Sep 2005 21:09:07 -0000	1.39
--- xml2html.xsl	24 Nov 2006 20:52:29 -0000	1.40
***************
*** 5,9 ****
  
  Copyright (c) 2003 Kurt Riede.
!     
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
--- 5,9 ----
  
  Copyright (c) 2003 Kurt Riede.
! 
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
***************
*** 412,416 ****
        <xsl:choose>
          <xsl:when test="contains(normalize-space(@name), '. ')">
! 	  <xsl:value-of select="substring-before(normalize-space(@name), concat('. ', @tag))"/>
          </xsl:when>
          <xsl:otherwise>
--- 412,416 ----
        <xsl:choose>
          <xsl:when test="contains(normalize-space(@name), '. ')">
!           <xsl:value-of select="substring-before(normalize-space(@name), concat('. ', @tag))"/>
          </xsl:when>
          <xsl:otherwise>
***************
*** 1019,1022 ****
--- 1019,1051 ----
        </xsl:apply-templates>
      </xsl:if>
+     <xsl:if test="doc:restriction/doc:enumeration">
+       <br/>
+       <a name="values"/>
+       <table border="1" cellpadding="3" cellspacing="0" width="100%">
+         <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+           <td colspan="2">
+             <font size="+2">
+               <b>Value Summary</b>
+             </font>
+           </td>
+         </tr>
+         <xsl:apply-templates select="doc:restriction/doc:enumeration" mode="summary">
+           <xsl:sort select="@name"/>
+         </xsl:apply-templates>
+       </table>
+       <br/>
+       <table border="1" cellpadding="3" cellspacing="0" width="100%">
+         <tr bgcolor="#CCCCFF" class="TableHeadingColor">
+           <td colspan="2">
+             <font size="+2">
+               <b>Value Detail</b>
+             </font>
+           </td>
+         </tr>
+       </table>
+       <xsl:apply-templates select="doc:restriction/doc:enumeration" mode="detail">
+         <xsl:sort select="@name"/>
+       </xsl:apply-templates>
+     </xsl:if>
    </xsl:template>
    <!--
***************
*** 1746,1750 ****
        <xsl:choose>
          <xsl:when test="contains(., '.')">
!                            </xsl:when>
          <xsl:otherwise>
            <xsl:call-template name="short-documentation">
--- 1775,1779 ----
        <xsl:choose>
          <xsl:when test="contains(., '.')">
!         </xsl:when>
          <xsl:otherwise>
            <xsl:call-template name="short-documentation">

Index: model.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/model.xsl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** model.xsl	26 Feb 2005 14:27:12 -0000	1.31
--- model.xsl	24 Nov 2006 20:52:29 -0000	1.32
***************
*** 568,571 ****
--- 568,585 ----
    </xsl:template>
    <!--
+     enumeration model.
+   -->
+   <xsl:template match="xs:enumeration" mode="model">
+     <xsl:param name="prohibited" select="string('')"/>
+     <xsl:element name="doc:{local-name()}">
+       <xsl:apply-templates select="@*" mode="model"/>
+       <xsl:for-each select="xs:annotation/xs:documentation">
+         <doc:documentation>
+           <xsl:copy-of select="* | text()"/>
+         </doc:documentation>
+       </xsl:for-each>
+     </xsl:element>
+   </xsl:template>
+   <!--
      default elements model.
    -->

Index: component.xsl
===================================================================
RCS file: /cvsroot/xframe/xsddoc/src/net/sf/xframe/xsddoc/xslt/component.xsl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** component.xsl	22 Apr 2005 14:47:44 -0000	1.30
--- component.xsl	24 Nov 2006 20:52:29 -0000	1.31
***************
*** 274,278 ****
        </doc:documentation>
      </xsl:for-each>
!     <xsl:apply-templates select="*[((local-name() != 'attribute') and (local-name() != 'element')) or (@name = '')]" mode="collectDocs"/>
    </xsl:template>
    <!--
--- 274,278 ----
        </doc:documentation>
      </xsl:for-each>
!     <xsl:apply-templates select="*[((local-name() != 'attribute') and (local-name() != 'element') and (local-name() != 'enumeration')) or (@name = '')]" mode="collectDocs"/>
    </xsl:template>
    <!--