/[texi2html]/texi2html/texi2html.pl
ViewVC logotype

Diff of /texi2html/texi2html.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.146 by pertusus, Sun Aug 21 21:31:55 2005 UTC revision 1.147 by pertusus, Tue Aug 23 06:58:03 2005 UTC
# Line 2626  else Line 2626  else
2626      $docu_toc = $docu_foot = $docu_stoc = $docu_about = $docu_top = $docu_doc;      $docu_toc = $docu_foot = $docu_stoc = $docu_about = $docu_top = $docu_doc;
2627  }  }
2628    
 # For use in init files  
2629  # Note that file extension has already been added here.  # Note that file extension has already been added here.
2630  $Texi2HTML::Config::TOP_FILE = $docu_top;  # don't use that anymore, only for the user to pass a top/toc file name  
2631  $Texi2HTML::Config::TOC_FILE = $docu_toc;  #$Texi2HTML::Config::TOP_FILE = $docu_top;
2632    #$Texi2HTML::Config::TOC_FILE = $docu_toc;
2633    
2634    # For use in init files
2635    $Texi2HTML::THISDOC{'filename'}->{'top'} = $docu_top;
2636    $Texi2HTML::THISDOC{'filename'}->{'foot'} = $docu_foot;
2637    $Texi2HTML::THISDOC{'filename'}->{'stoc'} = $docu_stoc;
2638    $Texi2HTML::THISDOC{'filename'}->{'about'} = $docu_about;
2639    $Texi2HTML::THISDOC{'filename'}->{'top'} = $docu_top;
2640    $Texi2HTML::THISDOC{'filename'}->{'toc'} = $docu_toc;
2641    
2642  my $docu_doc_file = "$docu_rdir$docu_doc";  my $docu_doc_file = "$docu_rdir$docu_doc";
2643  my $docu_toc_file  = "$docu_rdir$docu_toc";  my $docu_toc_file  = "$docu_rdir$docu_toc";
# Line 2839  if ($T2H_DEBUG & $DEBUG_USER) Line 2847  if ($T2H_DEBUG & $DEBUG_USER)
2847    
2848  #  #
2849  # read texi2html extensions (if any)  # read texi2html extensions (if any)
2850  # FIXME isn't that obsolete ? (obsoleted by -init-file)  # It is obsolete (obsoleted by -init-file). we keep it for backward
2851    # compatibility.
2852  my $extensions = 'texi2html.ext';  # extensions in working directory  my $extensions = 'texi2html.ext';  # extensions in working directory
2853  if (-f $extensions)  if (-f $extensions)
2854  {  {
# Line 2858  if ($progdir && ($progdir ne './')) Line 2867  if ($progdir && ($progdir ne './'))
2867      }      }
2868  }  }
2869    
2870  # parse texinfo cnf file for external manual specifications.  # parse texinfo cnf file for external manual specifications. This was
2871    # discussed on texinfo list but not in makeinfo for now.
2872  my @texinfo_htmlxref_files = locate_init_file ($texinfo_htmlxref, 1, \@texinfo_config_dirs);  my @texinfo_htmlxref_files = locate_init_file ($texinfo_htmlxref, 1, \@texinfo_config_dirs);
2873  foreach my $file (@texinfo_htmlxref_files)  foreach my $file (@texinfo_htmlxref_files)
2874  {  {
# Line 4512  sub rearrange_elements() Line 4522  sub rearrange_elements()
4522              my $prev_section = $previous_sections[$section->{'level'}];              my $prev_section = $previous_sections[$section->{'level'}];
4523              $section->{'section_prev'} = $prev_section;              $section->{'section_prev'} = $prev_section;
4524              $prev_section->{'next'} = $section;              $prev_section->{'next'} = $section;
4525              #FIXME section_next is not used while element->{'next'} is              #FIXME section_next is not used while element->{'next'} is.
4526              # And there is also element_next...              # And there is also element_next...
4527              # Moreover element->{'next'} may not be rightly selected when there              # Moreover element->{'next'} may not be rightly selected when there
4528              # are lone nodes after sections, athough this may be what we want.              # are lone nodes after sections, athough this may be what we want.
4529              # 'section_prev' is used however, while 'prev' for section is              # 'section_prev' is used however, while 'prev' for section is
4530              # never used. Should be clened somehow.              # never used. Should be cleaned somehow.
4531              #$prev_section->{'section_next'} = $section;              #$prev_section->{'section_next'} = $section;
4532              $prev_section->{'element_next'} = $section;              $prev_section->{'element_next'} = $section;
4533          }          }
# Line 5366  $DEBUG_ELEMENTS); Line 5376  $DEBUG_ELEMENTS);
5376          }          }
5377      }      }
5378    
5379      # Find node file names      # Find node file names and file names for nodes considered as elements
5380      if ($Texi2HTML::Config::NODE_FILES)      if ($Texi2HTML::Config::NODE_FILES)
5381      {      {
5382          my $top;          my $top;
# Line 5384  $DEBUG_ELEMENTS); Line 5394  $DEBUG_ELEMENTS);
5394          }          }
5395          if ($top)          if ($top)
5396          {          {
5397              my $file = "$Texi2HTML::Config::TOP_NODE_FILE.$Texi2HTML::Config::NODE_FILE_EXTENSION";              my ($file,$node_file);
5398              $top->{'file'} = $file if ($Texi2HTML::Config::SPLIT eq 'node');              ($file, $node_file) = &$Texi2HTML::Config::node_file_name($top,'top');
5399              $top->{'node_file'} = $file;              $top->{'file'} = $file if (defined($file));
5400                $top->{'node_file'} = $node_file if (defined($node_file));
5401          }          }
5402          foreach my $key (keys(%nodes))          foreach my $key (keys(%nodes))
5403          {          {
5404              my $node = $nodes{$key};              my $node = $nodes{$key};
5405              my ($file, $node_file);              my ($file, $node_file);
5406              ($file, $node_file) = &$Texi2HTML::Config::node_file_name ($node);              ($file, $node_file) = &$Texi2HTML::Config::node_file_name($node,'');
5407              $node->{'file'} = $file if (defined($file));              $node->{'file'} = $file if (defined($file));
5408              $node->{'node_file'} = $node_file if (defined($node_file));              $node->{'node_file'} = $node_file if (defined($node_file));
 #            next if ($node->{'external_node'} or $node->{'index_page'});  
 #            if (defined($Texi2HTML::Config::node_file_name))  
 #            {  
 #                 ($node->{'file'}, $node->{'node_file'}) =  
 #                      &$Texi2HTML::Config::node_file_name ($node);  
 #            }  
 #            else  
 #            {  
 #                 next if (defined($node->{'file'}));  
 #                 my $name = remove_texi($node->{'texi'});  
 #                 $name =~ s/[^\w\.\-]/-/g;  
 #                 my $file = "${name}.$Texi2HTML::Config::NODE_FILE_EXTENSION";  
 #                 $node->{'file'} = $file if (($Texi2HTML::Config::SPLIT eq 'node') and ($Texi2HTML::Config::USE_NODES or $node->{'with_section'}));  
 #                 $node->{'node_file'} = $file;  
 #            }  
5409          }          }
5410      }      }
5411      # find document nr and document file for sections and nodes.      # find document nr and document file for sections and nodes.
# Line 5452  $DEBUG_ELEMENTS); Line 5448  $DEBUG_ELEMENTS);
5448              }              }
5449              else              else
5450              {              {
5451                    my $is_top = '';
5452                  $element->{'file'} = "${docu_name}_$doc_nr"                  $element->{'file'} = "${docu_name}_$doc_nr"
5453                                       . ($docu_ext ? ".$docu_ext" : "");                                       . ($docu_ext ? ".$docu_ext" : "");
                 my $is_top = '';  
5454                  if (defined($top_doc_nr))                  if (defined($top_doc_nr))
5455                  {                  {
5456                      if ($doc_nr eq $top_doc_nr)                      if ($doc_nr eq $top_doc_nr)
# Line 5485  $DEBUG_ELEMENTS); Line 5481  $DEBUG_ELEMENTS);
5481                  }                  }
5482                  if (defined($Texi2HTML::Config::element_file_name))                  if (defined($Texi2HTML::Config::element_file_name))
5483                  {                  {
5484                       $element->{'file'} =                      $element->{'file'} =
5485                           &$Texi2HTML::Config::element_file_name ($element, $is_top, $docu_name);                          &$Texi2HTML::Config::element_file_name ($element, $is_top, $docu_name);
5486                  }                  }
5487              }              }
5488              print STDERR "# add_file $element->{'file'} for $element->{'texi'}\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);              print STDERR "# add_file $element->{'file'} for $element->{'texi'}\n" if ($T2H_DEBUG & $DEBUG_ELEMENTS);
# Line 5725  sub do_names() Line 5721  sub do_names()
5721          $nodes{$node}->{'text'} = substitute_line ($nodes{$node}->{'texi'});          $nodes{$node}->{'text'} = substitute_line ($nodes{$node}->{'texi'});
5722          $nodes{$node}->{'name'} = $nodes{$node}->{'text'};          $nodes{$node}->{'name'} = $nodes{$node}->{'text'};
5723          $nodes{$node}->{'no_texi'} = &$Texi2HTML::Config::protect_text(remove_texi($nodes{$node}->{'texi'}));          $nodes{$node}->{'no_texi'} = &$Texi2HTML::Config::protect_text(remove_texi($nodes{$node}->{'texi'}));
5724          $nodes{$node}->{'unformatted'} = unformatted_text (undef, $nodes{$node}->{'texi'});          # FIXME UNFORMATTED: could be a line
5725            $nodes{$node}->{'unformatted'} = unformatted_text(undef, $nodes{$node}->{'texi'});
5726          # FIXME : what to do if $nodes{$node}->{'external_node'} and          # FIXME : what to do if $nodes{$node}->{'external_node'} and
5727          # $nodes{$node}->{'seen'}          # $nodes{$node}->{'seen'}
5728      }      }
5729      foreach my $number (keys(%sections))      foreach my $number (keys(%sections))
5730      {      {
5731          my $section = $sections{$number};          my $section = $sections{$number};
5732          $section->{'name'} = substitute_line ($section->{'texi'});          $section->{'name'} = substitute_line($section->{'texi'});
5733          $section->{'text'} = $section->{'number'} . " " . $section->{'name'};          $section->{'text'} = $section->{'number'} . " " . $section->{'name'};
5734          $section->{'text'} =~ s/^\s*//;          $section->{'text'} =~ s/^\s*//;
5735          $section->{'no_texi'} = &$Texi2HTML::Config::protect_text($section->{'number'} . " " .remove_texi($section->{'texi'}));          $section->{'no_texi'} = &$Texi2HTML::Config::protect_text($section->{'number'} . " " .remove_texi($section->{'texi'}));
5736          $section->{'no_texi'} =~ s/^\s*//;          $section->{'no_texi'} =~ s/^\s*//;
5737            # FIXME UNFORMATTED: could be a line
5738          $section->{'unformatted'} = &$Texi2HTML::Config::protect_text($section->{'number'}) . " " .unformatted_text(undef,$section->{'texi'});          $section->{'unformatted'} = &$Texi2HTML::Config::protect_text($section->{'number'}) . " " .unformatted_text(undef,$section->{'texi'});
5739          $section->{'unformatted'} =~ s/^\s*//;          $section->{'unformatted'} =~ s/^\s*//;
5740      }      }
# Line 6078  sub pass_text() Line 6076  sub pass_text()
6076          $Texi2HTML::THISDOC{$doc_thing} = substitute_line($thing_texi);          $Texi2HTML::THISDOC{$doc_thing} = substitute_line($thing_texi);
6077          $Texi2HTML::THISDOC{$doc_thing . '_no_texi'} =          $Texi2HTML::THISDOC{$doc_thing . '_no_texi'} =
6078             &$Texi2HTML::Config::protect_text(remove_texi($thing_texi));             &$Texi2HTML::Config::protect_text(remove_texi($thing_texi));
6079            # FIXME: UNFORMATTED: could it be a line
6080          $Texi2HTML::THISDOC{$doc_thing . '_unformatted'} =          $Texi2HTML::THISDOC{$doc_thing . '_unformatted'} =
6081             unformatted_text(undef, $thing_texi);             unformatted_text(undef, $thing_texi);
6082      }      }
 #    $Texi2HTML::THISDOC{'shorttitlepage_texi'} = $value{'_shorttitlepage'};  
 #    $Texi2HTML::THISDOC{'fulltitle'} = substitute_line($value{'_title'}) || substitute_line($value{'_settitle'}) || substitute_line($value{'_shorttitlepage'}) || substitute_line($value{'_titlefont'});  
 #    $Texi2HTML::THISDOC{'title'} = substitute_line($value{'_settitle'}) || $Texi2HTML::THISDOC{'fulltitle'};  
 #    $Texi2HTML::THISDOC{'shorttitle'} =  substitute_line($value{'_shorttitle'});  
