[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/Info.pm Texinfo/Conv...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/Info.pm Texinfo/Conv... |
|
Date: |
Mon, 11 Feb 2013 23:32:29 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 13/02/11 23:32:29
Modified files:
tp/Texinfo/Convert: Info.pm Plaintext.pm
tp/init : tex4ht.pm
tp/t/results/converters_tests: at_commands_in_refs.pl
image_formatting.pl
image_with_spaces.pl
tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info:
at_commands_in_refs_latin1.info
tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info:
at_commands_in_refs_utf8.info
tp/t/results/coverage_braces: space_in_image.pl
tp/t/results/info_tests: image_and_punctuation.pl
image_and_spaces_formatting.pl
image_in_paragraph.pl
multiline_image_and_align.pl
tp/t/results/paragraph: image_in_paragraph.pl
tp/t/results/plaintext_tests: multiline_image_and_align.pl
tp/tests/layout/res_parser/formatting_plaintext: formatting.1
Log message:
Never put [ ] around @image text, and always put [ ] around alt
text.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.239&r2=1.240
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/tex4ht.pm?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/image_formatting.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/image_with_spaces.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/space_in_image.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/image_and_punctuation.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/image_and_spaces_formatting.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/image_in_paragraph.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/multiline_image_and_align.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/paragraph/image_in_paragraph.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1?cvsroot=texinfo&r1=1.7&r2=1.8
Patches:
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- Texinfo/Convert/Info.pm 7 Feb 2013 00:02:55 -0000 1.94
+++ Texinfo/Convert/Info.pm 11 Feb 2013 23:32:26 -0000 1.95
@@ -438,34 +438,29 @@
}
}
my ($text, $width) = $self->_image_text($root, $basefile);
- my $text_result;
- if (defined($text)) {
- if (!$self->{'formatters'}->[-1]->{'_top_formatter'}) {
- $text_result = '['.$text.']';
- } else {
- $text_result = $text;
- }
+ my $alt;
+ if (defined($root->{'extra'}->{'brace_command_contents'}->[3])) {
+ $alt = Texinfo::Convert::Text::convert(
+ {'contents' => $root->{'extra'}->{'brace_command_contents'}->[3]},
+ {Texinfo::Common::_convert_text_options($self)});
}
my $result;
- if (defined($image_file)) {
+ if (defined($image_file) or (defined($text) and defined($alt))) {
$image_file =~ s/\\/\\\\/g;
$image_file =~ s/\"/\\\"/g;
$result = "\x{00}\x{08}[image src=\"$image_file\"";
if (defined($root->{'extra'}->{'brace_command_contents'}->[3])) {
- my $alt = Texinfo::Convert::Text::convert(
- {'contents' => $root->{'extra'}->{'brace_command_contents'}->[3]},
- {Texinfo::Common::_convert_text_options($self)});
$alt =~ s/\\/\\\\/g;
$alt =~ s/\"/\\\"/g;
$result .= " alt=\"$alt\"";
}
- if (defined($text_result)) {
- $text_result =~ s/\\/\\\\/g;
- $text_result =~ s/\"/\\\"/g;
- $result .= " text=\"$text_result\"";
+ if (defined($text)) {
+ $text =~ s/\\/\\\\/g;
+ $text =~ s/\"/\\\"/g;
+ $result .= " text=\"$text\"";
}
$result .= "\x{00}\x{08}]";
if ($self->{'formatters'}->[-1]->{'_top_formatter'}) {
@@ -474,8 +469,7 @@
my $image_lines_count = ($result =~ tr/\n/\n/) +1;
$self->_add_image($root, $image_lines_count, $width, 1);
} else {
- $result = $self->_image_formatted_text($root, $basefile, $text,
- $text_result);
+ $result = $self->_image_formatted_text($root, $basefile, $text);
$lines_count = ($result =~ tr/\n/\n/);
$self->_add_image($root, $lines_count+1, $width);
}
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -b -r1.239 -r1.240
--- Texinfo/Convert/Plaintext.pm 7 Feb 2013 00:02:55 -0000 1.239
+++ Texinfo/Convert/Plaintext.pm 11 Feb 2013 23:32:26 -0000 1.240
@@ -1322,26 +1322,20 @@
return undef;
}
-sub _image_formatted_text($$$$$)
+sub _image_formatted_text($$$$)
{
my $self = shift;
my $root = shift;
my $basefile = shift;
my $text = shift;
- my $text_result = shift;
my $result;
if (defined($text)) {
- $result = $text_result;
+ $result = $text;
} elsif (defined($root->{'extra'}->{'brace_command_contents'}->[3])) {
- my $alt = Texinfo::Convert::Text::convert(
+ $result = '[' .Texinfo::Convert::Text::convert(
{'contents' => $root->{'extra'}->{'brace_command_contents'}->[3]},
- {Texinfo::Common::_convert_text_options($self)});
- if (!$self->{'formatters'}->[-1]->{'_top_formatter'}) {
- $result = '['.$alt.']';
- } else {
- $result = $alt;
- }
+ {Texinfo::Common::_convert_text_options($self)}) .']';
} else {
$self->line_warn(sprintf($self->__(
"could not find address@hidden file `%s.txt' nor alternate
text"),
@@ -1361,16 +1355,7 @@
{'contents' => $root->{'extra'}->{'brace_command_contents'}->[0]},
{'code' => 1, Texinfo::Common::_convert_text_options($self)});
my ($text, $width) = $self->_image_text($root, $basefile);
- my $text_result;
- if (defined($text)) {
- if (!$self->{'formatters'}->[-1]->{'_top_formatter'}) {
- $text_result = '['.$text.']';
- } else {
- $text_result = $text;
- }
- }
- my $result = $self->_image_formatted_text($root, $basefile, $text,
- $text_result);
+ my $result = $self->_image_formatted_text($root, $basefile, $text);
my $lines_count = ($result =~ tr/\n/\n/);
if (!defined($width)) {
$width = Texinfo::Convert::Unicode::string_width($result);
Index: init/tex4ht.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/tex4ht.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- init/tex4ht.pm 2 Feb 2013 23:18:24 -0000 1.16
+++ init/tex4ht.pm 11 Feb 2013 23:32:27 -0000 1.17
@@ -256,7 +256,7 @@
my $cmd = "$commands{$command}->{'exec'} $commands{$command}->{'basefile'}
$options";
print STDERR "tex4ht command: $cmd\n" if ($self->get_conf('VERBOSE'));
if (system($cmd)) {
- $self->document_warn(sprintf(__(
+ $self->document_warn(sprintf($self->__(
"tex4ht.pm: command failed: %s"), $cmd));
return 1;
}
@@ -264,7 +264,7 @@
# extract the html from the file created by tex4ht
my $html_basefile = $commands{$command}->{'html_file'};
unless (open (TEX4HT_HTMLFILE, $html_basefile)) {
- $self->document_warn(sprintf(__("tex4ht.pm: could not open: %s"),
+ $self->document_warn(sprintf($self->__("tex4ht.pm: could not open: %s"),
$html_basefile, $!));
return 1;
}
@@ -290,7 +290,8 @@
}
}
unless ($end_found) {
- $self->document_warn(sprintf(__("tex4ht.pm: end of address@hidden item
%d not found"),
+ $self->document_warn(sprintf($self->__(
+ "tex4ht.pm: end of address@hidden item %d not
found"),
$command, $count));
}
}
Index: t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/converters_tests/at_commands_in_refs.pl 2 Feb 2013 23:18:25
-0000 1.31
+++ t/results/converters_tests/at_commands_in_refs.pl 11 Feb 2013 23:32:27
-0000 1.32
@@ -22179,8 +22179,8 @@
****************************************************
-19 [f--ile1] [Image description""\\.]
-************************************
+19 [f--ile1] Image description""\\.
+**********************************
20 @ {} .
***********
@@ -22216,7 +22216,7 @@
e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
-<address@hidden>:: *note [f--ile1] [Image description""\\.]:: *note @ {} . ::
*note \'cite asis\' in @w b
+<address@hidden>:: *note [f--ile1] Image description""\\.:: *note @ {} . ::
*note \'cite asis\' in @w b
in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
\'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
*note \'indicateurl\':: *note <http://somewhere_aaa> text (url) ls::
@@ -23033,7 +23033,7 @@
* AAA (fff) AAA BBB::
* CCC (rrr) CCC DDD::
* the someone <address@hidden> <address@hidden>::
-* [f--ile1] [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ]::
+* [f--ile1] [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ]::
* @ {} . ::
* \'cite asis\' in @w b in r SC *str* t VAR "dfn" i::
* \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x <ESC>\'::
@@ -23149,20 +23149,20 @@
********************
-File: , Node: the someone <address@hidden> <address@hidden>, Next: [f--ile1]
[image src="f--ile.png" alt="alt" text="[Image description\\"\\"\\\\.]" ],
Prev: CCC (rrr) CCC DDD, Up: Top
+File: , Node: the someone <address@hidden> <address@hidden>, Next: [f--ile1]
[image src="f--ile.png" alt="alt" text="Image description\\"\\"\\\\." ],
Prev: CCC (rrr) CCC DDD, Up: Top
18 the someone <address@hidden> <address@hidden>
****************************************************
-File: , Node: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ], Next: @ {} . , Prev: the someone
<address@hidden> <address@hidden>, Up: Top
+File: , Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ], Next: @ {} . , Prev: the someone
<address@hidden> <address@hidden>, Up: Top
-19 [f--ile1] [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ]
-*********************************************************************************
+19 [f--ile1] [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ]
+*******************************************************************************
-File: , Node: @ {} . , Next: \'cite asis\' in @w b in r SC *str* t VAR
"dfn" i, Prev: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ], Up: Top
+File: , Node: @ {} . , Next: \'cite asis\' in @w b in r SC *str* t VAR
"dfn" i, Prev: [f--ile1] [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ], Up: Top
20 @ {} .
***********
@@ -23216,7 +23216,7 @@
e\'\' e;:: *note e. e( e_ .e e< j ee[:: *note i E=` C\',:: *note `` \'\' ` \'
,, ,:: *note << >> << >> < >:: *note `` \'\' --- -- ` \':: *note AAA (fff)
AAA BBB:: *note CCC (rrr) CCC DDD:: *note the someone <address@hidden>
-<address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt"
text="[Image description\\"\\"\\\\.]" ]:: *note @ {} . :: *note \'cite asis\'
in @w b
+<address@hidden>:: *note [f--ile1] [image src="f--ile.png" alt="alt"
text="Image description\\"\\"\\\\." ]:: *note @ {} . :: *note \'cite asis\'
in @w b
in r SC *str* t VAR "dfn" i:: *note \'env\' \'code\' \'option\' \'samp\'
\'command\' \'file\' \'C-x <ESC>\':: *note 8.27in:: *note sansserif slanted::
*note \'indicateurl\':: *note <http://somewhere_aaa> text (url) ls::
@@ -23225,33 +23225,33 @@
Tag Table:
Node: Top27
-Node: { }844
+Node: { }842
Node: !
-. . ? @923
-Node: @ { } \\ #1028
-Node: LaTeX TeX * , (C) ... ...1147
-Node: == error-> Euro ! ==> -1308
-Node: >= <= ->1464
-Node: a o -!- # -| ? (R)1583
-Node: => o a b a sunny day aa1722
-Node: AA ae oe AE OE /o /O ss /l /L D d TH th1902
-Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;2129
-Node: e. e( e_ .e e< j ee[2343
-Node: i E=` C\',2501
-Node: `` \'\' ` \' ,, ,2618
-Node: << >> << >> < >2740
-Node: `` \'\' --- -- ` \'2871
-Node: AAA (fff) AAA BBB2999
-Node: CCC (rrr) CCC DDD3139
-Node: the someone <address@hidden> <address@hidden>3312
-Node: [f--ile1] [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ]3614
-Node: @ {} . 3970
-Node: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i4179
-Node: \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x
<ESC>\'4441
-Node: 8.27in4721
-Node: sansserif slanted4869
-Node: \'indicateurl\'4995
-Node: <http://somewhere_aaa> text (url) ls5143
+. . ? @921
+Node: @ { } \\ #1026
+Node: LaTeX TeX * , (C) ... ...1145
+Node: == error-> Euro ! ==> -1306
+Node: >= <= ->1462
+Node: a o -!- # -| ? (R)1581
+Node: => o a b a sunny day aa1720
+Node: AA ae oe AE OE /o /O ss /l /L D d TH th1900
+Node: a" e~ i^ a^ a` e\' c, e= e* e\'\' e;2127
+Node: e. e( e_ .e e< j ee[2341
+Node: i E=` C\',2499
+Node: `` \'\' ` \' ,, ,2616
+Node: << >> << >> < >2738
+Node: `` \'\' --- -- ` \'2869
+Node: AAA (fff) AAA BBB2997
+Node: CCC (rrr) CCC DDD3137
+Node: the someone <address@hidden> <address@hidden>3310
+Node: [f--ile1] [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ]3610
+Node: @ {} . 3960
+Node: \'cite asis\' in @w b in r SC *str* t VAR "dfn" i4167
+Node: \'env\' \'code\' \'option\' \'samp\' \'command\' \'file\' \'C-x
<ESC>\'4429
+Node: 8.27in4709
+Node: sansserif slanted4857
+Node: \'indicateurl\'4983
+Node: <http://somewhere_aaa> text (url) ls5131
End Tag Table
';
Index: t/results/converters_tests/image_formatting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/image_formatting.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/converters_tests/image_formatting.pl 29 Jan 2013 19:11:32
-0000 1.9
+++ t/results/converters_tests/image_formatting.pl 11 Feb 2013 23:32:27
-0000 1.10
@@ -2869,31 +2869,31 @@
-$result_converted{'plaintext'}->{'image_formatting'} = '\'@image{f--ile}\'
[Image description""\\.] \'@image{f--ile,l--i}\' [Image description""\\.]
\'@image{f--ile,,l--e}\' [Image description""\\.]
-\'@image{f--ile,,,alt}\' [Image description""\\.] \'@image{f--ile,,,,e-d-xt}\'
[Image description""\\.]
-\'@image{f--ile,aze,az,alt,e--xt}\' [Image description""\\.]
\'@image{f-ile,aze,,a--lt}\' [a-lt]
-\'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt] [aaa
-bbb
-ccc] [aaa
-bbb
-ccc]
-
- @image{f--ile} [Image description""\\.]
- @image{f--ile,l--i} [Image description""\\.]
- @image{f--ile,,l--e} [Image description""\\.]
- @image{f--ile,,,alt} [Image description""\\.]
- @image{f--ile,,,,e-d-xt} [Image description""\\.]
- @image{f--ile,aze,az,alt,e--xt} [Image description""\\.]
+$result_converted{'plaintext'}->{'image_formatting'} = '\'@image{f--ile}\'
Image description""\\. \'@image{f--ile,l--i}\' Image description""\\.
\'@image{f--ile,,l--e}\' Image description""\\.
+\'@image{f--ile,,,alt}\' Image description""\\. \'@image{f--ile,,,,e-d-xt}\'
Image description""\\.
+\'@image{f--ile,aze,az,alt,e--xt}\' Image description""\\.
\'@image{f-ile,aze,,a--lt}\' [a-lt]
+\'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt] aaa
+bbb
+ccc aaa
+bbb
+ccc
+
+ @image{f--ile} Image description""\\.
+ @image{f--ile,l--i} Image description""\\.
+ @image{f--ile,,l--e} Image description""\\.
+ @image{f--ile,,,alt} Image description""\\.
+ @image{f--ile,,,,e-d-xt} Image description""\\.
+ @image{f--ile,aze,az,alt,e--xt} Image description""\\.
@image{f-ile,aze,,a--lt} [a-lt]
@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden [alt]
- [aaa
+ aaa
bbb
-ccc] [aaa
+ccc aaa
bbb
-ccc]
+ccc
Image description""\\.
- in para [Image description""\\.].
+ in para Image description""\\..
';
@@ -3119,32 +3119,32 @@
File: , Node: Top, Up: (dir)
-\'@image{f--ile}\' [image src="f--ile.png" text="[Image
description\\"\\"\\\\.]" ] \'@image{f--ile,l--i}\' [image src="f--ile.png"
text="[Image description\\"\\"\\\\.]" ] \'@image{f--ile,,l--e}\' [image
src="f--ile.png" text="[Image description\\"\\"\\\\.]" ]
-\'@image{f--ile,,,alt}\' [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ] \'@image{f--ile,,,,e-d-xt}\' [image
src="f--ile.png" text="[Image description\\"\\"\\\\.]" ]
-\'@image{f--ile,aze,az,alt,e--xt}\' [image src="f--ile.png" alt="alt"
text="[Image description\\"\\"\\\\.]" ] \'@image{f-ile,aze,,a--lt}\' [a-lt]
-\'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt] [aaa
-bbb
-ccc] [aaa
-bbb
-ccc]
-
- @image{f--ile} [image src="f--ile.png" text="[Image
description\\"\\"\\\\.]" ]
- @image{f--ile,l--i} [image src="f--ile.png" text="[Image
description\\"\\"\\\\.]" ]
- @image{f--ile,,l--e} [image src="f--ile.png" text="[Image
description\\"\\"\\\\.]" ]
- @image{f--ile,,,alt} [image src="f--ile.png" alt="alt" text="[Image
description\\"\\"\\\\.]" ]
- @image{f--ile,,,,e-d-xt} [image src="f--ile.png" text="[Image
description\\"\\"\\\\.]" ]
- @image{f--ile,aze,az,alt,e--xt} [image src="f--ile.png" alt="alt"
text="[Image description\\"\\"\\\\.]" ]
+\'@image{f--ile}\' [image src="f--ile.png" text="Image
description\\"\\"\\\\." ] \'@image{f--ile,l--i}\' [image src="f--ile.png"
text="Image description\\"\\"\\\\." ] \'@image{f--ile,,l--e}\' [image
src="f--ile.png" text="Image description\\"\\"\\\\." ]
+\'@image{f--ile,,,alt}\' [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ] \'@image{f--ile,,,,e-d-xt}\' [image
src="f--ile.png" text="Image description\\"\\"\\\\." ]
+\'@image{f--ile,aze,az,alt,e--xt}\' [image src="f--ile.png" alt="alt"
text="Image description\\"\\"\\\\." ] \'@image{f-ile,aze,,a--lt}\' [a-lt]
+\'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt] aaa
+bbb
+ccc aaa
+bbb
+ccc
+
+ @image{f--ile} [image src="f--ile.png" text="Image
description\\"\\"\\\\." ]
+ @image{f--ile,l--i} [image src="f--ile.png" text="Image
description\\"\\"\\\\." ]
+ @image{f--ile,,l--e} [image src="f--ile.png" text="Image
description\\"\\"\\\\." ]
+ @image{f--ile,,,alt} [image src="f--ile.png" alt="alt" text="Image
description\\"\\"\\\\." ]
+ @image{f--ile,,,,e-d-xt} [image src="f--ile.png" text="Image
description\\"\\"\\\\." ]
+ @image{f--ile,aze,az,alt,e--xt} [image src="f--ile.png" alt="alt"
text="Image description\\"\\"\\\\." ]
@image{f-ile,aze,,a--lt} [a-lt]
@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden [alt]
- [aaa
+ aaa
bbb
-ccc] [aaa
+ccc aaa
bbb
-ccc]
+ccc
[image src="f--ile.png" alt="a very long alt argument that could span more
than one line who knows" text="Image description\\"\\"\\\\." ]
- in para [image src="f--ile.png" alt="a very long alt argument that could
span more than one line who knows" text="[Image description\\"\\"\\\\.]" ].
+ in para [image src="f--ile.png" alt="a very long alt argument that could
span more than one line who knows" text="Image description\\"\\"\\\\." ].
Tag Table:
Index: t/results/converters_tests/image_with_spaces.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/image_with_spaces.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/image_with_spaces.pl 30 Jan 2013 00:54:32
-0000 1.4
+++ t/results/converters_tests/image_with_spaces.pl 11 Feb 2013 23:32:27
-0000 1.5
@@ -177,7 +177,7 @@
-$result_converted{'plaintext'}->{'image_with_spaces'} = 'Image
description""\\.. [Image description""\\.].
+$result_converted{'plaintext'}->{'image_with_spaces'} = 'Image
description""\\.. Image description""\\..
';
@@ -199,7 +199,7 @@
$result_converted{'info'}->{'image_with_spaces'} = 'This is , produced from .
[image src="f--ile.png" alt=" " text="Image description\\"\\"\\\\." ]
-. [image src="f--ile.png" alt="" text="[Image description\\"\\"\\\\.]" ].
+. [image src="f--ile.png" alt="" text="Image description\\"\\"\\\\." ].
Tag Table:
Index:
t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1/res_info/at_commands_in_refs_latin1.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
Binary files /tmp/cvsMA0aD9 and /tmp/cvsPqFvqE differ
Index:
t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8/res_info/at_commands_in_refs_utf8.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
Binary files /tmp/cvsUmC029 and /tmp/cvs5IlbRE differ
Index: t/results/coverage_braces/space_in_image.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/space_in_image.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/coverage_braces/space_in_image.pl 27 Aug 2012 22:04:39 -0000
1.21
+++ t/results/coverage_braces/space_in_image.pl 11 Feb 2013 23:32:28 -0000
1.22
@@ -204,7 +204,7 @@
-$result_converted{'plaintext'}->{'space_in_image'} = 'An image text before
paragraph.. [Another image text, in paragraph.].
+$result_converted{'plaintext'}->{'space_in_image'} = 'An image text before
paragraph.. Another image text, in paragraph..
';
Index: t/results/info_tests/image_and_punctuation.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/image_and_punctuation.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/info_tests/image_and_punctuation.pl 29 Jan 2013 19:11:48
-0000 1.9
+++ t/results/info_tests/image_and_punctuation.pl 11 Feb 2013 23:32:28
-0000 1.10
@@ -521,17 +521,17 @@
File: , Node: Top, Up: (dir)
-One space. [image src="f--ile.png" text="[Image description\\"\\"\\\\.]" ].
+One space. [image src="f--ile.png" text="Image description\\"\\"\\\\." ].
- Two spaces. [image src="f--ile.png" text="[Image
description\\"\\"\\\\.]" ].
+ Two spaces. [image src="f--ile.png" text="Image
description\\"\\"\\\\." ].
- End line. [image src="f--ile.png" text="[Image
description\\"\\"\\\\.]" ].
+ End line. [image src="f--ile.png" text="Image description\\"\\"\\\\." ].
- One space. [This is an image words.].
+ One space. This is an image words..
- Two spaces. [This is an image words.].
+ Two spaces. This is an image words..
- End line. [This is an image words.].
+ End line. This is an image words..
Tag Table:
Index: t/results/info_tests/image_and_spaces_formatting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/image_and_spaces_formatting.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/info_tests/image_and_spaces_formatting.pl 29 Jan 2013 19:11:48
-0000 1.10
+++ t/results/info_tests/image_and_spaces_formatting.pl 11 Feb 2013 23:32:28
-0000 1.11
@@ -1254,16 +1254,16 @@
File: , Node: Top, Up: (dir)
This is an image words.This is an image words.This is an image words.This is
an image words.This is an image words.This is an image words.This is an image
words.
-Some text [This is an image words.] [This is an image words.] [This is an
image words.] [This is an image words.] [This is an image words.] [This is an
image words.] [This is an image words.].
+Some text This is an image words. This is an image words. This is an image
words. This is an image words. This is an image words. This is an image words.
This is an image words..
- Some text [This is an image words.] text aaaaaaaaa [This is an image
words.] text bbbbbbbbbbb [This is an image words.] text ccccccccccccc [This is
an image words.] text
-ddddddddddddd [This is an image words.] text eeeeeeeeeeeeeee [This is an image
words.] text fffffffffff [This is an image words.].
+ Some text This is an image words. text aaaaaaaaa This is an image words.
text bbbbbbbbbbb This is an image words. text ccccccccccccc This is an image
words. text
+ddddddddddddd This is an image words. text eeeeeeeeeeeeeee This is an image
words. text fffffffffff This is an image words..
- AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA [This is an
image words.]
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA This is an
image words.
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBB
-[This is an image words.]
- Text. [This is an image words.] [This is an image words.].
+This is an image words.
+ Text. This is an image words. This is an image words..
Index: t/results/info_tests/image_in_paragraph.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/image_in_paragraph.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/info_tests/image_in_paragraph.pl 29 Jan 2013 19:11:48 -0000
1.10
+++ t/results/info_tests/image_in_paragraph.pl 11 Feb 2013 23:32:28 -0000
1.11
@@ -218,7 +218,7 @@
File: , Node: Top, Up: (dir)
-Para. [image src="f--ile.png" alt="alt\\"\\"\\\\" text="[Image
description\\"\\"\\\\.]" ]. End para.
+Para. [image src="f--ile.png" alt="alt\\"\\"\\\\" text="Image
description\\"\\"\\\\." ]. End para.
Tag Table:
Index: t/results/info_tests/multiline_image_and_align.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/multiline_image_and_align.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/info_tests/multiline_image_and_align.pl 7 Feb 2013 00:02:55
-0000 1.1
+++ t/results/info_tests/multiline_image_and_align.pl 11 Feb 2013 23:32:28
-0000 1.2
@@ -1843,69 +1843,69 @@
$result_converted{'info'}->{'multiline_image_and_align'} = 'This is , produced
from .
- [ 1 A B
+ 1 A B
2 C D
- 3 E F]
+ 3 E F
- CCCC [ 1 A B
+ CCCC 1 A B
2 C D
- 3 E F]
+ 3 E F
-fffffffffffffffffffffffffffffffffffffff [ 1 A B
+fffffffffffffffffffffffffffffffffffffff 1 A B
2 C D
- 3 E F]
+ 3 E F
- dddd [ 1 A B
+ dddd 1 A B
2 C D
- 3 E F] iiiii
+ 3 E F iiiii
AAA
- [ 1 A B
+ 1 A B
2 C D
- 3 E F]
+ 3 E F
- BBB [ 1 A B
+ BBB 1 A B
2 C D
- 3 E F] gggg [ 1 A B
+ 3 E F gggg 1 A B
2 C D
- 3 E F]
+ 3 E F
HHH
- [ 1 A B
+ 1 A B
2 C D
- 3 E F]JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+ 3 E FJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
- [image src="figure.txt" text="[ 1 A B
+ [image src="figure.txt" text=" 1 A B
2 C D
- 3 E F]" ]
+ 3 E F" ]
-CCCC [image src="figure.txt" text="[ 1 A B
+CCCC [image src="figure.txt" text=" 1 A B
2 C D
- 3 E F]" ]
+ 3 E F" ]
-fffffffffffffffffffffffffffffffffffffff [image src="figure.txt" text="[ 1
A B
+fffffffffffffffffffffffffffffffffffffff [image src="figure.txt" text=" 1 A
B
2 C D
- 3 E F]" ]
+ 3 E F" ]
-dddd [image src="figure.txt" text="[ 1 A B
+dddd [image src="figure.txt" text=" 1 A B
2 C D
- 3 E F]" ] iiiii
+ 3 E F" ] iiiii
AAA
- [image src="figure.txt" text="[ 1 A B
+ [image src="figure.txt" text=" 1 A B
2 C D
- 3 E F]" ]
+ 3 E F" ]
-BBB [image src="figure.txt" text="[ 1 A B
+BBB [image src="figure.txt" text=" 1 A B
2 C D
- 3 E F]" ] gggg [image src="figure.txt" text="[ 1 A B
+ 3 E F" ] gggg [image src="figure.txt" text=" 1 A B
2 C D
- 3 E F]" ]
+ 3 E F" ]
HHH
- [image src="figure.txt" text="[ 1 A B
+ [image src="figure.txt" text=" 1 A B
2 C D
- 3 E F]" ]JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+ 3 E F" ]JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
Tag Table:
Index: t/results/paragraph/image_in_paragraph.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/paragraph/image_in_paragraph.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/paragraph/image_in_paragraph.pl 27 Aug 2012 22:04:45 -0000
1.6
+++ t/results/paragraph/image_in_paragraph.pl 11 Feb 2013 23:32:28 -0000
1.7
@@ -141,7 +141,7 @@
-$result_converted{'plaintext'}->{'image_in_paragraph'} = 'Para. [Text for
image out of paragraph.]. After image.
+$result_converted{'plaintext'}->{'image_in_paragraph'} = 'Para. Text for image
out of paragraph.. After image.
';
Index: t/results/plaintext_tests/multiline_image_and_align.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/multiline_image_and_align.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/plaintext_tests/multiline_image_and_align.pl 7 Feb 2013
00:02:55 -0000 1.1
+++ t/results/plaintext_tests/multiline_image_and_align.pl 11 Feb 2013
23:32:29 -0000 1.2
@@ -718,37 +718,37 @@
-$result_converted{'plaintext'}->{'multiline_image_and_align'} = '
[ 1 A B
+$result_converted{'plaintext'}->{'multiline_image_and_align'} = '
1 A B
2 C D
- 3 E F]
+ 3 E F
- CCCC [ 1 A B
+ CCCC 1 A B
2 C D
- 3 E F]
+ 3 E F
-fffffffffffffffffffffffffffffffffffffff [ 1 A B
+fffffffffffffffffffffffffffffffffffffff 1 A B
2 C D
- 3 E F]
+ 3 E F
- dddd [ 1 A B
+ dddd 1 A B
2 C D
- 3 E F] iiiii
+ 3 E F iiiii
AAA
- [ 1 A B
+ 1 A B
2 C D
- 3 E F]
+ 3 E F
- BBB [ 1 A B
+ BBB 1 A B
2 C D
- 3 E F] gggg [ 1 A B
+ 3 E F gggg 1 A B
2 C D
- 3 E F]
+ 3 E F
HHH
- [ 1 A B
+ 1 A B
2 C D
- 3 E F]JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+ 3 E FJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
';
1;
Index: tests/layout/res_parser/formatting_plaintext/formatting.1
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_plaintext/formatting.1 4 Aug 2012
23:07:21 -0000 1.7
+++ tests/layout/res_parser/formatting_plaintext/formatting.1 11 Feb 2013
23:32:29 -0000 1.8
@@ -61,15 +61,15 @@
'@v{a}' a< '@v{--a}' -a< '@,{c}' c, '@,{--c}' -c, '@footnote{in
footnote}' (1) '@footnote{in footnote2}' (2)
- '@image{f--ile}' [ggg
-aaa] '@image{f--ile,l--i}' [ggg
-aaa] '@image{f--ile,,l--e}' [ggg
-aaa]
-'@image{f--ile,,,alt}' [ggg
-aaa] '@image{f--ile,,,,e-d-xt}' [ggg
-aaa]
-'@image{f--ile,aze,az,alt,e--xt}' [ggg
-aaa] '@image{f-ile,aze,,a--lt}' [a-lt]
+ '@image{f--ile}' ggg
+aaa '@image{f--ile,l--i}' ggg
+aaa '@image{f--ile,,l--e}' ggg
+aaa
+'@image{f--ile,,,alt}' ggg
+aaa '@image{f--ile,,,,e-d-xt}' ggg
+aaa
+'@image{f--ile,aze,az,alt,e--xt}' ggg
+aaa '@image{f-ile,aze,,a--lt}' [a-lt]
'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
@@ -408,15 +408,15 @@
'@v{a}' a< '@v{--a}' -a< '@,{c}' c, '@,{--c}' -c, '@footnote{in
footnote}' (3) '@footnote{in footnote2}' (4)
- '@image{f--ile}' [ggg
-aaa] '@image{f--ile,l--i}' [ggg
-aaa] '@image{f--ile,,l--e}' [ggg
-aaa]
-'@image{f--ile,,,alt}' [ggg
-aaa] '@image{f--ile,,,,e-d-xt}' [ggg
-aaa]
-'@image{f--ile,aze,az,alt,e--xt}' [ggg
-aaa] '@image{f-ile,aze,,a--lt}' [a-lt]
+ '@image{f--ile}' ggg
+aaa '@image{f--ile,l--i}' ggg
+aaa '@image{f--ile,,l--e}' ggg
+aaa
+'@image{f--ile,,,alt}' ggg
+aaa '@image{f--ile,,,,e-d-xt}' ggg
+aaa
+'@image{f--ile,aze,az,alt,e--xt}' ggg
+aaa '@image{f-ile,aze,,a--lt}' [a-lt]
'@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden' [alt]
@@ -887,18 +887,18 @@
@footnote{in footnote} (5)
@footnote{in footnote2} (6)
- @image{f--ile} [ggg
-aaa]
- @image{f--ile,l--i} [ggg
-aaa]
- @image{f--ile,,l--e} [ggg
-aaa]
- @image{f--ile,,,alt} [ggg
-aaa]
- @image{f--ile,,,,e-d-xt} [ggg
-aaa]
- @image{f--ile,aze,az,alt,e--xt} [ggg
-aaa]
+ @image{f--ile} ggg
+aaa
+ @image{f--ile,l--i} ggg
+aaa
+ @image{f--ile,,l--e} ggg
+aaa
+ @image{f--ile,,,alt} ggg
+aaa
+ @image{f--ile,,,,e-d-xt} ggg
+aaa
+ @image{f--ile,aze,az,alt,e--xt} ggg
+aaa
@image{f-ile,aze,,a--lt} [a-lt]
@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden [alt]
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/Info.pm Texinfo/Conv...,
Patrice Dumas <=