[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Convert/DocBook.pm Texinfo/C...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Convert/DocBook.pm Texinfo/C... |
|
Date: |
Tue, 14 Feb 2012 22:27:45 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/02/14 22:27:45
Modified files:
tp/Texinfo/Convert: DocBook.pm Info.pm Plaintext.pm
tp/t/results/converters_tests: at_commands_in_refs.pl
at_commands_in_refs_latin1.pl
at_commands_in_refs_utf8.pl
image_extension.pl
image_formatting.pl
tp/t/results/coverage_braces: test_image.pl
tp/t/results/info_tests: image_file_search.pl image_not_found.pl
tp/tests/coverage/res_parser_info/formatting: formatting.2
tp/tests/coverage/res_parser_info/formatting_fr: formatting.2
tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding:
formatting_utf8.2
tp/tests/layout/res_parser/formatting_docbook: formatting.2
Log message:
Warn for no image file found in DocBook and no text found in Plaintext.
But don't warn if there is an alt string even if there is no .txt files.
Report from Karl.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.206&r2=1.207
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/image_extension.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/image_formatting.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/test_image.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/image_file_search.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/image_not_found.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting_fr/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.2?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.2?cvsroot=texinfo&r1=1.1&r2=1.2
Patches:
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Texinfo/Convert/DocBook.pm 13 Feb 2012 22:38:01 -0000 1.43
+++ Texinfo/Convert/DocBook.pm 14 Feb 2012 22:27:42 -0000 1.44
@@ -876,7 +876,8 @@
push @files, ["$basefile.$extension", uc($extension)];
}
}
- if (!scalar(@files)) {
+ my $image_file_found = scalar(@files);;
+ if (!$image_file_found) {
push @files, ["$basefile.jpg", 'JPG'];
}
foreach my $file (@files) {
@@ -891,6 +892,10 @@
.$self->xml_protect_text($image_text)
.'</literallayout></textobject>';
}
+ if (!defined($image_text) and !$image_file_found) {
+ $self->line_warn(sprintf($self->__("address@hidden file `%s' not
found, using `%s'"), $basefile, "$basefile.jpg"), $root->{'line_nr'});
+ }
+
if ($is_inline) {
$result .= "</inlinemediaobject>";
} else {
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- Texinfo/Convert/Info.pm 26 Jan 2012 00:17:32 -0000 1.80
+++ Texinfo/Convert/Info.pm 14 Feb 2012 22:27:43 -0000 1.81
@@ -591,10 +591,10 @@
} else {
$text_result = $text;
}
- } elsif (!defined($image_file)) {
- $self->line_warn(sprintf($self->__("Cannot find address@hidden file
`%s.txt'"),
- $basefile), $root->{'line_nr'});
- }
+ }# elsif (!defined($image_file)) {
+ # $self->line_warn(sprintf($self->__("Cannot find address@hidden file
`%s.txt'"),
+ # $basefile), $root->{'line_nr'});
+ #}
my $result;
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -b -r1.206 -r1.207
--- Texinfo/Convert/Plaintext.pm 27 Jan 2012 18:50:21 -0000 1.206
+++ Texinfo/Convert/Plaintext.pm 14 Feb 2012 22:27:43 -0000 1.207
@@ -1026,6 +1026,8 @@
$result = $alt;
}
} else {
+ $self->line_warn(sprintf($self->__("Cannot find address@hidden file
`%s.txt' nor alternate text"),
+ $basefile), $root->{'line_nr'});
$result = '['.$basefile.']';
}
return $result;
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/converters_tests/at_commands_in_refs.pl 25 Jan 2012 07:37:41
-0000 1.2
+++ t/results/converters_tests/at_commands_in_refs.pl 14 Feb 2012 22:27:43
-0000 1.3
@@ -21750,6 +21750,37 @@
';
+$result_converted_errors{'plaintext'}->{'at_commands_in_refs'} = [
+ {
+ 'file_name' => '',
+ 'error_line' => ':23: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
+',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 23
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':91: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
+',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 91
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
+',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 89
+ }
+];
+
+
$result_converted{'html'}->{'at_commands_in_refs'} = '<!DOCTYPE html PUBLIC
"-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
<html>
@@ -22485,6 +22516,28 @@
</chapter>
';
+$result_converted_errors{'docbook'}->{'at_commands_in_refs'} = [
+ {
+ 'file_name' => '',
+ 'error_line' => ':91: warning: @image file `f--ile1\' not found, using
`f--ile1.jpg\'
+',
+ 'text' => '@image file `f--ile1\' not found, using `f--ile1.jpg\'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 91
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':141: warning: @image file `f--ile1\' not found, using
`f--ile1.jpg\'
+',
+ 'text' => '@image file `f--ile1\' not found, using `f--ile1.jpg\'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 141
+ }
+];
+
+
$result_converted{'info'}->{'at_commands_in_refs'} = 'This is , produced by tp
version from .
@@ -22741,63 +22794,63 @@
$result_converted_errors{'info'}->{'at_commands_in_refs'} = [
{
'file_name' => '',
- 'error_line' => ':23: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':23: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 23
},
{
'file_name' => '',
- 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 89
},
{
'file_name' => '',
- 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 89
},
{
'file_name' => '',
- 'error_line' => ':91: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':91: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 91
},
{
'file_name' => '',
- 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 89
},
{
'file_name' => '',
- 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 89
},
{
'file_name' => '',
- 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':89: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 89
Index: t/results/converters_tests/at_commands_in_refs_latin1.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_latin1.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/at_commands_in_refs_latin1.pl 26 Jan 2012
19:53:07 -0000 1.1
+++ t/results/converters_tests/at_commands_in_refs_latin1.pl 14 Feb 2012
22:27:43 -0000 1.2
@@ -21761,63 +21761,63 @@
$result_converted_errors{'file_info'}->{'at_commands_in_refs_latin1'} = [
{
'file_name' => '',
- 'error_line' => ':26: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':26: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 26
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
},
{
'file_name' => '',
- 'error_line' => ':94: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':94: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 94
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
Index: t/results/converters_tests/at_commands_in_refs_utf8.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs_utf8.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/at_commands_in_refs_utf8.pl 26 Jan 2012
00:15:23 -0000 1.1
+++ t/results/converters_tests/at_commands_in_refs_utf8.pl 14 Feb 2012
22:27:43 -0000 1.2
@@ -21761,63 +21761,63 @@
$result_converted_errors{'file_info'}->{'at_commands_in_refs_utf8'} = [
{
'file_name' => '',
- 'error_line' => ':26: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':26: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 26
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
},
{
'file_name' => '',
- 'error_line' => ':94: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':94: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 94
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
},
{
'file_name' => '',
- 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\'
+ 'error_line' => ':92: warning: Cannot find @image file `f--ile1.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f--ile1.txt\'',
+ 'text' => 'Cannot find @image file `f--ile1.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 92
Index: t/results/converters_tests/image_extension.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/image_extension.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/image_extension.pl 11 Jan 2012 00:10:11
-0000 1.1
+++ t/results/converters_tests/image_extension.pl 14 Feb 2012 22:27:43
-0000 1.2
@@ -100,6 +100,19 @@
$result_converted{'plaintext'}->{'image_extension'} = '[f---ile]';
+$result_converted_errors{'plaintext'}->{'image_extension'} = [
+ {
+ 'file_name' => '',
+ 'error_line' => ':1: warning: Cannot find @image file `f---ile.txt\' nor
alternate text
+',
+ 'text' => 'Cannot find @image file `f---ile.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 1
+ }
+];
+
+
$result_converted{'html_text'}->{'image_extension'} = '<img
src="f---ile.gr--a" alt="f---ile">
';
@@ -125,6 +138,19 @@
$result_converted{'docbook'}->{'image_extension'} =
'<informalfigure><mediaobject><imageobject><imagedata fileref="f---ile.jpg"
format="JPG"></imagedata></imageobject></mediaobject></informalfigure>
';
+$result_converted_errors{'docbook'}->{'image_extension'} = [
+ {
+ 'file_name' => '',
+ 'error_line' => ':1: warning: @image file `f---ile\' not found, using
`f---ile.jpg\'
+',
+ 'text' => '@image file `f---ile\' not found, using `f---ile.jpg\'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 1
+ }
+];
+
+
$result_converted{'info'}->{'image_extension'} = 'This is , produced by tp
version from .
@@ -144,9 +170,9 @@
},
{
'file_name' => '',
- 'error_line' => ':1: warning: Cannot find @image file `f---ile.txt\'
+ 'error_line' => ':1: warning: Cannot find @image file `f---ile.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `f---ile.txt\'',
+ 'text' => 'Cannot find @image file `f---ile.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 1
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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/converters_tests/image_formatting.pl 24 Jan 2012 22:16:57
-0000 1.2
+++ t/results/converters_tests/image_formatting.pl 14 Feb 2012 22:27:43
-0000 1.3
@@ -2979,6 +2979,46 @@
<inlinemediaobject><imageobject><imagedata fileref="f--ile.png"
format="PNG"></imagedata></imageobject><textobject><literallayout>Image
description""\\.</literallayout></textobject></inlinemediaobject>.
</para>';
+$result_converted_errors{'docbook'}->{'image_formatting'} = [
+ {
+ 'file_name' => '',
+ 'error_line' => ':9: warning: @image file `f-ile\' not found, using
`f-ile.jpg\'
+',
+ 'text' => '@image file `f-ile\' not found, using `f-ile.jpg\'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 9
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':10: warning: @image file address@hidden' not found,
using address@hidden'
+',
+ 'text' => '@image file address@hidden' not found, using address@hidden'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 10
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':20: warning: @image file `f-ile\' not found, using
`f-ile.jpg\'
+',
+ 'text' => '@image file `f-ile\' not found, using `f-ile.jpg\'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 20
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':21: warning: @image file address@hidden' not found,
using address@hidden'
+',
+ 'text' => '@image file address@hidden' not found, using address@hidden'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 21
+ }
+];
+
+
$result_converted{'info'}->{'image_formatting'} = 'This is , produced by tp
version from .
@@ -3019,44 +3059,4 @@
End Tag Table
';
-$result_converted_errors{'info'}->{'image_formatting'} = [
- {
- 'file_name' => '',
- 'error_line' => ':9: warning: Cannot find @image file `f-ile.txt\'
-',
- 'text' => 'Cannot find @image file `f-ile.txt\'',
- 'type' => 'warning',
- 'macro' => '',
- 'line_nr' => 9
- },
- {
- 'file_name' => '',
- 'error_line' => ':10: warning: Cannot find @image file address@hidden'
-',
- 'text' => 'Cannot find @image file address@hidden'',
- 'type' => 'warning',
- 'macro' => '',
- 'line_nr' => 10
- },
- {
- 'file_name' => '',
- 'error_line' => ':20: warning: Cannot find @image file `f-ile.txt\'
-',
- 'text' => 'Cannot find @image file `f-ile.txt\'',
- 'type' => 'warning',
- 'macro' => '',
- 'line_nr' => 20
- },
- {
- 'file_name' => '',
- 'error_line' => ':21: warning: Cannot find @image file address@hidden'
-',
- 'text' => 'Cannot find @image file address@hidden'',
- 'type' => 'warning',
- 'macro' => '',
- 'line_nr' => 21
- }
-];
-
-
1;
Index: t/results/coverage_braces/test_image.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage_braces/test_image.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/coverage_braces/test_image.pl 5 Feb 2012 22:22:08 -0000
1.15
+++ t/results/coverage_braces/test_image.pl 14 Feb 2012 22:27:44 -0000
1.16
@@ -4533,6 +4533,64 @@
';
+$result_converted_errors{'plaintext'}->{'test_image'} = [
+ {
+ 'file_name' => '',
+ 'error_line' => ':14: warning: Cannot find @image file address@hidden
a@<"%@ < & @ % " .txt\' nor alternate text (possibly involving @files-char)
+',
+ 'text' => 'Cannot find @image file address@hidden a@<"%@ < & @ % "
.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => 'files-char',
+ 'line_nr' => 14
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':9: warning: Cannot find @image file address@hidden
a@<"%@ < & @ % " .txt\' nor alternate text (possibly involving @files-char)
+',
+ 'text' => 'Cannot find @image file address@hidden a@<"%@ < & @ % "
.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => 'files-char',
+ 'line_nr' => 9
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':20: warning: Cannot find @image file address@hidden
a@<"%@ < & @ % " .txt\' nor alternate text (possibly involving @files-char)
+',
+ 'text' => 'Cannot find @image file address@hidden a@<"%@ < & @ % "
.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => 'files-char',
+ 'line_nr' => 20
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':24: warning: Cannot find @image file address@hidden
a@<"%@ < & @ % " .txt\' nor alternate text (possibly involving @files-char)
+',
+ 'text' => 'Cannot find @image file address@hidden a@<"%@ < & @ % "
.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => 'files-char',
+ 'line_nr' => 24
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':26: warning: Cannot find @image file address@hidden
a@<"%@ < & @ % " .txt\' nor alternate text (possibly involving @files-char)
+',
+ 'text' => 'Cannot find @image file address@hidden a@<"%@ < & @ % "
.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => 'files-char',
+ 'line_nr' => 26
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':26: warning: Cannot find @image file address@hidden
a@<"%@ < & @ % " .txt\' nor alternate text (possibly involving @files-char)
+',
+ 'text' => 'Cannot find @image file address@hidden a@<"%@ < & @ % "
.txt\' nor alternate text',
+ 'type' => 'warning',
+ 'macro' => 'files-char',
+ 'line_nr' => 26
+ }
+];
+
+
$result_converted{'html_text'}->{'test_image'} = '
Index: t/results/info_tests/image_file_search.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/image_file_search.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/info_tests/image_file_search.pl 7 Jan 2012 13:38:05 -0000
1.11
+++ t/results/info_tests/image_file_search.pl 14 Feb 2012 22:27:44 -0000
1.12
@@ -310,18 +310,18 @@
$result_converted_errors{'info'}->{'image_file_search'} = [
{
'file_name' => '',
- 'error_line' => ':7: warning: Cannot find @image file
`./tp/t/include_dir/f--ile.txt\'
+ 'error_line' => ':7: warning: Cannot find @image file
`./tp/t/include_dir/f--ile.txt\' nor alternate text
',
- 'text' => 'Cannot find @image file `./tp/t/include_dir/f--ile.txt\'',
+ 'text' => 'Cannot find @image file `./tp/t/include_dir/f--ile.txt\' nor
alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 7
},
{
'file_name' => '',
- 'error_line' => ':10: warning: Cannot find @image file
`../include_dir/f--ile.txt\'
+ 'error_line' => ':10: warning: Cannot find @image file
`../include_dir/f--ile.txt\' nor alternate text
',
- 'text' => 'Cannot find @image file `../include_dir/f--ile.txt\'',
+ 'text' => 'Cannot find @image file `../include_dir/f--ile.txt\' nor
alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 10
Index: t/results/info_tests/image_not_found.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/image_not_found.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/info_tests/image_not_found.pl 2 Nov 2011 00:44:06 -0000
1.8
+++ t/results/info_tests/image_not_found.pl 14 Feb 2012 22:27:44 -0000
1.9
@@ -169,9 +169,9 @@
$result_converted_errors{'info'}->{'image_not_found'} = [
{
'file_name' => '',
- 'error_line' => ':2: warning: Cannot find @image file `n_f_image.txt\'
+ 'error_line' => ':2: warning: Cannot find @image file `n_f_image.txt\' nor
alternate text
',
- 'text' => 'Cannot find @image file `n_f_image.txt\'',
+ 'text' => 'Cannot find @image file `n_f_image.txt\' nor alternate text',
'type' => 'warning',
'macro' => '',
'line_nr' => 2
Index: tests/coverage/res_parser_info/formatting/formatting.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting/formatting.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/coverage/res_parser_info/formatting/formatting.2 14 Jan 2012
18:58:20 -0000 1.1
+++ tests/coverage/res_parser_info/formatting/formatting.2 14 Feb 2012
22:27:45 -0000 1.2
@@ -42,11 +42,3 @@
formatting.texi:42: warning: Missing name for @deffnx (possibly involving
@mymacro)
formatting.texi:42: Command @bullet not accepting argument in brace should not
be on @table line (possibly involving @mymacro)
formatting.texi:42: Command @minus not accepting argument in brace should not
be on @ftable line (possibly involving @mymacro)
-formatting.texi:18: warning: Cannot find @image file `f-ile.txt' (possibly
involving @mymacro)
-formatting.texi:18: warning: Cannot find @image file address@hidden' (possibly
involving @mymacro)
-formatting.texi:18: warning: Cannot find @image file `f-ile.txt' (possibly
involving @mymacro)
-formatting.texi:18: warning: Cannot find @image file address@hidden' (possibly
involving @mymacro)
-formatting.texi:38: warning: Cannot find @image file `f-ile.txt' (possibly
involving @mymacro)
-formatting.texi:38: warning: Cannot find @image file address@hidden' (possibly
involving @mymacro)
-formatting.texi:42: warning: Cannot find @image file `f-ile.txt' (possibly
involving @mymacro)
-formatting.texi:42: warning: Cannot find @image file address@hidden' (possibly
involving @mymacro)
Index: tests/coverage/res_parser_info/formatting_fr/formatting.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting_fr/formatting.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/coverage/res_parser_info/formatting_fr/formatting.2 14 Jan 2012
18:58:20 -0000 1.1
+++ tests/coverage/res_parser_info/formatting_fr/formatting.2 14 Feb 2012
22:27:45 -0000 1.2
@@ -42,11 +42,3 @@
formatting.texi:42: warning: Missing name for @deffnx (possibly involving
@mymacro)
formatting.texi:42: Command @bullet not accepting argument in brace should not
be on @table line (possibly involving @mymacro)
formatting.texi:42: Command @minus not accepting argument in brace should not
be on @ftable line (possibly involving @mymacro)
-formatting.texi:18: warning: Cannot find @image file `f-ile.txt' (possibly
involving @mymacro)
-formatting.texi:18: warning: Cannot find @image file address@hidden' (possibly
involving @mymacro)
-formatting.texi:18: warning: Cannot find @image file `f-ile.txt' (possibly
involving @mymacro)
-formatting.texi:18: warning: Cannot find @image file address@hidden' (possibly
involving @mymacro)
-formatting.texi:38: warning: Cannot find @image file `f-ile.txt' (possibly
involving @mymacro)
-formatting.texi:38: warning: Cannot find @image file address@hidden' (possibly
involving @mymacro)
-formatting.texi:42: warning: Cannot find @image file `f-ile.txt' (possibly
involving @mymacro)
-formatting.texi:42: warning: Cannot find @image file address@hidden' (possibly
involving @mymacro)
Index:
tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
---
tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.2
14 Jan 2012 18:58:21 -0000 1.1
+++
tests/coverage/res_parser_info/formatting_utf8_enable_encoding/formatting_utf8.2
14 Feb 2012 22:27:45 -0000 1.2
@@ -43,11 +43,3 @@
formatting_utf8.texi:45: warning: Missing name for @deffnx (possibly involving
@mymacro)
formatting_utf8.texi:45: Command @bullet not accepting argument in brace
should not be on @table line (possibly involving @mymacro)
formatting_utf8.texi:45: Command @minus not accepting argument in brace should
not be on @ftable line (possibly involving @mymacro)
-formatting_utf8.texi:21: warning: Cannot find @image file `f-ile.txt'
(possibly involving @mymacro)
-formatting_utf8.texi:21: warning: Cannot find @image file address@hidden'
(possibly involving @mymacro)
-formatting_utf8.texi:21: warning: Cannot find @image file `f-ile.txt'
(possibly involving @mymacro)
-formatting_utf8.texi:21: warning: Cannot find @image file address@hidden'
(possibly involving @mymacro)
-formatting_utf8.texi:41: warning: Cannot find @image file `f-ile.txt'
(possibly involving @mymacro)
-formatting_utf8.texi:41: warning: Cannot find @image file address@hidden'
(possibly involving @mymacro)
-formatting_utf8.texi:45: warning: Cannot find @image file `f-ile.txt'
(possibly involving @mymacro)
-formatting_utf8.texi:45: warning: Cannot find @image file address@hidden'
(possibly involving @mymacro)
Index: tests/layout/res_parser/formatting_docbook/formatting.2
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_docbook/formatting.2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/layout/res_parser/formatting_docbook/formatting.2 14 Jan 2012
19:03:48 -0000 1.1
+++ tests/layout/res_parser/formatting_docbook/formatting.2 14 Feb 2012
22:27:45 -0000 1.2
@@ -42,3 +42,15 @@
formatting.texi:42: warning: Missing name for @deffnx (possibly involving
@mymacro)
formatting.texi:42: Command @bullet not accepting argument in brace should not
be on @table line (possibly involving @mymacro)
formatting.texi:42: Command @minus not accepting argument in brace should not
be on @ftable line (possibly involving @mymacro)
+formatting.texi:18: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
+formatting.texi:18: warning: @image file address@hidden' not found, using
address@hidden' (possibly involving @mymacro)
+formatting.texi:28: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
+formatting.texi:28: warning: @image file address@hidden' not found, using
address@hidden' (possibly involving @mymacro)
+formatting.texi:18: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
+formatting.texi:18: warning: @image file address@hidden' not found, using
address@hidden' (possibly involving @mymacro)
+formatting.texi:18: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
+formatting.texi:18: warning: @image file address@hidden' not found, using
address@hidden' (possibly involving @mymacro)
+formatting.texi:38: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
+formatting.texi:38: warning: @image file address@hidden' not found, using
address@hidden' (possibly involving @mymacro)
+formatting.texi:42: warning: @image file `f-ile' not found, using `f-ile.jpg'
(possibly involving @mymacro)
+formatting.texi:42: warning: @image file address@hidden' not found, using
address@hidden' (possibly involving @mymacro)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Convert/DocBook.pm Texinfo/C...,
Patrice Dumas <=