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

Diff of /texi2html/texi2html.pl

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

revision 1.141 by pertusus, Mon Aug 8 20:46:14 2005 UTC revision 1.142 by pertusus, Tue Aug 9 06:04:58 2005 UTC
# Line 7652  sub end_format($$$$$) Line 7652  sub end_format($$$$$)
7652      elsif ($format eq 'quotation')      elsif ($format eq 'quotation')
7653      {      {
7654          my $quotation_args = pop @{$state->{'quotation_stack'}};          my $quotation_args = pop @{$state->{'quotation_stack'}};
7655          add_prev($text, $stack, &$Texi2HTML::Config::quotation($format_ref->{'text'}, $quotation_args->{'text'}, $quotation_args->{'style_texi'}, $quotation_args->{'style_id'}));          #add_prev($text, $stack, &$Texi2HTML::Config::quotation($format_ref->{'text'}, $quotation_args->{'text'}, $quotation_args->{'style_texi'}, $quotation_args->{'style_id'}));
7656            add_prev($text, $stack, &$Texi2HTML::Config::quotation($format_ref->{'text'}, $quotation_args->{'text'}, $quotation_args->{'text_texi'}));
7657      }      }
7658      elsif ($format_type{$format} eq 'paragraph_style')      elsif ($format_type{$format} eq 'paragraph_style')
7659      {      {
# Line 8087  sub do_float_line($$$$$) Line 8088  sub do_float_line($$$$$)
8088      return '';      return '';
8089  }  }
8090    
8091    # FIXME pat: someone (I believe myself) added a first argument to
8092    # a quotation, namely a style. Don't know what it is.
8093  sub do_quotation_line($$$$$)  sub do_quotation_line($$$$$)
8094  {  {
8095      my $command = shift;      my $command = shift;
8096      my $args = shift;      my $args = shift;
8097      my @args = @$args;      my @args = @$args;
8098      my $style_texi = shift @args;  #    my $style_texi = shift @args;
8099      my $text_texi = shift @args;      my $text_texi = shift @args;
8100      my $style_stack = shift;      my $style_stack = shift;
8101      my $state = shift;      my $state = shift;
8102      my $line_nr = shift;      my $line_nr = shift;
8103      my $text;      my $text;
8104    
8105      $style_texi = undef if (defined($style_texi) and $style_texi=~/^\s*$/);  #    $style_texi = undef if (defined($style_texi) and $style_texi=~/^\s*$/);
8106      $text_texi = undef if (defined($text_texi) and $text_texi=~/^\s*$/);      $text_texi = undef if (defined($text_texi) and $text_texi=~/^\s*$/);
8107      if (defined($style_texi) and !defined($text_texi))  #    if (defined($style_texi) and !defined($text_texi))
8108      {  #    {
8109           $text_texi = $style_texi;  #         $text_texi = $style_texi;
8110           $style_texi = undef;  #         $style_texi = undef;
8111      }  #    }
8112      if (defined($text_texi))      if (defined($text_texi))
8113      {      {
8114           $text = substitute_line($text_texi, duplicate_state($state));           $text = substitute_line($text_texi, duplicate_state($state));
8115           $text =~ s/\s*$//;           $text =~ s/\s*$//;
8116      }      }
8117      my $quotation_args = { 'style_texi' => $style_texi, 'text' => $text, 'text_texi' => $text_texi };  #    my $quotation_args = { 'style_texi' => $style_texi, 'text' => $text, 'text_texi' => $text_texi };
8118      if (defined($style_texi))      my $quotation_args = { 'text' => $text, 'text_texi' => $text_texi };
8119      {  #    if (defined($style_texi))
8120           $quotation_args->{'style_id'} = cross_manual_line(normalize_space($style_texi));  #    {
8121      }  #         $quotation_args->{'style_id'} = cross_manual_line(normalize_space($style_texi));
8122    #    }
8123      push @{$state->{'quotation_stack'}}, $quotation_args;      push @{$state->{'quotation_stack'}}, $quotation_args;
8124      $state->{'prepend_text'} = &$Texi2HTML::Config::quotation_prepend_text($style_texi, $text_texi);      #$state->{'prepend_text'} = &$Texi2HTML::Config::quotation_prepend_text($style_texi, $text_texi);
8125        $state->{'prepend_text'} = &$Texi2HTML::Config::quotation_prepend_text($text_texi);
8126      return '';      return '';
8127  }  }
8128    
# Line 10549  sub scan_line($$$$;$) Line 10554  sub scan_line($$$$;$)
10554                      }                      }
10555                      elsif ($macro eq 'quotation')                      elsif ($macro eq 'quotation')
10556                      {                      {
10557                           open_cmd_line($stack, $state, ['keep','keep'], \&do_quotation_line);                           #open_cmd_line($stack, $state, ['keep','keep'], \&do_quotation_line);
10558                             open_cmd_line($stack, $state, ['keep'], \&do_quotation_line);
10559                      }                      }
10560                      #print STDERR "Begin cmd_line\n";                      #print STDERR "Begin cmd_line\n";
10561                      #dump_stack($text, $stack, $state);                      #dump_stack($text, $stack, $state);

Legend:
Removed from v.1.141  
changed lines
  Added in v.1.142

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