From: Fred Drake <fdrake@acm.org>
Date: Fri, 7 Aug 1998 20:51:58 +0000 (+0000)
Subject: insert_index():  Take two additional parameters: $columns and $letters.  Call
X-Git-Tag: v1.5.2a1~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d10b43c2669c9649e158c2c1be745c584cfcaca;p=python

insert_index():  Take two additional parameters: $columns and $letters.  Call
	buildindex.py appropriately.

add_idx(),
add_module_idx():  Add the appropriate parameters to the calls to
	insert_index().
---

diff --git a/Doc/perl/l2hinit.perl b/Doc/perl/l2hinit.perl
index fd1c281c60..9f8c04ee6a 100644
--- a/Doc/perl/l2hinit.perl
+++ b/Doc/perl/l2hinit.perl
@@ -31,8 +31,9 @@ $BODYTEXT = 'bgcolor="#ffffff"';
 $CHILDLINE = "\n<p><hr>\n";
 $VERBOSITY = 0;
 
-# default # of columns for the index
+# default # of columns for the indexes
 $INDEX_COLUMNS = 2;
+$MODULE_INDEX_COLUMNS = 5;
 
 
 # A little painful, but lets us clean up the top level directory a little,
@@ -194,15 +195,22 @@ sub make_index_entry {
 
 
 sub insert_index{
-    my($mark,$datafile) = @_;
-    my $index = `$myrootdir/tools/buildindex.py --columns $INDEX_COLUMNS $datafile`;
+    my($mark,$datafile,$columns,$letters) = @_;
+    my $prog = "$myrootdir/tools/buildindex.py";
+    my $index;
+    if ($letters) {
+	$index = `$prog --columns $columns --letters $datafile`;
+    }
+    else {
+	$index = `$prog --columns $columns $datafile`;
+    }
     s/$mark/$index/;
 }
 
 sub add_idx{
     print "\nDoing the index ...";
     close(IDXFILE);
-    insert_index($idx_mark, 'index.dat');
+    insert_index($idx_mark, 'index.dat', $INDEX_COLUMNS, 1);
 }
 
 
@@ -218,7 +226,7 @@ sub add_module_idx{
 	print MODIDXFILE "$Modules{$key}" . $IDXFILE_FIELD_SEP . "$key###\n";
     }
     close(MODIDXFILE);
-    insert_index($idx_module_mark, 'modindex.dat');
+    insert_index($idx_module_mark, 'modindex.dat', $MODULE_INDEX_COLUMNS, 0);
 }
 
 # replace both indexes as needed: