[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[7132] remove macrobody from extra
|
From: |
Gavin D. Smith |
|
Subject: |
[7132] remove macrobody from extra |
|
Date: |
Sun, 24 Apr 2016 14:16:22 +0000 |
Revision: 7132
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7132
Author: gavin
Date: 2016-04-24 14:16:21 +0000 (Sun, 24 Apr 2016)
Log Message:
-----------
remove macrobody from extra
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
trunk/tp/t/results/conditionals/macro_in_ifset.pl
trunk/tp/t/results/conditionals/macro_in_ifset_set.pl
trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl
trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
trunk/tp/t/results/coverage_braces/test_image.pl
trunk/tp/t/results/include/cpp_lines.pl
trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
trunk/tp/t/results/include/macro_definition_in_include.pl
trunk/tp/t/results/include/macro_in_early_commands.pl
trunk/tp/t/results/info_tests/def_in_copying.pl
trunk/tp/t/results/macro/arg_body_expansion_order.pl
trunk/tp/t/results/macro/arg_not_closed.pl
trunk/tp/t/results/macro/backslash_in_arg.pl
trunk/tp/t/results/macro/bad_argument.pl
trunk/tp/t/results/macro/bad_formal_arg.pl
trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl
trunk/tp/t/results/macro/complete_macro_for_end.pl
trunk/tp/t/results/macro/complex_argument.pl
trunk/tp/t/results/macro/double_macro_definition.pl
trunk/tp/t/results/macro/double_recursive_macro_call.pl
trunk/tp/t/results/macro/empty_end.pl
trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl
trunk/tp/t/results/macro/empty_macro_no_arg.pl
trunk/tp/t/results/macro/expand_two_same.pl
trunk/tp/t/results/macro/expansion_order.pl
trunk/tp/t/results/macro/form_feeds.pl
trunk/tp/t/results/macro/ifclear_in_macro.pl
trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
trunk/tp/t/results/macro/ifset_in_macro.pl
trunk/tp/t/results/macro/ifset_in_macro_set.pl
trunk/tp/t/results/macro/ignored_macro_definition.pl
trunk/tp/t/results/macro/implicit_quoting_one_arg.pl
trunk/tp/t/results/macro/implicit_quoting_recursion.pl
trunk/tp/t/results/macro/leading_spaces_ignore.pl
trunk/tp/t/results/macro/leading_spaces_no_ignore.pl
trunk/tp/t/results/macro/macro_expands_to_empty.pl
trunk/tp/t/results/macro/macro_expansion.pl
trunk/tp/t/results/macro/macro_for_end.pl
trunk/tp/t/results/macro/macro_for_ignored_line_command.pl
trunk/tp/t/results/macro/macro_in_accent.pl
trunk/tp/t/results/macro/macro_in_brace_command.pl
trunk/tp/t/results/macro/macro_in_end_argument.pl
trunk/tp/t/results/macro/macro_in_ifset.pl
trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
trunk/tp/t/results/macro/macro_in_index_commands.pl
trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
trunk/tp/t/results/macro/macro_in_macro_arg.pl
trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl
trunk/tp/t/results/macro/macro_in_menu.pl
trunk/tp/t/results/macro/macro_in_misc_commands.pl
trunk/tp/t/results/macro/macro_name_with_digit.pl
trunk/tp/t/results/macro/macro_name_with_hyphen.pl
trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl
trunk/tp/t/results/macro/macro_no_arg_expansion.pl
trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl
trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
trunk/tp/t/results/macro/macro_zero.pl
trunk/tp/t/results/macro/nested_macro_call.pl
trunk/tp/t/results/macro/no_macrobody.pl
trunk/tp/t/results/macro/paragraph_and_macro.pl
trunk/tp/t/results/macro/protect_comma_macro_line.pl
trunk/tp/t/results/macro/protect_in_body.pl
trunk/tp/t/results/macro/protect_in_body_line_arg.pl
trunk/tp/t/results/macro/protect_in_body_one_arg.pl
trunk/tp/t/results/macro/recursive_call_in_argument.pl
trunk/tp/t/results/macro/recursive_call_in_macro.pl
trunk/tp/t/results/macro/redefine_texinfo_macro.pl
trunk/tp/t/results/macro/simple_imbricated_macro.pl
trunk/tp/t/results/macro/space_macro_after_end.pl
trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl
trunk/tp/t/results/macro/text_before_after.pl
trunk/tp/t/results/macro/too_much_args.pl
trunk/tp/t/results/macro/two_macros_on_a_line.pl
trunk/tp/t/results/macro/zero_argument.pl
trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
trunk/tp/t/results/misc_commands/kbdinputstyle.pl
trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
trunk/tp/t/results/raw/nested_macros.pl
trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
trunk/tp/t/results/value_and_macro/macro_in_value.pl
trunk/tp/t/results/value_and_macro/value_in_macro_body.pl
trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
trunk/tp/t/results/xml_tests/macro_and_args.pl
trunk/tp/t/results/xtable/table_nested.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/ChangeLog 2016-04-24 14:16:21 UTC (rev 7132)
@@ -1,3 +1,14 @@
+2016-04-24 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Parser.pm (_expand_macro_arguments)
+ (_expand_macro_body, _end_line <insertcopying>, parse_texi):
+ Make $self->{'macros'} hash contain hashes which refer to the
+ elements that define the macro with the 'element' key, instead
+ of containing the elements themselves. Define 'macrobody' on
+ the elements of $self->{'macros'}, instead of defining it as an
+ 'extra' value. This change is because the 'macrobody' is not
+ used outside of Parser.pm.
+
2016-04-14 Gavin Smith <address@hidden>
* tp/Texinfo/Parser.pm (_end_line),
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/Texinfo/Parser.pm 2016-04-24 14:16:21 UTC (rev 7132)
@@ -2055,6 +2055,7 @@
return ($new_line, $line_nr);
}
+# $MACRO is the element in the tree defining the macro.
sub _expand_macro_arguments($$$$)
{
my $self = shift;
@@ -2134,15 +2135,16 @@
return ($arguments, $line, $line_nr);
}
+# $MACRO is a member of $self->{'macros'}.
sub _expand_macro_body($$$$) {
my $self = shift;
my $macro = shift;
my $args = shift;
my $line_nr = shift;
- my $macrobody = $macro->{'extra'}->{'macrobody'};
- my $args_total = scalar(@{$macro->{'args'}}) -1;
- my $args_index = $macro->{'extra'}->{'args_index'};
+ my $macrobody = $macro->{'macrobody'};
+ my $args_total = scalar(@{$macro->{'element'}->{'args'}}) -1;
+ my $args_index = $macro->{'element'}->{'extra'}->{'args_index'};
my $i;
for ($i=0; $i<=$args_total; $i++) {
@@ -2162,7 +2164,7 @@
} else {
$self->line_error(sprintf($self->__(
"\\ in address@hidden expansion followed `%s' instead of parameter
name or \\"),
- $macro->{'args'}->[0]->{'text'}, $arg), $line_nr);
+ $macro->{'element'}->{'args'}->[0]->{'text'}, $arg), $line_nr);
$result .= '\\' . $arg;
}
}
@@ -3319,11 +3321,11 @@
{'contents' => address@hidden);
#chomp ($body);
- $self->{'macros'}->{'insertcopying'} = {
+ $self->{'macros'}->{'insertcopying'} =
+ { 'element' => {
'args' => [{'text' => 'insertcopying', 'type' =>
'macro_name'}],
- 'cmdname' => 'macro',
- 'extra' => {'macrobody' =>
- $self->_strip_macrobody_leading_space($body)}
+ 'cmdname' => 'macro', },
+ 'macrobody' => $self->_strip_macrobody_leading_space($body)
};
$inline_copying = 1;
print STDERR "INLINE_INSERTCOPYING as macro\n" if
($self->{'DEBUG'});
@@ -3796,7 +3798,7 @@
or !$current->{'parent'}->{'cmdname'}
or ($current->{'parent'}->{'cmdname'} ne 'macro'
and $current->{'parent'}->{'cmdname'} ne 'rmacro'))) {
- $current->{'extra'}->{'macrobody'} =
+ my $macrobody =
$self->_strip_macrobody_leading_space(
Texinfo::Convert::Texinfo::convert({ 'contents'
=> $current->{'contents'} }));
@@ -3808,15 +3810,17 @@
$name), $current->{'line_nr'});
$self->line_warn(sprintf($self->__(
"here is the previous definition of `%s'"),
- $name),
$self->{'macros'}->{$name}->{'line_nr'});
+ $name), $self->{'macros'}->{$name}->{'element'}->{'line_nr'});
}
if ($all_commands{$name}) {
$self->line_warn(sprintf($self->__(
"redefining Texinfo language command:
address@hidden"),
$name), $current->{'line_nr'});
}
- $self->{'macros'}->{$name} = $current
- unless ($current->{'extra'}->{'invalid_syntax'});
+ $self->{'macros'}->{$name} = {
+ 'element' => $current,
+ 'macrobody' => $macrobody
+ } unless ($current->{'extra'}->{'invalid_syntax'});
}
}
$current = $current->{'parent'};
@@ -3921,7 +3925,7 @@
$command = $self->{'aliases'}->{$command};
}
- my $expanded_macro = $self->{'macros'}->{$command};
+ my $expanded_macro = $self->{'macros'}->{$command}->{'element'};
my $args_number = scalar(@{$expanded_macro->{'args'}}) -1;
my $arguments = [];
if ($line =~ s/^\s*{[^\S\f]*//) { # macro with args
@@ -3944,7 +3948,8 @@
$arguments = [$line];
$line = "\n" if ($has_end_of_line);
}
- my $expanded = _expand_macro_body ($self, $expanded_macro,
+ my $expanded = _expand_macro_body ($self,
+ $self->{'macros'}->{$command},
$arguments, $line_nr);
print STDERR "MACROBODY: $expanded".'||||||'."\n"
if ($self->{'DEBUG'});
Modified: trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
===================================================================
--- trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
2016-04-24 14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' truc
',
- 'macrobody' => 'machin
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/conditionals/macro_in_ifset.pl
===================================================================
--- trunk/tp/t/results/conditionals/macro_in_ifset.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/conditionals/macro_in_ifset.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -38,8 +38,6 @@
'extra' => {
'arg_line' => ' truc {}
',
- 'macrobody' => 'truc
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/conditionals/macro_in_ifset_set.pl
===================================================================
--- trunk/tp/t/results/conditionals/macro_in_ifset_set.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/conditionals/macro_in_ifset_set.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -68,8 +68,6 @@
'extra' => {
'arg_line' => ' truc {}
',
- 'macrobody' => 'truc
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -137,8 +135,6 @@
'extra' => {
'arg_line' => ' truc{}
',
- 'macrobody' => 'in ifset
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl
===================================================================
--- trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/conditionals/nested_ifset_ifclear.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -80,15 +80,6 @@
'extra' => {
'arg_line' => ' conditionals{}
',
- 'macrobody' => '@ifset somevar
address@hidden anothervar
-Both somevar and anothervar are set.
address@hidden ifset
address@hidden anothervar
-Somevar is set, anothervar is not.
address@hidden ifclear
address@hidden ifset
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_raw.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/converters_tests/at_commands_in_raw.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -72,8 +72,6 @@
'extra' => {
'arg_line' => ' othermacro{}
',
- 'macrobody' => 'Other macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1301,8 +1299,6 @@
'extra' => {
'arg_line' => ' mymacro{}
',
- 'macrobody' => 'truc
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1360,8 +1356,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'Some \\arg\\.
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/coverage_braces/test_image.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/test_image.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/coverage_braces/test_image.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -46,10 +46,6 @@
'extra' => {
'arg_line' => ' files-char
',
- 'macrobody' => '@image{f@@i--le@/address@hidden a@@<"%@@@verb{:
< & @ % " :} ,,,,ext@@i--le@/address@hidden a@@<"%@@@verb{: < & @ % " :}}
-
-In text @image{f@@i--le@/address@hidden a@@<"%@@@verb{: < & @ % " :} ,1in,
1cm, alt @address@hidden@dotless{i}}--le@/address@hidden
address@hidden<"%@@@verb{: < & @ % " :} ,ext@@i--le@/address@hidden
a@@<"%@@@verb{: < & @ % " :}}.
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/include/cpp_lines.pl
===================================================================
--- trunk/tp/t/results/include/cpp_lines.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/include/cpp_lines.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -260,8 +260,6 @@
'extra' => {
'arg_line' => ' macr
',
- 'macrobody' => '# line 7 "k"
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
===================================================================
--- trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/include/macro_and_commands_in_early_commands.pl
2016-04-24 14:16:21 UTC (rev 7132)
@@ -34,8 +34,6 @@
'extra' => {
'arg_line' => ' begin-file
',
- 'macrobody' => 'macro_i--n_pass@@
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -138,8 +136,6 @@
'extra' => {
'arg_line' => ' latin1
',
- 'macrobody' => 'ISO-8859-1@@
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -244,9 +240,6 @@
'extra' => {
'arg_line' => ' multiinclude
',
- 'macrobody' => 'macro_included.texi
address@hidden inc_@@f--ile.texi
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -384,8 +377,6 @@
'extra' => {
'arg_line' => ' themacro
',
- 'macrobody' => 'in themacro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/include/macro_definition_in_include.pl
===================================================================
--- trunk/tp/t/results/include/macro_definition_in_include.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/include/macro_definition_in_include.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' themacro
',
- 'macrobody' => 'in themacro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/include/macro_in_early_commands.pl
===================================================================
--- trunk/tp/t/results/include/macro_in_early_commands.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/include/macro_in_early_commands.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -34,8 +34,6 @@
'extra' => {
'arg_line' => ' begin-file
',
- 'macrobody' => 'macro_in_pass
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -87,8 +85,6 @@
'args_index' => {
'ext' => 0
},
- 'macrobody' => 'texi_commands.\\ext\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -183,8 +179,6 @@
'extra' => {
'arg_line' => ' latin1
',
- 'macrobody' => 'ISO-8859-1
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -234,8 +228,6 @@
'extra' => {
'arg_line' => ' documentencoding-command
',
- 'macrobody' => '@documentencoding
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -338,9 +330,6 @@
'extra' => {
'arg_line' => ' multiinclude
',
- 'macrobody' => 'macro_included.texi
address@hidden inc_file.texi
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -478,8 +467,6 @@
'extra' => {
'arg_line' => ' themacro
',
- 'macrobody' => 'in themacro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/info_tests/def_in_copying.pl
===================================================================
--- trunk/tp/t/results/info_tests/def_in_copying.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/info_tests/def_in_copying.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -52,11 +52,6 @@
'extra' => {
'arg_line' => ' mymacro
',
- 'macrobody' => '@deffn aa bb cc
address@hidden aax bbx ccx
-deffnx lines
address@hidden deffn
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/arg_body_expansion_order.pl
===================================================================
--- trunk/tp/t/results/macro/arg_body_expansion_order.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/arg_body_expansion_order.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -38,8 +38,6 @@
'extra' => {
'arg_line' => ' othermacro
',
- 'macrobody' => 'initial
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -134,12 +132,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@unmacro othermacro
address@hidden othermacro
-different
address@hidden macro
-\\arg\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -207,8 +199,6 @@
'extra' => {
'arg_line' => ' othermacro
',
- 'macrobody' => 'different
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/arg_not_closed.pl
===================================================================
--- trunk/tp/t/results/macro/arg_not_closed.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/arg_not_closed.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'foo
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/backslash_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/backslash_in_arg.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/backslash_in_arg.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -80,8 +80,6 @@
'args_index' => {
'TEXT' => 0
},
- 'macrobody' => '@findex \\TEXT\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/bad_argument.pl
===================================================================
--- trunk/tp/t/results/macro/bad_argument.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/bad_argument.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -26,8 +26,6 @@
'arg_line' => '
',
'invalid_syntax' => 1,
- 'macrobody' => 'in macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -78,8 +76,6 @@
'arg_line' => ' abar aaa
',
'invalid_syntax' => 1,
- 'macrobody' => 'in
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -138,8 +134,6 @@
'ggg' => 0
},
'invalid_syntax' => 1,
- 'macrobody' => 'in macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -183,8 +177,6 @@
'arg_line' => ' #badname
',
'invalid_syntax' => 1,
- 'macrobody' => 'in #
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/bad_formal_arg.pl
===================================================================
--- trunk/tp/t/results/macro/bad_formal_arg.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/bad_formal_arg.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -53,8 +53,6 @@
'not_empty' => 1
},
'invalid_syntax' => 1,
- 'macrobody' => 'in bad macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -119,8 +117,6 @@
'in 2arg' => 1
},
'invalid_syntax' => 1,
- 'macrobody' => 'bad space
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -205,11 +201,6 @@
':::' => 0
},
'invalid_syntax' => 1,
- 'macrobody' => 'in bar
address@hidden foo {? aaa}
-in macro foo
address@hidden macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl
===================================================================
--- trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/bad_macro_name_with_underscore.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -33,8 +33,6 @@
'arg_line' => ' the_macro {arg1, arg2}
',
'invalid_syntax' => 1,
- 'macrobody' => 'In macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/complete_macro_for_end.pl
===================================================================
--- trunk/tp/t/results/macro/complete_macro_for_end.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/complete_macro_for_end.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' theend
',
- 'macrobody' => '@end cartouche
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/complex_argument.pl
===================================================================
--- trunk/tp/t/results/macro/complex_argument.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/complex_argument.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'coucou \\arg\\ after arg
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -109,11 +107,6 @@
'extra' => {
'arg_line' => ' macrofour {}
',
- 'macrobody' => '1
-2
-3
-4
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -183,9 +176,6 @@
'arg' => 1,
'text' => 0
},
- 'macrobody' => '\\text\\
-&&&& \\arg\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -486,8 +476,6 @@
'args_index' => {
'truc' => 0
},
- 'macrobody' => '@emph{\\truc\\}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/double_macro_definition.pl
===================================================================
--- trunk/tp/t/results/macro/double_macro_definition.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/double_macro_definition.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -20,7 +20,6 @@
'extra' => {
'arg_line' => ' foo
',
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -58,7 +57,6 @@
'extra' => {
'arg_line' => ' foo
',
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/double_recursive_macro_call.pl
===================================================================
--- trunk/tp/t/results/macro/double_recursive_macro_call.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/double_recursive_macro_call.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -46,8 +46,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@mactwo{}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -105,8 +103,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@macone{}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/empty_end.pl
===================================================================
--- trunk/tp/t/results/macro/empty_end.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/empty_end.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -40,8 +40,6 @@
'args_index' => {
'aaa' => 0
},
- 'macrobody' => 'in foo
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl
===================================================================
--- trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/empty_macro_in_text_no_arg.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -20,7 +20,6 @@
'extra' => {
'arg_line' => ' texnl{}
',
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -80,7 +79,6 @@
'extra' => {
'arg_line' => ' texnltwo
',
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/empty_macro_no_arg.pl
===================================================================
--- trunk/tp/t/results/macro/empty_macro_no_arg.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/empty_macro_no_arg.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -20,7 +20,6 @@
'extra' => {
'arg_line' => ' foo
',
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/expand_two_same.pl
===================================================================
--- trunk/tp/t/results/macro/expand_two_same.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/expand_two_same.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -46,9 +46,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'With a doubles arg \\arg\\ and re \\arg\\
-
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/expansion_order.pl
===================================================================
--- trunk/tp/t/results/macro/expansion_order.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/expansion_order.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@machin{}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -97,9 +95,6 @@
'extra' => {
'arg_line' => ' machin
',
- 'macrobody' => '\\\\arg\\\\
-
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/form_feeds.pl
===================================================================
--- trunk/tp/t/results/macro/form_feeds.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/form_feeds.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -46,8 +46,6 @@
'a' => 0,
'b' => 1
},
- 'macrobody' => 'f \\a\\ n \\b\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -105,8 +103,6 @@
'args_index' => {
'c' => 0
},
- 'macrobody' => 'g \\c\\ v
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/ifclear_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifclear_in_macro.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/ifclear_in_macro.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -52,10 +52,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@ifclear notes
-\\arg\\
address@hidden ifclear
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/ifset_and_end_isef_in_macro.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' beginifset {}
',
- 'macrobody' => '@ifset a
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -83,8 +81,6 @@
'extra' => {
'arg_line' => ' endifset {}
',
- 'macrobody' => '@end ifset
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/ifset_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_in_macro.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/ifset_in_macro.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -52,10 +52,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@ifset notes
-\\arg\\
address@hidden ifset
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/ifset_in_macro_set.pl
===================================================================
--- trunk/tp/t/results/macro/ifset_in_macro_set.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/ifset_in_macro_set.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -52,10 +52,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@ifset notes
-\\arg\\
address@hidden ifset
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/ignored_macro_definition.pl
===================================================================
--- trunk/tp/t/results/macro/ignored_macro_definition.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/ignored_macro_definition.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' mymacro{}
',
- 'macrobody' => 'outside
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -129,8 +127,6 @@
'extra' => {
'arg_line' => ' mymacro{}
',
- 'macrobody' => 'in inlinefmt tex
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/implicit_quoting_one_arg.pl
===================================================================
--- trunk/tp/t/results/macro/implicit_quoting_one_arg.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/implicit_quoting_one_arg.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -46,8 +46,6 @@
'args_index' => {
'a' => 0
},
- 'macrobody' => '@strong{FIXME: \\a\\}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/implicit_quoting_recursion.pl
===================================================================
--- trunk/tp/t/results/macro/implicit_quoting_recursion.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/implicit_quoting_recursion.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -46,8 +46,6 @@
'a' => 0,
'b' => 1
},
- 'macrobody' => '\\a\\\\b\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/leading_spaces_ignore.pl
===================================================================
--- trunk/tp/t/results/macro/leading_spaces_ignore.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/leading_spaces_ignore.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -38,9 +38,6 @@
'extra' => {
'arg_line' => ' mymacro
',
- 'macrobody' => 'Some here
-text
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/leading_spaces_no_ignore.pl
===================================================================
--- trunk/tp/t/results/macro/leading_spaces_no_ignore.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/leading_spaces_no_ignore.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -38,9 +38,6 @@
'extra' => {
'arg_line' => ' mymacro
',
- 'macrobody' => ' Some here
- text
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_expands_to_empty.pl
===================================================================
--- trunk/tp/t/results/macro/macro_expands_to_empty.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_expands_to_empty.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '\\arg\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_expansion.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/macro_expansion.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -70,11 +70,6 @@
'arg1' => 0,
'arg2' => 1
},
- 'macrobody' => 'result of a macro with \\arg1\\ and
address@hidden
-\\arg2\\
address@hidden verbatim
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_for_end.pl
===================================================================
--- trunk/tp/t/results/macro/macro_for_end.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/macro_for_end.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' myend
',
- 'macrobody' => '@end
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_for_ignored_line_command.pl
===================================================================
--- trunk/tp/t/results/macro/macro_for_ignored_line_command.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/macro_for_ignored_line_command.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' pagemacro
',
- 'macrobody' => '@page
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_accent.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_accent.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/macro_in_accent.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' aletter
',
- 'macrobody' => 'a
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -83,8 +81,6 @@
'extra' => {
'arg_line' => ' aspace
',
- 'macrobody' => '
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_brace_command.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_brace_command.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_in_brace_command.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' foo
',
- 'macrobody' => 'foo-expansion
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -83,8 +81,6 @@
'extra' => {
'arg_line' => ' abar
',
- 'macrobody' => 'bar-expansion
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_end_argument.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_end_argument.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_in_end_argument.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' acartouche
',
- 'macrobody' => 'cartouche
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_ifset.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_ifset.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/macro_in_ifset.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@end ifset
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@end ifset
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_index_commands.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_index_commands.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_in_index_commands.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -34,8 +34,6 @@
'extra' => {
'arg_line' => ' cp
',
- 'macrobody' => 'cp
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -79,8 +77,6 @@
'extra' => {
'arg_line' => ' fn
',
- 'macrobody' => 'fn
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -124,8 +120,6 @@
'extra' => {
'arg_line' => ' syncodeindexcommand
',
- 'macrobody' => '@syncodeindex
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -265,8 +259,6 @@
'extra' => {
'arg_line' => ' truc
',
- 'macrobody' => 'truc
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -379,8 +371,6 @@
'extra' => {
'arg_line' => ' trucindexcommand
',
- 'macrobody' => '@trucindex
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -430,8 +420,6 @@
'extra' => {
'arg_line' => ' codeidx
',
- 'macrobody' => 'codeidx
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -528,8 +516,6 @@
'extra' => {
'arg_line' => ' defcodeindexentry
',
- 'macrobody' => 'a @var{index entry} address@hidden'e
@address@hidden
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/macro_in_invalid_documentencoding.pl
2016-04-24 14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' badmacro
',
- 'macrobody' => 'badm
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_macro_arg.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_macro_arg.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_in_macro_arg.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -38,8 +38,6 @@
'extra' => {
'arg_line' => ' macroone
',
- 'macrobody' => 'a, @macrotwo
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -97,8 +95,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'hello \\arg\\ after arg
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -168,9 +164,6 @@
'arg' => 1,
'text' => 0
},
- 'macrobody' => '\\text\\
-&&&& \\arg\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/macro_in_macro_arg_simpler.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' macrooneone
',
- 'macrobody' => 'a, macro2
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -103,9 +101,6 @@
'arg' => 1,
'text' => 0
},
- 'macrobody' => '\\text\\
-&&&& \\arg\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_menu.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_menu.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/macro_in_menu.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -38,8 +38,6 @@
'extra' => {
'arg_line' => ' astar
',
- 'macrobody' => '*
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -89,8 +87,6 @@
'extra' => {
'arg_line' => ' starspaces
',
- 'macrobody' => '*
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -140,8 +136,6 @@
'extra' => {
'arg_line' => ' spaces
',
- 'macrobody' => '
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -191,8 +185,6 @@
'extra' => {
'arg_line' => ' aspace
',
- 'macrobody' => '
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -242,8 +234,6 @@
'extra' => {
'arg_line' => ' twocolon
',
- 'macrobody' => '::
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -293,8 +283,6 @@
'extra' => {
'arg_line' => ' acolon
',
- 'macrobody' => ':
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_in_misc_commands.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_misc_commands.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_in_misc_commands.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -34,8 +34,6 @@
'extra' => {
'arg_line' => ' text
',
- 'macrobody' => 'atext
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -85,8 +83,6 @@
'extra' => {
'arg_line' => ' Top
',
- 'macrobody' => 'Top
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -318,8 +314,6 @@
'extra' => {
'arg_line' => ' en
',
- 'macrobody' => 'en
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -363,8 +357,6 @@
'extra' => {
'arg_line' => ' documentlanguagecommand
',
- 'macrobody' => '@documentlanguage
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -530,8 +522,6 @@
'extra' => {
'arg_line' => ' pagesizesarg
',
- 'macrobody' => '200mm,150mm
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -581,8 +571,6 @@
'extra' => {
'arg_line' => ' afourpapermacro
',
- 'macrobody' => '@afourpaper
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -775,8 +763,6 @@
'extra' => {
'arg_line' => ' needarg
',
- 'macrobody' => '0.1
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -873,8 +859,6 @@
'extra' => {
'arg_line' => ' raisesectionsmacro
',
- 'macrobody' => '@raisesections
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -930,8 +914,6 @@
'extra' => {
'arg_line' => ' lowersectionsmacro
',
- 'macrobody' => '@lowersections
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1095,8 +1077,6 @@
'extra' => {
'arg_line' => ' definfoenclosename
',
- 'macrobody' => 'phi
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1228,8 +1208,6 @@
'extra' => {
'arg_line' => ' strongmacro
',
- 'macrobody' => '@strong
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1273,8 +1251,6 @@
'extra' => {
'arg_line' => ' strongname
',
- 'macrobody' => 'strong
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1495,8 +1471,6 @@
'extra' => {
'arg_line' => ' kbdinputstylearg
',
- 'macrobody' => 'code
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1736,8 +1710,6 @@
'extra' => {
'arg_line' => ' asisarg
',
- 'macrobody' => 'asis
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1781,8 +1753,6 @@
'extra' => {
'arg_line' => ' zero
',
- 'macrobody' => '0
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1826,8 +1796,6 @@
'extra' => {
'arg_line' => ' nonearg
',
- 'macrobody' => 'none
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1871,8 +1839,6 @@
'extra' => {
'arg_line' => ' four
',
- 'macrobody' => '4
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -1916,8 +1882,6 @@
'extra' => {
'arg_line' => ' six
',
- 'macrobody' => '6
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2219,8 +2183,6 @@
'extra' => {
'arg_line' => ' endarg
',
- 'macrobody' => 'end
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2264,8 +2226,6 @@
'extra' => {
'arg_line' => ' separatearg
',
- 'macrobody' => 'separate
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2397,8 +2357,6 @@
'extra' => {
'arg_line' => ' onarg
',
- 'macrobody' => 'on
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2442,8 +2400,6 @@
'extra' => {
'arg_line' => ' offarg
',
- 'macrobody' => 'off
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2593,8 +2549,6 @@
'extra' => {
'arg_line' => ' ten
',
- 'macrobody' => '10
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2697,8 +2651,6 @@
'extra' => {
'arg_line' => ' falsearg
',
- 'macrobody' => 'false
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2742,8 +2694,6 @@
'extra' => {
'arg_line' => ' truearg
',
- 'macrobody' => 'true
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2881,8 +2831,6 @@
'extra' => {
'arg_line' => ' pagemacro
',
- 'macrobody' => '@page
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2926,8 +2874,6 @@
'extra' => {
'arg_line' => ' noindentmacro
',
- 'macrobody' => '@noindent
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -2971,8 +2917,6 @@
'extra' => {
'arg_line' => ' refillmacro
',
- 'macrobody' => '@refill
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -3322,8 +3266,6 @@
'extra' => {
'arg_line' => ' contentsmacro
',
- 'macrobody' => '@contents
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -3414,8 +3356,6 @@
'extra' => {
'arg_line' => ' cropmarksmacro
',
- 'macrobody' => '@cropmarks
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -3477,8 +3417,6 @@
'extra' => {
'arg_line' => ' exdentmacro
',
- 'macrobody' => '@exdent
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -3569,8 +3507,6 @@
'extra' => {
'arg_line' => ' two
',
- 'macrobody' => '2
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -3661,8 +3597,6 @@
'extra' => {
'arg_line' => ' resultmacro
',
- 'macrobody' => '@result
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -3991,8 +3925,6 @@
'extra' => {
'arg_line' => ' shortcontentsmacro
',
- 'macrobody' => '@shortcontents
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -4059,8 +3991,6 @@
'extra' => {
'arg_line' => ' byemacro
',
- 'macrobody' => '@bye
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_name_with_digit.pl
===================================================================
--- trunk/tp/t/results/macro/macro_name_with_digit.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_name_with_digit.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' macro1
',
- 'macrobody' => 'macro1
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -91,8 +89,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'expand \\arg\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_name_with_hyphen.pl
===================================================================
--- trunk/tp/t/results/macro/macro_name_with_hyphen.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_name_with_hyphen.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -46,8 +46,6 @@
'arg-one' => 0,
'arg2' => 1
},
- 'macrobody' => 'This \\arg-one\\ and that \\arg2\\.
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/macro_no_arg_bad_expansion.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' testone
',
- 'macrobody' => 'res1
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_no_arg_expansion.pl
===================================================================
--- trunk/tp/t/results/macro/macro_no_arg_expansion.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/macro_no_arg_expansion.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' testone
',
- 'macrobody' => 'res1
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl
===================================================================
--- trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/macro_one_arg_end_of_file.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'Arg \\arg\\.
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
===================================================================
--- trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
2016-04-24 14:16:21 UTC (rev 7132)
@@ -40,8 +40,6 @@
'args_index' => {
'string' => 0
},
- 'macrobody' => '@center
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/macro_zero.pl
===================================================================
--- trunk/tp/t/results/macro/macro_zero.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/macro_zero.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' zero
',
- 'macrobody' => '0
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/nested_macro_call.pl
===================================================================
--- trunk/tp/t/results/macro/nested_macro_call.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/nested_macro_call.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' machin{}
',
- 'macrobody' => '(machin)
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -89,9 +87,6 @@
'extra' => {
'arg_line' => ' truc{}
',
- 'macrobody' => '@machin{}
-
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/no_macrobody.pl
===================================================================
--- trunk/tp/t/results/macro/no_macrobody.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/no_macrobody.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -28,7 +28,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/paragraph_and_macro.pl
===================================================================
--- trunk/tp/t/results/macro/paragraph_and_macro.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/paragraph_and_macro.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -20,7 +20,6 @@
'extra' => {
'arg_line' => ' aempty
',
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -70,8 +69,6 @@
'extra' => {
'arg_line' => ' aspace
',
- 'macrobody' => '
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -121,8 +118,6 @@
'extra' => {
'arg_line' => ' word
',
- 'macrobody' => 'a word
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/protect_comma_macro_line.pl
===================================================================
--- trunk/tp/t/results/macro/protect_comma_macro_line.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/protect_comma_macro_line.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -58,11 +58,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'we get \\arg\\ and another \\arg\\
-and another one on another line \\arg\\
-
-and a last in another paragraph
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/protect_in_body.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/protect_in_body.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -46,8 +46,6 @@
'arg1' => 0,
'arg2' => 1
},
- 'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\
@emph{\\arg2\\}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/protect_in_body_line_arg.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body_line_arg.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/protect_in_body_line_arg.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -46,8 +46,6 @@
'arg1' => 0,
'arg2' => 1
},
- 'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\
@emph{\\arg2\\}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/protect_in_body_one_arg.pl
===================================================================
--- trunk/tp/t/results/macro/protect_in_body_one_arg.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/protect_in_body_one_arg.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -46,8 +46,6 @@
'arg1' => 0,
'arg2' => 1
},
- 'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\
@emph{\\arg2\\}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/recursive_call_in_argument.pl
===================================================================
--- trunk/tp/t/results/macro/recursive_call_in_argument.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/recursive_call_in_argument.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'a
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/recursive_call_in_macro.pl
===================================================================
--- trunk/tp/t/results/macro/recursive_call_in_macro.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/recursive_call_in_macro.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@anorecurse{arg}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/redefine_texinfo_macro.pl
===================================================================
--- trunk/tp/t/results/macro/redefine_texinfo_macro.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/redefine_texinfo_macro.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -40,8 +40,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@emph{\\arg\\}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/simple_imbricated_macro.pl
===================================================================
--- trunk/tp/t/results/macro/simple_imbricated_macro.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/simple_imbricated_macro.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -58,11 +58,6 @@
'extra' => {
'arg_line' => ' truc {}
',
- 'macrobody' => 'truc.
address@hidden bidule {}
-bidule.
address@hidden macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -119,8 +114,6 @@
'extra' => {
'arg_line' => ' bidule {}
',
- 'macrobody' => 'bidule.
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/space_macro_after_end.pl
===================================================================
--- trunk/tp/t/results/macro/space_macro_after_end.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/space_macro_after_end.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' spaces
',
- 'macrobody' => '
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl
===================================================================
--- trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/macro/space_macro_after_end_verbatim.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' spaces
',
- 'macrobody' => '
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/text_before_after.pl
===================================================================
--- trunk/tp/t/results/macro/text_before_after.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/text_before_after.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -38,8 +38,6 @@
'extra' => {
'arg_line' => ' mymacro
',
- 'macrobody' => 'in macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/too_much_args.pl
===================================================================
--- trunk/tp/t/results/macro/too_much_args.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/too_much_args.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -52,9 +52,6 @@
'first' => 0,
'second' => 1
},
- 'macrobody' => 'first arg: \\first\\
-second arg: \\second\\
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/two_macros_on_a_line.pl
===================================================================
--- trunk/tp/t/results/macro/two_macros_on_a_line.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/macro/two_macros_on_a_line.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' mymacro
',
- 'macrobody' => 'in mymacro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -103,10 +101,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'in with args
-now the arg \\arg\\
-after
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/macro/zero_argument.pl
===================================================================
--- trunk/tp/t/results/macro/zero_argument.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/macro/zero_argument.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -32,8 +32,6 @@
'extra' => {
'arg_line' => ' foo {}
',
- 'macrobody' => 'in foo
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -83,8 +81,6 @@
'extra' => {
'arg_line' => ' abar
',
- 'macrobody' => 'in bar
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified:
trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
===================================================================
--- trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
2016-04-24 14:16:21 UTC (rev 7132)
@@ -64,13 +64,6 @@
'extra' => {
'arg_line' => ' quotes
',
- 'macrobody' => '``simple-double--three---four----\'\' `simple\'
quotedblleft: @quotedblleft{} @*
-code: @code{``simple-double--three---four----\'\' `simple\' quotedblleft:
@quotedblleft{}} @*
-asis: @asis{``simple-double--three---four----\'\' `simple\' quotedblleft:
@quotedblleft{}} @*
-strong: @strong{``simple-double--three---four----\'\' `simple\' quotedblleft:
@quotedblleft{}} @*
-kbd: @kbd{``simple-double--three---four----\'\' `simple\' quotedblleft:
@quotedblleft{}} @*
-samp: @samp{``simple-double--three---four----\'\' `simple\' quotedblleft:
@quotedblleft{}} @*
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -216,24 +209,6 @@
'extra' => {
'arg_line' => ' allquotes
',
- 'macrobody' => '@quotes{}
-
address@hidden
-@@codequoteundirected on
-@@codequotebacktick on
address@hidden example
address@hidden
address@hidden
address@hidden
-
address@hidden
-@@codequoteundirected off
-@@codequotebacktick off
address@hidden example
address@hidden off
address@hidden off
address@hidden
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/misc_commands/kbdinputstyle.pl
===================================================================
--- trunk/tp/t/results/misc_commands/kbdinputstyle.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/misc_commands/kbdinputstyle.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -86,17 +86,6 @@
'extra' => {
'arg_line' => ' codekbdmacro
',
- 'macrobody' => '@code{in code out of example @code{in nested code}}.
address@hidden out of example}.
address@hidden @kbd{in code}}.
-
-in example
address@hidden
address@hidden code in example @code{in nested code}}.
address@hidden in example}.
address@hidden @kbd{in code} in example}.
address@hidden example
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl
===================================================================
--- trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/misc_commands/test_allowcodebreaks.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -110,13 +110,6 @@
'args_index' => {
'nr' => 0
},
- 'macrobody' => 'Out of code --- out-of-code.
address@hidden @code{2aaa-} @code{-3bbb} @code{4aaa-bbb}
address@hidden 5aaa-bb} @code{6aaa-bb } @code{ccc 7aaa-bbb} @code{ccc 8aaa-bbb
ddd}
address@hidden rrr_vv}
address@hidden --- address@hidden address@hidden'eff_gg address@hidden
address@hidden node\\nr\\}}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -184,11 +177,6 @@
'extra' => {
'arg_line' => ' testallowcodebreaksexample{}
',
- 'macrobody' => '
address@hidden
address@hidden
address@hidden example
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/plaintext_tests/star_at_command_formatting.pl
2016-04-24 14:16:21 UTC (rev 7132)
@@ -98,19 +98,6 @@
'extra' => {
'arg_line' => ' mymacro
',
- 'macrobody' => 'Some text @*
-more text. @
-Even more text. @* not at eol.
-
-Now followed by @@ : address@hidden@
-And now followed by a space and @@ : follow @* @
-And now followed by a space and @@ and text: follow @* @ text
-Followed by empty asis and a space @asis{}
-Followed by asis with space and a space @asis{ }
-And now with * empty @@asis: @address@hidden
-And now with * asis with space @@asis: @* @asis{ }
-And end para.
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/raw/nested_macros.pl
===================================================================
--- trunk/tp/t/results/raw/nested_macros.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/raw/nested_macros.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -91,13 +91,6 @@
'arg' => 0,
'ex' => 1
},
- 'macrobody' => 'in macro \\arg\\
address@hidden othermacro
-other macro
address@hidden macro
address@hidden
address@hidden macro
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
2016-04-24 14:16:21 UTC (rev 7132)
@@ -76,8 +76,6 @@
'arg1' => 0,
'arg2' => 1
},
- 'macrobody' => 'result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\
@emph{\\arg2\\}
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/value_and_macro/macro_in_value.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/macro_in_value.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/value_and_macro/macro_in_value.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -44,10 +44,6 @@
'extra' => {
'arg_line' => ' ab
',
- 'macrobody' => 'a
-
-b
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/value_and_macro/value_in_macro_body.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/value_in_macro_body.pl 2016-04-24
13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/value_and_macro/value_in_macro_body.pl 2016-04-24
14:16:21 UTC (rev 7132)
@@ -70,8 +70,6 @@
'args_index' => {
'arg' => 0
},
- 'macrobody' => 'result: @address@hidden }
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
===================================================================
--- trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
2016-04-24 13:42:24 UTC (rev 7131)
+++ trunk/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
2016-04-24 14:16:21 UTC (rev 7132)
@@ -77,8 +77,6 @@
'address@hidden' => 1
},
'invalid_syntax' => 1,
- 'macrobody' => 'result: @emph{\\arg\\} the \\the\\ thearg \\thearg\\
with value address@hidden
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/xml_tests/macro_and_args.pl
===================================================================
--- trunk/tp/t/results/xml_tests/macro_and_args.pl 2016-04-24 13:42:24 UTC
(rev 7131)
+++ trunk/tp/t/results/xml_tests/macro_and_args.pl 2016-04-24 14:16:21 UTC
(rev 7132)
@@ -34,7 +34,6 @@
'2b-bb' => 1,
'aaa' => 0
},
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
@@ -93,7 +92,6 @@
'nnn_b' => 1
},
'invalid_syntax' => 1,
- 'macrobody' => '',
'spaces_after_command' => {
'extra' => {
'command' => {}
Modified: trunk/tp/t/results/xtable/table_nested.pl
===================================================================
--- trunk/tp/t/results/xtable/table_nested.pl 2016-04-24 13:42:24 UTC (rev
7131)
+++ trunk/tp/t/results/xtable/table_nested.pl 2016-04-24 14:16:21 UTC (rev
7132)
@@ -152,28 +152,6 @@
'extra' => {
'arg_line' => ' myvtable
',
- 'macrobody' => '@vtable @asis
address@hidden first item
address@hidden second itemx
-
-Text.
-
address@hidden second item
-
-Text 2
-
address@hidden last
address@hidden vtable
-
-Something.
address@hidden @emph
address@hidden in item
-Text without blank line
address@hidden second item
-Text without blank line 2
address@hidden table
-After table.
-',
'spaces_after_command' => {
'extra' => {
'command' => {}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [7132] remove macrobody from extra,
Gavin D. Smith <=