6083    
6084      # find Top name      # find Top name
6085      my $element_top_text = '';      my $element_top_text = '';
# Line 6122  sub pass_text() Line 6117  sub pass_text()
6117      foreach my $possible_top_unformatted ($top_unformatted,      foreach my $possible_top_unformatted ($top_unformatted,
6118           $Texi2HTML::THISDOC{'title_unformatted'},           $Texi2HTML::THISDOC{'title_unformatted'},
6119           $Texi2HTML::THISDOC{'shorttitle_unformatted'},           $Texi2HTML::THISDOC{'shorttitle_unformatted'},
6120             # FIXME UNFORMATTED
6121           &$I('Top',{}, {'unformatted' => 1}))           &$I('Top',{}, {'unformatted' => 1}))
6122      {      {
6123           if (defined($possible_top_unformatted) and $possible_top_unformatted ne '')           if (defined($possible_top_unformatted) and $possible_top_unformatted ne '')
# Line 6149  sub pass_text() Line 6145  sub pass_text()
6145          $Texi2HTML::THISDOC{$doc_thing} = substitute_line($thing_texi);          $Texi2HTML::THISDOC{$doc_thing} = substitute_line($thing_texi);
6146          $Texi2HTML::THISDOC{$doc_thing . '_no_texi'} =          $Texi2HTML::THISDOC{$doc_thing . '_no_texi'} =
6147             &$Texi2HTML::Config::protect_text(remove_texi($thing_texi));             &$Texi2HTML::Config::protect_text(remove_texi($thing_texi));
6148            # FIXME: UNFORMATTED: could it be a line
6149          $Texi2HTML::THISDOC{$doc_thing . '_unformatted'} =          $Texi2HTML::THISDOC{$doc_thing . '_unformatted'} =
6150             unformatted_text(undef, $thing_texi);             unformatted_text(undef, $thing_texi);
6151      }      }
 #    $Texi2HTML::THISDOC{'fulltitle'} = $Texi2HTML::THISDOC{'fulltitle'} || &$I('Untitled Document') ;  
 #    $Texi2HTML::THISDOC{'title'} = $Texi2HTML::THISDOC{'settitle'} || $Texi2HTML::THISDOC{'fulltitle'};  
 #    $Texi2HTML::THISDOC{'author'} = substitute_line($value{'_author'});  
 #    $Texi2HTML::THISDOC{'titlefont'} = substitute_line($value{'_titlefont'});  
 #    $Texi2HTML::THISDOC{'subtitle'} = substitute_line($value{'_subtitle'});  
   
 #    $Texi2HTML::THISDOC{'title_unformatted'} = unformatted_text(undef, $Texi2HTML::THISDOC{'title_texi'});  
 #    $Texi2HTML::THISDOC{'shorttitle_unformatted'} =  unformatted_text(undef, $value{'_shorttitle'});  
 #    $Texi2HTML::THISDOC{'title_no_texi'} = &$Texi2HTML::Config::protect_text(remove_texi($value{'_title'})) || &$Texi2HTML::Config::protect_text(remove_texi($value{'_settitle'})) || &$Texi2HTML::Config::protect_text(remove_texi($value{'_shorttitlepage'})) || &$Texi2HTML::Config::protect_text(remove_texi($value{'_titlefont'}));  
 #    $Texi2HTML::THISDOC{'shorttitle_no_texi'} =  &$Texi2HTML::Config::protect_text(remove_texi($value{'_shorttitle'}));  
   
 #    my $top_no_texi = '';  
 #    my $top_unformatted = '';  
 #    if ($element_top and $element_top->{'no_texi'}  and (!$node_top or ($element_top ne $node_top)))  
 #    {  
 #        $top_no_texi = $element_top->{'no_texi'};  
 #        $top_unformatted =  $element_top->{'unformatted'};  
 #    }  
   
 #    $top_no_texi = $Texi2HTML::Config::TOP_HEADING || $top_no_texi || $Texi2HTML::THISDOC{'title_no_texi'} || $Texi2HTML::THISDOC{'shorttitle_no_texi'} || &$I('Top',{}, {'remove_texi' => 1, 'no_protection' => 1});  
 #    $top_unformatted = $top_unformatted || $Texi2HTML::THISDOC{'title_unformatted'} || $Texi2HTML::THISDOC{'shorttitle_unformatted'} || &$I('Top',{}, {'unformatted' => 1});  
 #    $Texi2HTML::THISDOC{'title_unformatted'} = $Texi2HTML::THISDOC{'title_unformatted'} || &$I('Untitled Document',{},  {'unformatted' => 1});  
 #    $Texi2HTML::THISDOC{'title_no_texi'} = $Texi2HTML::THISDOC{'title_no_texi'} || &$I('Untitled Document',{}, {'remove_texi' => 1, 'no_protection' => 1});  
