[Texi2html-cvs] texi2html/examples info.init

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/04/16 22:04:47

Modified files:
        examples       : info.init 

Log message:
        Fixes for def*

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/examples/info.init?cvsroot=texi2html&r1=1.27&r2=1.28

Patches:
Index: info.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/examples/info.init,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- info.init   16 Apr 2009 08:28:07 -0000      1.27
+++ info.init   16 Apr 2009 22:04:47 -0000      1.28
@@ -184,7 +184,7 @@
 }
 
 my %info_default_indented_commands;
-foreach my $command (keys (%{$complex_format_map}), 
@info_default_normal_formats, 'quotation', 'deff_item')
+foreach my $command (keys (%{$complex_format_map}), 
@info_default_normal_formats, 'quotation', 'deff_item', 'deff_itemx')
 {
     $info_default_indented_commands{$command} = 1;
 }
@@ -1028,7 +1028,8 @@
                   {
                      $text_added .= "\n";
                   }
-                  $indent_level++;
+                  #Â there is no close if !$content->{'content'}
+                  $indent_level++ if ($content->{'content'});
               }
           }
 
@@ -1393,7 +1394,7 @@
    my $command = shift;
    my $line = shift;
    my $state = shift;
-   info_default_open_command($state,$command);
+   info_default_open_command($state,$command) unless ($def_map{$command} and 
$command =~ /x$/);
    return $line;
 }
 
@@ -2313,6 +2314,7 @@
     my $entry_element_target = shift;
     my $index_entry_ref = shift;
 
+    return '' if ($index_entry_ref->{'hidden'});
     $entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in 
address@hidden");
 
     my $result = "* $entry: ";
@@ -2593,12 +2595,16 @@
     return info_default_close_command(undef, $format_command, undef, undef, 
undef, {'columns_size' => $columnsize});
 }
 
-sub info_default_def_item($$)
+sub info_default_def_item($$$)
 {
     my $text = shift;
     my $only_inter_item_commands = shift;
+    my $command = shift;
 
-    return info_default_close_command(undef, 'deff_item');
+    my $format = 'deff_item';
+    $format = 'deff_itemx' if ($command =~ /x$/);
+ print STDERR "LLLLLLLLLLLLLL $format $command\n";
+    return info_default_close_command(undef, $format);
 }
 
 sub info_default_def_line($$$$$$$$$$$$$$$$)
@@ -2631,13 +2637,16 @@
    my $state = $Texi2HTML::THISDOC{'state'};
 #   if ($command =~ /x$/)
 #   {
-    info_default_store_text($state,$result,$command);
+    info_default_store_text($state,$result,"${command}_line");
 #   }
 #   else
 #   {
 #      return info_default_open_command($state, $command, {'begin'=>$result});
 #   }
-    return info_default_open_command($state, 'deff_item');
+    my $format = 'deff_item';
+    $format = 'deff_itemx' if ($original_command =~ /x$/);
+    print STDERR "JJJJJJJJJJJJJ $command GGG $original_command $format\n";
+    return info_default_open_command($state, $format);
 }
 
 sub info_default_def($$)