texinfo/tp MANIFEST Makefile.am texi2any.pl Tex...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/01/07 19:25:04

Modified files:
        tp             : MANIFEST Makefile.am texi2any.pl 
        tp/Texinfo/Convert: HTML.pm Plaintext.pm 

Log message:
        Ship t/init/l2h.init.
        Protect correctly @ in strings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/MANIFEST?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.222&r2=1.223
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.200&r2=1.201

Patches:
Index: MANIFEST
===================================================================
RCS file: /sources/texinfo/texinfo/tp/MANIFEST,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- MANIFEST    25 Dec 2011 10:57:42 -0000      1.12
+++ MANIFEST    7 Jan 2012 19:25:03 -0000       1.13
@@ -104,6 +104,7 @@
 t/init/cvs.init
 t/init/icons.init
 t/init/ignore_and_comments_output.init
+t/init/l2h.init
 t/init/mini_ker_t2h.init
 t/init/misc_file_collision.init
 t/init/only_toc_out.init
@@ -118,6 +119,7 @@
 t/paragraph.t
 t/plaintext_tests.t
 t/README
+t/results/alias/alias_table_command.pl
 t/results/alias/bad_line.pl
 t/results/alias/block_command_alias.pl
 t/results/alias/simple.pl
@@ -167,12 +169,18 @@
 t/results/converters_tests/accent.pl
 t/results/converters_tests/accent_with_text.pl
 t/results/converters_tests/documentencoding_utf8_and_insertions.pl
+t/results/converters_tests/inline_expand_tex.pl
+t/results/converters_tests/inline.pl
 t/results/converters_tests/no_documentencoding_and_insertions.pl
+t/results/converters_tests/raw_block_commands_expand_tex.pl
+t/results/converters_tests/raw_block_commands.pl
 t/results/converters_tests/ref_error_formatting.pl
 t/results/converters_tests/refs_formatting.pl
 t/results/converters_tests/sp_in_example.pl
+t/results/converters_tests/test_deftypefnnewline.pl
 t/results/converters_tests/test_sp.pl
 t/results/converters_tests/unknown_value.pl
+t/results/converters_tests/verbatiminclude_paths.pl
 t/results/converters_tests/weird_accents_disable_encoding.pl
 t/results/converters_tests/weird_accents.pl
 t/results/coverage/accent_and_dash.pl
@@ -215,8 +223,6 @@
 t/results/coverage_braces/nested.pl
 t/results/coverage_braces/no_brace.pl
 t/results/coverage_braces/no_brace_space_end_line.pl
-t/results/coverage_braces/raw_expanded_in_style.pl
-t/results/coverage_braces/raw_in_style.pl
 t/results/coverage_braces/recursive_acronym.pl
 t/results/coverage_braces/ref_in_style_command.pl
 t/results/coverage_braces/simple.pl
@@ -345,11 +351,14 @@
 t/results/include/macro_definition_in_include.pl
 t/results/include/macro_in_early_commands.pl
 t/results/include/simple.pl
+t/results/include/test_include_directories.pl
 t/results/include/test_paths.pl
 t/results/include/value_expansion_in_include.pl
 t/results/include/verbatiminclude_and_encoding_latin1.pl
 t/results/include/verbatiminclude_and_encoding.pl
+t/results/indices/def_syn_indices.pl
 t/results/indices/double_index_entry.pl
+t/results/indices/double_syncodeindex.pl
 t/results/indices/empty_cindex_entry.pl
 t/results/indices/empty_index_entry.pl
 t/results/indices/empty_string_index_entry.pl
@@ -463,7 +472,6 @@
 t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
 t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
 t/results/invalid_nestings/unclosed_verb_on_section_line.pl
-t/results/invalid_nestings/verbatim_in_style_command.pl
 t/results/itemize/accent_argument.pl
 t/results/itemize/asis_as_itemize_argument.pl
 t/results/itemize/bad_enumerate_arguments.pl
@@ -502,7 +510,7 @@
 t/results/macro/double_recursive_macro_call.pl
 t/results/macro/empty_end.pl
 t/results/macro/empty_macro_in_text_no_arg.pl
-t/results/macro/empty_macro.pl
+t/results/macro/empty_macro_no_arg.pl
 t/results/macro/expand_two_same.pl
 t/results/macro/expansion_order.pl
 t/results/macro/ifclear_in_macro.pl