6152    
6153      for my $key (keys %Texi2HTML::THISDOC)      for my $key (keys %Texi2HTML::THISDOC)
6154      {      {
# Line 6238  print STDERR "!!$key\n" if (!defined($Te Line 6212  print STDERR "!!$key\n" if (!defined($Te
6212          (          (
6213           'First',   $element_first->{'no_texi'},           'First',   $element_first->{'no_texi'},
6214           'Last',    $element_last->{'no_texi'},           'Last',    $element_last->{'no_texi'},
 #FIXME this is not really NO_TEXI as there may be some formatting expanded  
 # in &$I, using substitute_line  
6215           'About',    &$I('About This Document', {}, {'remove_texi' => 1, 'no_protection' => 1} ),           'About',    &$I('About This Document', {}, {'remove_texi' => 1, 'no_protection' => 1} ),
6216           'Contents', &$I('Table of Contents', {}, {'remove_texi' => 1, 'no_protection' => 1} ),           'Contents', &$I('Table of Contents', {}, {'remove_texi' => 1, 'no_protection' => 1} ),
6217           'Overview', &$I('Short Table of Contents', {}, {'remove_texi' => 1, 'no_protection' => 1} ),           'Overview', &$I('Short Table of Contents', {}, {'remove_texi' => 1, 'no_protection' => 1} ),
# Line 6247  print STDERR "!!$key\n" if (!defined($Te Line 6219  print STDERR "!!$key\n" if (!defined($Te
6219           'Footnotes', &$I('Footnotes', {}, {'remove_texi' => 1, 'no_protection' => 1} ),           'Footnotes', &$I('Footnotes', {}, {'remove_texi' => 1, 'no_protection' => 1} ),
6220          );          );
6221      $Texi2HTML::NO_TEXI{'Index'} = $element_chapter_index->{'no_texi'} if (defined($element_chapter_index));      $Texi2HTML::NO_TEXI{'Index'} = $element_chapter_index->{'no_texi'} if (defined($element_chapter_index));
6222         # FIXME UNFORMATTED
6223      %Texi2HTML::UNFORMATTED =      %Texi2HTML::UNFORMATTED =
6224          (          (
6225           'First',   $element_first->{'unformatted'},           'First',   $element_first->{'unformatted'},
6226           'Last',    $element_last->{'unformatted'},           'Last',    $element_last->{'unformatted'},
 #FIXME this is not really UNFORMATTED as there may be some formatting expanded  
 # in &$I, using substitute_line  
6227           'About',    &$I('About This Document', {}, {'unformatted' => 1}),           'About',    &$I('About This Document', {}, {'unformatted' => 1}),
6228           'Contents', &$I('Table of Contents',{},  {'unformatted' => 1}),           'Contents', &$I('Table of Contents',{},  {'unformatted' => 1}),
6229           'Overview', &$I('Short Table of Contents', {}, {'unformatted' => 1}),           'Overview', &$I('Short Table of Contents', {}, {'unformatted' => 1}),
# Line 7239  sub do_external_href($) Line 7210  sub do_external_href($)
7210      my $file = '';      my $file = '';
7211      my $node_id = '';      my $node_id = '';
7212      my $node_xhtml_id = '';      my $node_xhtml_id = '';
7213        # node_id is a unique node identifier with only letters, digits, - and _
7214        # node_xhtml_id is almost the same, but xhtml id can only begin with
7215        # letters, so a prefix has to be appended  
7216      if ($texi_node =~ s/^\((.+?)\)//)      if ($texi_node =~ s/^\((.+?)\)//)
7217      {      {
7218           $file = $1;           $file = $1;
# Line 7260  sub do_external_href($) Line 7234  sub do_external_href($)
7234          $node_xhtml_id, $file);          $node_xhtml_id, $file);
7235  }  }
7236    
7237  # transform node for cross ref name to id suitable for xhtml.  # transform node for cross ref name to id suitable for xhtml: an xhtml id
7238    # must begin with a letter.
7239  sub node_to_id($)  sub node_to_id($)
7240  {  {
7241      my $cross_ref_node_name = shift;      my $cross_ref_node_name = shift;
# Line 7865  sub do_menu_link($$;$) Line 7840  sub do_menu_link($$;$)
7840          }          }
7841      }      }
7842      elsif ($menu_entry->{'node'} =~ /^\s*\(.*\)/ or $novalidate)      elsif ($menu_entry->{'node'} =~ /^\s*\(.*\)/ or $novalidate)
7843      {#FIXME this is wrong for $novalidate      {
7844          # menu entry points to another info manual          # menu entry points to another info manual or invalid nodes
7845            # and novalidate is set
7846          #$href = $nodes{$node_name}->{'file'};          #$href = $nodes{$node_name}->{'file'};
7847          $href = do_external_href($node_name);          $href = do_external_href($node_name);
7848      }      }
# Line 8103  sub do_acronym_like($$$$$) Line 8079  sub do_acronym_like($$$$$)
8079           }           }
8080           $text =~ s/ $//;           $text =~ s/ $//;
8081           my $unformatted_state = duplicate_state($state);           my $unformatted_state = duplicate_state($state);
8082             # FIXME UNFORMATTED
8083           $unformatted_state->{'unformatted'} = 1;           $unformatted_state->{'unformatted'} = 1;
8084           $explanation_unformatted = substitute_line($text, $unformatted_state);           $explanation_unformatted = substitute_line($text, $unformatted_state);
8085           $explanation_text = substitute_line($text, duplicate_state($state));           $explanation_text = substitute_line($text, duplicate_state($state));
# Line 8578  sub do_index_entries($$$) Line 8555  sub do_index_entries($$$)
8555  # Doesn't protect html  # Doesn't protect html
8556  sub remove_texi(@)  sub remove_texi(@)
8557  {  {
8558    # FIXME default should be not to protect.
8559      return substitute_text ({ 'remove_texi' => 1, 'no_protection' => 1 }, @_);      return substitute_text ({ 'remove_texi' => 1, 'no_protection' => 1 }, @_);
8560  }  }
8561    
# Line 8586  sub unformatted_text($@) Line 8564  sub unformatted_text($@)
8564  {  {
8565      my $state = shift;      my $state = shift;
8566      $state = {} if (!defined($state));      $state = {} if (!defined($state));
8567    # FIXME default should be not to protect.
8568      $state->{'remove_texi'} = 1;      $state->{'remove_texi'} = 1;
8569      $simple_map_texi_ref = \%Texi2HTML::Config::unformatted_text_simple_map_texi;      $simple_map_texi_ref = \%Texi2HTML::Config::unformatted_text_simple_map_texi;
8570      $style_map_texi_ref = \%Texi2HTML::Config::unformatted_text_style_map_texi;      $style_map_texi_ref = \%Texi2HTML::Config::unformatted_text_style_map_texi;
8571      $texi_map_ref = \%Texi2HTML::Config::unformatted_text_texi_map;      $texi_map_ref = \%Texi2HTML::Config::unformatted_text_texi_map;
8572      my $text = substitute_text ($state, @_);      my $text = substitute_text($state, @_);
8573      $simple_map_texi_ref = \%Texi2HTML::Config::simple_map_texi;      $simple_map_texi_ref = \%Texi2HTML::Config::simple_map_texi;
8574      $style_map_texi_ref = \%Texi2HTML::Config::style_map_texi;      $style_map_texi_ref = \%Texi2HTML::Config::style_map_texi;
8575      $texi_map_ref = \%Texi2HTML::Config::texi_map;      $texi_map_ref = \%Texi2HTML::Config::texi_map;
# Line 10175  sub scan_line($$$$;$) Line 10154  sub scan_line($$$$;$)
10154                       next;                       next;
10155                  }                  }
10156              }              }
 #            if ($macro eq 'sp')  
 #            {  
 #                my ($space1, $sp_number, $space2);  
 #                if (s/^(\s+)(\d+)(\s*)//)  
 #                {  
 #                    $space1 = $1;  
 #                    $sp_number = $2;  
 #                    $space2 = $3;  
 #                }  
 #                elsif (s/(\s*)$//)  
 #                {  
 #                    $space1 = $1;  
 #                    $sp_number = '';  
 #                    $space2 = '';  
 #                }  
 #                else  
 #                {  
 #                    next if ($state->{'remove_texi'});  
 #                    if ($state->{'keep_texi'})  
 #                    {  
 #                        add_prev($text, $stack, "\@$macro");  
 #                        next;  
 #                    }  
 #                    echo_error ("\@$macro needs a numeric arg or no arg", $line_nr);  
 #                    next;  
 #                }  
 #                next if ($state->{'remove_texi'});  
 #                if ($state->{'keep_texi'})  
 #                {  
 #                    add_prev($text, $stack, "\@$macro" . $space1 . $sp_number . $space2);  
 #                    next;  
 #                }  
 #                $sp_number = 1 if ($sp_number eq '');  
 #                add_prev($text, $stack, &$Texi2HTML::Config::sp($sp_number, $state->{'preformatted'}));  
 #                next;  
 #            }  
             #if ($macro eq 'verbatiminclude' or $macro eq 'listoffloats')  
10157              if ($macro eq 'listoffloats')              if ($macro eq 'listoffloats')
10158              {              {
10159                  if ($state->{'keep_texi'})                  if ($state->{'keep_texi'})
# Line 11843  sub substitute_line($;$) Line 11785  sub substitute_line($;$)
11785      my $state = shift;      my $state = shift;
11786      $state = {} if (!defined($state));      $state = {} if (!defined($state));
11787      $state->{'no_paragraph'} = 1;      $state->{'no_paragraph'} = 1;
11788        # FIXME UNFORMATTED
11789      return unformatted_text($state, $line) if ($state->{'unformatted'});      return unformatted_text($state, $line) if ($state->{'unformatted'});
11790      return substitute_text($state, $line);      return substitute_text($state, $line);
11791  }  }

Legend:
Removed from v.1.146  
changed lines
  Added in v.1.147

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26