[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8056] inline manual_tree.pl
|
From: |
gavinsmith0123 |
|
Subject: |
[8056] inline manual_tree.pl |
|
Date: |
Tue, 14 Aug 2018 04:03:18 -0400 (EDT) |
Revision: 8056
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8056
Author: gavin
Date: 2018-08-14 04:03:17 -0400 (Tue, 14 Aug 2018)
Log Message:
-----------
inline manual_tree.pl
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Makefile.am
trunk/tp/t/01use.t
Removed Paths:
-------------
trunk/tp/t/manual_tree.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-08-13 11:41:21 UTC (rev 8055)
+++ trunk/ChangeLog 2018-08-14 08:03:17 UTC (rev 8056)
@@ -1,3 +1,7 @@
+2018-08-14 Gavin Smith <address@hidden>
+
+ * tp/t/01use.t: Inline file tp/t/manual_tree.pl.
+
2018-08-13 Gavin Smith <address@hidden>
* tp/Texinfo/ModulePath.pm.in (init): Remove subroutine
Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am 2018-08-13 11:41:21 UTC (rev 8055)
+++ trunk/tp/Makefile.am 2018-08-14 08:03:17 UTC (rev 8056)
@@ -153,7 +153,6 @@
t/init/test_renamed_nodes.init \
t/init/misc_file_collision.init \
t/init/l2h.init \
- t/manual_tree.pl \
t/test_utils.pl \
t/input_files/all_spaces.texi \
t/input_files/char_latin1_utf8_in_refs.texi \
Modified: trunk/tp/t/01use.t
===================================================================
--- trunk/tp/t/01use.t 2018-08-13 11:41:21 UTC (rev 8055)
+++ trunk/tp/t/01use.t 2018-08-14 08:03:17 UTC (rev 8056)
@@ -23,8 +23,110 @@
use vars qw($manual_tree $manual_tree_result);
-require 't/manual_tree.pl';
+$manual_tree = { 'cmdname' => 'multitable',
+ 'args' => [
+ { 'type' => 'block_line_arg',
+ 'contents' => [
+ { 'text' => ' ' },
+ { 'type' => 'bracketed',
+ 'contents' => [
+ {'text' => 'aaaa'},
+ ]
+ },
+ { 'text' => ' ' },
+ { 'type' => 'bracketed',
+ 'contents' => [
+ {'text' => 'xx'},
+ {'cmdname' => 'b',
+ 'args' => [
+ {
+ 'type' => 'brace_command_arg',
+ 'contents' => [
+ { 'text' => 'rr' }
+ ]
+ }
+ ]
+ }
+ ]
+ },
+ {'text' => " ccc\n"},
+ ],
+ } ],
+ 'extra' => { 'number_of_columns' => 3,
+ 'end_command' => {} },
+ 'contents' => [
+ { 'type' => 'multitable_title',
+ 'contents' => [
+ { 'type' => 'paragraph',
+ 'contents' => [
+ { 'text' => "title" },
+ { 'cmdname' => 'verb',
+ 'args' => [ {
+ 'contents' => [
+ { 'text' =>
' in verb } ',
+ 'type' =>
'raw' }
+ ],
+ 'type' =>
'brace_command_arg',
+ } ],
+ 'type' => ':'
+ },
+ { 'cmdname' => '@'},
+ { 'text' => ".\n"},
+ ]
+ }
+ ]
+ },
+ { 'cmdname' => 'item',
+ 'type' => 'multitable_row',
+ 'extra' => {'row_number' => 1},
+ 'contents' => [
+ {
+ 'type' => 'multitable_cell',
+ 'extra' => {'col_number' => 1,
+ 'row_number' => 1},
+ 'contents' => [ {'text' => " \n" } ]
+ }
+ ]
+ },
+ { 'cmdname' => 'end',
+ 'extra' => {'command_argument' => 'multitable',
+ 'text_arg' => 'multitable',
+ },
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'multitable'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ }
+ ]
+
+};
+
+$manual_tree_result = '@multitable {aaaa} address@hidden ccc
address@hidden: in verb } :}@@.
address@hidden
address@hidden multitable
+';
+
is (Texinfo::Convert::Texinfo::convert($manual_tree),
$manual_tree_result, "tree_to_texi on a manually written tree");
Deleted: trunk/tp/t/manual_tree.pl
===================================================================
--- trunk/tp/t/manual_tree.pl 2018-08-13 11:41:21 UTC (rev 8055)
+++ trunk/tp/t/manual_tree.pl 2018-08-14 08:03:17 UTC (rev 8056)
@@ -1,105 +0,0 @@
-$manual_tree = { 'cmdname' => 'multitable',
- 'args' => [
- { 'type' => 'block_line_arg',
- 'contents' => [
- { 'text' => ' ' },
- { 'type' => 'bracketed',
- 'contents' => [
- {'text' => 'aaaa'},
- ]
- },
- { 'text' => ' ' },
- { 'type' => 'bracketed',
- 'contents' => [
- {'text' => 'xx'},
- {'cmdname' => 'b',
- 'args' => [
- {
- 'type' => 'brace_command_arg',
- 'contents' => [
- { 'text' => 'rr' }
- ]
- }
- ]
- }
- ]
- },
- {'text' => " ccc\n"},
- ],
- } ],
- 'extra' => { 'number_of_columns' => 3,
- 'end_command' => {} },
- 'contents' => [
- { 'type' => 'multitable_title',
- 'contents' => [
- { 'type' => 'paragraph',
- 'contents' => [
- { 'text' => "title" },
- { 'cmdname' => 'verb',
- 'args' => [ {
- 'contents' => [
- { 'text' =>
' in verb } ',
- 'type' =>
'raw' }
- ],
- 'type' =>
'brace_command_arg',
- } ],
- 'type' => ':'
- },
- { 'cmdname' => '@'},
- { 'text' => ".\n"},
- ]
- }
- ]
- },
- { 'cmdname' => 'item',
- 'type' => 'multitable_row',
- 'extra' => {'row_number' => 1},
- 'contents' => [
- {
- 'type' => 'multitable_cell',
- 'extra' => {'col_number' => 1,
- 'row_number' => 1},
- 'contents' => [ {'text' => " \n" } ]
- }
- ]
- },
- { 'cmdname' => 'end',
- 'extra' => {'command_argument' => 'multitable',
- 'text_arg' => 'multitable',
- },
- 'args' => [
- {
- 'contents' => [
- {
- 'parent' => {},
- 'text' => ' ',
- 'type' => 'empty_spaces_after_command'
- },
- {
- 'parent' => {},
- 'text' => 'multitable'
- },
- {
- 'parent' => {},
- 'text' => '
-',
- 'type' => 'spaces_at_end'
- }
- ],
- 'parent' => {},
- 'type' => 'misc_line_arg'
- }
- ],
-
- }
- ]
-
-};
-
-$manual_tree_result = '@multitable {aaaa} address@hidden ccc
address@hidden: in verb } :}@@.
address@hidden
address@hidden multitable
-';
-
-1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8056] inline manual_tree.pl,
gavinsmith0123 <=