[Texi2html-cvs] texi2html ChangeLog TODO texi2html.init texi2ht...

[Patrice Dumas]

CVSROOT:        /cvsroot/texi2html
Module name:    texi2html
Changes by:     Patrice Dumas <pertusus>        09/04/13 23:06:16

Modified files:
        .              : ChangeLog TODO texi2html.init texi2html.pl 
        test/formatting: tests.txt 

Log message:
                * texi2html.pl, texi2html.init: give the command name in \&def
                argument.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texi2html/ChangeLog?cvsroot=texi2html&r1=1.368&r2=1.369
http://cvs.savannah.gnu.org/viewcvs/texi2html/TODO?cvsroot=texi2html&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.init?cvsroot=texi2html&r1=1.182&r2=1.183
http://cvs.savannah.gnu.org/viewcvs/texi2html/texi2html.pl?cvsroot=texi2html&r1=1.269&r2=1.270
http://cvs.savannah.gnu.org/viewcvs/texi2html/test/formatting/tests.txt?cvsroot=texi2html&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/texi2html/texi2html/ChangeLog,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -b -r1.368 -r1.369
--- ChangeLog   12 Apr 2009 23:05:36 -0000      1.368
+++ ChangeLog   13 Apr 2009 23:06:16 -0000      1.369
@@ -1,3 +1,8 @@
+2009-04-14   Patrice Dumas  <address@hidden>
+
+       * texi2html.pl, texi2html.init: give the command name in \&def
+       argument.
+
 2009-04-05   Patrice Dumas  <address@hidden>
 
        * texi2html.pl: call tab_item_texi after closing formats.

Index: TODO
===================================================================
RCS file: /cvsroot/texi2html/texi2html/TODO,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- TODO        12 Apr 2009 23:05:36 -0000      1.87
+++ TODO        13 Apr 2009 23:06:16 -0000      1.88
@@ -54,6 +54,7 @@
   Also element formatting documentation, especially print_foot_navigation
   is not up to date.
   new arguments and return args of index_summary_letter
+  new argument of def
 
 * document the 'math' in 'args', in style_map, and simple_*math*. It
   could also be more flexible and similar with other environments, that

Index: texi2html.init
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.init,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -b -r1.182 -r1.183
--- texi2html.init      3 Apr 2009 14:10:37 -0000       1.182
+++ texi2html.init      13 Apr 2009 23:06:16 -0000      1.183
@@ -12,7 +12,7 @@
 # Afterwards, load the file with command-line 
 # option -init-file <your_init_file>
 #
-# $Id: texi2html.init,v 1.182 2009/04/03 14:10:37 pertusus Exp $
+# $Id: texi2html.init,v 1.183 2009/04/13 23:06:16 pertusus Exp $
 
 ######################################################################
 # The following variables can also be set by command-line options
@@ -5018,9 +5018,10 @@
 # text of the whole @def, line and associated text.
 #
 # $DEF_TABLE should be used.
-sub t2h_default_def($)
+sub t2h_default_def($$)
 {
     my $text = shift;
+    my $command = shift;
     if ($text =~ /\S/)
     {
         if (! $DEF_TABLE)

Index: texi2html.pl
===================================================================
RCS file: /cvsroot/texi2html/texi2html/texi2html.pl,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -b -r1.269 -r1.270
--- texi2html.pl        12 Apr 2009 23:05:36 -0000      1.269
+++ texi2html.pl        13 Apr 2009 23:06:16 -0000      1.270
@@ -79,7 +79,7 @@
 }
 
 # CVS version:
-# $Id: texi2html.pl,v 1.269 2009/04/12 23:05:36 pertusus Exp $
+# $Id: texi2html.pl,v 1.270 2009/04/13 23:06:16 pertusus Exp $
 
 # Homepage:
 my $T2H_HOMEPAGE = "http://www.nongnu.org/texi2html/";;
@@ -8925,7 +8925,7 @@
              $format_mismatch = 1;
              echo_warn ("Waiting for address@hidden $format_ref->{'format'}, 
found address@hidden $format", $line_nr);
         }
-        add_prev($text, $stack, 
&$Texi2HTML::Config::def($format_ref->{'text'}));
+        add_prev($text, $stack, 
&$Texi2HTML::Config::def($format_ref->{'text'}, $format_ref->{'orig_format'}));
     }
     elsif ($format_type{$format} eq 'cartouche')
     {
@@ -9212,13 +9212,14 @@
         else
         {
              # a new @def.             
+             my $orig_command = $macro;
              $macro =~ s/x$//o;
              # we remove what is on the stack and put it back,
              # to make sure that it is the form without x.
              pop @{$state->{'command_stack'}};
              push @{$state->{'command_stack'}}, $macro;
              #print STDERR "DEF begin $macro\n";
-             $top_format = { 'format' => $macro, 'text' => '' };
+             $top_format = { 'format' => $macro, 'text' => '', 'orig_format' 
=>$orig_command};
              push @$stack, $top_format;
         }
         #print STDERR "BEGIN_DEFF $macro\n";

Index: test/formatting/tests.txt
===================================================================
RCS file: /cvsroot/texi2html/texi2html/test/formatting/tests.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- test/formatting/tests.txt   12 Apr 2009 23:05:37 -0000      1.15
+++ test/formatting/tests.txt   13 Apr 2009 23:06:16 -0000      1.16
@@ -40,6 +40,7 @@
 # for makeinfo
 texi ../coverage/formatting.texi -U texi2html
 def_cmds def_cmds.texi
+#def_cmds_info def_cmds.texi -init info.init
 menus menus.texi
 menus_simple menus.texi -init simple_menu.init
 quotation quotation.texi