[Python-checkins] python/dist/src/Doc/perl l2hinit.perl,1.62,1.63 python.perl,1.124,1.125
fdrake@users.sourceforge.net
fdrake@users.sourceforge.net
Thu, 23 May 2002 10:59:18 -0700
Update of /cvsroot/python/python/dist/src/Doc/perl
In directory usw-pr-cvs1:/tmp/cvs-serv10556/perl
Modified Files:
l2hinit.perl python.perl
Log Message:
Use Perl function prototypes to help avoid definition/usage mismatches
while modifying these files.
Minor style changes to make the use of "my" with arrays more consistent.
Index: l2hinit.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** l2hinit.perl 15 Apr 2002 18:41:29 -0000 1.62
--- l2hinit.perl 23 May 2002 17:59:16 -0000 1.63
***************
*** 100,105 ****
$CUSTOM_BUTTONS = '';
! sub make_nav_sectref {
! my($label,$title) = @_;
if ($title) {
if ($title =~ /\<[aA] /) {
--- 100,105 ----
$CUSTOM_BUTTONS = '';
! sub make_nav_sectref($$) {
! my($label, $title) = @_;
if ($title) {
if ($title =~ /\<[aA] /) {
***************
*** 128,132 ****
$my_icon_names{'next_page'} = 'next';
! sub get_my_icon {
my $name = @_[0];
my $text = $my_icon_tags{$name};
--- 128,132 ----
$my_icon_names{'next_page'} = 'next';
! sub get_my_icon($) {
my $name = @_[0];
my $text = $my_icon_tags{$name};
***************
*** 142,146 ****
}
! sub use_my_icon {
my $s = @_[0];
if ($s =~ /\<tex2html_([a-z_]+)_visible_mark\>/) {
--- 142,146 ----
}
! sub use_my_icon($) {
my $s = @_[0];
if ($s =~ /\<tex2html_([a-z_]+)_visible_mark\>/) {
***************
*** 151,155 ****
}
! sub make_nav_panel {
my $s;
my $BLANK_ICON = get_my_icon('blank');
--- 151,155 ----
}
! sub make_nav_panel() {
my $s;
my $BLANK_ICON = get_my_icon('blank');
***************
*** 193,197 ****
}
! sub get_version_text {
if ($PACKAGE_VERSION ne '' && $t_date) {
return ("<span class=\"release-info\">"
--- 193,197 ----
}
! sub get_version_text() {
if ($PACKAGE_VERSION ne '' && $t_date) {
return ("<span class=\"release-info\">"
***************
*** 211,215 ****
! sub top_navigation_panel {
return "\n"
. make_nav_panel()
--- 211,215 ----
! sub top_navigation_panel() {
return "\n"
. make_nav_panel()
***************
*** 217,221 ****
}
! sub bot_navigation_panel {
return "\n<p><hr>\n"
. make_nav_panel()
--- 217,221 ----
}
! sub bot_navigation_panel() {
return "\n<p><hr>\n"
. make_nav_panel()
***************
*** 256,260 ****
}
! sub add_special_link {
my($icon, $file, $current_file) = @_;
if ($icon =~ /\<tex2html_([_a-z]+)_visible_mark\>/) {
--- 256,260 ----
}
! sub add_special_link($$$) {
my($icon, $file, $current_file) = @_;
if ($icon =~ /\<tex2html_([_a-z]+)_visible_mark\>/) {
***************
*** 282,293 ****
! sub gen_index_id {
# this is used to ensure common index key generation and a stable sort
! my($str,$extra) = @_;
sprintf('%s###%s%010d', $str, $extra, ++$global{'max_id'});
}
! sub insert_index {
! my($mark,$datafile,$columns,$letters,$prefix) = @_;
my $prog = "$myrootdir/tools/buildindex.py";
my $index;
--- 282,293 ----
! sub gen_index_id($$) {
# this is used to ensure common index key generation and a stable sort
! my($str, $extra) = @_;
sprintf('%s###%s%010d', $str, $extra, ++$global{'max_id'});
}
! sub insert_index($$$$$) {
! my($mark, $datafile, $columns, $letters, $prefix) = @_;
my $prog = "$myrootdir/tools/buildindex.py";
my $index;
***************
*** 303,307 ****
}
! sub add_idx {
print "\nBuilding HTML for the index ...";
close(IDXFILE);
--- 303,307 ----
}
! sub add_idx() {
print "\nBuilding HTML for the index ...";
close(IDXFILE);
***************
*** 313,317 ****
$idx_module_title = 'Module Index';
! sub add_module_idx {
print "\nBuilding HTML for the module index ...";
my $key;
--- 313,317 ----
$idx_module_title = 'Module Index';
! sub add_module_idx() {
print "\nBuilding HTML for the module index ...";
my $key;
***************
*** 392,396 ****
$TITLE = $toc_title;
$tocfile = $CURRENT_FILE;
! my($closures,$reopens) = preserve_open_tags();
anchor_label('contents', $CURRENT_FILE, $_); # this is added
join('', "<BR>\n\\tableofchildlinks[off]", $closures
--- 392,396 ----
$TITLE = $toc_title;
$tocfile = $CURRENT_FILE;
! my($closures, $reopens) = preserve_open_tags();
anchor_label('contents', $CURRENT_FILE, $_); # this is added
join('', "<BR>\n\\tableofchildlinks[off]", $closures
***************
*** 403,407 ****
$TITLE = $lof_title;
$loffile = $CURRENT_FILE;
! my($closures,$reopens) = preserve_open_tags();
anchor_label('lof', $CURRENT_FILE, $_); # this is added
join('', "<BR>\n", $closures
--- 403,407 ----
$TITLE = $lof_title;
$loffile = $CURRENT_FILE;
! my($closures, $reopens) = preserve_open_tags();
anchor_label('lof', $CURRENT_FILE, $_); # this is added
join('', "<BR>\n", $closures
***************
*** 414,418 ****
$TITLE = $lot_title;
$lotfile = $CURRENT_FILE;
! my($closures,$reopens) = preserve_open_tags();
anchor_label('lot', $CURRENT_FILE, $_); # this is added
join('', "<BR>\n", $closures
--- 414,418 ----
$TITLE = $lot_title;
$lotfile = $CURRENT_FILE;
! my($closures, $reopens) = preserve_open_tags();
anchor_label('lot', $CURRENT_FILE, $_); # this is added
join('', "<BR>\n", $closures
***************
*** 456,460 ****
else { $preindex = ''; }
my $heading = make_section_heading($idx_title, 'h2') . $idx_mark;
! my($pre,$post) = minimize_open_tags($heading);
anchor_label('genindex',$CURRENT_FILE,$_); # this is added
return "<br>\n" . $pre . $_;
--- 456,460 ----
else { $preindex = ''; }
my $heading = make_section_heading($idx_title, 'h2') . $idx_mark;
! my($pre, $post) = minimize_open_tags($heading);
anchor_label('genindex',$CURRENT_FILE,$_); # this is added
return "<br>\n" . $pre . $_;
***************
*** 586,590 ****
# content of the page.
$MY_PARTIAL_HEADER = '';
! sub make_head_and_body {
my($title, $body) = @_;
$body = " $body" unless ($body eq '');
--- 586,590 ----
# content of the page.
$MY_PARTIAL_HEADER = '';
! sub make_head_and_body($$) {
my($title, $body) = @_;
$body = " $body" unless ($body eq '');
Index: python.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** python.perl 15 Apr 2002 20:48:39 -0000 1.124
--- python.perl 23 May 2002 17:59:16 -0000 1.125
***************
*** 21,25 ****
sub next_optional_argument{
! my($param,$rx) = ('', "^\\s*(\\[([^]]*)\\])?");
s/$rx/$param=$2;''/eo;
return $param;
--- 21,25 ----
sub next_optional_argument{
! my($param, $rx) = ('', "^\\s*(\\[([^]]*)\\])?");
s/$rx/$param=$2;''/eo;
return $param;
***************
*** 151,155 ****
}
! sub use_wrappers{
local($_,$before,$after) = @_;
my $stuff = next_argument();
--- 151,155 ----
}
! sub use_wrappers($$$){
local($_,$before,$after) = @_;
my $stuff = next_argument();
***************
*** 298,302 ****
local($_) = @_;
my $envvar = next_argument();
! my($name,$aname,$ahref) = new_link_info();
# The <tt> here is really to keep buildindex.py from making
# the variable name case-insensitive.
--- 298,302 ----
local($_) = @_;
my $envvar = next_argument();
! my($name, $aname, $ahref) = new_link_info();
# The <tt> here is really to keep buildindex.py from making
# the variable name case-insensitive.
***************
*** 396,400 ****
}
! sub versionnote{
# one or two parameters: \versionnote[explanation]{version}
my $type = @_[0];
--- 396,400 ----
}
! sub versionnote($$){
# one or two parameters: \versionnote[explanation]{version}
my $type = @_[0];
***************
*** 410,418 ****
sub do_cmd_versionadded{
! return versionnote('New', @_);
}
sub do_cmd_versionchanged{
! return versionnote('Changed', @_);
}
--- 410,418 ----
sub do_cmd_versionadded{
! return versionnote('New', @_[0]);
}
sub do_cmd_versionchanged{
! return versionnote('Changed', @_[0]);
}
***************
*** 442,446 ****
$INDEX_SUBITEM = "";
! sub get_indexsubitem{
return $INDEX_SUBITEM ? " $INDEX_SUBITEM" : '';
}
--- 442,446 ----
$INDEX_SUBITEM = "";
! sub get_indexsubitem(){
return $INDEX_SUBITEM ? " $INDEX_SUBITEM" : '';
}
***************
*** 488,506 ****
$IDXFILE_FIELD_SEP = "\1";
! sub write_idxfile{
! my ($ahref, $str) = @_;
print IDXFILE $ahref, $IDXFILE_FIELD_SEP, $str, "\n";
}
! sub gen_link{
! my($node,$target) = @_;
print INTLABELS "\$internal_labels{\"$target\"} = \"$URL/$node\";\n";
return "<a href=\"$node#$target\">";
}
! sub add_index_entry{
# add an entry to the index structures; ignore the return value
! my($str,$ahref) = @_;
$str = gen_index_id($str, '');
$index{$str} .= $ahref;
--- 488,506 ----
$IDXFILE_FIELD_SEP = "\1";
! sub write_idxfile($$){
! my($ahref, $str) = @_;
print IDXFILE $ahref, $IDXFILE_FIELD_SEP, $str, "\n";
}
! sub gen_link($$){
! my($node, $target) = @_;
print INTLABELS "\$internal_labels{\"$target\"} = \"$URL/$node\";\n";
return "<a href=\"$node#$target\">";
}
! sub add_index_entry($$){
# add an entry to the index structures; ignore the return value
! my($str, $ahref) = @_;
$str = gen_index_id($str, '');
$index{$str} .= $ahref;
***************
*** 508,512 ****
}
! sub new_link_info{
my $name = "l2h-" . ++$globals{'max_id'};
my $aname = "<a name=\"$name\">";
--- 508,512 ----
}
! sub new_link_info(){
my $name = "l2h-" . ++$globals{'max_id'};
my $aname = "<a name=\"$name\">";
***************
*** 516,520 ****
$IndexMacroPattern = '';
! sub define_indexing_macro{
my $count = @_;
my $i = 0;
--- 516,520 ----
$IndexMacroPattern = '';
! sub define_indexing_macro(@){
my $count = @_;
my $i = 0;
***************
*** 536,544 ****
$DEBUG_INDEXING = 0;
! sub process_index_macros{
local($_) = @_;
my $cmdname = @_[1]; # This is what triggered us in the first place;
# we know it's real, so just process it.
! my($name,$aname,$ahref) = new_link_info();
my $cmd = "idx_cmd_$cmdname";
print "\nIndexing: \\$cmdname"
--- 536,544 ----
$DEBUG_INDEXING = 0;
! sub process_index_macros($$){
local($_) = @_;
my $cmdname = @_[1]; # This is what triggered us in the first place;
# we know it's real, so just process it.
! my($name, $aname, $ahref) = new_link_info();
my $cmd = "idx_cmd_$cmdname";
print "\nIndexing: \\$cmdname"
***************
*** 565,569 ****
define_indexing_macro('index');
! sub idx_cmd_index{
my $str = next_argument();
add_index_entry("$str", @_[0]);
--- 565,569 ----
define_indexing_macro('index');
! sub idx_cmd_index($){
my $str = next_argument();
add_index_entry("$str", @_[0]);
***************
*** 571,575 ****
define_indexing_macro('kwindex');
! sub idx_cmd_kwindex{
my $str = next_argument();
add_index_entry("<tt>$str</tt>!keyword", @_[0]);
--- 571,575 ----
define_indexing_macro('kwindex');
! sub idx_cmd_kwindex($){
my $str = next_argument();
add_index_entry("<tt>$str</tt>!keyword", @_[0]);
***************
*** 578,582 ****
define_indexing_macro('indexii');
! sub idx_cmd_indexii{
my $str1 = next_argument();
my $str2 = next_argument();
--- 578,582 ----
define_indexing_macro('indexii');
! sub idx_cmd_indexii($){
my $str1 = next_argument();
my $str2 = next_argument();
***************
*** 586,590 ****
define_indexing_macro('indexiii');
! sub idx_cmd_indexiii{
my $str1 = next_argument();
my $str2 = next_argument();
--- 586,590 ----
define_indexing_macro('indexiii');
! sub idx_cmd_indexiii($){
my $str1 = next_argument();
my $str2 = next_argument();
***************
*** 596,600 ****
define_indexing_macro('indexiv');
! sub idx_cmd_indexiv{
my $str1 = next_argument();
my $str2 = next_argument();
--- 596,600 ----
define_indexing_macro('indexiv');
! sub idx_cmd_indexiv($){
my $str1 = next_argument();
my $str2 = next_argument();
***************
*** 608,612 ****
define_indexing_macro('ttindex');
! sub idx_cmd_ttindex{
my $str = next_argument();
my $entry = $str . get_indexsubitem();
--- 608,612 ----
define_indexing_macro('ttindex');
! sub idx_cmd_ttindex($){
my $str = next_argument();
my $entry = $str . get_indexsubitem();
***************
*** 614,619 ****
}
! sub my_typed_index_helper{
! my($word,$ahref) = @_;
my $str = next_argument();
add_index_entry("$str $word", $ahref);
--- 614,619 ----
}
! sub my_typed_index_helper($$){
! my($word, $ahref) = @_;
my $str = next_argument();
add_index_entry("$str $word", $ahref);
***************
*** 622,632 ****
define_indexing_macro('stindex', 'opindex', 'exindex', 'obindex');
! sub idx_cmd_stindex{ my_typed_index_helper('statement', @_[0]); }
! sub idx_cmd_opindex{ my_typed_index_helper('operator', @_[0]); }
! sub idx_cmd_exindex{ my_typed_index_helper('exception', @_[0]); }
! sub idx_cmd_obindex{ my_typed_index_helper('object', @_[0]); }
define_indexing_macro('bifuncindex');
! sub idx_cmd_bifuncindex{
my $str = next_argument();
add_index_entry("<tt class=\"function\">$str()</tt> (built-in function)",
--- 622,632 ----
define_indexing_macro('stindex', 'opindex', 'exindex', 'obindex');
! sub idx_cmd_stindex($){ my_typed_index_helper('statement', @_[0]); }
! sub idx_cmd_opindex($){ my_typed_index_helper('operator', @_[0]); }
! sub idx_cmd_exindex($){ my_typed_index_helper('exception', @_[0]); }
! sub idx_cmd_obindex($){ my_typed_index_helper('object', @_[0]); }
define_indexing_macro('bifuncindex');
! sub idx_cmd_bifuncindex($){
my $str = next_argument();
add_index_entry("<tt class=\"function\">$str()</tt> (built-in function)",
***************
*** 635,641 ****
! sub make_mod_index_entry{
! my($str,$define) = @_;
! my($name,$aname,$ahref) = new_link_info();
# equivalent of add_index_entry() using $define instead of ''
$ahref =~ s/\#[-_a-zA-Z0-9]*\"/\"/
--- 635,641 ----
! sub make_mod_index_entry($$){
! my($str, $define) = @_;
! my($name, $aname, $ahref) = new_link_info();
# equivalent of add_index_entry() using $define instead of ''
$ahref =~ s/\#[-_a-zA-Z0-9]*\"/\"/
***************
*** 658,663 ****
$THIS_CLASS = '';
! sub define_module{
! my($word,$name) = @_;
my $section_tag = join('', @curr_sec_id);
if ($word ne "built-in" && $word ne "extension"
--- 658,663 ----
$THIS_CLASS = '';
! sub define_module($$){
! my($word, $name) = @_;
my $section_tag = join('', @curr_sec_id);
if ($word ne "built-in" && $word ne "extension"
***************
*** 675,679 ****
}
! sub my_module_index_helper{
local($word, $_) = @_;
my $name = next_argument();
--- 675,679 ----
}
! sub my_module_index_helper($$){
local($word, $_) = @_;
my $name = next_argument();
***************
*** 686,690 ****
sub do_cmd_stmodindex{ return my_module_index_helper('standard', @_); }
! sub ref_module_index_helper{
my($word, $ahref) = @_;
my $str = next_argument();
--- 686,690 ----
sub do_cmd_stmodindex{ return my_module_index_helper('standard', @_); }
! sub ref_module_index_helper($$){
my($word, $ahref) = @_;
my $str = next_argument();
***************
*** 701,712 ****
define_indexing_macro('refmodindex', 'refbimodindex',
'refexmodindex', 'refstmodindex');
! sub idx_cmd_refmodindex{ return ref_module_index_helper('', @_); }
! sub idx_cmd_refbimodindex{ return ref_module_index_helper('built-in', @_); }
! sub idx_cmd_refexmodindex{ return ref_module_index_helper('extension', @_); }
! sub idx_cmd_refstmodindex{ return ref_module_index_helper('standard', @_); }
sub do_cmd_nodename{ return do_cmd_label(@_); }
! sub init_myformat{
$anchor_invisible_mark = ' ';
$anchor_invisible_mark2 = '';
--- 701,712 ----
define_indexing_macro('refmodindex', 'refbimodindex',
'refexmodindex', 'refstmodindex');
! sub idx_cmd_refmodindex($){ return ref_module_index_helper('', @_); }
! sub idx_cmd_refbimodindex($){ return ref_module_index_helper('built-in', @_); }
! sub idx_cmd_refexmodindex($){ return ref_module_index_helper('extension', @_);}
! sub idx_cmd_refstmodindex($){ return ref_module_index_helper('standard', @_); }
sub do_cmd_nodename{ return do_cmd_label(@_); }
! sub init_myformat(){
$anchor_invisible_mark = ' ';
$anchor_invisible_mark2 = '';
***************
*** 719,725 ****
# instead of the dummy filler.
#
! sub make_str_index_entry{
! my($str) = @_;
! my($name,$aname,$ahref) = new_link_info();
add_index_entry($str, $ahref);
return "$aname$str</a>";
--- 719,725 ----
# instead of the dummy filler.
#
! sub make_str_index_entry($){
! my $str = @_[0];
! my($name, $aname, $ahref) = new_link_info();
add_index_entry($str, $ahref);
return "$aname$str</a>";
***************
*** 820,824 ****
}
! sub process_grammar_files{
my $lang;
my $filename;
--- 820,824 ----
}
! sub process_grammar_files(){
my $lang;
my $filename;
***************
*** 858,862 ****
}
! sub strip_grammar_markup{
local($_) = @_;
s/\\productioncont/ /g;
--- 858,862 ----
}
! sub strip_grammar_markup($){
local($_) = @_;
s/\\productioncont/ /g;
***************
*** 874,878 ****
$REFCOUNTS_LOADED = 0;
! sub load_refcounts{
$REFCOUNTS_LOADED = 1;
--- 874,878 ----
$REFCOUNTS_LOADED = 0;
! sub load_refcounts(){
$REFCOUNTS_LOADED = 1;
***************
*** 897,902 ****
}
! sub get_refcount{
! my ($func, $param) = @_;
load_refcounts()
unless $REFCOUNTS_LOADED;
--- 897,902 ----
}
! sub get_refcount($$){
! my($func, $param) = @_;
load_refcounts()
unless $REFCOUNTS_LOADED;
***************
*** 908,913 ****
$TLEND = '</span>';
! sub cfuncline_helper{
! my ($type, $name, $args) = @_;
my $idx = make_str_index_entry(
"<tt class=\"cfunction\">$name()</tt>" . get_indexsubitem());
--- 908,913 ----
$TLEND = '</span>';
! sub cfuncline_helper($$$){
! my($type, $name, $args) = @_;
my $idx = make_str_index_entry(
"<tt class=\"cfunction\">$name()</tt>" . get_indexsubitem());
***************
*** 992,996 ****
$index_name = $type_name
unless $index_name;
! my($name,$aname,$ahref) = new_link_info();
add_index_entry("<tt class=\"ctype\">$index_name</tt> (C type)", $ahref);
return "<dl><dt><b><tt class=\"ctype\">$aname$type_name</a></tt></b>\n<dd>"
--- 992,996 ----
$index_name = $type_name
unless $index_name;
! my($name, $aname, $ahref) = new_link_info();
add_index_entry("<tt class=\"ctype\">$index_name</tt> (C type)", $ahref);
return "<dl><dt><b><tt class=\"ctype\">$aname$type_name</a></tt></b>\n<dd>"
***************
*** 1133,1137 ****
! sub handle_classlike_descriptor{
local($_, $what) = @_;
$THIS_CLASS = next_argument();
--- 1133,1137 ----
! sub handle_classlike_descriptor($$){
local($_, $what) = @_;
$THIS_CLASS = next_argument();
***************
*** 1291,1295 ****
);
! sub fix_font{
# do a little magic on a font name to get the right behavior in the first
# column of the output table
--- 1291,1295 ----
);
! sub fix_font($){
# do a little magic on a font name to get the right behavior in the first
# column of the output table
***************
*** 1301,1305 ****
}
! sub figure_column_alignment{
my $a = @_[0];
my $mark = substr($a, 0, 1);
--- 1301,1305 ----
}
! sub figure_column_alignment($){
my $a = @_[0];
my $mark = substr($a, 0, 1);
***************
*** 1316,1322 ****
}
! sub setup_column_alignments{
local($_) = @_;
! my($s1,$s2,$s3,$s4,$a5) = split(/[|]/,$_);
my $a1 = figure_column_alignment($s1);
my $a2 = figure_column_alignment($s2);
--- 1316,1322 ----
}
! sub setup_column_alignments($){
local($_) = @_;
! my($s1, $s2, $s3, $s4, $a5) = split(/[|]/,$_);
my $a1 = figure_column_alignment($s1);
my $a2 = figure_column_alignment($s2);
***************
*** 1333,1339 ****
}
! sub get_table_col1_fonts{
my $font = $globals{'lineifont'};
! my ($sfont,$efont) = ('', '');
if ($font) {
$sfont = "<$font>";
--- 1333,1339 ----
}
! sub get_table_col1_fonts(){
my $font = $globals{'lineifont'};
! my($sfont, $efont) = ('', '');
if ($font) {
$sfont = "<$font>";
***************
*** 1346,1350 ****
sub do_env_tableii{
local($_) = @_;
! my($th1,$th2,$th3,$th4,$th5) = setup_column_alignments(next_argument());
my $font = fix_font(next_argument());
my $h1 = next_argument();
--- 1346,1351 ----
sub do_env_tableii{
local($_) = @_;
! my $arg = next_argument();
! my($th1, $th2, $th3, $th4, $th5) = setup_column_alignments($arg);
my $font = fix_font(next_argument());
my $h1 = next_argument();
***************
*** 1378,1384 ****
my $c2 = next_argument();
s/[\s\n]+//;
! my($sfont,$efont) = get_table_col1_fonts();
$c2 = ' ' if ($c2 eq '');
! my($c1align,$c2align) = split('\|', $aligns);
my $padding = '';
if ($c1align =~ /align="right"/ || $c1 eq '') {
--- 1379,1385 ----
my $c2 = next_argument();
s/[\s\n]+//;
! my($sfont, $efont) = get_table_col1_fonts();
$c2 = ' ' if ($c2 eq '');
! my($c1align, $c2align) = split('\|', $aligns);
my $padding = '';
if ($c1align =~ /align="right"/ || $c1 eq '') {
***************
*** 1392,1396 ****
sub do_env_tableiii{
local($_) = @_;
! my($th1,$th2,$th3,$th4,$th5) = setup_column_alignments(next_argument());
my $font = fix_font(next_argument());
my $h1 = next_argument();
--- 1393,1398 ----
sub do_env_tableiii{
local($_) = @_;
! my $arg = next_argument();
! my($th1, $th2, $th3, $th4, $th5) = setup_column_alignments($arg);
my $font = fix_font(next_argument());
my $h1 = next_argument();
***************
*** 1428,1434 ****
my $c3 = next_argument();
s/[\s\n]+//;
! my($sfont,$efont) = get_table_col1_fonts();
$c3 = ' ' if ($c3 eq '');
! my($c1align,$c2align,$c3align) = split('\|', $aligns);
my $padding = '';
if ($c1align =~ /align="right"/ || $c1 eq '') {
--- 1430,1436 ----
my $c3 = next_argument();
s/[\s\n]+//;
! my($sfont, $efont) = get_table_col1_fonts();
$c3 = ' ' if ($c3 eq '');
! my($c1align, $c2align, $c3align) = split('\|', $aligns);
my $padding = '';
if ($c1align =~ /align="right"/ || $c1 eq '') {
***************
*** 1443,1447 ****
sub do_env_tableiv{
local($_) = @_;
! my($th1,$th2,$th3,$th4,$th5) = setup_column_alignments(next_argument());
my $font = fix_font(next_argument());
my $h1 = next_argument();
--- 1445,1450 ----
sub do_env_tableiv{
local($_) = @_;
! my $arg = next_argument();
! my($th1, $th2, $th3, $th4, $th5) = setup_column_alignments($arg);
my $font = fix_font(next_argument());
my $h1 = next_argument();
***************
*** 1483,1489 ****
my $c4 = next_argument();
s/[\s\n]+//;
! my($sfont,$efont) = get_table_col1_fonts();
$c4 = ' ' if ($c4 eq '');
! my($c1align,$c2align,$c3align,$c4align) = split('\|', $aligns);
my $padding = '';
if ($c1align =~ /align="right"/ || $c1 eq '') {
--- 1486,1492 ----
my $c4 = next_argument();
s/[\s\n]+//;
! my($sfont, $efont) = get_table_col1_fonts();
$c4 = ' ' if ($c4 eq '');
! my($c1align, $c2align, $c3align, $c4align) = split('\|', $aligns);
my $padding = '';
if ($c1align =~ /align="right"/ || $c1 eq '') {
***************
*** 1499,1503 ****
sub do_env_tablev{
local($_) = @_;
! my($th1,$th2,$th3,$th4,$th5) = setup_column_alignments(next_argument());
my $font = fix_font(next_argument());
my $h1 = next_argument();
--- 1502,1507 ----
sub do_env_tablev{
local($_) = @_;
! my $arg = next_argument();
! my($th1, $th2, $th3, $th4, $th5) = setup_column_alignments($arg);
my $font = fix_font(next_argument());
my $h1 = next_argument();
***************
*** 1543,1549 ****
my $c5 = next_argument();
s/[\s\n]+//;
! my($sfont,$efont) = get_table_col1_fonts();
$c5 = ' ' if ($c5 eq '');
! my($c1align,$c2align,$c3align,$c4align,$c5align) = split('\|', $aligns);
my $padding = '';
if ($c1align =~ /align="right"/ || $c1 eq '') {
--- 1547,1553 ----
my $c5 = next_argument();
s/[\s\n]+//;
! my($sfont, $efont) = get_table_col1_fonts();
$c5 = ' ' if ($c5 eq '');
! my($c1align, $c2align, $c3align, $c4align, $c5align) = split('\|',$aligns);
my $padding = '';
if ($c1align =~ /align="right"/ || $c1 eq '') {
***************
*** 1577,1581 ****
# $TITLE_PAGE_GRAPHIC_ON_RIGHT = 0;
! sub make_my_titlepage() {
my $the_title = "";
if ($t_title) {
--- 1581,1585 ----
# $TITLE_PAGE_GRAPHIC_ON_RIGHT = 0;
! sub make_my_titlepage(){
my $the_title = "";
if ($t_title) {
***************
*** 1630,1634 ****
}
! sub make_my_titlegraphic() {
my $filename = make_icon_filename($TITLE_PAGE_GRAPHIC);
my $graphic = "<td class=\"titlegraphic\"";
--- 1634,1638 ----
}
! sub make_my_titlegraphic(){
my $filename = make_icon_filename($TITLE_PAGE_GRAPHIC);
my $graphic = "<td class=\"titlegraphic\"";
***************
*** 1644,1648 ****
}
! sub do_cmd_maketitle {
local($_) = @_;
my $the_title = "\n<div class=\"titlepage\">";
--- 1648,1652 ----
}
! sub do_cmd_maketitle{
local($_) = @_;
my $the_title = "\n<div class=\"titlepage\">";
***************
*** 1693,1697 ****
sub get_synopsis_table($){
! my($chap) = @_;
my $key;
foreach $key (keys %ModuleSynopses) {
--- 1697,1701 ----
sub get_synopsis_table($){
! my $chap = @_[0];
my $key;
foreach $key (keys %ModuleSynopses) {
***************
*** 1748,1752 ****
}
! sub process_all_localmoduletables{
my $key;
my $st, $file;
--- 1752,1756 ----
}
! sub process_all_localmoduletables(){
my $key;
my $st, $file;
***************
*** 1763,1767 ****
}
! sub process_localmoduletables_in_file{
my $file = @_[0];
open(MYFILE, "<$file");
--- 1767,1771 ----
}
! sub process_localmoduletables_in_file($){
my $file = @_[0];
open(MYFILE, "<$file");
***************
*** 1781,1785 ****
close(MYFILE);
}
! sub process_python_state{
process_all_localmoduletables();
process_grammar_files();
--- 1785,1789 ----
close(MYFILE);
}
! sub process_python_state(){
process_all_localmoduletables();
process_grammar_files();
***************
*** 1832,1836 ****
}
! sub handle_rfclike_reference{
local($_, $what, $format) = @_;
my $rfcnum = next_argument();
--- 1836,1840 ----
}
! sub handle_rfclike_reference($$$){
local($_, $what, $format) = @_;
my $rfcnum = next_argument();
***************
*** 1906,1910 ****
local($_) = @_;
my $term = next_argument();
! my($name,$aname,$ahref) = new_link_info();
# could easily add an index entry here...
return "<dt><b>$aname" . $term . "</a></b>\n<dd>" . $_;
--- 1910,1914 ----
local($_) = @_;
my $term = next_argument();
! my($name, $aname, $ahref) = new_link_info();
# could easily add an index entry here...
return "<dt><b>$aname" . $term . "</a></b>\n<dd>" . $_;
***************
*** 1932,1936 ****
$alltt_end = '</pre></div>';
! sub do_env_alltt {
local ($_) = @_;
local($closures,$reopens,@open_block_tags);
--- 1936,1940 ----
$alltt_end = '</pre></div>';
! sub do_env_alltt{
local ($_) = @_;
local($closures,$reopens,@open_block_tags);