[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Convert/Info.pm t/info_...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Convert/Info.pm t/info_... |
|
Date: |
Sat, 26 Feb 2011 18:26:00 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/02/26 18:25:59
Modified files:
tp : TODO
tp/Texinfo/Convert: Info.pm
tp/t : info_tests.t
Added files:
tp/t/results/info_tests: image_file_search.pl image_not_found.pl
Log message:
More tests for image files.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/info_tests.t?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/image_file_search.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/image_not_found.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- TODO 26 Feb 2011 15:10:20 -0000 1.96
+++ TODO 26 Feb 2011 18:25:59 -0000 1.97
@@ -63,9 +63,6 @@
entry is Top, it should be the node created especially for the footnote
and the lines count should also be adjusted.
-Is the following error right? Or maybe it should be a warning?
-test_setfilename.texi:5: @top missing argument
-
Test empty/no empty line at a multitable beginning, between 2 rows and
after a multitable.
@@ -135,14 +132,6 @@
Maybe:
defcondx_Ubar defcondx_Dbar
-from test_paths.texi:
address@hidden/f--ile}
-
-@@image dot.
address@hidden/formatting/f--ile}
-
-@@image dot parent.
address@hidden/test/formatting/f--ile}
@verbatiminclude formatting/simplest.texi
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- Texinfo/Convert/Info.pm 26 Feb 2011 16:09:51 -0000 1.37
+++ Texinfo/Convert/Info.pm 26 Feb 2011 18:25:59 -0000 1.38
@@ -604,7 +604,7 @@
if ($self->{'formatters'}->[-1]->{'_top_formatter'}) {
$result .= "\n";
}
- } else {
+ } elsif (defined($text)) {
$result = $text;
$lines_count = ($result =~ tr/\n/\n/);
}
Index: t/info_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/info_tests.t,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/info_tests.t 26 Feb 2011 16:09:51 -0000 1.20
+++ t/info_tests.t 26 Feb 2011 18:25:59 -0000 1.21
@@ -113,6 +113,21 @@
Para.
@image{f--ile,,,alt""\\}. End para.
'],
+['image_not_found',
+'@node Top
address@hidden
+'],
+['image_file_search',
+'@node Top
+
address@hidden/t/include/f--ile}
+
+@@image dot.
address@hidden/tp/t/include/f--ile}
+
+@@image dot parent.
address@hidden/include/f--ile}
+',{'include_directories' => ['.', '..', 't/include']}],
[ 'multitable_anchor_and_index_entry',
'@node Top
Index: t/results/info_tests/image_file_search.pl
===================================================================
RCS file: t/results/info_tests/image_file_search.pl
diff -N t/results/info_tests/image_file_search.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/info_tests/image_file_search.pl 26 Feb 2011 18:25:59 -0000
1.1
@@ -0,0 +1,335 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors);
+
+$result_trees{'image_file_search'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'tp/t/include/f--ile'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'image',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'image dot.
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => './tp/t/include/f--ile'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'image',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'cmdname' => '@',
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'image dot parent.
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '../include/f--ile'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'image',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'image_file_search'}{'contents'}[0]{'parent'} =
$result_trees{'image_file_search'};
+$result_trees{'image_file_search'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'args'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'args'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'args'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'image_file_search'}{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'image_file_search'}{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'image_file_search'}{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'image_file_search'}{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'image_file_search'}{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[2];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'contents'}[3]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'image_file_search'}{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'image_file_search'}{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[2];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'contents'}[3]{'parent'}
= $result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6];
+$result_trees{'image_file_search'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'image_file_search'}{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'extra'}{'node_content'}[0]
= $result_trees{'image_file_search'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'image_file_search'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'image_file_search'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'image_file_search'}{'contents'}[1]{'parent'} =
$result_trees{'image_file_search'};
+
+$result_texis{'image_file_search'} = '@node Top
+
address@hidden/t/include/f--ile}
+
+@@image dot.
address@hidden/tp/t/include/f--ile}
+
+@@image dot parent.
address@hidden/include/f--ile}
+';
+
+
+$result_texts{'image_file_search'} = '
+tp/t/include/f--ile
+
address@hidden dot.
+./tp/t/include/f--ile
+
address@hidden dot parent.
+../include/f--ile
+';
+
+$result_sectioning{'image_file_search'} = {};
+
+$result_nodes{'image_file_search'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'node_up' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ]
+ }
+ }
+};
+
+$result_menus{'image_file_search'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ }
+};
+
+$result_errors{'image_file_search'} = [];
+
+
+
+$result_converted{'info'}->{'image_file_search'} = 'This is , produced by
makeinfo version 4.13 from .
+
+
+File: , Node: Top, Up: (dir)
+
+ [image src="tp/t/include/f--ile.png" text="Image description\\"\\"\\\\." ]
+
address@hidden dot.
+
+ @image dot parent.
+
+
+Tag Table:
+Node: Top52
+
+End Tag Table
+';
+
+$result_converted_errors{'info'}->{'image_file_search'} = [
+ {
+ 'file_name' => '',
+ 'error_line' => ':6: warning: Cannot find @image file
`./tp/t/include/f--ile.txt\'
+',
+ 'text' => 'Cannot find @image file `./tp/t/include/f--ile.txt\'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 6
+ },
+ {
+ 'file_name' => '',
+ 'error_line' => ':9: warning: Cannot find @image file
`../include/f--ile.txt\'
+',
+ 'text' => 'Cannot find @image file `../include/f--ile.txt\'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 9
+ }
+];
+
+
+1;
Index: t/results/info_tests/image_not_found.pl
===================================================================
RCS file: t/results/info_tests/image_not_found.pl
diff -N t/results/info_tests/image_not_found.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/info_tests/image_not_found.pl 26 Feb 2011 18:25:59 -0000
1.1
@@ -0,0 +1,172 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors);
+
+$result_trees{'image_not_found'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'n_f_image'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'image',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'image_not_found'}{'contents'}[0]{'parent'} =
$result_trees{'image_not_found'};
+$result_trees{'image_not_found'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'image_not_found'}{'contents'}[1]{'args'}[0];
+$result_trees{'image_not_found'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'image_not_found'}{'contents'}[1]{'args'}[0];
+$result_trees{'image_not_found'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'image_not_found'}{'contents'}[1]{'args'}[0];
+$result_trees{'image_not_found'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'image_not_found'}{'contents'}[1];
+$result_trees{'image_not_found'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'image_not_found'}{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'image_not_found'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'image_not_found'}{'contents'}[1]{'contents'}[0];
+$result_trees{'image_not_found'}{'contents'}[1]{'contents'}[0]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'image_not_found'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'image_not_found'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'image_not_found'}{'contents'}[1];
+$result_trees{'image_not_found'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'image_not_found'}{'contents'}[1];
+$result_trees{'image_not_found'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'image_not_found'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'image_not_found'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'image_not_found'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'image_not_found'}{'contents'}[1]{'parent'} =
$result_trees{'image_not_found'};
+
+$result_texis{'image_not_found'} = '@node Top
address@hidden
+';
+
+
+$result_texts{'image_not_found'} = 'n_f_image
+';
+
+$result_sectioning{'image_not_found'} = {};
+
+$result_nodes{'image_not_found'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'node_up' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ]
+ }
+ }
+};
+
+$result_menus{'image_not_found'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ }
+};
+
+$result_errors{'image_not_found'} = [];
+
+
+
+$result_converted{'info'}->{'image_not_found'} = 'This is , produced by
makeinfo version 4.13 from .
+
+
+File: , Node: Top, Up: (dir)
+
+
+
+Tag Table:
+Node: Top52
+
+End Tag Table
+';
+
+$result_converted_errors{'info'}->{'image_not_found'} = [
+ {
+ 'file_name' => '',
+ 'error_line' => ':2: warning: Cannot find @image file `n_f_image.txt\'
+',
+ 'text' => 'Cannot find @image file `n_f_image.txt\'',
+ 'type' => 'warning',
+ 'macro' => '',
+ 'line_nr' => 2
+ }
+];
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Convert/Info.pm t/info_...,
Patrice Dumas <=