@@ -544,6 +552,7 @@
 t/results/macro/redefine_texinfo_macro.pl
 t/results/macro/simple_imbricated_macro.pl
 t/results/macro/space_macro_after_end.pl
+t/results/macro/space_macro_after_end_verbatim.pl
 t/results/macro/text_before_after.pl
 t/results/macro/too_much_args.pl
 t/results/macro/two_macros_on_a_line.pl
@@ -713,16 +722,24 @@
 t/results/quotation/space_at_commands_end_quotation_line.pl
 t/results/quotation/standard_quotations.pl
 t/results/raw/braces_in_tex.pl
+t/results/raw/inlinefmt.pl
+t/results/raw/inlinefmt_with_empty_line.pl
+t/results/raw/inline_in_example.pl
+t/results/raw/inline_missing_first_arg.pl
+t/results/raw/inlineraw.pl
+t/results/raw/inlineraw_with_empty_line.pl
 t/results/raw/misc_raw_comments.pl
 t/results/raw/misc_raw.pl
 t/results/raw/nested_macros.pl
 t/results/raw/raw_commands_and_end_of_lines.pl
-t/results/raw/raw_in_brace_command.pl
+t/results/raw/raw_expanded_in_style.pl
 t/results/raw/raw_in_example.pl
 t/results/raw/raw_in_para.pl
+t/results/raw/raw_in_style.pl
 t/results/raw/raw_not_closed.pl
 t/results/raw/tex_not_closed.pl
 t/results/raw/verbatim_and_verbatiminclude.pl
+t/results/raw/verbatim_in_brace_command.pl
 t/results/raw/verbatim_not_closed.pl
 t/results/regions/anchor_in_copying_in_footnote.pl
 t/results/regions/anchor_in_copying.pl
@@ -871,6 +888,7 @@
 t/results/xtable/title_and_itemx_before_item.pl
 t/test_count.t
 t/test_sort.t
+t/test_tree_copy.t
 t/test_utils.pl
 t/xml_tests.t
 LocaleData/cs/LC_MESSAGES/texinfo.mo

Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- Makefile.am 25 Dec 2011 23:49:26 -0000      1.18
+++ Makefile.am 7 Jan 2012 19:25:03 -0000       1.19
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.18 2011/12/25 23:49:26 pertusus Exp $
+# $Id: Makefile.am,v 1.19 2012/01/07 19:25:03 pertusus Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011 Free Software Foundation, Inc.
@@ -118,6 +118,7 @@
  t/init/mini_ker_t2h.init \
  t/init/test_renamed_nodes.init \
  t/init/misc_file_collision.init \
