Author: ben
Date: 2007-10-08 21:47:28 -0700 (Mon, 08 Oct 2007)
New Revision: 6765
Modified:
openlaszlo/branches/paperpie/docs/src/xsl/js2doc2dbk.xsl
openlaszlo/branches/paperpie/docs/src/xsl/simple-driver.xsl
Log:
Improving ordering of information in reference entry.
Modified: openlaszlo/branches/paperpie/docs/src/xsl/js2doc2dbk.xsl
===================================================================
--- openlaszlo/branches/paperpie/docs/src/xsl/js2doc2dbk.xsl 2007-10-09
02:30:15 UTC (rev 6764)
+++ openlaszlo/branches/paperpie/docs/src/xsl/js2doc2dbk.xsl 2007-10-09
04:47:28 UTC (rev 6765)
@@ -54,7 +54,7 @@
<xsl:if test="count($decls) > 0">
<reference id="{$topicid}" xreflabel="{$topicdesc}">
<title><xsl:value-of select="$subtopic"/></title>
- <xsl:message><xsl:value-of select="concat('found ', count($decls),
' visible items in ', $topicdesc)"/></xsl:message>
+ <!-- [bshine commenting out jgrandy code with unknown purpose
10.07.2007] <xsl:message><xsl:value-of select="concat('found ', count($decls),
' visible items in ', $topicdesc)"/></xsl:message> -->
<xsl:for-each select="$decls">
<xsl:sort select="translate(@id,'_$',' ')"/>
<xsl:apply-templates select="." mode="refentry"/>
@@ -122,12 +122,9 @@
<refsynopsisdiv>
<xsl:call-template name="insert-refinfo"/>
</refsynopsisdiv>
- <xsl:call-template name="describe-inherited-attributes">
- <xsl:with-param name="class" select="class"></xsl:with-param>
- </xsl:call-template>
- <xsl:call-template name="declaration-description"/>
+ <xsl:call-template name="declaration-description"/>
<xsl:apply-templates select="." mode="refentry-details"/>
- <xsl:apply-templates select="." mode="detailed-synopsis"/>
+ <xsl:apply-templates select="." mode="detailed-synopsis"/>
</refentry>
</xsl:template>
@@ -247,7 +244,12 @@
<xsl:with-param name="members" select="$ivars"/>
<xsl:with-param name="title" select="'Attributes'"/>
</xsl:call-template>
-
+
+ <!-- Inherited Attributes -->
+ <xsl:call-template name="describe-inherited-attributes">
+ <xsl:with-param name="class" select="class"></xsl:with-param>
+ </xsl:call-template>
+
<!-- Setters -->
<xsl:call-template name="describe-members">
<xsl:with-param name="members" select="$svars"/>
@@ -264,12 +266,22 @@
<xsl:with-param name="members" select="$pvars[child::function]"/>
<xsl:with-param name="title" select="'Methods'"/>
</xsl:call-template>
+
+ <!-- Inherited Methods -->
+ <xsl:call-template name="describe-inherited-methods">
+ <xsl:with-param name="class" select="class"></xsl:with-param>
+ </xsl:call-template>
<!-- (Prototype) Events -->
<xsl:call-template name="describe-members">
<xsl:with-param name="members" select="[EMAIL PROTECTED]'LzEvent']"/>
<xsl:with-param name="title" select="'Events'"/>
</xsl:call-template>
+
+ <!-- Inherited Events -->
+ <xsl:call-template name="describe-inherited-events">
+ <xsl:with-param name="class" select="class"></xsl:with-param>
+ </xsl:call-template>
<!-- Prototype Properties -->
<xsl:call-template name="describe-members">
@@ -529,11 +541,10 @@
</xsl:template>
<xsl:template name="describe-superclass-chain">
- <xsl:param name="class"/>
+ <xsl:param name="class"/>
<xsl:call-template name="describe-superclass-chain-inner">
<xsl:with-param name="class" select="$class"/>
- </xsl:call-template>
- <xsl:call-template name="classlabel"/>
+ </xsl:call-template>
</xsl:template>
<xsl:template name="describe-superclass-chain-inner">
@@ -543,11 +554,11 @@
<xsl:if test="$superclass">
<xsl:choose>
<xsl:when test="contains($visibility.filter, $superclass/@access)">
+ <xref linkend="{$superclass/@id}"/>
+ <xsl:text> » </xsl:text>
<xsl:call-template name="describe-superclass-chain-inner">
<xsl:with-param name="class" select="$superclass/class"/>
- </xsl:call-template>
- <xref linkend="{$superclass/@id}"/>
- <xsl:text> » </xsl:text>
+ </xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="($superclass/@name | $superclass/doc/[EMAIL
PROTECTED]'lzxname']/text)[1]"/>
@@ -728,45 +739,124 @@
</xsl:choose>
</xsl:template>
- <xsl:template name="describe-inherited-attributes">
- <xsl:param name="class"/>
-
- <xsl:variable name="jsname" select="@name"/>
- <xsl:variable name="lzxname" select="&tagname;"/>
-
- <xsl:variable name="extends" select="$class/@extends"/>
- <xsl:variable name="superclass" select="(key('id',$extends) |
key('name-lzx',$extends))[1]"/>
- <xsl:if test="$superclass">
- <refsect2>
- <title>
- <xsl:text>Attributes inherited from </xsl:text>
- <link linkend="{$superclass/@id}">
- <xsl:text><</xsl:text>
- <xsl:value-of select="$superclass/doc/[EMAIL
PROTECTED]'lzxname']/text"/>
- <xsl:text>></xsl:text>
- </link>
- </title>
- <para>
+ <xsl:template name="describe-inherited-attributes">
+ <xsl:param name="class"/>
+
+ <xsl:variable name="jsname" select="@name"/>
+ <xsl:variable name="lzxname" select="&tagname;"/>
+
+ <xsl:variable name="extends" select="$class/@extends"/>
+ <xsl:variable name="superclass" select="(key('id',$extends) |
key('name-lzx',$extends))[1]"/>
+ <xsl:if test="$superclass">
+ <refsect2>
+ <title>
+ <xsl:text>Attributes inherited from </xsl:text>
+ <link linkend="{$superclass/@id}">
+ <xsl:text><</xsl:text>
+ <xsl:value-of select="$superclass/doc/[EMAIL
PROTECTED]'lzxname']/text"/>
+ <xsl:text>></xsl:text>
+ </link>
+ </title>
+ <para>
<xsl:variable name="inheritedattrs" select="$superclass/class/[EMAIL
PROTECTED]'__ivars__']/object/[EMAIL PROTECTED]'public']"></xsl:variable>
- <xsl:for-each select="$inheritedattrs">
- <link linkend="[EMAIL PROTECTED]"><xsl:value-of
select="@name"/></link>
- <xsl:text>, </xsl:text>
- </xsl:for-each>
- </para>
- </refsect2>
- <xsl:choose>
- <xsl:when test="contains($visibility.filter, $superclass/@access)">
- <xsl:call-template name="describe-inherited-attributes">
- <xsl:with-param name="class" select="$superclass/class"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="($superclass/@name | $superclass/doc/[EMAIL
PROTECTED]'lzxname']/text)[1]"/>
- <xsl:text> (private) » </xsl:text>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:if>
- </xsl:template>
+ <xsl:for-each select="$inheritedattrs">
+ <link linkend="[EMAIL PROTECTED]"><xsl:value-of
select="@name"/></link>
+ <xsl:text>, </xsl:text>
+ </xsl:for-each>
+ </para>
+ </refsect2>
+ <xsl:choose>
+ <xsl:when test="contains($visibility.filter, $superclass/@access)">
+ <xsl:call-template name="describe-inherited-attributes">
+ <xsl:with-param name="class" select="$superclass/class"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="($superclass/@name | $superclass/doc/[EMAIL
PROTECTED]'lzxname']/text)[1]"/>
+ <xsl:text> (private) » </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="describe-inherited-methods">
+ <xsl:param name="class"/>
+ <xsl:variable name="jsname" select="@name"/>
+ <xsl:variable name="lzxname" select="&tagname;"/>
+
+ <xsl:variable name="extends" select="$class/@extends"/>
+ <xsl:variable name="superclass" select="(key('id',$extends) |
key('name-lzx',$extends))[1]"/>
+ <xsl:if test="$superclass">
+ <xsl:variable name="inheritedmethods"
select="$superclass/class/property/object/[EMAIL
PROTECTED]'public']/function"></xsl:variable>
+ <refsect2>
+ <title>
+ <xsl:text>Methods inherited from </xsl:text>
+ <link linkend="{$superclass/@id}">
+ <xsl:text><</xsl:text>
+ <xsl:value-of select="$superclass/doc/[EMAIL
PROTECTED]'lzxname']/text"/>
+ <xsl:text>></xsl:text>
+ </link>
+ </title>
+ <para>
+ <xsl:for-each select="$inheritedmethods">
+ <link linkend="{../@id}"><xsl:value-of select="../@name"/></link>
+ <xsl:text>, </xsl:text>
+ </xsl:for-each>
+ </para>
+ </refsect2>
+ <xsl:choose>
+ <xsl:when test="contains($visibility.filter, $superclass/@access)">
+ <xsl:call-template name="describe-inherited-methods">
+ <xsl:with-param name="class" select="$superclass/class"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="($superclass/@name | $superclass/doc/[EMAIL
PROTECTED]'lzxname']/text)[1]"/>
+ <xsl:text> (private) » </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="describe-inherited-events">
+ <xsl:param name="class"/>
+
+ <xsl:variable name="jsname" select="@name"/>
+ <xsl:variable name="lzxname" select="&tagname;"/>
+
+ <xsl:variable name="extends" select="$class/@extends"/>
+ <xsl:variable name="superclass" select="(key('id',$extends) |
key('name-lzx',$extends))[1]"/>
+ <xsl:if test="$superclass">
+ <xsl:variable name="inheritedevents"
select="$superclass/class/property/object/[EMAIL PROTECTED]'LzEvent' and
&ispublic;]"></xsl:variable>
+ <refsect2>
+ <title>
+ <xsl:text>Events inherited from </xsl:text>
+ <link linkend="{$superclass/@id}">
+ <xsl:text><</xsl:text>
+ <xsl:value-of select="$superclass/doc/[EMAIL
PROTECTED]'lzxname']/text"/>
+ <xsl:text>></xsl:text>
+ </link>
+ </title>
+ <para>
+ <xsl:for-each select="$inheritedevents">
+ <link linkend="[EMAIL PROTECTED]"><xsl:value-of
select="@name"/></link>
+ <xsl:text>, </xsl:text>
+ </xsl:for-each>
+ </para>
+ </refsect2>
+ <xsl:choose>
+ <xsl:when test="contains($visibility.filter, $superclass/@access)">
+ <xsl:call-template name="describe-inherited-events">
+ <xsl:with-param name="class" select="$superclass/class"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="($superclass/@name | $superclass/doc/[EMAIL
PROTECTED]'lzxname']/text)[1]"/>
+ <xsl:text> (private) » </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
Modified: openlaszlo/branches/paperpie/docs/src/xsl/simple-driver.xsl
===================================================================
--- openlaszlo/branches/paperpie/docs/src/xsl/simple-driver.xsl 2007-10-09
02:30:15 UTC (rev 6764)
+++ openlaszlo/branches/paperpie/docs/src/xsl/simple-driver.xsl 2007-10-09
04:47:28 UTC (rev 6765)
@@ -23,7 +23,7 @@
]>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
-
+ <xsl:preserve-space elements="body"/>
<xsl:output method="xml"/>
<!-- simple driver for testing paperpie doctools work -->
@@ -55,11 +55,14 @@
<xsl:template match="class">
<xsl:if test="attribute::extends != ''">
+ <xsl:call-template name="describe-superclass-methods">
+ <xsl:with-param name="class" select="."/>
+ </xsl:call-template>
<xsl:call-template name="describe-superclass-chain-inner">
<xsl:with-param name="class" select="."/>
</xsl:call-template>
</xsl:if>
-
+
</xsl:template>
<xsl:template name="describe-superclass-chain-inner">
@@ -73,9 +76,12 @@
<xsl:if test="$superclass">
<div>
<xsl:variable name="inheritedattrs"
select="$superclass/class/[EMAIL PROTECTED]'__ivars__']/object/[EMAIL
PROTECTED]'public']"></xsl:variable>
- <xsl:text>Attributes inherited
from </xsl:text><xsl:value-of select="$superclass/@name"/>
+ <xsl:text>Attributes inherited from </xsl:text>
+ <xref linkend="{$superclass/@id}">
+ <xsl:value-of select="$superclass/doc/[EMAIL
PROTECTED]'lzxname']/text"/>
+ </xref>
<xsl:text>: </xsl:text>
- <xsl:for-each select="$inheritedattrs"><xsl:value-of
select="@name"/>, </xsl:for-each>
+ <xsl:for-each select="$inheritedattrs"><xsl:value-of
select="@name"/> <xref linkend="{$superclass/@id}"/> </xsl:for-each>
</div>
<xsl:choose>
<xsl:when test="contains($visibility.filter,
$superclass/@access)">
@@ -91,5 +97,36 @@
</xsl:if>
</xsl:template>
-
+ <xsl:template name="describe-superclass-methods">
+ <xsl:param name="class"/>
+
+ <xsl:variable name="jsname" select="@name"/>
+ <xsl:variable name="lzxname" select="&tagname;"/>
+
+ <xsl:variable name="extends" select="$class/@extends"/>
+ <xsl:variable name="superclass" select="(key('id',$extends) |
key('name-lzx',$extends))[1]"/>
+ <xsl:if test="$superclass">
+ <div>
+ <xsl:variable name="inheritedmethods"
select="$superclass/class/property/object/[EMAIL
PROTECTED]'public']/function"></xsl:variable>
+ <xsl:text>Methods inherited from </xsl:text>
+ <xref linkend="{$superclass/@id}">
+ <xsl:value-of select="$superclass/doc/[EMAIL
PROTECTED]'lzxname']/text"/>
+ </xref>
+ <xsl:text>: </xsl:text>
+ <xsl:for-each select="$inheritedmethods"><xsl:value-of
select="../@name"/> <xref linkend="{../@id}"/> </xsl:for-each>
+ </div>
+ <xsl:choose>
+ <xsl:when test="contains($visibility.filter,
$superclass/@access)">
+ <xsl:call-template name="describe-superclass-methods">
+ <xsl:with-param name="class"
select="$superclass/class"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="($superclass/@name |
$superclass/doc/[EMAIL PROTECTED]'lzxname']/text)[1]"/>
+ <xsl:text> (private) » </xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:if>
+ </xsl:template>
+
</xsl:stylesheet>
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
