[8194] allow TEXINFO_OUTPUT_FORMAT to override TEXI2HTML

[gavinsmith0123]

Revision: 8194
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8194
Author:   gavin
Date:     2018-09-22 05:03:43 -0400 (Sat, 22 Sep 2018)
Log Message:
-----------
allow TEXINFO_OUTPUT_FORMAT to override TEXI2HTML

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-22 08:08:14 UTC (rev 8193)
+++ trunk/ChangeLog     2018-09-22 09:03:43 UTC (rev 8194)
@@ -1,5 +1,10 @@
-2018-09-21  Gavin Smith  <address@hidden>
+2018-09-22  Gavin Smith  <address@hidden>
 
+       * tp/texi2any.pl: Allow '-c TEXINFO_OUTPUT_FORMAT' to override 
+       '-c TEXI2HTML'.
+
+2018-09-22  Gavin Smith  <address@hidden>
+
        * tp/tests/README: Update to mention list-of-tests file.
 
 2018-09-21  Gavin Smith  <address@hidden>

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2018-09-22 08:08:14 UTC (rev 8193)
+++ trunk/tp/texi2any.pl        2018-09-22 09:03:43 UTC (rev 8194)
@@ -946,7 +946,7 @@
      if ($var eq 'TEXINFO_OUTPUT_FORMAT') {
        $format = set_format($value, $format, 1);
      } elsif ($var eq 'TEXI2HTML') {
-       $format = set_format('html');
+       $format = set_format('html', $format, 1);
        $parser_default_options->{'values'}->{'texi2html'} = 1;
      }
      set_from_cmdline($var, $value);