Bug 3600058 work-in-progress: restored table format for contents page (easy for eyes to scan, each to search in browser) but added category-based list below. Need to review CSS and where we look for packages.list.txt.

1 files changed, 29 insertions, 13 deletions

diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 8ae4079..b7d0648 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -235,14 +235,22 @@ proc css-stylesheet {} {
 	font-size: 11px;
     }
     css-style ul.multicolumn {
+	list-style-type: none;
+	padding-left: 1em;
+	margin: 0;    
 	column-fill: balance;
-	column-count: 3;
-	-moz-column-count: 3;
-	-webkit-column-count: 3;
         column-gap: 20px;
 	-moz-column-gap: 20px;
 	-webkit-column-gap: 20px;
     }
+    css-style ul.ncols1 { column-count: 1; -moz-column-count: 1; -webkit-column-count: 1; }
+    css-style ul.ncols2 { column-count: 2; -moz-column-count: 2; -webkit-column-count: 2; }
+    css-style ul.ncols3 { column-count: 3; -moz-column-count: 3; -webkit-column-count: 3; }
+    css-style ul.ncols4 { column-count: 4; -moz-column-count: 4; -webkit-column-count: 4; }
+    css-style ul.ncols5 { column-count: 5; -moz-column-count: 5; -webkit-column-count: 5; }
+    css-style td.command {
+	padding-left: 1em;
+    }
     css-style ".keylist dt" ".arguments dt" {
 	width: 20em;
 	float: left;
@@ -684,18 +692,23 @@ try {
 
 	    # ... but try to extract (name, version) from subdir contents
 	    try {
-		set f [open [file join $pkgsDir $dir configure.in]]
-		foreach line [split [read $f] \n] {
-		    if {2 == [scan $line \
-			    { AC_INIT ( [%[^]]] , [%[^]]] ) } n v]} {
-			set description [list $n $v]
-			break
+		glob -directory [file join $pkgsDir $dir] -- \
+                  configure.in configure.ac unix/configure.in 
+	    } trap {POSIX ENOENT} {e} {
+		puts stderr "warning: no 'configure.in' (or .ac) under '[file nativename [file join $pkgsDir $dir]]'"
+	    } on ok {flist} {
+		try {
+		    set f [open [lindex $flist 0]]
+		    foreach line [split [read $f] \n] {
+			if {2 == [scan $line \
+				{ AC_INIT ( [%[^]]] , [%[^]]] ) } n v]} {
+			    set description [list $n $v]
+			    break
+			}
 		    }
+        	} finally {
+		    catch {close $f; unset f}
 		}
-	    } trap {POSIX ENOENT} {e} {
-		puts stderr "warning: no 'configure.in' in '[file nativename [file join $pkgsDir $dir]]'"
-            } finally {
-		catch {close $f; unset f}
 	    }
 
 	    if {[file exists [file join $pkgsDir $dir configure]]} {
@@ -710,6 +723,9 @@ try {
     try {
 	set packageDirNameMap {}
 	if {$build_tcl} {
+#FIXME-TD look in --pkgsrc = $pkgsDir for this
+#	    set f [open [file join $pkgsDir "package.list.txt"]]
+# May need to look in more than one place?
 	    set f [open $tcltkdir/$tcldir/pkgs/package.list.txt]
 	    try {
 		foreach line [split [read $f] \n] {