[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp/t 60macro.t results/macro/bad_argume...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp/t 60macro.t results/macro/bad_argume... |
|
Date: |
Thu, 19 Jul 2012 11:46:39 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/07/19 11:46:39
Modified files:
tp/t : 60macro.t
tp/t/results/macro: bad_argument.pl bad_formal_arg.pl
complete_macro_for_end.pl
complex_argument.pl
double_recursive_macro_call.pl
empty_macro_in_text_no_arg.pl
expand_two_same.pl macro_expansion.pl
macro_for_end.pl
macro_for_ignored_line_command.pl
macro_in_accent.pl macro_in_brace_command.pl
macro_in_end_argument.pl macro_in_ifset.pl
macro_in_ifset_end_in_arg.pl
macro_in_index_commands.pl
macro_in_macro_arg.pl
macro_in_macro_arg_simpler.pl
macro_in_menu.pl macro_in_misc_commands.pl
macro_no_arg_bad_expansion.pl
macro_no_arg_expansion.pl
macro_one_arg_end_of_file.pl no_macrobody.pl
paragraph_and_macro.pl
protect_comma_macro_line.pl
protect_in_body.pl
protect_in_body_line_arg.pl
protect_in_body_one_arg.pl
recursive_call_in_argument.pl
recursive_call_in_macro.pl
two_macros_on_a_line.pl zero_argument.pl
Added files:
tp/t/results/macro: macro_name_with_digit.pl
macro_name_with_hyphen.pl
Log message:
More TeX friendly macro tests.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/60macro.t?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/bad_argument.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/bad_formal_arg.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/complete_macro_for_end.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/complex_argument.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/double_recursive_macro_call.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/expand_two_same.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_expansion.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_for_end.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_accent.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_brace_command.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_end_argument.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_ifset.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_index_commands.pl?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_macro_arg.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/no_macrobody.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/paragraph_and_macro.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_comma_macro_line.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/recursive_call_in_argument.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/recursive_call_in_macro.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/two_macros_on_a_line.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/zero_argument.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_name_with_digit.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_name_with_hyphen.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: 60macro.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/60macro.t,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- 60macro.t 7 Jan 2012 15:48:08 -0000 1.39
+++ 60macro.t 19 Jul 2012 11:46:35 -0000 1.40
@@ -8,7 +8,7 @@
in foo
@end macro
address@hidden bar
address@hidden abar
in bar
@end macro'],
['text_before_after',
@@ -17,12 +17,12 @@
@end macro after
'],
['no_macrobody',
-'@macro no-macrobody {arg}
+'@macro nomacrobody {arg}
@end macro
address@hidden line arg
address@hidden line arg
address@hidden brace}.
address@hidden brace}.
'],
['empty_macro_no_arg',
'@macro foo
@@ -38,10 +38,10 @@
address@hidden It.
address@hidden texnl2
address@hidden texnltwo
@end macro
-This 2 address@hidden A.
+This 2 address@hidden A.
'],
['empty_end','@macro foo {aaa, }
in foo
@@ -50,11 +50,11 @@
in macro
@end macro
address@hidden bar aaa
address@hidden abar aaa
in
@end rmacro
address@hidden after-name {ggg} more
address@hidden aftername {ggg} more
in macro
@end macro
'],
@@ -63,17 +63,35 @@
In macro
@end macro
'],
+['macro_name_with_hyphen',
+'@macro macro-one {arg-one, arg2}
+This \arg-one\ and that \arg2\.
address@hidden macro
+
address@hidden, @code{bli-bli}}
+'],
+['macro_name_with_digit',
+'@macro macro1
+macro1
address@hidden macro
+
address@hidden macro11 {arg}
+expand \arg\
address@hidden macro
+
address@hidden some thing @macro1{}
+'],
['bad_formal_arg',
'
@macro bad { , not_empty}
in bad macro
@end macro
address@hidden bad-space{first, in 2arg}
address@hidden badspace{first, in 2arg}
bad space
@end macro
address@hidden bar {:::}
address@hidden abar {:::}
in bar
@macro foo {? aaa}
in macro foo
@@ -88,25 +106,25 @@
@end macro
'],
['macro_no_arg_expansion',
-'@macro test1
+'@macro testone
res1
@end macro
address@hidden abc
address@hidden abc
'],
['macro_no_arg_bad_expansion',
-'@macro test1
+'@macro testone
res1
@end macro
address@hidden abc
address@hidden abc
'],
['macro_one_arg_end_of_file',
-'@macro one-arg{arg}
+'@macro onearg{arg}
Arg \arg\.
@end macro
address@hidden'],
address@hidden'],
['too_much_args',
'@macro twoargs {first, second}
first arg: \first\
@@ -116,24 +134,24 @@
@twoargs{one, two, three}.
'],
['macro_expansion','
address@hidden macro1 {arg1, arg2 }
address@hidden macroone {arg1, arg2 }
result of a macro with \arg1\ and
@verbatim
\arg2\
@end verbatim
@end macro
-2 simple args. @macro1 {first arg, second arg}.
+2 simple args. @macroone {first arg, second arg}.
-comma in command. @macro1{aaa @samp{a macro , } bbb}.
+comma in command. @macroone{aaa @samp{a macro , } bbb}.
-call on the line. @macro1 my arg.
+call on the line. @macroone my arg.
-recursive call. @macro1{first arg, @macro1{nested second arg}}.
+recursive call. @macroone{first arg, @macroone{nested second arg}}.
-protect stuff. @macro1{first \, arg, \{\} \\\\ }.
+protect stuff. @macroone{first \, arg, \{\} \\\\ }.
-multi-line arg. @macro1{arg 1
+multi-line arg. @macroone{arg 1
now, arg3
@@ -167,16 +185,16 @@
['macro_no_argument',
'@macro'],
['expand_two_same',
-'@macro macro2 { arg }
+'@macro macrotwo { arg }
With a doubles arg \arg\ and re \arg\
@end macro
Call macro2
address@hidden { a simple @code{
address@hidden { a simple @code{
arg}
}
Call macro2 with 2 args
address@hidden { arg with comma , here }
address@hidden { arg with comma , here }
'],
['macro_zero',
'@macro zero
@@ -187,25 +205,25 @@
@zero{}
'],
['protect_in_body',
-'@macro macro1 { arg1 , arg2 }
+'@macro macroone { arg1 , arg2 }
result: @emph{\arg1\} protected \\\\ -> \\\\arg1\\\\ @emph{\arg2\}
@end macro
-the @macro1 { @samp{f\irst arg}, second arg } after macro.
+the @macroone { @samp{f\irst arg}, second arg } after macro.
'],
['protect_in_body_one_arg',
-'@macro macro1 { arg1 , arg2 }
+'@macro macroone { arg1 , arg2 }
result: @emph{\arg1\} protected \\\\ -> \\\\arg1\\\\ @emph{\arg2\}
@end macro
address@hidden { @samp{f\irst arg}}
address@hidden { @samp{f\irst arg}}
'],
['protect_in_body_line_arg',
-'@macro macro1 { arg1 , arg2 }
+'@macro macroone { arg1 , arg2 }
result: @emph{\arg1\} protected \\\\ -> \\\\arg1\\\\ @emph{\arg2\}
@end macro
address@hidden @samp{f\irst arg}, second arg
address@hidden @samp{f\irst arg}, second arg
'],
['backslash_in_arg',
'@node Top
@@ -221,20 +239,20 @@
@printindex fn
'],
['protect_comma_macro_line',
-'@macro macro2 { arg }
+'@macro macrotwo { arg }
we get \arg\ and another \arg\
and another one on another line \arg\
and a last in another paragraph
@end macro
address@hidden arg, comma \,
address@hidden arg, comma \,
'],
['paragraph_and_macro',
-'@macro empty
+'@macro aempty
@end macro
address@hidden space
address@hidden aspace
@end macro
@@ -242,41 +260,41 @@
a word
@end macro
address@hidden
address@hidden
- @empty{}
+ @aempty{}
address@hidden text after empty.
address@hidden text after empty.
address@hidden
address@hidden
- @space{}
+ @aspace{}
address@hidden text after space.
address@hidden text after space.
'],
['macro_in_end_argument',
-'@macro a-cartouche
+'@macro acartouche
cartouche
@end macro
@cartouche
address@hidden @a-cartouche{}
address@hidden @acartouche{}
'],
['macro_for_end',
-'@macro my-end
+'@macro myend
@end
@end macro
@cartouche
address@hidden cartouche
address@hidden cartouche
'],
['complete_macro_for_end',
-'@macro the-end
+'@macro theend
@end cartouche
@end macro
@cartouche
address@hidden'],
address@hidden'],
['space_macro_after_end',
'@macro spaces
@@ -295,11 +313,11 @@
@end verbatim @spaces{}'],
['macro_in_menu',
'
address@hidden star
address@hidden astar
*
@end macro
address@hidden star-spaces
address@hidden starspaces
*
@end macro
@@ -307,50 +325,50 @@
@end macro
address@hidden space
address@hidden aspace
@end macro
address@hidden two-colon
address@hidden twocolon
::
@end macro
address@hidden colon
address@hidden acolon
:
@end macro
@menu
address@hidden address@hidden description
address@hidden address@hidden description
@spaces{}
menu comment
address@hidden node::
address@hidden@space{}other node::
-* node colon address@hidden@address@hidden
-* 3rd node: address@hidden
address@hidden node::
address@hidden@aspace{}other node::
+* node colon address@hidden@address@hidden
+* 3rd node: address@hidden
@end menu
'],
['macro_in_accent',
-'@macro a-letter
+'@macro aletter
a
@end macro
address@hidden space
address@hidden aspace
@end macro
address@hidden @a-letter{}.
address@hidden@a-letter{}.
address@hidden@a-letter{}.
address@hidden@a-letter{}}.
address@hidden @aletter{}.
address@hidden@aletter{}.
address@hidden@aletter{}.
address@hidden@aletter{}}.
address@hidden@address@hidden
address@hidden@address@hidden
'],
['macro_for_ignored_line_command',
-'@macro page-macro
+'@macro pagemacro
@page
@end macro
address@hidden on the line
address@hidden on the line
'],
['nested_macro_call',
'@macro machin{}
@@ -369,7 +387,7 @@
in mymacro
@end macro
address@hidden mymacro-with-args{arg}
address@hidden mymacrowithargs{arg}
in with args
now the arg \arg\
after
@@ -386,7 +404,7 @@
@mymacro{} @mymacro
with args
address@hidden {an
address@hidden {an
arg
in macro} @mymacro{}
@@ -404,89 +422,89 @@
@bidule{}
'],
['macro_in_macro_arg','
address@hidden macro1
-a, @macro2
address@hidden macroone
+a, @macrotwo
@end macro
address@hidden macro2{arg}
address@hidden macrotwo{arg}
hello \arg\ after arg
@end macro
address@hidden macro3{text, arg}
address@hidden macrothree{text, arg}
\text\
&&&& \arg\
@end macro
address@hidden@macro1{}text for macro2}
address@hidden@macroone{}text for macro2}
'],
['macro_in_macro_arg_simpler',
-'@macro macro11
+'@macro macrooneone
a, macro2
@end macro
address@hidden macro3{text, arg}
address@hidden macrothree{text, arg}
\text\
&&&& \arg\
@end macro
address@hidden@macro11{}text for macro2}
address@hidden@macrooneone{}text for macro2}
'],
['macro_in_brace_command',
'@macro foo
foo-expansion
@end macro
address@hidden bar
address@hidden abar
bar-expansion
@end macro
@itemize @bullet
address@hidden @address@hidden@@@bar{}},
address@hidden @address@hidden@@@abar{}},
also helped.
@end itemize
'],
['complex_argument',
-'@macro macro2{arg}
+'@macro macrotwo{arg}
coucou \arg\ after arg
@end macro
address@hidden macro4 {}
address@hidden macrofour {}
1
2
3
4
@end macro
address@hidden macro3{text, arg}
address@hidden macrothree{text, arg}
\text\
&&&& \arg\
@end macro
address@hidden@verb{% @macro2 %}
address@hidden @macro4
address@hidden 4 @macro4{}
address@hidden doubleafter @macro4{}
address@hidden@verb{% @macrotwo %}
address@hidden @macrofour
address@hidden 4 @macrofour{}
address@hidden doubleafter @macrofour{}
@verbatim
address@hidden
address@hidden
@end verbatim
@ignore
address@hidden
address@hidden
@end ignore
address@hidden macro7 {truc}
address@hidden macroseven {truc}
@emph{\\\\truc\\\\}
@end macro
-macro7 defined
+macroseven defined
@ifinfo
address@hidden
address@hidden
@end ifinfo
@iftex
address@hidden,bb}
address@hidden,bb}
@end iftex
address@hidden
address@hidden
}
-Call macro7
address@hidden
+Call macroseven
address@hidden
'],
['expansion_order',
@@ -513,22 +531,22 @@
}
'],
['macro_in_ifset',
-'@macro macro1 {arg}
+'@macro macroone {arg}
@end ifset
@end macro
@ifset a
address@hidden
address@hidden
in ifset
@end ifset
'],
['macro_in_ifset_end_in_arg',
-'@macro macro1 {arg}
+'@macro macroone {arg}
@end ifset
@end macro
@ifset a
address@hidden
address@hidden
@end ifset
}
in ifset
@@ -594,12 +612,12 @@
@macro fn
fn
@end macro
address@hidden syncodeindex-command
address@hidden syncodeindexcommand
@syncodeindex
@end macro
@syncodeindex @cp{} @fn{}
address@hidden cp fn
address@hidden cp fn
@macro truc
truc
@@ -609,7 +627,7 @@
@defindex @truc{}
after
address@hidden trucindex-command
address@hidden trucindexcommand
@trucindex
@end macro
@@ -619,15 +637,15 @@
@defcodeindex @codeidx{}
address@hidden defcodeindex-entry
address@hidden defcodeindexentry
a @var{index entry} address@hidden'e @address@hidden
@end macro
@node Top
address@hidden index truc
address@hidden index truc
address@hidden @defcodeindex-entry{}
address@hidden @defcodeindexentry{}
@kindex @truc{} kindex
@pindex pindex @codeidx{}
@@ -664,75 +682,75 @@
@macro en
en
@end macro
address@hidden documentlanguage-command
address@hidden documentlanguagecommand
@documentlanguage
@end macro
documentlanguage @documentlanguage @en{}
documentlanguage on its line
address@hidden en
address@hidden en
line following documentlanguage
address@hidden pagesizes-arg
address@hidden pagesizesarg
200mm,150mm
@end macro
address@hidden afourpaper-macro
address@hidden afourpapermacro
@afourpaper
@end macro
address@hidden @pagesizes-arg{}
address@hidden
address@hidden @pagesizesarg{}
address@hidden
@headings on line following headings @text{}
@oddfooting some text ignored @text{}
@everyheading on line following everyheading @text{}
address@hidden need-arg
address@hidden needarg
0.1
@end macro
address@hidden @need-arg{}
address@hidden @needarg{}
address@hidden raisesections-macro
address@hidden raisesectionsmacro
@raisesections
@end macro
address@hidden
address@hidden lowersections-macro
address@hidden
address@hidden lowersectionsmacro
@lowersections
@end macro
address@hidden
address@hidden
@@definfoenclose phoo,//,\\\\ @definfoenclose phoo,//,\\\\
@phoo{bar}
address@hidden definfoenclose-name
address@hidden definfoenclosename
phi
@end macro
address@hidden @definfoenclose-name{},:,:
address@hidden @definfoenclosename{},:,:
@phi{bar}
address@hidden strong-macro
address@hidden strongmacro
@strong
@end macro
address@hidden strong-name
address@hidden strongname
strong
@end macro
address@hidden strong}
address@hidden strong}
address@hidden @strong-name{},(@strong-name{}:,:)
address@hidden @strongname{},(@strongname{}:,:)
address@hidden is it really strong? }
address@hidden is it really strong? }
@kbd{something before kbdinputstyle}
address@hidden kbdinputstyle-arg
address@hidden kbdinputstylearg
code
@end macro
address@hidden @kbdinputstyle-arg{}
address@hidden @kbdinputstylearg{}
@kbd{truc}
@@ -740,13 +758,13 @@
@kbd{example}
@end example
address@hidden asis-arg
address@hidden asisarg
asis
@end macro
@macro zero
0
@end macro
address@hidden none-arg
address@hidden nonearg
none
@end macro
@macro four
@@ -756,30 +774,30 @@
6
@end macro
address@hidden @asis-arg{}
address@hidden @asisarg{}
@paragraphindent @zero{}
address@hidden @none-arg{}
address@hidden @nonearg{}
@paragraphindent @four{}
address@hidden @none-arg{}
address@hidden @nonearg{}
@exampleindent @six{}
address@hidden end-arg
address@hidden endarg
end
@end macro
address@hidden separate-arg
address@hidden separatearg
separate
@end macro
address@hidden @end-arg{}
address@hidden @separate-arg{}
address@hidden @endarg{}
address@hidden @separatearg{}
address@hidden on-arg
address@hidden onarg
on
@end macro
address@hidden off-arg
address@hidden offarg
off
@end macro
address@hidden @on-arg{}
address@hidden @off-arg{}
address@hidden @onarg{}
address@hidden @offarg{}
@c accepts 10 or 11
@macro ten
@@ -787,67 +805,67 @@
@end macro
@fonttextsize @ten{}
@c accept false or true
address@hidden false-arg
address@hidden falsearg
false
@end macro
address@hidden true-arg
address@hidden truearg
true
@end macro
address@hidden @false-arg{}
address@hidden @falsearg{}
address@hidden @true-arg{}
address@hidden @truearg{}
address@hidden page-macro
address@hidden pagemacro
@page
@end macro
address@hidden noindent-macro
address@hidden noindentmacro
@noindent
@end macro
address@hidden refill-macro
address@hidden refillmacro
@refill
@end macro
-@@page @page-macro{} on page line
-@@noindent @noindent-macro{} @@refill @refill-macro{} something
+@@page @pagemacro{} on page line
+@@noindent @noindentmacro{} @@refill @refillmacro{} something
address@hidden noindent at beginning of line
address@hidden
address@hidden noindent at beginning of line
address@hidden
noindent on the preceding line
- @noindent-macro{} noindent after space at beginning of line
address@hidden page at beginning of line
address@hidden
+ @noindentmacro{} noindent after space at beginning of line
address@hidden page at beginning of line
address@hidden
After page on its own line.
-@@page @page-macro{}
-two spaces @@noindent @noindent-macro{} @@refill @refill-macro{}
+@@page @pagemacro{}
+two spaces @@noindent @noindentmacro{} @@refill @refillmacro{}
address@hidden contents-macro
address@hidden contentsmacro
@contents
@end macro
address@hidden
address@hidden
@vskip @atext{}
address@hidden cropmarks-macro
address@hidden cropmarksmacro
@cropmarks
@end macro
address@hidden
address@hidden
address@hidden exdent-macro
address@hidden exdentmacro
@exdent
@end macro
address@hidden line after exdent
address@hidden line after exdent
@macro two
2
@end macro
@sp @two{}
address@hidden result-macro
address@hidden resultmacro
@result
@end macro
address@hidden @result-macro{}
address@hidden @resultmacro{}
@menu
* node @text{}::
@@ -856,45 +874,45 @@
@node node @text{}
@chapter chapter
address@hidden
address@hidden
address@hidden shortcontents-macro
address@hidden shortcontentsmacro
@shortcontents
@end macro
address@hidden
address@hidden
address@hidden bye-macro
address@hidden byemacro
@bye
@end macro
address@hidden
address@hidden
'],
# this does not lead to a recursive call with the current implementation
['recursive_call_in_argument',
-'@macro norecurse{arg}
+'@macro anorecurse{arg}
a
@end macro
address@hidden@norecurse{}}
address@hidden@anorecurse{}}
'],
['recursive_call_in_macro',
-'@macro norecurse{arg}
address@hidden
+'@macro anorecurse{arg}
address@hidden
@end macro
address@hidden
address@hidden
'],
['double_recursive_macro_call',
'
address@hidden mac1 {arg}
address@hidden
address@hidden macone {arg}
address@hidden
@end macro
address@hidden mac2{arg}
address@hidden
address@hidden mactwo{arg}
address@hidden
@end macro
address@hidden
address@hidden
'],
['unknown_macro_on_line_command',
'@setfilename @begin{}file'
Index: results/macro/bad_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/bad_argument.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- results/macro/bad_argument.pl 26 Sep 2011 17:15:49 -0000 1.24
+++ results/macro/bad_argument.pl 19 Jul 2012 11:46:36 -0000 1.25
@@ -55,7 +55,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'bar',
+ 'text' => 'abar',
'type' => 'macro_name'
}
],
@@ -74,7 +74,7 @@
}
],
'extra' => {
- 'arg_line' => ' bar aaa
+ 'arg_line' => ' abar aaa
',
'invalid_syntax' => 1,
'macrobody' => 'in
@@ -106,7 +106,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'after-name',
+ 'text' => 'aftername',
'type' => 'macro_name'
},
{
@@ -130,7 +130,7 @@
}
],
'extra' => {
- 'arg_line' => ' after-name {ggg} more
+ 'arg_line' => ' aftername {ggg} more
',
'args_index' => {
'ggg' => 0
@@ -183,11 +183,11 @@
in macro
@end macro
address@hidden bar aaa
address@hidden abar aaa
in
@end rmacro
address@hidden after-name {ggg} more
address@hidden aftername {ggg} more
in macro
@end macro
';
Index: results/macro/bad_formal_arg.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/bad_formal_arg.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- results/macro/bad_formal_arg.pl 26 Sep 2011 17:15:49 -0000 1.24
+++ results/macro/bad_formal_arg.pl 19 Jul 2012 11:46:36 -0000 1.25
@@ -82,7 +82,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'bad-space',
+ 'text' => 'badspace',
'type' => 'macro_name'
},
{
@@ -111,7 +111,7 @@
}
],
'extra' => {
- 'arg_line' => ' bad-space{first, in 2arg}
+ 'arg_line' => ' badspace{first, in 2arg}
',
'args_index' => {
'first' => 0,
@@ -147,7 +147,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'bar',
+ 'text' => 'abar',
'type' => 'macro_name'
},
{
@@ -196,7 +196,7 @@
}
],
'extra' => {
- 'arg_line' => ' bar {:::}
+ 'arg_line' => ' abar {:::}
',
'args_index' => {
':::' => 0
@@ -263,11 +263,11 @@
in bad macro
@end macro
address@hidden bad-space{first, in 2arg}
address@hidden badspace{first, in 2arg}
bad space
@end macro
address@hidden bar {:::}
address@hidden abar {:::}
in bar
@macro foo {? aaa}
in macro foo
Index: results/macro/complete_macro_for_end.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/complete_macro_for_end.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- results/macro/complete_macro_for_end.pl 26 Sep 2011 17:15:49 -0000
1.21
+++ results/macro/complete_macro_for_end.pl 19 Jul 2012 11:46:36 -0000
1.22
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'the-end',
+ 'text' => 'theend',
'type' => 'macro_name'
}
],
@@ -30,7 +30,7 @@
}
],
'extra' => {
- 'arg_line' => ' the-end
+ 'arg_line' => ' theend
',
'macrobody' => '@end cartouche
'
@@ -99,7 +99,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 6,
- 'macro' => 'the-end'
+ 'macro' => 'theend'
},
'parent' => {}
}
@@ -135,7 +135,7 @@
$result_trees{'complete_macro_for_end'}{'contents'}[3]{'extra'}{'end_command'}
= $result_trees{'complete_macro_for_end'}{'contents'}[3]{'contents'}[1];
$result_trees{'complete_macro_for_end'}{'contents'}[3]{'parent'} =
$result_trees{'complete_macro_for_end'};
-$result_texis{'complete_macro_for_end'} = '@macro the-end
+$result_texis{'complete_macro_for_end'} = '@macro theend
@end cartouche
@end macro
Index: results/macro/complex_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/complex_argument.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- results/macro/complex_argument.pl 26 Sep 2011 17:15:49 -0000 1.29
+++ results/macro/complex_argument.pl 19 Jul 2012 11:46:36 -0000 1.30
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro2',
+ 'text' => 'macrotwo',
'type' => 'macro_name'
},
{
@@ -35,7 +35,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro2{arg}
+ 'arg_line' => ' macrotwo{arg}
',
'args_index' => {
'arg' => 0
@@ -69,7 +69,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro4',
+ 'text' => 'macrofour',
'type' => 'macro_name'
}
],
@@ -106,7 +106,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro4 {}
+ 'arg_line' => ' macrofour {}
',
'macrobody' => '1
2
@@ -140,7 +140,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro3',
+ 'text' => 'macrothree',
'type' => 'macro_name'
},
{
@@ -175,7 +175,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro3{text, arg}
+ 'arg_line' => ' macrothree{text, arg}
',
'args_index' => {
'arg' => 1,
@@ -215,7 +215,7 @@
'contents' => [
{
'parent' => {},
- 'text' => ' @macro2 ',
+ 'text' => ' @macrotwo ',
'type' => 'raw'
}
],
@@ -228,7 +228,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 38,
- 'macro' => 'macro3'
+ 'macro' => 'macrothree'
},
'parent' => {},
'type' => '%'
@@ -242,7 +242,7 @@
'args' => [
{
'parent' => {},
- 'text' => ' @macro4
+ 'text' => ' @macrofour
',
'type' => 'misc_arg'
}
@@ -286,7 +286,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 38,
- 'macro' => 'macro3'
+ 'macro' => 'macrothree'
},
'parent' => {}
},
@@ -336,7 +336,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 38,
- 'macro' => 'macro3'
+ 'macro' => 'macrothree'
},
'parent' => {}
},
@@ -373,7 +373,7 @@
},
{
'parent' => {},
- 'text' => '@macro2
+ 'text' => '@macrotwo
',
'type' => 'raw'
}
@@ -381,7 +381,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 38,
- 'macro' => 'macro3'
+ 'macro' => 'macrothree'
},
'parent' => {}
},
@@ -408,7 +408,7 @@
},
{
'parent' => {},
- 'text' => '@macro4',
+ 'text' => '@macrofour',
'type' => 'raw'
},
{
@@ -421,7 +421,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 38,
- 'macro' => 'macro3'
+ 'macro' => 'macrothree'
},
'parent' => {}
},
@@ -438,7 +438,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro7',
+ 'text' => 'macroseven',
'type' => 'macro_name'
},
{
@@ -462,7 +462,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro7 {truc}
+ 'arg_line' => ' macroseven {truc}
',
'args_index' => {
'truc' => 0
@@ -473,7 +473,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 38,
- 'macro' => 'macro3'
+ 'macro' => 'macrothree'
},
'parent' => {}
},
@@ -490,7 +490,7 @@
'contents' => [
{
'parent' => {},
- 'text' => 'macro7 defined
+ 'text' => 'macroseven defined
'
},
{
@@ -544,7 +544,7 @@
'contents' => [
{
'parent' => {},
- 'text' => 'Call macro7
+ 'text' => 'Call macroseven
'
},
{
@@ -565,7 +565,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 41,
- 'macro' => 'macro7'
+ 'macro' => 'macroseven'
},
'parent' => {}
},
@@ -679,24 +679,24 @@
$result_trees{'complex_argument'}{'contents'}[20]{'parent'} =
$result_trees{'complex_argument'};
$result_trees{'complex_argument'}{'contents'}[21]{'parent'} =
$result_trees{'complex_argument'};
-$result_texis{'complex_argument'} = '@macro macro2{arg}
+$result_texis{'complex_argument'} = '@macro macrotwo{arg}
coucou \\arg\\ after arg
@end macro
address@hidden macro4 {}
address@hidden macrofour {}
1
2
3
4
@end macro
address@hidden macro3{text, arg}
address@hidden macrothree{text, arg}
\\text\\
&&&& \\arg\\
@end macro
address@hidden @macro2 %}
address@hidden @macro4
address@hidden @macrotwo %}
address@hidden @macrofour
@pagesizes 4 1
2
3
@@ -706,15 +706,15 @@
3
4
@verbatim
address@hidden
address@hidden
@end verbatim
@ignore
address@hidden
address@hidden
@end ignore
address@hidden macro7 {truc}
address@hidden macroseven {truc}
@emph{\\truc\\}
@end macro
-macro7 defined
+macroseven defined
1
2
3
@@ -722,7 +722,7 @@
&&&&
-Call macro7
+Call macroseven
@emph{aaa}
';
@@ -731,15 +731,15 @@
$result_texts{'complex_argument'} = '
- @macro2
+ @macrotwo
2
3
4
2
3
4
address@hidden
-macro7 defined
address@hidden
+macroseven defined
1
2
3
@@ -747,18 +747,18 @@
&&&&
-Call macro7
+Call macroseven
aaa
';
$result_errors{'complex_argument'} = [
{
- 'error_line' => ':38: Bad argument to @headings: doubleafter 1 (possibly
involving @macro4)
+ 'error_line' => ':38: Bad argument to @headings: doubleafter 1 (possibly
involving @macrofour)
',
'file_name' => '',
'line_nr' => 38,
- 'macro' => 'macro4',
+ 'macro' => 'macrofour',
'text' => 'Bad argument to @headings: doubleafter 1',
'type' => 'error'
}
Index: results/macro/double_recursive_macro_call.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/double_recursive_macro_call.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- results/macro/double_recursive_macro_call.pl 26 Sep 2011 17:15:49
-0000 1.6
+++ results/macro/double_recursive_macro_call.pl 19 Jul 2012 11:46:36
-0000 1.7
@@ -17,7 +17,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'mac1',
+ 'text' => 'macone',
'type' => 'macro_name'
},
{
@@ -30,7 +30,7 @@
'contents' => [
{
'parent' => {},
- 'text' => '@mac2{}',
+ 'text' => '@mactwo{}',
'type' => 'raw'
},
{
@@ -41,12 +41,12 @@
}
],
'extra' => {
- 'arg_line' => ' mac1 {arg}
+ 'arg_line' => ' macone {arg}
',
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@mac2{}
+ 'macrobody' => '@mactwo{}
'
},
'line_nr' => {
@@ -75,7 +75,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'mac2',
+ 'text' => 'mactwo',
'type' => 'macro_name'
},
{
@@ -88,7 +88,7 @@
'contents' => [
{
'parent' => {},
- 'text' => '@mac1{}',
+ 'text' => '@macone{}',
'type' => 'raw'
},
{
@@ -99,12 +99,12 @@
}
],
'extra' => {
- 'arg_line' => ' mac2{arg}
+ 'arg_line' => ' mactwo{arg}
',
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@mac1{}
+ 'macrobody' => '@macone{}
'
},
'line_nr' => {
@@ -158,12 +158,12 @@
$result_trees{'double_recursive_macro_call'}{'contents'}[7]{'parent'} =
$result_trees{'double_recursive_macro_call'};
$result_texis{'double_recursive_macro_call'} = '
address@hidden mac1 {arg}
address@hidden
address@hidden macone {arg}
address@hidden
@end macro
address@hidden mac2{arg}
address@hidden
address@hidden mactwo{arg}
address@hidden
@end macro
@@ -178,12 +178,12 @@
$result_errors{'double_recursive_macro_call'} = [
{
- 'error_line' => ':10: Recursive call of macro mac2 is not allowed; use
@rmacro if needed (possibly involving @mac1)
+ 'error_line' => ':10: Recursive call of macro mactwo is not allowed; use
@rmacro if needed (possibly involving @macone)
',
'file_name' => '',
'line_nr' => 10,
- 'macro' => 'mac1',
- 'text' => 'Recursive call of macro mac2 is not allowed; use @rmacro if
needed',
+ 'macro' => 'macone',
+ 'text' => 'Recursive call of macro mactwo is not allowed; use @rmacro if
needed',
'type' => 'error'
}
];
Index: results/macro/empty_macro_in_text_no_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- results/macro/empty_macro_in_text_no_arg.pl 3 Jul 2011 14:50:58 -0000
1.17
+++ results/macro/empty_macro_in_text_no_arg.pl 19 Jul 2012 11:46:36 -0000
1.18
@@ -70,14 +70,14 @@
'args' => [
{
'parent' => {},
- 'text' => 'texnl2',
+ 'text' => 'texnltwo',
'type' => 'macro_name'
}
],
'cmdname' => 'macro',
'contents' => [],
'extra' => {
- 'arg_line' => ' texnl2
+ 'arg_line' => ' texnltwo
',
'macrobody' => ''
},
@@ -139,7 +139,7 @@
This. It.
address@hidden texnl2
address@hidden texnltwo
@end macro
This 2 see. A.
Index: results/macro/expand_two_same.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/expand_two_same.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- results/macro/expand_two_same.pl 26 Sep 2011 17:15:49 -0000 1.25
+++ results/macro/expand_two_same.pl 19 Jul 2012 11:46:36 -0000 1.26
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro2',
+ 'text' => 'macrotwo',
'type' => 'macro_name'
},
{
@@ -41,7 +41,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro2 { arg }
+ 'arg_line' => ' macrotwo { arg }
',
'args_index' => {
'arg' => 0
@@ -100,7 +100,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 8,
- 'macro' => 'macro2'
+ 'macro' => 'macrotwo'
},
'parent' => {}
},
@@ -136,7 +136,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 8,
- 'macro' => 'macro2'
+ 'macro' => 'macrotwo'
},
'parent' => {}
},
@@ -215,7 +215,7 @@
$result_trees{'expand_two_same'}{'contents'}[5]{'parent'} =
$result_trees{'expand_two_same'};
$result_trees{'expand_two_same'}{'contents'}[6]{'parent'} =
$result_trees{'expand_two_same'};
-$result_texis{'expand_two_same'} = '@macro macro2 { arg }
+$result_texis{'expand_two_same'} = '@macro macrotwo { arg }
With a doubles arg \\arg\\ and re \\arg\\
@end macro
Index: results/macro/macro_expansion.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_expansion.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- results/macro/macro_expansion.pl 26 Sep 2011 17:15:50 -0000 1.28
+++ results/macro/macro_expansion.pl 19 Jul 2012 11:46:36 -0000 1.29
@@ -17,7 +17,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro1',
+ 'text' => 'macroone',
'type' => 'macro_name'
},
{
@@ -64,7 +64,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro1 {arg1, arg2 }
+ 'arg_line' => ' macroone {arg1, arg2 }
',
'args_index' => {
'arg1' => 0,
@@ -131,7 +131,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 9,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
},
@@ -176,7 +176,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 11,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
},
@@ -211,7 +211,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 11,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
},
@@ -265,7 +265,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 13,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
},
@@ -319,7 +319,7 @@
},
{
'parent' => {},
- 'text' => '@macro1{nested second arg}
+ 'text' => '@macroone{nested second arg}
',
'type' => 'raw'
}
@@ -327,7 +327,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 15,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
},
@@ -381,7 +381,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 17,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
},
@@ -464,7 +464,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 23,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
},
@@ -560,7 +560,7 @@
$result_trees{'macro_expansion'}{'contents'}[29]{'parent'} =
$result_trees{'macro_expansion'};
$result_texis{'macro_expansion'} = '
address@hidden macro1 {arg1, arg2 }
address@hidden macroone {arg1, arg2 }
result of a macro with \\arg1\\ and
@verbatim
\\arg2\\
@@ -584,7 +584,7 @@
recursive call. result of a macro with first arg and
@verbatim
address@hidden second arg}
address@hidden second arg}
@end verbatim.
protect stuff. result of a macro with first , arg and
@@ -617,7 +617,7 @@
my arg.
recursive call. result of a macro with first arg and
address@hidden second arg}
address@hidden second arg}
.
protect stuff. result of a macro with first , arg and
@@ -634,12 +634,12 @@
$result_errors{'macro_expansion'} = [
{
- 'error_line' => ':13: warning: @macro1 defined with zero or more than one
argument should be invoked with {}
+ 'error_line' => ':13: warning: @macroone defined with zero or more than
one argument should be invoked with {}
',
'file_name' => '',
'line_nr' => 13,
'macro' => '',
- 'text' => '@macro1 defined with zero or more than one argument should be
invoked with {}',
+ 'text' => '@macroone defined with zero or more than one argument should be
invoked with {}',
'type' => 'warning'
}
];
Index: results/macro/macro_for_end.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_for_end.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- results/macro/macro_for_end.pl 26 Sep 2011 17:15:50 -0000 1.23
+++ results/macro/macro_for_end.pl 19 Jul 2012 11:46:36 -0000 1.24
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'my-end',
+ 'text' => 'myend',
'type' => 'macro_name'
}
],
@@ -30,7 +30,7 @@
}
],
'extra' => {
- 'arg_line' => ' my-end
+ 'arg_line' => ' myend
',
'macrobody' => '@end
'
@@ -105,7 +105,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 6,
- 'macro' => 'my-end'
+ 'macro' => 'myend'
},
'parent' => {}
}
@@ -142,7 +142,7 @@
$result_trees{'macro_for_end'}{'contents'}[3]{'extra'}{'end_command'} =
$result_trees{'macro_for_end'}{'contents'}[3]{'contents'}[1];
$result_trees{'macro_for_end'}{'contents'}[3]{'parent'} =
$result_trees{'macro_for_end'};
-$result_texis{'macro_for_end'} = '@macro my-end
+$result_texis{'macro_for_end'} = '@macro myend
@end
@end macro
Index: results/macro/macro_for_ignored_line_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- results/macro/macro_for_ignored_line_command.pl 26 Sep 2011 17:15:50
-0000 1.16
+++ results/macro/macro_for_ignored_line_command.pl 19 Jul 2012 11:46:37
-0000 1.17
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'page-macro',
+ 'text' => 'pagemacro',
'type' => 'macro_name'
}
],
@@ -30,7 +30,7 @@
}
],
'extra' => {
- 'arg_line' => ' page-macro
+ 'arg_line' => ' pagemacro
',
'macrobody' => '@page
'
@@ -73,7 +73,7 @@
$result_trees{'macro_for_ignored_line_command'}{'contents'}[2]{'parent'} =
$result_trees{'macro_for_ignored_line_command'};
$result_trees{'macro_for_ignored_line_command'}{'contents'}[3]{'parent'} =
$result_trees{'macro_for_ignored_line_command'};
-$result_texis{'macro_for_ignored_line_command'} = '@macro page-macro
+$result_texis{'macro_for_ignored_line_command'} = '@macro pagemacro
@page
@end macro
Index: results/macro/macro_in_accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_accent.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- results/macro/macro_in_accent.pl 30 Oct 2011 00:51:18 -0000 1.21
+++ results/macro/macro_in_accent.pl 19 Jul 2012 11:46:37 -0000 1.22
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'a-letter',
+ 'text' => 'aletter',
'type' => 'macro_name'
}
],
@@ -30,7 +30,7 @@
}
],
'extra' => {
- 'arg_line' => ' a-letter
+ 'arg_line' => ' aletter
',
'macrobody' => 'a
'
@@ -61,7 +61,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'space',
+ 'text' => 'aspace',
'type' => 'macro_name'
}
],
@@ -80,7 +80,7 @@
}
],
'extra' => {
- 'arg_line' => ' space
+ 'arg_line' => ' aspace
',
'macrobody' => '
'
@@ -283,11 +283,11 @@
$result_trees{'macro_in_accent'}{'contents'}[8]{'contents'}[1]{'parent'} =
$result_trees{'macro_in_accent'}{'contents'}[8];
$result_trees{'macro_in_accent'}{'contents'}[8]{'parent'} =
$result_trees{'macro_in_accent'};
-$result_texis{'macro_in_accent'} = '@macro a-letter
+$result_texis{'macro_in_accent'} = '@macro aletter
a
@end macro
address@hidden space
address@hidden aspace
@end macro
Index: results/macro/macro_in_brace_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- results/macro/macro_in_brace_command.pl 26 Sep 2011 17:15:50 -0000
1.34
+++ results/macro/macro_in_brace_command.pl 19 Jul 2012 11:46:37 -0000
1.35
@@ -61,7 +61,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'bar',
+ 'text' => 'abar',
'type' => 'macro_name'
}
],
@@ -80,7 +80,7 @@
}
],
'extra' => {
- 'arg_line' => ' bar
+ 'arg_line' => ' abar
',
'macrobody' => 'bar-expansion
'
@@ -320,7 +320,7 @@
foo-expansion
@end macro
address@hidden bar
address@hidden abar
bar-expansion
@end macro
Index: results/macro/macro_in_end_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_end_argument.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- results/macro/macro_in_end_argument.pl 26 Sep 2011 17:15:50 -0000
1.23
+++ results/macro/macro_in_end_argument.pl 19 Jul 2012 11:46:37 -0000
1.24
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'a-cartouche',
+ 'text' => 'acartouche',
'type' => 'macro_name'
}
],
@@ -30,7 +30,7 @@
}
],
'extra' => {
- 'arg_line' => ' a-cartouche
+ 'arg_line' => ' acartouche
',
'macrobody' => 'cartouche
'
@@ -142,7 +142,7 @@
$result_trees{'macro_in_end_argument'}{'contents'}[3]{'extra'}{'end_command'}
= $result_trees{'macro_in_end_argument'}{'contents'}[3]{'contents'}[1];
$result_trees{'macro_in_end_argument'}{'contents'}[3]{'parent'} =
$result_trees{'macro_in_end_argument'};
-$result_texis{'macro_in_end_argument'} = '@macro a-cartouche
+$result_texis{'macro_in_end_argument'} = '@macro acartouche
cartouche
@end macro
Index: results/macro/macro_in_ifset.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_ifset.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- results/macro/macro_in_ifset.pl 26 Sep 2011 17:15:50 -0000 1.21
+++ results/macro/macro_in_ifset.pl 19 Jul 2012 11:46:37 -0000 1.22
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro1',
+ 'text' => 'macroone',
'type' => 'macro_name'
},
{
@@ -35,7 +35,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro1 {arg}
+ 'arg_line' => ' macroone {arg}
',
'args_index' => {
'arg' => 0
@@ -77,7 +77,7 @@
$result_trees{'macro_in_ifset'}{'contents'}[1]{'parent'} =
$result_trees{'macro_in_ifset'};
$result_trees{'macro_in_ifset'}{'contents'}[2]{'parent'} =
$result_trees{'macro_in_ifset'};
-$result_texis{'macro_in_ifset'} = '@macro macro1 {arg}
+$result_texis{'macro_in_ifset'} = '@macro macroone {arg}
@end ifset
@end macro
Index: results/macro/macro_in_ifset_end_in_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_ifset_end_in_arg.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- results/macro/macro_in_ifset_end_in_arg.pl 26 Sep 2011 17:15:50 -0000
1.25
+++ results/macro/macro_in_ifset_end_in_arg.pl 19 Jul 2012 11:46:37 -0000
1.26
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro1',
+ 'text' => 'macroone',
'type' => 'macro_name'
},
{
@@ -35,7 +35,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro1 {arg}
+ 'arg_line' => ' macroone {arg}
',
'args_index' => {
'arg' => 0
@@ -140,7 +140,7 @@
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[4]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[4];
$result_trees{'macro_in_ifset_end_in_arg'}{'contents'}[4]{'parent'} =
$result_trees{'macro_in_ifset_end_in_arg'};
-$result_texis{'macro_in_ifset_end_in_arg'} = '@macro macro1 {arg}
+$result_texis{'macro_in_ifset_end_in_arg'} = '@macro macroone {arg}
@end ifset
@end macro
Index: results/macro/macro_in_index_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- results/macro/macro_in_index_commands.pl 7 Jan 2012 15:48:09 -0000
1.39
+++ results/macro/macro_in_index_commands.pl 19 Jul 2012 11:46:37 -0000
1.40
@@ -101,7 +101,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'syncodeindex-command',
+ 'text' => 'syncodeindexcommand',
'type' => 'macro_name'
}
],
@@ -120,7 +120,7 @@
}
],
'extra' => {
- 'arg_line' => ' syncodeindex-command
+ 'arg_line' => ' syncodeindexcommand
',
'macrobody' => '@syncodeindex
'
@@ -225,7 +225,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 12,
- 'macro' => 'syncodeindex-command'
+ 'macro' => 'syncodeindexcommand'
},
'parent' => {}
},
@@ -351,7 +351,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'trucindex-command',
+ 'text' => 'trucindexcommand',
'type' => 'macro_name'
}
],
@@ -370,7 +370,7 @@
}
],
'extra' => {
- 'arg_line' => ' trucindex-command
+ 'arg_line' => ' trucindexcommand
',
'macrobody' => '@trucindex
'
@@ -497,7 +497,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'defcodeindex-entry',
+ 'text' => 'defcodeindexentry',
'type' => 'macro_name'
}
],
@@ -516,7 +516,7 @@
}
],
'extra' => {
- 'arg_line' => ' defcodeindex-entry
+ 'arg_line' => ' defcodeindexentry
',
'macrobody' => 'a @var{index entry} address@hidden'e
@address@hidden
'
@@ -631,7 +631,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 38,
- 'macro' => 'trucindex-command'
+ 'macro' => 'trucindexcommand'
},
'parent' => {},
'type' => 'index_entry_command'
@@ -676,7 +676,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 40,
- 'macro' => 'defcodeindex-entry'
+ 'macro' => 'defcodeindexentry'
},
'parent' => {}
},
@@ -1215,7 +1215,7 @@
@macro fn
fn
@end macro
address@hidden syncodeindex-command
address@hidden syncodeindexcommand
@syncodeindex
@end macro
@@ -1230,7 +1230,7 @@
@defindex truc
after
address@hidden trucindex-command
address@hidden trucindexcommand
@trucindex
@end macro
@@ -1240,7 +1240,7 @@
@defcodeindex codeidx
address@hidden defcodeindex-entry
address@hidden defcodeindexentry
a @var{index entry} address@hidden'e @address@hidden
@end macro
Index: results/macro/macro_in_macro_arg.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- results/macro/macro_in_macro_arg.pl 26 Sep 2011 17:15:51 -0000 1.23
+++ results/macro/macro_in_macro_arg.pl 19 Jul 2012 11:46:37 -0000 1.24
@@ -17,7 +17,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro1',
+ 'text' => 'macroone',
'type' => 'macro_name'
}
],
@@ -25,7 +25,7 @@
'contents' => [
{
'parent' => {},
- 'text' => 'a, @macro2',
+ 'text' => 'a, @macrotwo',
'type' => 'raw'
},
{
@@ -36,9 +36,9 @@
}
],
'extra' => {
- 'arg_line' => ' macro1
+ 'arg_line' => ' macroone
',
- 'macrobody' => 'a, @macro2
+ 'macrobody' => 'a, @macrotwo
'
},
'line_nr' => {
@@ -67,7 +67,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro2',
+ 'text' => 'macrotwo',
'type' => 'macro_name'
},
{
@@ -91,7 +91,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro2{arg}
+ 'arg_line' => ' macrotwo{arg}
',
'args_index' => {
'arg' => 0
@@ -125,7 +125,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro3',
+ 'text' => 'macrothree',
'type' => 'macro_name'
},
{
@@ -160,7 +160,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro3{text, arg}
+ 'arg_line' => ' macrothree{text, arg}
',
'args_index' => {
'arg' => 1,
@@ -242,15 +242,15 @@
$result_trees{'macro_in_macro_arg'}{'contents'}[10]{'parent'} =
$result_trees{'macro_in_macro_arg'};
$result_texis{'macro_in_macro_arg'} = '
address@hidden macro1
-a, @macro2
address@hidden macroone
+a, @macrotwo
@end macro
address@hidden macro2{arg}
address@hidden macrotwo{arg}
hello \\arg\\ after arg
@end macro
address@hidden macro3{text, arg}
address@hidden macrothree{text, arg}
\\text\\
&&&& \\arg\\
@end macro
Index: results/macro/macro_in_macro_arg_simpler.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_macro_arg_simpler.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- results/macro/macro_in_macro_arg_simpler.pl 26 Sep 2011 17:15:51 -0000
1.21
+++ results/macro/macro_in_macro_arg_simpler.pl 19 Jul 2012 11:46:37 -0000
1.22
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro11',
+ 'text' => 'macrooneone',
'type' => 'macro_name'
}
],
@@ -30,7 +30,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro11
+ 'arg_line' => ' macrooneone
',
'macrobody' => 'a, macro2
'
@@ -61,7 +61,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro3',
+ 'text' => 'macrothree',
'type' => 'macro_name'
},
{
@@ -96,7 +96,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro3{text, arg}
+ 'arg_line' => ' macrothree{text, arg}
',
'args_index' => {
'arg' => 1,
@@ -168,11 +168,11 @@
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6];
$result_trees{'macro_in_macro_arg_simpler'}{'contents'}[6]{'parent'} =
$result_trees{'macro_in_macro_arg_simpler'};
-$result_texis{'macro_in_macro_arg_simpler'} = '@macro macro11
+$result_texis{'macro_in_macro_arg_simpler'} = '@macro macrooneone
a, macro2
@end macro
address@hidden macro3{text, arg}
address@hidden macrothree{text, arg}
\\text\\
&&&& \\arg\\
@end macro
Index: results/macro/macro_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- results/macro/macro_in_menu.pl 26 Sep 2011 17:15:51 -0000 1.34
+++ results/macro/macro_in_menu.pl 19 Jul 2012 11:46:37 -0000 1.35
@@ -17,7 +17,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'star',
+ 'text' => 'astar',
'type' => 'macro_name'
}
],
@@ -36,7 +36,7 @@
}
],
'extra' => {
- 'arg_line' => ' star
+ 'arg_line' => ' astar
',
'macrobody' => '*
'
@@ -67,7 +67,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'star-spaces',
+ 'text' => 'starspaces',
'type' => 'macro_name'
}
],
@@ -86,7 +86,7 @@
}
],
'extra' => {
- 'arg_line' => ' star-spaces
+ 'arg_line' => ' starspaces
',
'macrobody' => '*
'
@@ -167,7 +167,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'space',
+ 'text' => 'aspace',
'type' => 'macro_name'
}
],
@@ -186,7 +186,7 @@
}
],
'extra' => {
- 'arg_line' => ' space
+ 'arg_line' => ' aspace
',
'macrobody' => '
'
@@ -217,7 +217,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'two-colon',
+ 'text' => 'twocolon',
'type' => 'macro_name'
}
],
@@ -236,7 +236,7 @@
}
],
'extra' => {
- 'arg_line' => ' two-colon
+ 'arg_line' => ' twocolon
',
'macrobody' => '::
'
@@ -267,7 +267,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'colon',
+ 'text' => 'acolon',
'type' => 'macro_name'
}
],
@@ -286,7 +286,7 @@
}
],
'extra' => {
- 'arg_line' => ' colon
+ 'arg_line' => ' acolon
',
'macrobody' => ':
'
@@ -817,11 +817,11 @@
$result_trees{'macro_in_menu'}{'contents'}[19]{'parent'} =
$result_trees{'macro_in_menu'};
$result_texis{'macro_in_menu'} = '
address@hidden star
address@hidden astar
*
@end macro
address@hidden star-spaces
address@hidden starspaces
*
@end macro
@@ -829,15 +829,15 @@
@end macro
address@hidden space
address@hidden aspace
@end macro
address@hidden two-colon
address@hidden twocolon
::
@end macro
address@hidden colon
address@hidden acolon
:
@end macro
Index: results/macro/macro_in_misc_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- results/macro/macro_in_misc_commands.pl 5 Feb 2012 22:22:10 -0000
1.62
+++ results/macro/macro_in_misc_commands.pl 19 Jul 2012 11:46:37 -0000
1.63
@@ -325,7 +325,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'documentlanguage-command',
+ 'text' => 'documentlanguagecommand',
'type' => 'macro_name'
}
],
@@ -344,7 +344,7 @@
}
],
'extra' => {
- 'arg_line' => ' documentlanguage-command
+ 'arg_line' => ' documentlanguagecommand
',
'macrobody' => '@documentlanguage
'
@@ -466,7 +466,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 26,
- 'macro' => 'documentlanguage-command'
+ 'macro' => 'documentlanguagecommand'
},
'parent' => {}
},
@@ -489,7 +489,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'pagesizes-arg',
+ 'text' => 'pagesizesarg',
'type' => 'macro_name'
}
],
@@ -508,7 +508,7 @@
}
],
'extra' => {
- 'arg_line' => ' pagesizes-arg
+ 'arg_line' => ' pagesizesarg
',
'macrobody' => '200mm,150mm
'
@@ -539,7 +539,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'afourpaper-macro',
+ 'text' => 'afourpapermacro',
'type' => 'macro_name'
}
],
@@ -558,7 +558,7 @@
}
],
'extra' => {
- 'arg_line' => ' afourpaper-macro
+ 'arg_line' => ' afourpapermacro
',
'macrobody' => '@afourpaper
'
@@ -698,7 +698,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'need-arg',
+ 'text' => 'needarg',
'type' => 'macro_name'
}
],
@@ -717,7 +717,7 @@
}
],
'extra' => {
- 'arg_line' => ' need-arg
+ 'arg_line' => ' needarg
',
'macrobody' => '0.1
'
@@ -794,7 +794,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'raisesections-macro',
+ 'text' => 'raisesectionsmacro',
'type' => 'macro_name'
}
],
@@ -813,7 +813,7 @@
}
],
'extra' => {
- 'arg_line' => ' raisesections-macro
+ 'arg_line' => ' raisesectionsmacro
',
'macrobody' => '@raisesections
'
@@ -842,7 +842,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'lowersections-macro',
+ 'text' => 'lowersectionsmacro',
'type' => 'macro_name'
}
],
@@ -861,7 +861,7 @@
}
],
'extra' => {
- 'arg_line' => ' lowersections-macro
+ 'arg_line' => ' lowersectionsmacro
',
'macrobody' => '@lowersections
'
@@ -997,7 +997,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'definfoenclose-name',
+ 'text' => 'definfoenclosename',
'type' => 'macro_name'
}
],
@@ -1016,7 +1016,7 @@
}
],
'extra' => {
- 'arg_line' => ' definfoenclose-name
+ 'arg_line' => ' definfoenclosename
',
'macrobody' => 'phi
'
@@ -1128,7 +1128,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'strong-macro',
+ 'text' => 'strongmacro',
'type' => 'macro_name'
}
],
@@ -1147,7 +1147,7 @@
}
],
'extra' => {
- 'arg_line' => ' strong-macro
+ 'arg_line' => ' strongmacro
',
'macrobody' => '@strong
'
@@ -1172,7 +1172,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'strong-name',
+ 'text' => 'strongname',
'type' => 'macro_name'
}
],
@@ -1191,7 +1191,7 @@
}
],
'extra' => {
- 'arg_line' => ' strong-name
+ 'arg_line' => ' strongname
',
'macrobody' => 'strong
'
@@ -1392,7 +1392,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'kbdinputstyle-arg',
+ 'text' => 'kbdinputstylearg',
'type' => 'macro_name'
}
],
@@ -1411,7 +1411,7 @@
}
],
'extra' => {
- 'arg_line' => ' kbdinputstyle-arg
+ 'arg_line' => ' kbdinputstylearg
',
'macrobody' => 'code
'
@@ -1629,7 +1629,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'asis-arg',
+ 'text' => 'asisarg',
'type' => 'macro_name'
}
],
@@ -1648,7 +1648,7 @@
}
],
'extra' => {
- 'arg_line' => ' asis-arg
+ 'arg_line' => ' asisarg
',
'macrobody' => 'asis
'
@@ -1717,7 +1717,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'none-arg',
+ 'text' => 'nonearg',
'type' => 'macro_name'
}
],
@@ -1736,7 +1736,7 @@
}
],
'extra' => {
- 'arg_line' => ' none-arg
+ 'arg_line' => ' nonearg
',
'macrobody' => 'none
'
@@ -2101,7 +2101,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'end-arg',
+ 'text' => 'endarg',
'type' => 'macro_name'
}
],
@@ -2120,7 +2120,7 @@
}
],
'extra' => {
- 'arg_line' => ' end-arg
+ 'arg_line' => ' endarg
',
'macrobody' => 'end
'
@@ -2145,7 +2145,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'separate-arg',
+ 'text' => 'separatearg',
'type' => 'macro_name'
}
],
@@ -2164,7 +2164,7 @@
}
],
'extra' => {
- 'arg_line' => ' separate-arg
+ 'arg_line' => ' separatearg
',
'macrobody' => 'separate
'
@@ -2275,7 +2275,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'on-arg',
+ 'text' => 'onarg',
'type' => 'macro_name'
}
],
@@ -2294,7 +2294,7 @@
}
],
'extra' => {
- 'arg_line' => ' on-arg
+ 'arg_line' => ' onarg
',
'macrobody' => 'on
'
@@ -2319,7 +2319,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'off-arg',
+ 'text' => 'offarg',
'type' => 'macro_name'
}
],
@@ -2338,7 +2338,7 @@
}
],
'extra' => {
- 'arg_line' => ' off-arg
+ 'arg_line' => ' offarg
',
'macrobody' => 'off
'
@@ -2557,7 +2557,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'false-arg',
+ 'text' => 'falsearg',
'type' => 'macro_name'
}
],
@@ -2576,7 +2576,7 @@
}
],
'extra' => {
- 'arg_line' => ' false-arg
+ 'arg_line' => ' falsearg
',
'macrobody' => 'false
'
@@ -2601,7 +2601,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'true-arg',
+ 'text' => 'truearg',
'type' => 'macro_name'
}
],
@@ -2620,7 +2620,7 @@
}
],
'extra' => {
- 'arg_line' => ' true-arg
+ 'arg_line' => ' truearg
',
'macrobody' => 'true
'
@@ -2737,7 +2737,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'page-macro',
+ 'text' => 'pagemacro',
'type' => 'macro_name'
}
],
@@ -2756,7 +2756,7 @@
}
],
'extra' => {
- 'arg_line' => ' page-macro
+ 'arg_line' => ' pagemacro
',
'macrobody' => '@page
'
@@ -2781,7 +2781,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'noindent-macro',
+ 'text' => 'noindentmacro',
'type' => 'macro_name'
}
],
@@ -2800,7 +2800,7 @@
}
],
'extra' => {
- 'arg_line' => ' noindent-macro
+ 'arg_line' => ' noindentmacro
',
'macrobody' => '@noindent
'
@@ -2825,7 +2825,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'refill-macro',
+ 'text' => 'refillmacro',
'type' => 'macro_name'
}
],
@@ -2844,7 +2844,7 @@
}
],
'extra' => {
- 'arg_line' => ' refill-macro
+ 'arg_line' => ' refillmacro
',
'macrobody' => '@refill
'
@@ -2904,7 +2904,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 163,
- 'macro' => 'noindent-macro'
+ 'macro' => 'noindentmacro'
},
'parent' => {}
},
@@ -2948,7 +2948,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 165,
- 'macro' => 'noindent-macro'
+ 'macro' => 'noindentmacro'
},
'parent' => {}
},
@@ -2972,7 +2972,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 166,
- 'macro' => 'noindent-macro'
+ 'macro' => 'noindentmacro'
},
'parent' => {}
},
@@ -2999,7 +2999,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 168,
- 'macro' => 'noindent-macro'
+ 'macro' => 'noindentmacro'
},
'parent' => {}
},
@@ -3085,7 +3085,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 174,
- 'macro' => 'noindent-macro'
+ 'macro' => 'noindentmacro'
},
'parent' => {}
},
@@ -3128,7 +3128,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'contents-macro',
+ 'text' => 'contentsmacro',
'type' => 'macro_name'
}
],
@@ -3147,7 +3147,7 @@
}
],
'extra' => {
- 'arg_line' => ' contents-macro
+ 'arg_line' => ' contentsmacro
',
'macrobody' => '@contents
'
@@ -3173,7 +3173,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 179,
- 'macro' => 'contents-macro'
+ 'macro' => 'contentsmacro'
},
'parent' => {}
},
@@ -3205,7 +3205,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'cropmarks-macro',
+ 'text' => 'cropmarksmacro',
'type' => 'macro_name'
}
],
@@ -3224,7 +3224,7 @@
}
],
'extra' => {
- 'arg_line' => ' cropmarks-macro
+ 'arg_line' => ' cropmarksmacro
',
'macrobody' => '@cropmarks
'
@@ -3259,7 +3259,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'exdent-macro',
+ 'text' => 'exdentmacro',
'type' => 'macro_name'
}
],
@@ -3278,7 +3278,7 @@
}
],
'extra' => {
- 'arg_line' => ' exdent-macro
+ 'arg_line' => ' exdentmacro
',
'macrobody' => '@exdent
'
@@ -3335,7 +3335,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 191,
- 'macro' => 'exdent-macro'
+ 'macro' => 'exdentmacro'
},
'parent' => {}
},
@@ -3439,7 +3439,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'result-macro',
+ 'text' => 'resultmacro',
'type' => 'macro_name'
}
],
@@ -3458,7 +3458,7 @@
}
],
'extra' => {
- 'arg_line' => ' result-macro
+ 'arg_line' => ' resultmacro
',
'macrobody' => '@result
'
@@ -3489,13 +3489,13 @@
'args' => [
{
'parent' => {},
- 'text' => '@result-macro',
+ 'text' => '@resultmacro',
'type' => 'misc_arg'
}
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @result-macro{}
+ 'arg_line' => ' @resultmacro{}
'
},
'line_nr' => {
@@ -3739,7 +3739,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 211,
- 'macro' => 'contents-macro'
+ 'macro' => 'contentsmacro'
},
'parent' => {}
},
@@ -3753,7 +3753,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'shortcontents-macro',
+ 'text' => 'shortcontentsmacro',
'type' => 'macro_name'
}
],
@@ -3772,7 +3772,7 @@
}
],
'extra' => {
- 'arg_line' => ' shortcontents-macro
+ 'arg_line' => ' shortcontentsmacro
',
'macrobody' => '@shortcontents
'
@@ -3798,7 +3798,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 216,
- 'macro' => 'shortcontents-macro'
+ 'macro' => 'shortcontentsmacro'
},
'parent' => {}
},
@@ -3812,7 +3812,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'bye-macro',
+ 'text' => 'byemacro',
'type' => 'macro_name'
}
],
@@ -3831,7 +3831,7 @@
}
],
'extra' => {
- 'arg_line' => ' bye-macro
+ 'arg_line' => ' byemacro
',
'macrobody' => '@bye
'
@@ -4488,7 +4488,7 @@
@macro en
en
@end macro
address@hidden documentlanguage-command
address@hidden documentlanguagecommand
@documentlanguage
@end macro
@@ -4498,11 +4498,11 @@
@documentlanguage en
line following documentlanguage
address@hidden pagesizes-arg
address@hidden pagesizesarg
200mm,150mm
@end macro
address@hidden afourpaper-macro
address@hidden afourpapermacro
@afourpaper
@end macro
@@ -4512,17 +4512,17 @@
@oddfooting some text ignored @text{}
@everyheading on line following everyheading @text{}
address@hidden need-arg
address@hidden needarg
0.1
@end macro
@need 0.1
address@hidden raisesections-macro
address@hidden raisesectionsmacro
@raisesections
@end macro
@raisesections
address@hidden lowersections-macro
address@hidden lowersectionsmacro
@lowersections
@end macro
@lowersections
@@ -4531,17 +4531,17 @@
@phoo{bar}
address@hidden definfoenclose-name
address@hidden definfoenclosename
phi
@end macro
@definfoenclose phi,:,:
@phi{bar}
address@hidden strong-macro
address@hidden strongmacro
@strong
@end macro
address@hidden strong-name
address@hidden strongname
strong
@end macro
@@ -4553,7 +4553,7 @@
@kbd{something before kbdinputstyle}
address@hidden kbdinputstyle-arg
address@hidden kbdinputstylearg
code
@end macro
@kbdinputstyle code
@@ -4564,13 +4564,13 @@
@kbd{example}
@end example
address@hidden asis-arg
address@hidden asisarg
asis
@end macro
@macro zero
0
@end macro
address@hidden none-arg
address@hidden nonearg
none
@end macro
@macro four
@@ -4587,19 +4587,19 @@
@firstparagraphindent none
@exampleindent 6
address@hidden end-arg
address@hidden endarg
end
@end macro
address@hidden separate-arg
address@hidden separatearg
separate
@end macro
@footnotestyle end
@footnotestyle separate
address@hidden on-arg
address@hidden onarg
on
@end macro
address@hidden off-arg
address@hidden offarg
off
@end macro
@frenchspacing on
@@ -4611,23 +4611,23 @@
@end macro
@fonttextsize 10
@c accept false or true
address@hidden false-arg
address@hidden falsearg
false
@end macro
address@hidden true-arg
address@hidden truearg
true
@end macro
@allowcodebreaks false
@allowcodebreaks true
address@hidden page-macro
address@hidden pagemacro
@page
@end macro
address@hidden noindent-macro
address@hidden noindentmacro
@noindent
@end macro
address@hidden refill-macro
address@hidden refillmacro
@refill
@end macro
@@ -4645,19 +4645,19 @@
@@page @page
two spaces @@noindent @noindent @@refill @refill
address@hidden contents-macro
address@hidden contentsmacro
@contents
@end macro
@contents
@vskip @atext{}
address@hidden cropmarks-macro
address@hidden cropmarksmacro
@cropmarks
@end macro
@cropmarks
address@hidden exdent-macro
address@hidden exdentmacro
@exdent
@end macro
@exdent line after exdent
@@ -4667,11 +4667,11 @@
@end macro
@sp 2
address@hidden result-macro
address@hidden resultmacro
@result
@end macro
address@hidden @result-macro{}
address@hidden @resultmacro{}
@menu
* node atext::
@@ -4682,12 +4682,12 @@
@contents
address@hidden shortcontents-macro
address@hidden shortcontentsmacro
@shortcontents
@end macro
@shortcontents
address@hidden bye-macro
address@hidden byemacro
@bye
@end macro
@@ -4924,20 +4924,20 @@
'type' => 'warning'
},
{
- 'error_line' => ':162: warning: @page should only appear at a line
beginning (possibly involving @page-macro)
+ 'error_line' => ':162: warning: @page should only appear at a line
beginning (possibly involving @pagemacro)
',
'file_name' => '',
'line_nr' => 162,
- 'macro' => 'page-macro',
+ 'macro' => 'pagemacro',
'text' => '@page should only appear at a line beginning',
'type' => 'warning'
},
{
- 'error_line' => ':173: warning: @page should only appear at a line
beginning (possibly involving @page-macro)
+ 'error_line' => ':173: warning: @page should only appear at a line
beginning (possibly involving @pagemacro)
',
'file_name' => '',
'line_nr' => 173,
- 'macro' => 'page-macro',
+ 'macro' => 'pagemacro',
'text' => '@page should only appear at a line beginning',
'type' => 'warning'
}
Index: results/macro/macro_no_arg_bad_expansion.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_no_arg_bad_expansion.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- results/macro/macro_no_arg_bad_expansion.pl 26 Sep 2011 17:15:51 -0000
1.22
+++ results/macro/macro_no_arg_bad_expansion.pl 19 Jul 2012 11:46:38 -0000
1.23
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'test1',
+ 'text' => 'testone',
'type' => 'macro_name'
}
],
@@ -30,7 +30,7 @@
}
],
'extra' => {
- 'arg_line' => ' test1
+ 'arg_line' => ' testone
',
'macrobody' => 'res1
'
@@ -81,7 +81,7 @@
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3];
$result_trees{'macro_no_arg_bad_expansion'}{'contents'}[3]{'parent'} =
$result_trees{'macro_no_arg_bad_expansion'};
-$result_texis{'macro_no_arg_bad_expansion'} = '@macro test1
+$result_texis{'macro_no_arg_bad_expansion'} = '@macro testone
res1
@end macro
Index: results/macro/macro_no_arg_expansion.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_no_arg_expansion.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- results/macro/macro_no_arg_expansion.pl 26 Sep 2011 17:15:51 -0000
1.21
+++ results/macro/macro_no_arg_expansion.pl 19 Jul 2012 11:46:38 -0000
1.22
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'test1',
+ 'text' => 'testone',
'type' => 'macro_name'
}
],
@@ -30,7 +30,7 @@
}
],
'extra' => {
- 'arg_line' => ' test1
+ 'arg_line' => ' testone
',
'macrobody' => 'res1
'
@@ -81,7 +81,7 @@
$result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_no_arg_expansion'}{'contents'}[3];
$result_trees{'macro_no_arg_expansion'}{'contents'}[3]{'parent'} =
$result_trees{'macro_no_arg_expansion'};
-$result_texis{'macro_no_arg_expansion'} = '@macro test1
+$result_texis{'macro_no_arg_expansion'} = '@macro testone
res1
@end macro
Index: results/macro/macro_one_arg_end_of_file.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_one_arg_end_of_file.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- results/macro/macro_one_arg_end_of_file.pl 26 Sep 2011 17:15:52 -0000
1.19
+++ results/macro/macro_one_arg_end_of_file.pl 19 Jul 2012 11:46:38 -0000
1.20
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'one-arg',
+ 'text' => 'onearg',
'type' => 'macro_name'
},
{
@@ -35,7 +35,7 @@
}
],
'extra' => {
- 'arg_line' => ' one-arg{arg}
+ 'arg_line' => ' onearg{arg}
',
'args_index' => {
'arg' => 0
@@ -89,7 +89,7 @@
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_one_arg_end_of_file'}{'contents'}[3];
$result_trees{'macro_one_arg_end_of_file'}{'contents'}[3]{'parent'} =
$result_trees{'macro_one_arg_end_of_file'};
-$result_texis{'macro_one_arg_end_of_file'} = '@macro one-arg{arg}
+$result_texis{'macro_one_arg_end_of_file'} = '@macro onearg{arg}
Arg \\arg\\.
@end macro
Index: results/macro/no_macrobody.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/no_macrobody.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- results/macro/no_macrobody.pl 3 Jul 2011 14:50:59 -0000 1.23
+++ results/macro/no_macrobody.pl 19 Jul 2012 11:46:38 -0000 1.24
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'no-macrobody',
+ 'text' => 'nomacrobody',
'type' => 'macro_name'
},
{
@@ -23,7 +23,7 @@
'cmdname' => 'macro',
'contents' => [],
'extra' => {
- 'arg_line' => ' no-macrobody {arg}
+ 'arg_line' => ' nomacrobody {arg}
',
'args_index' => {
'arg' => 0
@@ -89,7 +89,7 @@
$result_trees{'no_macrobody'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'no_macrobody'}{'contents'}[5];
$result_trees{'no_macrobody'}{'contents'}[5]{'parent'} =
$result_trees{'no_macrobody'};
-$result_texis{'no_macrobody'} = '@macro no-macrobody {arg}
+$result_texis{'no_macrobody'} = '@macro nomacrobody {arg}
@end macro
Index: results/macro/paragraph_and_macro.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/paragraph_and_macro.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- results/macro/paragraph_and_macro.pl 26 Sep 2011 17:15:52 -0000
1.23
+++ results/macro/paragraph_and_macro.pl 19 Jul 2012 11:46:38 -0000
1.24
@@ -11,14 +11,14 @@
'args' => [
{
'parent' => {},
- 'text' => 'empty',
+ 'text' => 'aempty',
'type' => 'macro_name'
}
],
'cmdname' => 'macro',
'contents' => [],
'extra' => {
- 'arg_line' => ' empty
+ 'arg_line' => ' aempty
',
'macrobody' => ''
},
@@ -48,7 +48,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'space',
+ 'text' => 'aspace',
'type' => 'macro_name'
}
],
@@ -67,7 +67,7 @@
}
],
'extra' => {
- 'arg_line' => ' space
+ 'arg_line' => ' aspace
',
'macrobody' => '
'
@@ -268,10 +268,10 @@
$result_trees{'paragraph_and_macro'}{'contents'}[21]{'contents'}[0]{'parent'}
= $result_trees{'paragraph_and_macro'}{'contents'}[21];
$result_trees{'paragraph_and_macro'}{'contents'}[21]{'parent'} =
$result_trees{'paragraph_and_macro'};
-$result_texis{'paragraph_and_macro'} = '@macro empty
+$result_texis{'paragraph_and_macro'} = '@macro aempty
@end macro
address@hidden space
address@hidden aspace
@end macro
Index: results/macro/protect_comma_macro_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/protect_comma_macro_line.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- results/macro/protect_comma_macro_line.pl 26 Sep 2011 17:15:52 -0000
1.21
+++ results/macro/protect_comma_macro_line.pl 19 Jul 2012 11:46:38 -0000
1.22
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro2',
+ 'text' => 'macrotwo',
'type' => 'macro_name'
},
{
@@ -53,7 +53,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro2 { arg }
+ 'arg_line' => ' macrotwo { arg }
',
'args_index' => {
'arg' => 0
@@ -140,7 +140,7 @@
$result_trees{'protect_comma_macro_line'}{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'protect_comma_macro_line'}{'contents'}[5];
$result_trees{'protect_comma_macro_line'}{'contents'}[5]{'parent'} =
$result_trees{'protect_comma_macro_line'};
-$result_texis{'protect_comma_macro_line'} = '@macro macro2 { arg }
+$result_texis{'protect_comma_macro_line'} = '@macro macrotwo { arg }
we get \\arg\\ and another \\arg\\
and another one on another line \\arg\\
Index: results/macro/protect_in_body.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/protect_in_body.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- results/macro/protect_in_body.pl 26 Sep 2011 17:15:52 -0000 1.23
+++ results/macro/protect_in_body.pl 19 Jul 2012 11:46:38 -0000 1.24
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro1',
+ 'text' => 'macroone',
'type' => 'macro_name'
},
{
@@ -40,7 +40,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro1 { arg1 , arg2 }
+ 'arg_line' => ' macroone { arg1 , arg2 }
',
'args_index' => {
'arg1' => 0,
@@ -99,7 +99,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
}
@@ -171,7 +171,7 @@
$result_trees{'protect_in_body'}{'contents'}[3]{'contents'}[4]{'parent'} =
$result_trees{'protect_in_body'}{'contents'}[3];
$result_trees{'protect_in_body'}{'contents'}[3]{'parent'} =
$result_trees{'protect_in_body'};
-$result_texis{'protect_in_body'} = '@macro macro1 { arg1 , arg2 }
+$result_texis{'protect_in_body'} = '@macro macroone { arg1 , arg2 }
result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
@end macro
Index: results/macro/protect_in_body_line_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/protect_in_body_line_arg.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- results/macro/protect_in_body_line_arg.pl 26 Sep 2011 17:15:52 -0000
1.23
+++ results/macro/protect_in_body_line_arg.pl 19 Jul 2012 11:46:38 -0000
1.24
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro1',
+ 'text' => 'macroone',
'type' => 'macro_name'
},
{
@@ -40,7 +40,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro1 { arg1 , arg2 }
+ 'arg_line' => ' macroone { arg1 , arg2 }
',
'args_index' => {
'arg1' => 0,
@@ -90,7 +90,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
},
@@ -172,7 +172,7 @@
$result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'contents'}[6]{'parent'}
= $result_trees{'protect_in_body_line_arg'}{'contents'}[3];
$result_trees{'protect_in_body_line_arg'}{'contents'}[3]{'parent'} =
$result_trees{'protect_in_body_line_arg'};
-$result_texis{'protect_in_body_line_arg'} = '@macro macro1 { arg1 , arg2 }
+$result_texis{'protect_in_body_line_arg'} = '@macro macroone { arg1 , arg2 }
result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
@end macro
@@ -186,12 +186,12 @@
$result_errors{'protect_in_body_line_arg'} = [
{
- 'error_line' => ':5: warning: @macro1 defined with zero or more than one
argument should be invoked with {}
+ 'error_line' => ':5: warning: @macroone defined with zero or more than one
argument should be invoked with {}
',
'file_name' => '',
'line_nr' => 5,
'macro' => '',
- 'text' => '@macro1 defined with zero or more than one argument should be
invoked with {}',
+ 'text' => '@macroone defined with zero or more than one argument should be
invoked with {}',
'type' => 'warning'
}
];
Index: results/macro/protect_in_body_one_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/protect_in_body_one_arg.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- results/macro/protect_in_body_one_arg.pl 26 Sep 2011 17:15:52 -0000
1.24
+++ results/macro/protect_in_body_one_arg.pl 19 Jul 2012 11:46:38 -0000
1.25
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'macro1',
+ 'text' => 'macroone',
'type' => 'macro_name'
},
{
@@ -40,7 +40,7 @@
}
],
'extra' => {
- 'arg_line' => ' macro1 { arg1 , arg2 }
+ 'arg_line' => ' macroone { arg1 , arg2 }
',
'args_index' => {
'arg1' => 0,
@@ -99,7 +99,7 @@
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
- 'macro' => 'macro1'
+ 'macro' => 'macroone'
},
'parent' => {}
}
@@ -165,7 +165,7 @@
$result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'contents'}[4]{'parent'}
= $result_trees{'protect_in_body_one_arg'}{'contents'}[3];
$result_trees{'protect_in_body_one_arg'}{'contents'}[3]{'parent'} =
$result_trees{'protect_in_body_one_arg'};
-$result_texis{'protect_in_body_one_arg'} = '@macro macro1 { arg1 , arg2 }
+$result_texis{'protect_in_body_one_arg'} = '@macro macroone { arg1 , arg2 }
result: @emph{\\arg1\\} protected \\\\ -> \\\\arg1\\\\ @emph{\\arg2\\}
@end macro
Index: results/macro/recursive_call_in_argument.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/recursive_call_in_argument.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- results/macro/recursive_call_in_argument.pl 26 Sep 2011 17:15:52 -0000
1.6
+++ results/macro/recursive_call_in_argument.pl 19 Jul 2012 11:46:38 -0000
1.7
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'norecurse',
+ 'text' => 'anorecurse',
'type' => 'macro_name'
},
{
@@ -35,7 +35,7 @@
}
],
'extra' => {
- 'arg_line' => ' norecurse{arg}
+ 'arg_line' => ' anorecurse{arg}
',
'args_index' => {
'arg' => 0
@@ -90,7 +90,7 @@
$result_trees{'recursive_call_in_argument'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'recursive_call_in_argument'}{'contents'}[3];
$result_trees{'recursive_call_in_argument'}{'contents'}[3]{'parent'} =
$result_trees{'recursive_call_in_argument'};
-$result_texis{'recursive_call_in_argument'} = '@macro norecurse{arg}
+$result_texis{'recursive_call_in_argument'} = '@macro anorecurse{arg}
a
@end macro
Index: results/macro/recursive_call_in_macro.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/recursive_call_in_macro.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- results/macro/recursive_call_in_macro.pl 26 Sep 2011 17:15:52 -0000
1.6
+++ results/macro/recursive_call_in_macro.pl 19 Jul 2012 11:46:38 -0000
1.7
@@ -11,7 +11,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'norecurse',
+ 'text' => 'anorecurse',
'type' => 'macro_name'
},
{
@@ -24,7 +24,7 @@
'contents' => [
{
'parent' => {},
- 'text' => '@norecurse{arg}',
+ 'text' => '@anorecurse{arg}',
'type' => 'raw'
},
{
@@ -35,12 +35,12 @@
}
],
'extra' => {
- 'arg_line' => ' norecurse{arg}
+ 'arg_line' => ' anorecurse{arg}
',
'args_index' => {
'arg' => 0
},
- 'macrobody' => '@norecurse{arg}
+ 'macrobody' => '@anorecurse{arg}
'
},
'line_nr' => {
@@ -84,8 +84,8 @@
$result_trees{'recursive_call_in_macro'}{'contents'}[2]{'parent'} =
$result_trees{'recursive_call_in_macro'};
$result_trees{'recursive_call_in_macro'}{'contents'}[3]{'parent'} =
$result_trees{'recursive_call_in_macro'};
-$result_texis{'recursive_call_in_macro'} = '@macro norecurse{arg}
address@hidden
+$result_texis{'recursive_call_in_macro'} = '@macro anorecurse{arg}
address@hidden
@end macro
@@ -98,12 +98,12 @@
$result_errors{'recursive_call_in_macro'} = [
{
- 'error_line' => ':5: Recursive call of macro norecurse is not allowed; use
@rmacro if needed (possibly involving @norecurse)
+ 'error_line' => ':5: Recursive call of macro anorecurse is not allowed;
use @rmacro if needed (possibly involving @anorecurse)
',
'file_name' => '',
'line_nr' => 5,
- 'macro' => 'norecurse',
- 'text' => 'Recursive call of macro norecurse is not allowed; use @rmacro
if needed',
+ 'macro' => 'anorecurse',
+ 'text' => 'Recursive call of macro anorecurse is not allowed; use @rmacro
if needed',
'type' => 'error'
}
];
Index: results/macro/two_macros_on_a_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/two_macros_on_a_line.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- results/macro/two_macros_on_a_line.pl 26 Sep 2011 17:15:53 -0000
1.24
+++ results/macro/two_macros_on_a_line.pl 19 Jul 2012 11:46:39 -0000
1.25
@@ -61,7 +61,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'mymacro-with-args',
+ 'text' => 'mymacrowithargs',
'type' => 'macro_name'
},
{
@@ -97,7 +97,7 @@
}
],
'extra' => {
- 'arg_line' => ' mymacro-with-args{arg}
+ 'arg_line' => ' mymacrowithargs{arg}
',
'args_index' => {
'arg' => 0
@@ -401,7 +401,7 @@
in mymacro
@end macro
address@hidden mymacro-with-args{arg}
address@hidden mymacrowithargs{arg}
in with args
now the arg \\arg\\
after
Index: results/macro/zero_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/zero_argument.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- results/macro/zero_argument.pl 26 Sep 2011 17:15:53 -0000 1.21
+++ results/macro/zero_argument.pl 19 Jul 2012 11:46:39 -0000 1.22
@@ -61,7 +61,7 @@
'args' => [
{
'parent' => {},
- 'text' => 'bar',
+ 'text' => 'abar',
'type' => 'macro_name'
}
],
@@ -80,7 +80,7 @@
}
],
'extra' => {
- 'arg_line' => ' bar
+ 'arg_line' => ' abar
',
'macrobody' => 'in bar
'
@@ -121,7 +121,7 @@
in foo
@end macro
address@hidden bar
address@hidden abar
in bar
@end macro';
Index: results/macro/macro_name_with_digit.pl
===================================================================
RCS file: results/macro/macro_name_with_digit.pl
diff -N results/macro/macro_name_with_digit.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ results/macro/macro_name_with_digit.pl 19 Jul 2012 11:46:38 -0000
1.1
@@ -0,0 +1,170 @@
+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_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'macro_name_with_digit'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'macro1',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'macro1',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'last_raw_newline'
+ }
+ ],
+ 'extra' => {
+ 'arg_line' => ' macro1
+',
+ 'macrobody' => 'macro1
+'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'macro11',
+ 'type' => 'macro_name'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'expand \\arg\\',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'last_raw_newline'
+ }
+ ],
+ 'extra' => {
+ 'arg_line' => ' macro11 {arg}
+',
+ 'args_index' => {
+ 'arg' => 0
+ },
+ 'macrobody' => 'expand \\arg\\
+'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'expand some thing macro1
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'macro_name_with_digit'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_name_with_digit'}{'contents'}[0];
+$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
+$result_trees{'macro_name_with_digit'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[0];
+$result_trees{'macro_name_with_digit'}{'contents'}[0]{'parent'} =
$result_trees{'macro_name_with_digit'};
+$result_trees{'macro_name_with_digit'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_name_with_digit'}{'contents'}[0];
+$result_trees{'macro_name_with_digit'}{'contents'}[1]{'parent'} =
$result_trees{'macro_name_with_digit'};
+$result_trees{'macro_name_with_digit'}{'contents'}[2]{'parent'} =
$result_trees{'macro_name_with_digit'};
+$result_trees{'macro_name_with_digit'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'macro_name_with_digit'}{'contents'}[3];
+$result_trees{'macro_name_with_digit'}{'contents'}[3]{'args'}[1]{'parent'} =
$result_trees{'macro_name_with_digit'}{'contents'}[3];
+$result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[3];
+$result_trees{'macro_name_with_digit'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[3];
+$result_trees{'macro_name_with_digit'}{'contents'}[3]{'parent'} =
$result_trees{'macro_name_with_digit'};
+$result_trees{'macro_name_with_digit'}{'contents'}[4]{'extra'}{'command'} =
$result_trees{'macro_name_with_digit'}{'contents'}[3];
+$result_trees{'macro_name_with_digit'}{'contents'}[4]{'parent'} =
$result_trees{'macro_name_with_digit'};
+$result_trees{'macro_name_with_digit'}{'contents'}[5]{'parent'} =
$result_trees{'macro_name_with_digit'};
+$result_trees{'macro_name_with_digit'}{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_digit'}{'contents'}[6];
+$result_trees{'macro_name_with_digit'}{'contents'}[6]{'parent'} =
$result_trees{'macro_name_with_digit'};
+
+$result_texis{'macro_name_with_digit'} = '@macro macro1
+macro1
address@hidden macro
+
address@hidden macro11 {arg}
+expand \\arg\\
address@hidden macro
+
+expand some thing macro1
+';
+
+
+$result_texts{'macro_name_with_digit'} = '
+
+expand some thing macro1
+';
+
+$result_errors{'macro_name_with_digit'} = [];
+
+
+1;
Index: results/macro/macro_name_with_hyphen.pl
===================================================================
RCS file: results/macro/macro_name_with_hyphen.pl
diff -N results/macro/macro_name_with_hyphen.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ results/macro/macro_name_with_hyphen.pl 19 Jul 2012 11:46:38 -0000
1.1
@@ -0,0 +1,145 @@
+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_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'macro_name_with_hyphen'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'parent' => {},
+ 'text' => 'macro-one',
+ 'type' => 'macro_name'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'arg-one',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'This \\arg-one\\ and that \\arg2\\.',
+ 'type' => 'raw'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'last_raw_newline'
+ }
+ ],
+ 'extra' => {
+ 'arg_line' => ' macro-one {arg-one, arg2}
+',
+ 'args_index' => {
+ 'arg-one' => 0,
+ 'arg2' => 1
+ },
+ 'macrobody' => 'This \\arg-one\\ and that \\arg2\\.
+'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'This blah and that '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'bli-bli'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => 'macro-one'
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'macro_name_with_hyphen'}{'contents'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'macro_name_with_hyphen'}{'contents'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'args'}[2]{'parent'} =
$result_trees{'macro_name_with_hyphen'}{'contents'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[0]{'parent'} =
$result_trees{'macro_name_with_hyphen'};
+$result_trees{'macro_name_with_hyphen'}{'contents'}[1]{'extra'}{'command'} =
$result_trees{'macro_name_with_hyphen'}{'contents'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[1]{'parent'} =
$result_trees{'macro_name_with_hyphen'};
+$result_trees{'macro_name_with_hyphen'}{'contents'}[2]{'parent'} =
$result_trees{'macro_name_with_hyphen'};
+$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[3];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[1];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[3];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'macro_name_with_hyphen'}{'contents'}[3];
+$result_trees{'macro_name_with_hyphen'}{'contents'}[3]{'parent'} =
$result_trees{'macro_name_with_hyphen'};
+
+$result_texis{'macro_name_with_hyphen'} = '@macro macro-one {arg-one, arg2}
+This \\arg-one\\ and that \\arg2\\.
address@hidden macro
+
+This blah and that @code{bli-bli}.
+';
+
+
+$result_texts{'macro_name_with_hyphen'} = '
+This blah and that bli-bli.
+';
+
+$result_errors{'macro_name_with_hyphen'} = [];
+
+
+1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp/t 60macro.t results/macro/bad_argume...,
Patrice Dumas <=