[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Texi2html-cvs] Changes to texi2html/texi2html.pl
From: |
Patrice Dumas |
Subject: |
[Texi2html-cvs] Changes to texi2html/texi2html.pl |
Date: |
Tue, 09 Aug 2005 02:05:00 -0400 |
Index: texi2html/texi2html.pl
diff -u texi2html/texi2html.pl:1.141 texi2html/texi2html.pl:1.142
--- texi2html/texi2html.pl:1.141 Mon Aug 8 20:46:14 2005
+++ texi2html/texi2html.pl Tue Aug 9 06:04:58 2005
@@ -62,7 +62,7 @@
#--##############################################################################
# CVS version:
-# $Id: texi2html.pl,v 1.141 2005/08/08 20:46:14 pertusus Exp $
+# $Id: texi2html.pl,v 1.142 2005/08/09 06:04:58 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://texi2html.cvshome.org/";
@@ -7652,7 +7652,8 @@
elsif ($format eq 'quotation')
{
my $quotation_args = pop @{$state->{'quotation_stack'}};
- 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'}));
+ add_prev($text, $stack,
&$Texi2HTML::Config::quotation($format_ref->{'text'},
$quotation_args->{'text'}, $quotation_args->{'text_texi'}));
}
elsif ($format_type{$format} eq 'paragraph_style')
{
@@ -8087,37 +8088,41 @@
return '';
}
+# FIXME pat: someone (I believe myself) added a first argument to
+# a quotation, namely a style. Don't know what it is.
sub do_quotation_line($$$$$)
{
my $command = shift;
my $args = shift;
my @args = @$args;
- my $style_texi = shift @args;
+# my $style_texi = shift @args;
my $text_texi = shift @args;
my $style_stack = shift;
my $state = shift;
my $line_nr = shift;
my $text;
- $style_texi = undef if (defined($style_texi) and $style_texi=~/^\s*$/);
+# $style_texi = undef if (defined($style_texi) and $style_texi=~/^\s*$/);
$text_texi = undef if (defined($text_texi) and $text_texi=~/^\s*$/);
- if (defined($style_texi) and !defined($text_texi))
- {
- $text_texi = $style_texi;
- $style_texi = undef;
- }
+# if (defined($style_texi) and !defined($text_texi))
+# {
+# $text_texi = $style_texi;
+# $style_texi = undef;
+# }
if (defined($text_texi))
{
$text = substitute_line($text_texi, duplicate_state($state));
$text =~ s/\s*$//;
}
- my $quotation_args = { 'style_texi' => $style_texi, 'text' => $text,
'text_texi' => $text_texi };
- if (defined($style_texi))
- {
- $quotation_args->{'style_id'} =
cross_manual_line(normalize_space($style_texi));
- }
+# my $quotation_args = { 'style_texi' => $style_texi, 'text' => $text,
'text_texi' => $text_texi };
+ my $quotation_args = { 'text' => $text, 'text_texi' => $text_texi };
+# if (defined($style_texi))
+# {
+# $quotation_args->{'style_id'} =
cross_manual_line(normalize_space($style_texi));
+# }
push @{$state->{'quotation_stack'}}, $quotation_args;
- $state->{'prepend_text'} =
&$Texi2HTML::Config::quotation_prepend_text($style_texi, $text_texi);
+ #$state->{'prepend_text'} =
&$Texi2HTML::Config::quotation_prepend_text($style_texi, $text_texi);
+ $state->{'prepend_text'} =
&$Texi2HTML::Config::quotation_prepend_text($text_texi);
return '';
}
@@ -10549,7 +10554,8 @@
}
elsif ($macro eq 'quotation')
{
- open_cmd_line($stack, $state, ['keep','keep'],
\&do_quotation_line);
+ #open_cmd_line($stack, $state, ['keep','keep'],
\&do_quotation_line);
+ open_cmd_line($stack, $state, ['keep'],
\&do_quotation_line);
}
#print STDERR "Begin cmd_line\n";
#dump_stack($text, $stack, $state);
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/08
- [Texi2html-cvs] Changes to texi2html/texi2html.pl,
Patrice Dumas <=
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/09
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/09
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/19
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/21
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/23
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/23
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/24
- [Texi2html-cvs] Changes to texi2html/texi2html.pl, Patrice Dumas, 2005/08/28