[Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.87,1.88

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/perl
In directory slayer.i.sourceforge.net:/tmp/cvs-serv30299/perl

Modified Files:
	python.perl 
Log Message:
$OFF_SITE_LINK_ICON:  Don't define here; simply defining it overrides a
        definition provided by previously loaded configuration code, and
        testing whether it's defined isn't needed since the default was
        false anyway.

get_link_icon():  Add support for $OFF_SITE_LINK_ICON_HEIGHT and
        $OFF_SITE_LINK_ICON_WIDTH, giving the dimensions of the icon
        being used.  This can make for faster page display.  Both are
        optional.

make_my_titlegraphic():  Fix insertion of the off-site icon link.

do_env_funcdesc():  Remove debugging print.

handle_rfclike_reference():  Remove trailing colon from first line; it
        doesn't really make sense and looks bad if we add an icon to
        mark off-site links.


Index: python.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** python.perl	2000/10/02 14:43:38	1.87
--- python.perl	2000/10/03 06:05:25	1.88
***************
*** 37,42 ****
  }
  
- $OFF_SITE_LINK_ICON = '';
- 
  sub get_link_icon($){
      my $url = @_[0];
--- 37,40 ----
***************
*** 45,49 ****
          my $icon = make_icon_filename($OFF_SITE_LINK_ICON);
          return (" <img src='$icon'\n"
!                 . "  height='12' width='15' border='0' alt='[off-site link]'\n"
                  . "  >");
      }
--- 43,54 ----
          my $icon = make_icon_filename($OFF_SITE_LINK_ICON);
          return (" <img src='$icon'\n"
!                 . "  border='0' class='offsitelink'"
!                 . ($OFF_SITE_LINK_ICON_HEIGHT
!                    ? " height='$OFF_SITE_LINK_ICON_HEIGHT'"
!                    : '')
!                 . ($OFF_SITE_LINK_ICON_WIDTH
!                    ? " width='$OFF_SITE_LINK_ICON_WIDTH'"
!                    : '')
!                 . " alt='[off-site link]'\n"
                  . "  >");
      }
***************
*** 770,774 ****
      my $idx = make_str_index_entry("<tt class='function'>$function_name()</tt>"
  				   . get_indexsubitem());
-     print "\n--- funcdesc arg_list:\n$arg_list\n===";
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)<\/tt>/<\/tt>/;
--- 775,778 ----
***************
*** 1294,1298 ****
      $graphic .= " height=\"$TITLE_PAGE_GRAPHIC_HEIGHT\""
        if ($TITLE_PAGE_GRAPHIC_HEIGHT);
!     $graphic .= "\n  src=\"$mydir/$myname$myext\"></td>\n";
      return $graphic;
  }
--- 1298,1302 ----
      $graphic .= " height=\"$TITLE_PAGE_GRAPHIC_HEIGHT\""
        if ($TITLE_PAGE_GRAPHIC_HEIGHT);
!     $graphic .= "\n  src=\"$filename\"></td>\n";
      return $graphic;
  }
***************
*** 1481,1485 ****
        . "\n    <dt><a href=\"$url\""
        . "\n        title=\"$title\""
!       . "\n        >$what $rfcnum, <em>$title</em>$icon</a>:"
        . "\n    <dd>$text\n  </dl>"
        . $_;
--- 1485,1489 ----
        . "\n    <dt><a href=\"$url\""
        . "\n        title=\"$title\""
!       . "\n        >$what $rfcnum, <em>$title</em>$icon</a>"
        . "\n    <dd>$text\n  </dl>"
        . $_;
***************
*** 1499,1504 ****
      my $title = next_argument();
      my $text = next_argument();
-     my $icon = get_link_icon($url);
      if ($url) {
          return '<dl compact class="seetitle">'
            . "\n    <dt><em class=\"citetitle\"><a href=\"$url\""
--- 1503,1508 ----
      my $title = next_argument();
      my $text = next_argument();
      if ($url) {
+         my $icon = get_link_icon($url);
          return '<dl compact class="seetitle">'
            . "\n    <dt><em class=\"citetitle\"><a href=\"$url\""