Update of /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt
In directory sc8-pr-cvs1:/tmp/cvs-serv4733/xslt
Modified Files:
allmembers.xslt common.xslt event.xslt field.xslt indices.xslt
individualmembers.xslt member.xslt memberoverload.xslt
namespace.xslt namespacehierarchy.xslt property.xslt type.xslt
Log Message:
Now generating indices and proper titles for almost everything but the individual member pages
Index: allmembers.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/allmembers.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** allmembers.xslt 3 Nov 2003 06:14:55 -0000 1.1
--- allmembers.xslt 8 Nov 2003 17:08:25 -0000 1.2
***************
*** 15,18 ****
--- 15,19 ----
<xsl:call-template name="html-head">
<xsl:with-param name="title" select="concat(@name, ' Members')" />
+ <xsl:with-param name="page-type" select="'Members'" />
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
***************
*** 223,242 ****
</xsl:call-template>
- <xsl:if test="not($ndoc-omit-object-tags)">
- <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
- <xsl:element name="param">
- <xsl:attribute name="name">Keyword</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' ', local-name())" /></xsl:attribute>
- </xsl:element>
- <xsl:element name="param">
- <xsl:attribute name="name">Keyword</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select="concat(substring-after(@id, ':'), ' ', local-name())" /></xsl:attribute>
- </xsl:element>
- <xsl:element name="param">
- <xsl:attribute name="name">Keyword</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' ', local-name(), ', all members')" /></xsl:attribute>
- </xsl:element>
- </object>
- </xsl:if>
<xsl:call-template name="footer-row">
--- 224,227 ----
Index: common.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/common.xslt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** common.xslt 7 Nov 2003 01:28:26 -0000 1.3
--- common.xslt 8 Nov 2003 17:08:25 -0000 1.4
***************
*** 142,145 ****
--- 142,146 ----
<xsl:choose>
<xsl:when test="local-name(..)='interface'">Interface</xsl:when>
+ <xsl:when test="local-name(..)='structure'">Structure</xsl:when>
<xsl:otherwise>Class</xsl:otherwise>
</xsl:choose>
***************
*** 148,151 ****
--- 149,153 ----
<xsl:choose>
<xsl:when test="local-name()='interface'">Interface</xsl:when>
+ <xsl:when test="local-name(..)='structure'">Structure</xsl:when>
<xsl:otherwise>Class</xsl:otherwise>
</xsl:choose>
***************
*** 683,689 ****
--- 685,693 ----
</xsl:choose>
</xsl:template>
+
<!-- -->
<xsl:template name="html-head">
<xsl:param name="title" />
+ <xsl:param name="page-type"/>
<head>
<title>
***************
*** 693,701 ****
<xsl:apply-templates select="." mode="MSHelpTitle">
<xsl:with-param name="title" select="$title"/>
</xsl:apply-templates>
! <xsl:apply-templates select="." mode="KIndex"/>
! <xsl:apply-templates select="." mode="FIndex"/>
! <xsl:apply-templates select="." mode="AIndex"/>
<MSHelp:Attr Name="DocSet" Value="NETFramework"/>
--- 697,715 ----
<xsl:apply-templates select="." mode="MSHelpTitle">
<xsl:with-param name="title" select="$title"/>
+ <xsl:with-param name="page-type" select="$page-type"/>
</xsl:apply-templates>
! <xsl:if test="$page-type!='hierarchy'">
! <xsl:apply-templates select="." mode="KIndex">
! <xsl:with-param name="title" select="$title"/>
! <xsl:with-param name="page-type" select="$page-type"/>
! </xsl:apply-templates>
!
! <xsl:apply-templates select="." mode="FIndex">
! <xsl:with-param name="title" select="$title"/>
! <xsl:with-param name="page-type" select="$page-type"/>
! </xsl:apply-templates>
! </xsl:if>
! <!--<xsl:apply-templates select="." mode="AIndex"/>-->
<MSHelp:Attr Name="DocSet" Value="NETFramework"/>
***************
*** 711,715 ****
<MSHelp:Attr Name="TechnologyVers" Value="kbManagedC"/>
<MSHelp:Attr Name="Locale" Value="kbEnglish"/>
! <MSHelp:Attr Name="HelpPriority" Value="2"/>
</xml>
<SCRIPT SRC="dtuelink.js"></SCRIPT>
--- 725,729 ----
<MSHelp:Attr Name="TechnologyVers" Value="kbManagedC"/>
<MSHelp:Attr Name="Locale" Value="kbEnglish"/>
! <MSHelp:Attr Name="HelpPriority" Value="3"/>
</xml>
<SCRIPT SRC="dtuelink.js"></SCRIPT>
Index: event.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/event.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** event.xslt 5 Nov 2003 05:43:00 -0000 1.2
--- event.xslt 8 Nov 2003 17:08:25 -0000 1.3
***************
*** 19,22 ****
--- 19,23 ----
<xsl:call-template name="html-head">
<xsl:with-param name="title" select="concat(../@name, '.', @name, ' Event')" />
+ <xsl:with-param name="page-type" select="'event'"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
***************
*** 81,100 ****
<xsl:with-param name="page">event</xsl:with-param>
</xsl:call-template>
! <xsl:if test="not($ndoc-omit-object-tags)">
! <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='@name' /> event</xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='@name' /> event, <xsl:value-of select='../@name' /> class</xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='../@name' />.<xsl:value-of select='@name' /> event</xsl:attribute>
! </xsl:element>
! </object>
! </xsl:if>
<xsl:call-template name="footer-row">
<xsl:with-param name="type-name">
--- 82,86 ----
<xsl:with-param name="page">event</xsl:with-param>
</xsl:call-template>
!
<xsl:call-template name="footer-row">
<xsl:with-param name="type-name">
Index: field.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/field.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** field.xslt 5 Nov 2003 05:43:00 -0000 1.2
--- field.xslt 8 Nov 2003 17:08:25 -0000 1.3
***************
*** 17,20 ****
--- 17,21 ----
<xsl:call-template name="html-head">
<xsl:with-param name="title" select="concat(../@name, '.', @name, ' Field')" />
+ <xsl:with-param name="page-type" select="'fields'"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
***************
*** 34,53 ****
<xsl:with-param name="page">field</xsl:with-param>
</xsl:call-template>
! <xsl:if test="not($ndoc-omit-object-tags)">
! <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='@name' /> field</xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='@name' /> field, <xsl:value-of select='../@name' /> class</xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='../@name' />.<xsl:value-of select='@name' /> field</xsl:attribute>
! </xsl:element>
! </object>
! </xsl:if>
<xsl:call-template name="footer-row">
<xsl:with-param name="type-name">
--- 35,39 ----
<xsl:with-param name="page">field</xsl:with-param>
</xsl:call-template>
!
<xsl:call-template name="footer-row">
<xsl:with-param name="type-name">
Index: indices.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/indices.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** indices.xslt 7 Nov 2003 01:28:26 -0000 1.2
--- indices.xslt 8 Nov 2003 17:08:25 -0000 1.3
***************
*** 1,5 ****
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
!
<!-- provide no-op override for all non-specified types -->
<xsl:template match="* | node() | text()" mode="FIndex"/>
--- 1,6 ----
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:MSHelp="http://msdn.microsoft.com/mshelp">
! <!-- good for debugging -->
! <xsl:output indent="yes"/>
<!-- provide no-op override for all non-specified types -->
<xsl:template match="* | node() | text()" mode="FIndex"/>
***************
*** 9,41 ****
<!-- this is just here until each type has it's own title logic -->
<xsl:template match="* | node() | text()" mode="MSHelpTitle">
! <MSHelp:TOCTitle>
! <xsl:attribute name="Title"><xsl:value-of select="@id"/></xsl:attribute>
! </MSHelp:TOCTitle>
! <MSHelp:RLTitle>
! <xsl:attribute name="Title"><xsl:value-of select="@id"/></xsl:attribute>
! </MSHelp:RLTitle>
</xsl:template>
<xsl:template match="ndoc" mode="MSHelpTitle">
<xsl:param name="title" />
! <MSHelp:TOCTitle>
! <xsl:attribute name="Title"><xsl:value-of select="$title"/></xsl:attribute>
! </MSHelp:TOCTitle>
! <MSHelp:RLTitle>
! <xsl:attribute name="Title"><xsl:value-of select="concat( $title, ' Namespace' )"/></xsl:attribute>
! </MSHelp:RLTitle>
</xsl:template>
! <xsl:template match="enumeration" mode="MSHelpTitle">
<xsl:param name="title" />
! <MSHelp:TOCTitle>
! <xsl:attribute name="Title"><xsl:value-of select="$title"/></xsl:attribute>
! </MSHelp:TOCTitle>
! <MSHelp:RLTitle>
! <xsl:attribute name="Title"><xsl:value-of select="$title"/></xsl:attribute>
! </MSHelp:RLTitle>
</xsl:template>
<xsl:template match="enumeration" mode="FIndex">
<xsl:call-template name="add-index-term">
--- 10,73 ----
<!-- this is just here until each type has it's own title logic -->
<xsl:template match="* | node() | text()" mode="MSHelpTitle">
! <MSHelp:TOCTitle Title="{@id}"/>
! <MSHelp:RLTitle Title="{@id}"/>
</xsl:template>
<xsl:template match="ndoc" mode="MSHelpTitle">
<xsl:param name="title" />
! <MSHelp:TOCTitle Title="{$title}"/>
! <MSHelp:RLTitle Title="{concat( $title, ' Namespace' )}"/>
</xsl:template>
! <xsl:template match="enumeration | delegate | constructor" mode="MSHelpTitle">
<xsl:param name="title" />
! <MSHelp:TOCTitle Title="{$title}"/>
! <MSHelp:RLTitle Title="{$title}"/>
</xsl:template>
+ <xsl:template match="class | interface | structure" mode="MSHelpTitle">
+ <xsl:param name="title" />
+ <xsl:param name="page-type"/>
+ <xsl:choose>
+ <xsl:when test="$page-type='type' or $page-type='hierarchy' or $page-type='Members'">
+ <MSHelp:TOCTitle Title="{$title}"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <MSHelp:TOCTitle Title="{concat( @name, ' ', $page-type )}"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <MSHelp:RLTitle Title="{$title}"/>
+ </xsl:template>
+
+ <xsl:template match="method" mode="MSHelpTitle">
+ <xsl:param name="title" />
+ <xsl:param name="page-type"/>
+ <MSHelp:TOCTitle Title="{concat( @name, ' ', $page-type )}"/>
+ <MSHelp:RLTitle Title="{$title}"/>
+ </xsl:template>
+
+ <xsl:template match="operator" mode="MSHelpTitle">
+ <xsl:param name="title" />
+ <xsl:param name="page-type"/>
+ <MSHelp:TOCTitle Title="{$page-type}"/>
+ <MSHelp:RLTitle Title="{$title}"/>
+ </xsl:template>
+
+ <xsl:template match="ndoc" mode="FIndex">
+ <xsl:param name="title"/>
+ <xsl:call-template name="add-index-term">
+ <xsl:with-param name="index">F</xsl:with-param>
+ <xsl:with-param name="term" select="$title"/>
+ </xsl:call-template>
+ </xsl:template>
+
+ <xsl:template match="delegate" mode="FIndex">
+ <xsl:call-template name="add-index-term">
+ <xsl:with-param name="index">F</xsl:with-param>
+ <xsl:with-param name="term" select="substring-after( @id, ':')"/>
+ </xsl:call-template>
+ </xsl:template>
+
<xsl:template match="enumeration" mode="FIndex">
<xsl:call-template name="add-index-term">
***************
*** 46,49 ****
--- 78,93 ----
</xsl:template>
+ <xsl:template match="class | structure | interface" mode="FIndex">
+ <xsl:param name="title"/>
+ <xsl:param name="page-type"/>
+
+ <xsl:if test="$page-type='Members' or $page-type='type'">
+ <xsl:call-template name="add-index-term">
+ <xsl:with-param name="index">F</xsl:with-param>
+ <xsl:with-param name="term" select="substring-after( @id, ':' )"/>
+ </xsl:call-template>
+ </xsl:if>
+ </xsl:template>
+
<xsl:template match="enumeration/field" mode="FIndex">
<xsl:call-template name="add-index-term">
***************
*** 57,75 ****
</xsl:template>
- <xsl:template match="namespace" mode="FIndex">
- <!-- TODO - look at how nested namespace appear -->
- <xsl:call-template name="add-index-term">
- <xsl:with-param name="index">F</xsl:with-param>
- <xsl:with-param name="term" select="@name"/>
- </xsl:call-template>
- </xsl:template>
! <xsl:template match="namespace" mode="KIndex">
! <!-- TODO - look at how nested namespace appear -->
<xsl:call-template name="add-index-term">
<xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' namespace' )"/>
! </xsl:call-template>
! </xsl:template>
<xsl:template match="enumeration" mode="KIndex">
--- 101,176 ----
</xsl:template>
! <xsl:template match="ndoc" mode="KIndex">
! <xsl:param name="title" />
! <xsl:if test="contains( $title, '.' )">
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( substring-after( $title, '.' ), ' Namespace' )"/>
! </xsl:call-template>
! </xsl:if>
<xsl:call-template name="add-index-term">
<xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( $title, ' Namespace' )"/>
! </xsl:call-template>
! </xsl:template>
!
!
! <xsl:template match="class | interface | structure" mode="KIndex">
! <xsl:param name="title"/>
! <xsl:param name="page-type"/>
! <xsl:choose>
! <xsl:when test="$page-type='Members'">
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' ', local-name() )"/>
! </xsl:call-template>
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' ', local-name(), ', all members' )"/>
! </xsl:call-template>
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( substring-after( @id, ':' ), ' ', local-name() )"/>
! </xsl:call-template>
! </xsl:when>
! <xsl:when test="$page-type='Properties'">
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' ', local-name(), ', properties' )"/>
! </xsl:call-template>
! </xsl:when>
! <xsl:when test="$page-type='Events'">
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' ', local-name(), ', events' )"/>
! </xsl:call-template>
! </xsl:when>
! <xsl:when test="$page-type='Operators'">
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' ', local-name(), ', operators' )"/>
! </xsl:call-template>
! </xsl:when>
! <xsl:when test="$page-type='Methods'">
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' ', local-name(), ', methods' )"/>
! </xsl:call-template>
! </xsl:when>
! <xsl:when test="$page-type='Fields'">
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' ', local-name(), ', fields' )"/>
! </xsl:call-template>
! </xsl:when>
! <xsl:otherwise>
! <xsl:call-template name="add-index-term">
! <xsl:with-param name="index">K</xsl:with-param>
! <xsl:with-param name="term" select="concat( @name, ' ', local-name(), ', about ', @name, ' ', local-name() )"/>
! </xsl:call-template>
! </xsl:otherwise>
! </xsl:choose>
! </xsl:template>
<xsl:template match="enumeration" mode="KIndex">
***************
*** 88,109 ****
</xsl:template>
- <xsl:template match="enumeration | namespace" mode="AIndex">
- <MSHelp:Keyword Index="A">
- <xsl:attribute name="Term">
- <xsl:call-template name="get-filename-for-type">
- <xsl:with-param name="id" select="@id"/>
- </xsl:call-template>
- </xsl:attribute>
- </MSHelp:Keyword>
- </xsl:template>
<xsl:template name="add-index-term">
<xsl:param name="index"/>
<xsl:param name="term"/>
! <MSHelp:Keyword>
! <xsl:attribute name="Index"><xsl:value-of select="$index"/></xsl:attribute>
! <xsl:attribute name="Term"><xsl:value-of select="$term"/></xsl:attribute>
! </MSHelp:Keyword>
</xsl:template>
--- 189,208 ----
</xsl:template>
+ <xsl:template match="delegate" mode="KIndex">
+ <xsl:call-template name="add-index-term">
+ <xsl:with-param name="index">K</xsl:with-param>
+ <xsl:with-param name="term" select="concat( @name, ' delegate' )"/>
+ </xsl:call-template>
+ <xsl:call-template name="add-index-term">
+ <xsl:with-param name="index">K</xsl:with-param>
+ <xsl:with-param name="term" select="concat( substring-after( @id, ':' ), ' delegate' )"/>
+ </xsl:call-template>
+ </xsl:template>
<xsl:template name="add-index-term">
<xsl:param name="index"/>
<xsl:param name="term"/>
! <MSHelp:Keyword Index="{$index}" Term="{$term}"/>
</xsl:template>
Index: individualmembers.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/individualmembers.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** individualmembers.xslt 3 Nov 2003 06:14:55 -0000 1.1
--- individualmembers.xslt 8 Nov 2003 17:08:25 -0000 1.2
***************
*** 26,29 ****
--- 26,30 ----
<xsl:call-template name="html-head">
<xsl:with-param name="title" select="concat(@name, ' ', $Members)" />
+ <xsl:with-param name="page-type" select="$Members"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
***************
*** 104,116 ****
</xsl:with-param>
</xsl:call-template>
-
- <xsl:if test="not($ndoc-omit-object-tags)">
- <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
- <xsl:element name="param">
- <xsl:attribute name="name">Keyword</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' ', local-name(), ', ', $members)" /></xsl:attribute>
- </xsl:element>
- </object>
- </xsl:if>
<xsl:call-template name="footer-row">
--- 105,108 ----
Index: member.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/member.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** member.xslt 5 Nov 2003 05:43:00 -0000 1.2
--- member.xslt 8 Nov 2003 17:08:25 -0000 1.3
***************
*** 17,20 ****
--- 17,21 ----
<xsl:choose>
<xsl:when test="local-name(..)='interface'">Interface</xsl:when>
+ <xsl:when test="local-name(..)='structure'">Structure</xsl:when>
<xsl:otherwise>Class</xsl:otherwise>
</xsl:choose>
***************
*** 24,38 ****
<xsl:when test="local-name()='method'">Method</xsl:when>
<xsl:when test="local-name()='operator'">
! <xsl:call-template name="operator-name">
! <xsl:with-param name="name">
! <xsl:value-of select="@name" />
! </xsl:with-param>
! <xsl:with-param name="from">
! <xsl:value-of select="parameter/@type" />
! </xsl:with-param>
! <xsl:with-param name="to">
! <xsl:value-of select="@returnType" />
! </xsl:with-param>
! </xsl:call-template>
</xsl:when>
<xsl:when test="@contract='Static'">Static Constructor</xsl:when>
--- 25,39 ----
<xsl:when test="local-name()='method'">Method</xsl:when>
<xsl:when test="local-name()='operator'">
! <xsl:call-template name="operator-name">
! <xsl:with-param name="name">
! <xsl:value-of select="@name" />
! </xsl:with-param>
! <xsl:with-param name="from">
! <xsl:value-of select="parameter/@type" />
! </xsl:with-param>
! <xsl:with-param name="to">
! <xsl:value-of select="@returnType" />
! </xsl:with-param>
! </xsl:call-template>
</xsl:when>
<xsl:when test="@contract='Static'">Static Constructor</xsl:when>
***************
*** 58,61 ****
--- 59,63 ----
</xsl:if>
</xsl:with-param>
+ <xsl:with-param name="page-type" select="$childType"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
***************
*** 71,75 ****
<xsl:value-of select="$childType" />
<xsl:text> </xsl:text>
! <xsl:if test="local-name()!='operator'">
<xsl:if test="count(parent::node()/*[@name=$memberName]) > 1">
<xsl:call-template name="get-param-list" />
--- 73,77 ----
<xsl:value-of select="$childType" />
<xsl:text> </xsl:text>
! <xsl:if test="local-name()!='operator'">
<xsl:if test="count(parent::node()/*[@name=$memberName]) > 1">
<xsl:call-template name="get-param-list" />
***************
*** 93,127 ****
</xsl:call-template>
- <xsl:if test="local-name()='constructor'">
- <xsl:if test="count(parent::node()/constructor) < 2">
- <xsl:if test="not($ndoc-omit-object-tags)">
- <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
- <xsl:element name="param">
- <xsl:attribute name="name">Keyword</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select='../@name' /> class, constructor</xsl:attribute>
- </xsl:element>
- </object>
- </xsl:if>
- </xsl:if>
- </xsl:if>
-
- <xsl:if test="local-name()='method'">
- <xsl:if test="not($ndoc-omit-object-tags)">
- <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
- <xsl:element name="param">
- <xsl:attribute name="name">Keyword</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select='@name' /> method</xsl:attribute>
- </xsl:element>
- <xsl:element name="param">
- <xsl:attribute name="name">Keyword</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' method, ', ../@name, ' ', local-name(parent::*))" /></xsl:attribute>
- </xsl:element>
- <xsl:element name="param">
- <xsl:attribute name="name">Keyword</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select='../@name' />.<xsl:value-of select='@name' /> method</xsl:attribute>
- </xsl:element>
- </object>
- </xsl:if>
- </xsl:if>
<xsl:call-template name="footer-row">
--- 95,98 ----
Index: memberoverload.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/memberoverload.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** memberoverload.xslt 3 Nov 2003 06:14:55 -0000 1.1
--- memberoverload.xslt 8 Nov 2003 17:08:25 -0000 1.2
***************
*** 17,20 ****
--- 17,21 ----
<xsl:choose>
<xsl:when test="local-name(..)='interface'">Interface</xsl:when>
+ <xsl:when test="local-name(..)='structure'">Structure</xsl:when>
<xsl:otherwise>Class</xsl:otherwise>
</xsl:choose>
***************
*** 49,52 ****
--- 50,54 ----
<xsl:value-of select="$childType" />
</xsl:with-param>
+ <xsl:with-param name="page-type" select="'member-overload'"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
***************
*** 145,158 ****
<xsl:with-param name="page">memberoverload</xsl:with-param>
</xsl:call-template>
! <xsl:if test="local-name()='constructor'">
! <xsl:if test="not($ndoc-omit-object-tags)">
! <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='../@name' /> class, constructors</xsl:attribute>
! </xsl:element>
! </object>
! </xsl:if>
! </xsl:if>
<xsl:call-template name="footer-row">
<xsl:with-param name="type-name">
--- 147,151 ----
<xsl:with-param name="page">memberoverload</xsl:with-param>
</xsl:call-template>
!
<xsl:call-template name="footer-row">
<xsl:with-param name="type-name">
Index: namespace.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/namespace.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** namespace.xslt 3 Nov 2003 06:14:55 -0000 1.1
--- namespace.xslt 8 Nov 2003 17:08:25 -0000 1.2
***************
*** 18,21 ****
--- 18,22 ----
<xsl:call-template name="html-head">
<xsl:with-param name="title" select="$namespace" />
+ <xsl:with-param name="page-type" select="'namespace'"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
Index: namespacehierarchy.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/namespacehierarchy.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** namespacehierarchy.xslt 3 Nov 2003 06:14:55 -0000 1.1
--- namespacehierarchy.xslt 8 Nov 2003 17:08:25 -0000 1.2
***************
*** 14,17 ****
--- 14,18 ----
<xsl:call-template name="html-head">
<xsl:with-param name="title" select="concat($ns/@name, 'Hierarchy')" />
+ <xsl:with-param name="page-type" select="'hierarchy'"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
Index: property.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/property.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** property.xslt 5 Nov 2003 05:43:00 -0000 1.2
--- property.xslt 8 Nov 2003 17:08:25 -0000 1.3
***************
*** 17,20 ****
--- 17,21 ----
<xsl:choose>
<xsl:when test="local-name(..)='interface'">Interface</xsl:when>
+ <xsl:when test="local-name(..)='structure'">Structure</xsl:when>
<xsl:otherwise>Class</xsl:otherwise>
</xsl:choose>
***************
*** 24,27 ****
--- 25,29 ----
<xsl:call-template name="html-head">
<xsl:with-param name="title" select="concat(../@name, '.', @name, ' Property')" />
+ <xsl:with-param name="page-type" select="'property'"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
***************
*** 46,65 ****
<xsl:with-param name="page">property</xsl:with-param>
</xsl:call-template>
! <xsl:if test="not($ndoc-omit-object-tags)">
! <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='@name' /> property</xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' property, ', ../@name, ' ', local-name(parent::*))" /></xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select='../@name' />.<xsl:value-of select='@name' /> property</xsl:attribute>
! </xsl:element>
! </object>
! </xsl:if>
<xsl:call-template name="footer-row">
<xsl:with-param name="type-name">
--- 48,52 ----
<xsl:with-param name="page">property</xsl:with-param>
</xsl:call-template>
!
<xsl:call-template name="footer-row">
<xsl:with-param name="type-name">
Index: type.xslt
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Documenter/NativeHtmlHelp2/xslt/type.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** type.xslt 5 Nov 2003 05:43:00 -0000 1.2
--- type.xslt 8 Nov 2003 17:08:25 -0000 1.3
***************
*** 114,117 ****
--- 114,118 ----
<xsl:call-template name="html-head">
<xsl:with-param name="title" select="concat(@name, ' ', $type)" />
+ <xsl:with-param name="page-type" select="'type'"/>
</xsl:call-template>
<body topmargin="0" id="bodyID" class="dtBODY">
***************
*** 225,274 ****
</xsl:choose>
</xsl:variable>
<xsl:call-template name="seealso-section">
<xsl:with-param name="page" select="$page" />
! </xsl:call-template>
!
! <xsl:if test="not($ndoc-omit-object-tags)">
! <object type="application/x-oleobject" classid="clsid:1e2a7bd0-dab9-11d0-b93a-00c04fc99f9e" viewastext="true" style="display: none;">
! <xsl:choose>
! <xsl:when test="local-name() = 'enumeration'">
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' enumeration')" /></xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select="concat(substring-after(@id, ':'), ' enumeration')" /></xsl:attribute>
! </xsl:element>
! <xsl:for-each select="field">
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' enumeration member')" /></xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select="concat(../@name, '.', @name, ' enumeration member')" /></xsl:attribute>
! </xsl:element>
! </xsl:for-each>
! </xsl:when>
! <xsl:when test="local-name() = 'delegate'">
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' delegate')" /></xsl:attribute>
! </xsl:element>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select="concat(substring-after(@id, ':'), ' delegate')" /></xsl:attribute>
! </xsl:element>
! </xsl:when>
! <xsl:otherwise>
! <xsl:element name="param">
! <xsl:attribute name="name">Keyword</xsl:attribute>
! <xsl:attribute name="value"><xsl:value-of select="concat(@name, ' ', local-name(), ', about ', @name, ' ', local-name())" /></xsl:attribute>
! </xsl:element>
! </xsl:otherwise>
! </xsl:choose>
! </object>
! </xsl:if>
<xsl:call-template name="footer-row">
--- 226,233 ----
</xsl:choose>
</xsl:variable>
+
<xsl:call-template name="seealso-section">
<xsl:with-param name="page" select="$page" />
! </xsl:call-template>
<xsl:call-template name="footer-row">
|