Author: jgrandy
Date: 2007-06-29 17:12:24 -0700 (Fri, 29 Jun 2007)
New Revision: 5563
Modified:
openlaszlo/branches/doctools/docs/includes/docbook.css
openlaszlo/branches/doctools/docs/src/xsl/js2doc2dbk.xsl
Log:
better primary entry naming; add links to source files inside main index
Modified: openlaszlo/branches/doctools/docs/includes/docbook.css
===================================================================
--- openlaszlo/branches/doctools/docs/includes/docbook.css 2007-06-29
22:42:13 UTC (rev 5562)
+++ openlaszlo/branches/doctools/docs/includes/docbook.css 2007-06-30
00:12:24 UTC (rev 5563)
@@ -64,6 +64,10 @@
margin-bottom: 5px;
}
+.indexdiv dl dd {
+ padding-bottom: inherit;
+}
+
/* Inline markup */
/* This substitutes for turning on shade.verbatim in parameters.xsl */
Modified: openlaszlo/branches/doctools/docs/src/xsl/js2doc2dbk.xsl
===================================================================
--- openlaszlo/branches/doctools/docs/src/xsl/js2doc2dbk.xsl 2007-06-29
22:42:13 UTC (rev 5562)
+++ openlaszlo/branches/doctools/docs/src/xsl/js2doc2dbk.xsl 2007-06-30
00:12:24 UTC (rev 5563)
@@ -602,75 +602,83 @@
<!-- INDEX -->
- <xsl:template name="declaration-index">
- <xsl:variable name="jsname" select="@name"/>
- <xsl:variable name="lzxname" select="&tagname;"/>
- <xsl:choose>
- <xsl:when test="$jsname and not(starts-with($jsname,'lz.'))">
- <!-- JavaScript name is primary -->
- <xsl:variable name="sortasjs" select="translate($jsname,'_$',' ')"/>
- <indexterm>
+ <xsl:template name="declaration-index-inner">
+ <xsl:param name="name"/>
+ <xsl:param name="altname"/>
+ <xsl:variable name="sortas" select="translate($name,'_$',' ')"/>
+ <indexterm zone="[EMAIL PROTECTED]">
+ <primary>
+ <xsl:if test="$name != $sortas">
+ <xsl:attribute name="sortas"><xsl:value-of
select="$sortas"/></xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="$name"/>
+ </primary>
+ <secondary>Described</secondary>
+ <xsl:if test="$altname">
+ <seealso><xsl:value-of select="$altname"/></seealso>
+ </xsl:if>
+ </indexterm>
+ <xsl:if test="$altname">
+ <xsl:variable name="sortasalt" select="translate($altname,'_$',' ')"/>
+ <indexterm zone="[EMAIL PROTECTED]">
+ <xsl:if test="$altname != $sortasalt">
+ <xsl:attribute name="sortas"><xsl:value-of
select="$sortasalt"/></xsl:attribute>
+ </xsl:if>
+ <primary><xsl:value-of select="$altname"/></primary>
+ <see><xsl:value-of select="$name"/></see>
+ </indexterm>
+<?ignore
+ <indexterm type="tags">
+ <primary><xsl:value-of select="$lzxname"/></primary>
+ </indexterm>
+?>
+ </xsl:if>
+ <xsl:variable name="parentid" select="@unitid"/>
+ <xsl:if test="$parentid">
+ <xsl:message><xsl:value-of select="concat('parentid: ',
$parentid)"/></xsl:message>
+ <xsl:variable name="visibility"><xsl:value-of
select="key('id',$parentid)/@access"/></xsl:variable>
+ <xsl:if test="contains($visibility.filter, $visibility)">
+ <indexterm zone="{$parentid}">
<primary>
- <xsl:if test="$jsname != $sortasjs">
- <xsl:attribute name="sortas"><xsl:value-of
select="$sortasjs"/></xsl:attribute>
+ <xsl:if test="$name != $sortas">
+ <xsl:attribute name="sortas"><xsl:value-of
select="$sortas"/></xsl:attribute>
</xsl:if>
- <xsl:value-of select="$jsname"/>
+ <xsl:value-of select="$name"/>
</primary>
- <secondary>Described</secondary>
- <xsl:if test="$lzxname">
- <seealso><xsl:value-of select="$lzxname"/></seealso>
- </xsl:if>
+ <secondary>Declared in</secondary>
</indexterm>
- <xsl:if test="$lzxname">
- <xsl:variable name="sortaslzx" select="translate($lzxname,'_$','
')"/>
- <indexterm>
- <xsl:if test="$lzxname != $sortaslzx">
- <xsl:attribute name="sortas"><xsl:value-of
select="$sortaslzx"/></xsl:attribute>
- </xsl:if>
- <primary><xsl:value-of select="$lzxname"/></primary>
- <see><xsl:value-of select="$jsname"/></see>
- </indexterm>
+ </xsl:if>
+ </xsl:if>
<?ignore
- <indexterm type="tags">
- <primary><xsl:value-of select="$lzxname"/></primary>
- </indexterm>
-?>
+ <xsl:if test="contains(@keywords, 'deprecated')">
+ <indexterm type="deprecated">
+ <xsl:if test="$name != $sortas">
+ <xsl:attribute name="sortas"><xsl:value-of
select="$sortas"/></xsl:attribute>
</xsl:if>
-<?ignore
- <xsl:if test="contains(@keywords, 'deprecated')">
- <indexterm type="deprecated">
- <xsl:if test="$jsname != $sortasjs">
- <xsl:attribute name="sortas"><xsl:value-of
select="$sortasjs"/></xsl:attribute>
- </xsl:if>
- <primary>
- <xsl:value-of select="$jsname"/>
- </primary>
- </indexterm>
- </xsl:if>
+ <primary>
+ <xsl:value-of select="$name"/>
+ </primary>
+ </indexterm>
+ </xsl:if>
?>
+ </xsl:template>
+
+ <xsl:template name="declaration-index">
+ <xsl:variable name="jsname" select="@name"/>
+ <xsl:variable name="lzxname" select="&tagname;"/>
+ <xsl:choose>
+ <xsl:when test="$jsname and not(starts-with($jsname,'lz.'))">
+ <!-- JavaScript name is primary -->
+ <xsl:call-template name="declaration-index-inner">
+ <xsl:with-param name="name" select="$jsname"/>
+ <xsl:with-param name="altname" select="$lzxname"/>
+ </xsl:call-template>
</xsl:when>
<xsl:when test="$lzxname and $lzxname != ''">
<!-- LZX name is primary -->
- <xsl:variable name="sortaslzx" select="translate($lzxname,'_$','
')"/>
- <indexterm>
- <xsl:if test="$lzxname != $sortaslzx">
- <xsl:attribute name="sortas"><xsl:value-of
select="$sortaslzx"/></xsl:attribute>
- </xsl:if>
- <primary><xsl:value-of select="$lzxname"/></primary>
- <secondary>Described</secondary>
- </indexterm>
-<?ignore
- <xsl:if test="contains(@keywords, 'deprecated')">
- <indexterm type="deprecated">
- <xsl:if test="$lzxname != $sortaslzx">
- <xsl:attribute name="sortas"><xsl:value-of
select="$sortaslzx"/></xsl:attribute>
- </xsl:if>
- <primary>
- <xsl:value-of select="$lzxname"/>
- </primary>
- </indexterm>
- </xsl:if>
-?>
+ <xsl:call-template name="declaration-index-inner">
+ <xsl:with-param name="name" select="$lzxname"/>
+ </xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:message><xsl:text>couldn't generate index for item with no
name</xsl:text></xsl:message>
@@ -692,7 +700,7 @@
</xsl:if>
<xsl:variable name="decltype"><xsl:apply-templates select="."
mode="type"/></xsl:variable>
- <xsl:if test="$decltype">
+ <xsl:if test="$decltype and $decltype != ''">
<varlistentry><term>Type: <xsl:value-of
select="$decltype"/></term></varlistentry>
</xsl:if>
@@ -714,20 +722,28 @@
<varlistentry><term>Build Flags: <xsl:value-of
select="@includebuilds"/></term></varlistentry>
</xsl:if>
- <xsl:variable name="topic" select="@topic"/>
- <xsl:variable name="subtopic" select="@subtopic"/>
- <xsl:if test="$topic">
- <varlistentry><term>Topic: <xref
linkend="{translate(concat('topic.',$topic,'.',$subtopic),'
','_')}"/></term></varlistentry>
- </xsl:if>
+ <xsl:variable name="topic" select="@topic"/>
+ <xsl:variable name="subtopic" select="@subtopic"/>
+ <xsl:if test="$topic">
+ <varlistentry><term>Topic: <xref
linkend="{translate(concat('topic.',$topic,'.',$subtopic),'
','_')}"/></term></varlistentry>
+ </xsl:if>
- <xsl:variable name="parentid" select="@unitid"/>
- <xsl:if test="$parentid">
- <xsl:variable name="visibility"><xsl:value-of
select="key('id',$parentid)/@access"/></xsl:variable>
- <xsl:if test="contains($visibility.filter, $visibility)">
- <varlistentry><term>Declared in: <xref
linkend="{$parentid}"/></term></varlistentry>
+ <xsl:variable name="parentid" select="@unitid"/>
+ <xsl:if test="$parentid">
+ <xsl:variable name="visibility"><xsl:value-of
select="key('id',$parentid)/@access"/></xsl:variable>
+ <xsl:if test="contains($visibility.filter, $visibility)">
+ <varlistentry><term>Declared in: <xref
linkend="{$parentid}"/></term></varlistentry>
+ </xsl:if>
</xsl:if>
- </xsl:if>
+<?ignore
+ <!-- need to turn path into webapp url, not sure how to do that -->
+ <xsl:variable name="path" select="@path"/>
+ <xsl:if test="$path and $path != ''">
+ <xsl:variable name="pathurl" select="$pathurl"/>
+ <varlistentry><term>Source: <ulink
url="{$pathurl}"/></term></varlistentry>
+ </xsl:if>
+?>
</variablelist>
</xsl:template>
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
