mirror of
				https://github.com/python/cpython.git
				synced 2025-10-30 21:21:22 +00:00 
			
		
		
		
	Fix SF bug #479967: Appearantly I broke something that made the index
insertion work. This fix makes things at least somewhat more explicit, and adds a little sanity checking (and verbosity!) to add_bbl_and_idx_dummy_commands().
This commit is contained in:
		
							parent
							
								
									97e3201220
								
							
						
					
					
						commit
						bb7775a6ae
					
				
					 1 changed files with 10 additions and 2 deletions
				
			
		|  | @ -497,6 +497,7 @@ sub add_bbl_and_idx_dummy_commands { | |||
|     if (scalar(@parts) == 3) { | ||||
|         # Be careful to re-write the string in place, since $_ is *not* | ||||
|         # returned explicity;  *** nasty side-effect dependency! *** | ||||
|         print "\nadd_bbl_and_idx_dummy_commands ==> adding general index"; | ||||
|         print "\nadd_bbl_and_idx_dummy_commands ==> adding module index"; | ||||
|         my $rx = "([\\\\]begin\\s*$O\\d+$C\\s*theindex[\\s\\S]*)" | ||||
|           . "([\\\\]begin\\s*$O\\d+$C\\s*theindex)"; | ||||
|  | @ -509,14 +510,21 @@ sub add_bbl_and_idx_dummy_commands { | |||
|         $HAVE_GENERAL_INDEX = 1; | ||||
|     } | ||||
|     elsif (scalar(@parts) == 2) { | ||||
|         print "\nadd_bbl_and_idx_dummy_commands ==> adding general index"; | ||||
|         my $rx = "([\\\\]begin\\s*$O\\d+$C\\s*theindex)"; | ||||
|         s/$rx/\\textohtmlindex \1/o; | ||||
|         $HAVE_GENERAL_INDEX = 1; | ||||
|     } | ||||
|     else { | ||||
|     elsif (scalar(@parts) == 1) { | ||||
|         print "\nadd_bbl_and_idx_dummy_commands ==> no index found"; | ||||
|         $CUSTOM_BUTTONS .= get_my_icon('blank'); | ||||
|         $global{'max_id'} = $id; # not sure why.... | ||||
|         s/([\\]begin\s*$O\d+$C\s*theindex)/\\textohtmlindex $1/o; | ||||
| 	    s/[\\]printindex/\\textohtmlindex /o; | ||||
| 	} | ||||
|     } | ||||
|     else { | ||||
|         die "\n\nBad number of index environments!\n\n"; | ||||
|     } | ||||
|     #---------------------------------------------------------------------- | ||||
|     lib_add_bbl_and_idx_dummy_commands() | ||||
|         if defined(&lib_add_bbl_and_idx_dummy_commands); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Fred Drake
						Fred Drake