[Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.85,1.86

[Fred L. Drake]

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

Modified Files:
	python.perl 
Log Message:

use_sans_serif(),
use_italics():  Remove both functions, inlining use_italics() at its
                only call site.

init_myformat():  Uncomment line so that some internal markup does not
                  get generated, since it is not properly removed later.
                  (Fix on aspect of SourceForge bug #114749.)

Modified call to process_commands_wrap_deferred(), removing \code from
the list since it had a bad interaction with other changes in some contexts.


Index: python.perl
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** python.perl	2000/09/21 15:58:02	1.85
--- python.perl	2000/09/22 17:05:04	1.86
***************
*** 111,121 ****
  }
  
- sub use_sans_serif{
-     return use_wrappers(@_[0], '<font face="sans-serif">', '</font>');
- }
- sub use_italics{
-     return use_wrappers(@_[0], '<i>', '</i>');
- }
- 
  $IN_DESC_HANDLER = 0;
  sub do_cmd_optional{
--- 111,114 ----
***************
*** 183,187 ****
      return use_wrappers(@_[0], '<i class="dfn">', '</i>'); }
  sub do_cmd_emph{
!     return use_italics(@_); }
  sub do_cmd_file{
      return use_wrappers(@_[0], '<span class="file">', '</span>'); }
--- 176,180 ----
      return use_wrappers(@_[0], '<i class="dfn">', '</i>'); }
  sub do_cmd_emph{
!     return use_wrappers(@_[0], '<i>', '</i>'); }
  sub do_cmd_file{
      return use_wrappers(@_[0], '<span class="file">', '</span>'); }
***************
*** 619,623 ****
  
  sub init_myformat{
! #    $anchor_invisible_mark = '';
      $anchor_mark = '';
      $icons{'anchor_mark'} = '';
--- 612,616 ----
  
  sub init_myformat{
!     $anchor_invisible_mark = '';
      $anchor_mark = '';
      $icons{'anchor_mark'} = '';
***************
*** 1532,1537 ****
  
  
  process_commands_wrap_deferred(<<_RAW_ARG_DEFERRED_CMDS_);
- code # {}
  declaremodule # [] # {} # {}
  memberline # [] # {}
--- 1525,1534 ----
  
  
+ # I don't recall exactly why this was needed, but it was very much needed.
+ # We'll see if anything breaks when I move the "code" line out -- some
+ # things broke with it in.
+ 
+ #code # {}
  process_commands_wrap_deferred(<<_RAW_ARG_DEFERRED_CMDS_);
  declaremodule # [] # {} # {}
  memberline # [] # {}