Author: dda
Date: 2008-03-10 19:35:26 -0700 (Mon, 10 Mar 2008)
New Revision: 8220

Modified:
   openlaszlo/trunk/docs/src/nav/tags.xml
   openlaszlo/trunk/docs/src/reference/navbuilder/navxmlbuilder.rb
Log:
Change 20080310-dda-7 by [EMAIL PROTECTED] on 2008-03-10 22:20:03 EDT
    in /Users/dda/laszlo/src/svn/openlaszlo/trunk-doc
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: doctools: fix to include <splash>, <splash view> in tags index

New Features:

Bugs Fixed: LPP-5366

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

Documentation:

Release Notes:

Details:
    This was missed in the big submit to fix the tags index.
    The titles:   <splash> (as2)  <splash view> (as2)
    were not recognized as tags because (as2) confused the script.
    This is now fixed.

Tests:



Modified: openlaszlo/trunk/docs/src/nav/tags.xml
===================================================================
--- openlaszlo/trunk/docs/src/nav/tags.xml      2008-03-11 02:33:24 UTC (rev 
8219)
+++ openlaszlo/trunk/docs/src/nav/tags.xml      2008-03-11 02:35:26 UTC (rev 
8220)
@@ -135,6 +135,8 @@
     <item href="lz.sliderthumb.html" title="sliderthumb" />
     <item href="lz.slidertrack.html" title="slidertrack" />
     <item href="lz.soap.html" title="soap" />
+    <item href="tag.splash+as2.html" title="splash (as2)" />
+    <item href="tag.splash-view.html" title="splash view (as2)" />
     <item href="lz.stableborderlayout.html" title="stableborderlayout" />
     <item href="LzState.html" title="state" />
     <item href="lz.statictext.html" title="statictext" />

Modified: openlaszlo/trunk/docs/src/reference/navbuilder/navxmlbuilder.rb
===================================================================
--- openlaszlo/trunk/docs/src/reference/navbuilder/navxmlbuilder.rb     
2008-03-11 02:33:24 UTC (rev 8219)
+++ openlaszlo/trunk/docs/src/reference/navbuilder/navxmlbuilder.rb     
2008-03-11 02:35:26 UTC (rev 8220)
@@ -58,14 +58,20 @@
   lowerkey.sort.each { |low,key| yield key, h[key] }
 end
 
+# If the title of this document has a tag name, return it.
+# We look for &lt;.....&gt;  (e.g. <canvas>), but we
+# also allow that the title may contain platform information,
+# like <splash> (as2).  We return the title without brackets,
+# e.g. "canvas", or "splash (as2)" as that is how it appears
+# in the index.
 def tagname_for(filename)
   tag = nil;
   open(filename) {|f|
       f.each_line { |line|
           line.chomp!
           if (line =~ /<title>.*<\/title>/) then
-              if (line =~ /<title>&lt;.*&gt;<\/title>/) then
-                  tag = line.sub(/.*<title>&lt;/, '').sub(/&gt;<\/title>.*/, 
'')
+              if (line =~ /<title>&lt;.*&gt;.*<\/title>/) then
+                  tag = line.sub(/.*<title>&lt;/, '').sub(/&gt;/, 
'').sub(/<\/title>.*/, '')
               end
           end
           if (line =~ /<link.*\.Incubator\./) then
@@ -81,8 +87,6 @@
 # The file pattern for Lz/lz should work around any file case issues
 # on Windows vs. Unix/Linux.
 
-$stderr.puts "This version of navxmlbuilder has not resolved the issue of 
pruning out things from incubator"
-
 generate_index("{[Ll]z,tag}*.html", "tags.xml", "index") { | file,fullname |
     tagname_for(fullname);
  }


_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins

Reply via email to