+ t/init/l2h.init \
  t/manual_tree.pl \
  t/test_utils.pl \
  #

Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- texi2any.pl 4 Jan 2012 21:23:41 -0000       1.100
+++ texi2any.pl 7 Jan 2012 19:25:03 -0000       1.101
@@ -1073,6 +1073,9 @@
   if ($file_number != 0) {
     delete $cmdline_options->{'OUTFILE'} if 
exists($cmdline_options->{'OUTFILE'});
     delete $cmdline_options->{'OUT'} if exists($cmdline_options->{'OUT'});
+    delete $cmdline_options->{'PREFIX'} if 
exists($cmdline_options->{'PREFIX'});
+    delete $cmdline_options->{'SUBDIR'} 
+      if (exists($cmdline_options->{'SUBDIR'}) and get_conf('SPLIT'));
   }
   my $converter_options = { %$converter_default_options, 
                             %$cmdline_options,

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- Texinfo/Convert/HTML.pm     6 Jan 2012 00:20:32 -0000       1.222
+++ Texinfo/Convert/HTML.pm     7 Jan 2012 19:25:03 -0000       1.223
@@ -3901,7 +3901,7 @@
                 'arguments' => $arguments};
         if ($self->get_conf('deftypefnnewline') eq 'on') {
           $tree 
-             = $self->gdt("{category}:@* address@hidden@* address@hidden 
address@hidden", 
+             = $self->gdt("{category}:address@hidden address@hidden@* 
address@hidden address@hidden", 
                           $strings);
         } else {
           $tree 
@@ -3914,7 +3914,7 @@
                 'type' => $command->{'extra'}->{'def_parsed_hash'}->{'type'},
                 'name' => $name};
         if ($self->get_conf('deftypefnnewline') eq 'on') {
-          $tree = $self->gdt("{category}:@* address@hidden@* address@hidden",
+          $tree = $self->gdt("{category}:address@hidden address@hidden@* 
address@hidden",
                   $strings);
         } else {
           $tree = $self->gdt("{category}: address@hidden address@hidden",
@@ -3961,7 +3961,7 @@
                 'arguments' => $arguments};
         if ($self->get_conf('deftypefnnewline') eq 'on') {
           $tree 
-            = $self->gdt("{category} on {class}:@* address@hidden@* 
address@hidden address@hidden", 
+            = $self->gdt("{category} on {class}:address@hidden 
address@hidden@* address@hidden address@hidden", 
                          $strings);
         } else {
           $tree 
@@ -3976,7 +3976,7 @@
                 'name' => $name};
         if ($self->get_conf('deftypefnnewline') eq 'on') {
           $tree 
-            = $self->gdt("{category} on {class}:@* address@hidden@* 
address@hidden", 
+            = $self->gdt("{category} on {class}:address@hidden 
address@hidden@* address@hidden", 
                          $strings);
         } else {
           $tree 
@@ -3994,7 +3994,7 @@
                 'arguments' => $arguments};
         if ($self->get_conf('deftypefnnewline') eq 'on') {
           $tree 
-            = $self->gdt("{category} of {class}:@* address@hidden@* 
address@hidden address@hidden",
+            = $self->gdt("{category} of {class}:address@hidden 
address@hidden@* address@hidden address@hidden",
                          $strings);
         } else {
           $tree 
@@ -4009,7 +4009,7 @@
                 'name' => $name};
         if ($self->get_conf('deftypefnnewline') eq 'on') {
           $tree 
-            = $self->gdt("{category} of {class}:@* address@hidden@* 
address@hidden",
+            = $self->gdt("{category} of {class}:address@hidden 
address@hidden@* address@hidden",
                          $strings);
         } else {
           $tree 

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -b -r1.200 -r1.201
--- Texinfo/Convert/Plaintext.pm        6 Jan 2012 00:20:32 -0000       1.200
+++ Texinfo/Convert/Plaintext.pm        7 Jan 2012 19:25:04 -0000       1.201
@@ -2217,7 +2217,7 @@
                     'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'arguments' => $arguments};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree = $self->gdt("address@hidden }-- 
{category}:@address@hidden {arguments}",
+              $tree = $self->gdt("address@hidden }-- 
{category}:address@hidden@*{name} {arguments}",
                                  $strings);
             } else {
               $tree = $self->gdt("address@hidden }-- {category}: {type} {name} 
{arguments}",
@@ -2229,7 +2229,7 @@
                     'type' => $root->{'extra'}->{'def_parsed_hash'}->{'type'},
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
-              $tree = $self->gdt("address@hidden }-- 
{category}:@address@hidden",
+              $tree = $self->gdt("address@hidden }-- 
{category}:address@hidden@*{name}",
                                  $strings);
             } else {
               $tree = $self->gdt("address@hidden }-- {category}: {type} 
{name}",
@@ -2276,7 +2276,7 @@
                     'arguments' => $arguments};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
               $tree 
-                = $self->gdt("address@hidden }-- {category} on 
{class}:@address@hidden {arguments}",
+                = $self->gdt("address@hidden }-- {category} on 
{class}:address@hidden@*{name} {arguments}",
                              $strings);
             } else {
               $tree 
@@ -2291,7 +2291,7 @@
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
               $tree 
-                = $self->gdt("address@hidden }-- {category} on 
{class}:@address@hidden",
+                = $self->gdt("address@hidden }-- {category} on 
{class}:address@hidden@*{name}",
                              $strings);
             } else {
               $tree 
@@ -2309,7 +2309,7 @@
                     'arguments' => $arguments};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
               $tree 
-                = $self->gdt("address@hidden }-- {category} of 
{class}:@address@hidden {arguments}",
+                = $self->gdt("address@hidden }-- {category} of 
{class}:address@hidden@*{name} {arguments}",
                              $strings);
             } else {
               $tree 
@@ -2324,7 +2324,7 @@
                     'name' => $name};
             if ($self->get_conf('deftypefnnewline') eq 'on') {
               $tree 
-                = $self->gdt("address@hidden }-- {category} of 
{class}:@address@hidden",
+                = $self->gdt("address@hidden }-- {category} of 
{class}:address@hidden@*{name}",
                              $strings);
             } else {
               $tree