[Laszlo-checkins] r9931 - openlaszlo/trunk/docs/src/xsl

[dda@openlaszlo.org]

Author: dda
Date: 2008-06-24 04:44:38 -0700 (Tue, 24 Jun 2008)
New Revision: 9931

Modified:
   openlaszlo/trunk/docs/src/xsl/lzx2js2doc.xsl
Log:
Change 20080623-dda-V by dda at lester.local on 2008-06-23 18:59:54 EDT
    in /Users/dda/laszlo/src/svn/openlaszlo/trunk-doc5
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Doctools now understand value="$xxx{yyy}" in lzx files

New Features:

Bugs Fixed: LPP-6479 (complete), LPP-6477 (partial)

Technical Reviewer: (pending)
QA Reviewer: (pending)
Doc Reviewer: liorio (pending)

Documentation:

Release Notes:

Details:
    This fixes basegrid page problems, where the "Default" heading
    was shown as $immediately{null}.  In lzx, when value is of the
    form $x{y} it indicates value is y, with x being a directive for "when".
    This fix separates out the two elements into a value and when,
    so the value can be shown in the Default column.  Currently,
    the documentation is not showing "when".

    This fix is general to cases that have ${expression} like in baseformitem
    or basecombobox - so that the enclosing ${} will be removed.

Tests:
    Visual check of basegrid, baseformitem, basecombobox pages



Modified: openlaszlo/trunk/docs/src/xsl/lzx2js2doc.xsl
===================================================================
--- openlaszlo/trunk/docs/src/xsl/lzx2js2doc.xsl	2008-06-24 11:44:04 UTC (rev 9930)
+++ openlaszlo/trunk/docs/src/xsl/lzx2js2doc.xsl	2008-06-24 11:44:38 UTC (rev 9931)
@@ -236,7 +236,17 @@
           <tag name="lzxname"><text><xsl:value-of select="@name"/></text></tag>
         </xsl:if>
         <xsl:if test="@value">
-          <tag name="lzxdefault"><text><xsl:value-of select="@value"/></text></tag>
+          <xsl:choose>
+            <!-- translate e.g. value="$immediately{null}" to value="null" when="immediately" -->
+            <xsl:when test="substring(@value, 1, 1) = '$' and contains(@value, '{') and contains(@value, '}')">
+              <tag name="lzxdefault"><text><xsl:value-of select="substring-after(substring-before(@value, '}'), '{')"/></text></tag>
+              <!-- TODO [dda 2008-06-23] 'when' is not handled - maybe this should modify the 'category' shown in attributes? -->
+              <tag name="lzxwhen"><text><xsl:value-of select="substring-before(substring(@value, 2), '{')"/></text></tag>
+            </xsl:when>
+            <xsl:otherwise>
+              <tag name="lzxdefault"><text><xsl:value-of select="@value"/></text></tag>
+            </xsl:otherwise>
+          </xsl:choose>
         </xsl:if>
         <xsl:choose>
           <xsl:when test="@type">