texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Patrice Dumas
Date: Tue, 17 Aug 2021 18:33:37 -0400 (EDT)

branch: master
commit f174cefb11aab528e8cf5f4eae67ea99e29431d1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Aug 18 00:33:25 2021 +0200

    * tp/init/tex4ht.pm (tex4ht_prepare, tex4ht_convert)
    (tex4ht_process_format, tex4ht_process_command):
    process commands in the input file order, using
    Texinfo::Common::collect_commands_list_in_tree().
    Prepare and process a file for tex4ht per format and
    not per @-command.
---
 ChangeLog                                          |   9 +
 tp/init/tex4ht.pm                                  | 189 +++++++++++----------
 tp/tests/many_input_files/tex_t4ht_res/tex.html    |  11 +-
 .../many_input_files/tex_t4ht_res/tex_complex.html |   7 +-
 .../tex_t4ht_res/tex_complex_tex4ht_math.4ct       |   2 -
 .../tex_t4ht_res/tex_complex_tex4ht_math.4tc       |   1 -
 .../tex_t4ht_res/tex_complex_tex4ht_math.css       |  42 -----
 .../tex_t4ht_res/tex_complex_tex4ht_math.html      |  49 ------
 .../tex_t4ht_res/tex_complex_tex4ht_math.lg        |  53 ------
 .../tex_t4ht_res/tex_complex_tex4ht_math.tex       |  10 --
 .../tex_t4ht_res/tex_complex_tex4ht_math.tmp       |   2 -
 .../tex_t4ht_res/tex_complex_tex4ht_math.xref      |   1 -
 .../tex_t4ht_res/tex_complex_tex4ht_tex.lg         |   2 +
 .../tex_t4ht_res/tex_complex_tex4ht_tex.tex        |  14 +-
 .../tex_t4ht_res/tex_tex4ht_displaymath.4ct        |   2 -
 .../tex_t4ht_res/tex_tex4ht_displaymath.4tc        |   1 -
 .../tex_t4ht_res/tex_tex4ht_displaymath.css        |  42 -----
 .../tex_t4ht_res/tex_tex4ht_displaymath.html       |  35 ----
 .../tex_t4ht_res/tex_tex4ht_displaymath.lg         |  54 ------
 .../tex_t4ht_res/tex_tex4ht_displaymath.tex        |   9 -
 .../tex_t4ht_res/tex_tex4ht_displaymath.tmp        |   2 -
 .../tex_t4ht_res/tex_tex4ht_displaymath.xref       |   1 -
 .../tex_t4ht_res/tex_tex4ht_math.4ct               |   2 -
 .../tex_t4ht_res/tex_tex4ht_math.4tc               |   1 -
 .../tex_t4ht_res/tex_tex4ht_math.css               |  44 -----
 .../tex_t4ht_res/tex_tex4ht_math.html              |  73 --------
 .../tex_t4ht_res/tex_tex4ht_math.lg                |  54 ------
 .../tex_t4ht_res/tex_tex4ht_math.tex               |  14 --
 .../tex_t4ht_res/tex_tex4ht_math.tmp               |   2 -
 .../tex_t4ht_res/tex_tex4ht_math.xref              |   1 -
 .../tex_t4ht_res/tex_tex4ht_tex.css                |   1 +
 .../tex_t4ht_res/tex_tex4ht_tex.lg                 |   2 +
 .../tex_t4ht_res/tex_tex4ht_tex.tex                |  15 ++
 tp/tests/tex_html/list-of-tests                    |   2 +-
 .../res_parser/tex_complex_httex/tex_complex.html  |   7 +-
 .../tex_complex_httex/tex_complex_tex4ht_math.4ct  |   2 -
 .../tex_complex_httex/tex_complex_tex4ht_math.4tc  |   1 -
 .../tex_complex_httex/tex_complex_tex4ht_math.css  |  42 -----
 .../tex_complex_httex/tex_complex_tex4ht_math.html |  49 ------
 .../tex_complex_httex/tex_complex_tex4ht_math.lg   |  53 ------
 .../tex_complex_httex/tex_complex_tex4ht_math.tex  |  10 --
 .../tex_complex_httex/tex_complex_tex4ht_math.tmp  |   2 -
 .../tex_complex_httex/tex_complex_tex4ht_math.xref |   1 -
 .../tex_complex_httex/tex_complex_tex4ht_tex.html  |  40 ++++-
 .../tex_complex_httex/tex_complex_tex4ht_tex.lg    |   2 +
 .../tex_complex_httex/tex_complex_tex4ht_tex.tex   |  14 +-
 .../res_parser/tex_eqalign_httex/tex_eqalign.html  |   7 +-
 .../tex_eqalign_tex4ht_displaymath.4ct             |   2 -
 .../tex_eqalign_tex4ht_displaymath.4tc             |   1 -
 .../tex_eqalign_tex4ht_displaymath.css             |  41 -----
 .../tex_eqalign_tex4ht_displaymath.html            |  36 ----
 .../tex_eqalign_tex4ht_displaymath.lg              |  52 ------
 .../tex_eqalign_tex4ht_displaymath.tex             |  12 --
 .../tex_eqalign_tex4ht_displaymath.tmp             |   2 -
 .../tex_eqalign_tex4ht_displaymath.xref            |   1 -
 .../tex_eqalign_httex/tex_eqalign_tex4ht_tex.html  |  21 ++-
 .../tex_eqalign_httex/tex_eqalign_tex4ht_tex.lg    |   1 +
 .../tex_eqalign_httex/tex_eqalign_tex4ht_tex.tex   |  12 +-
 .../res_parser/tex_gdef_httex/tex_gdef.html        |  18 +-
 .../tex_gdef_httex/tex_gdef_tex4ht_displaymath.4ct |   2 -
 .../tex_gdef_httex/tex_gdef_tex4ht_displaymath.4tc |   1 -
 .../tex_gdef_httex/tex_gdef_tex4ht_displaymath.css |  40 -----
 .../tex_gdef_tex4ht_displaymath.html               |   6 -
 .../tex_gdef_httex/tex_gdef_tex4ht_displaymath.lg  |  47 -----
 .../tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex |   9 -
 .../tex_gdef_httex/tex_gdef_tex4ht_displaymath.tmp |   2 -
 .../tex_gdef_tex4ht_displaymath.xref               |   1 -
 .../tex_gdef_httex/tex_gdef_tex4ht_math.4ct        |   2 -
 .../tex_gdef_httex/tex_gdef_tex4ht_math.4tc        |   1 -
 .../tex_gdef_httex/tex_gdef_tex4ht_math.css        |  40 -----
 .../tex_gdef_httex/tex_gdef_tex4ht_math.html       |   6 -
 .../tex_gdef_httex/tex_gdef_tex4ht_math.lg         |  47 -----
 .../tex_gdef_httex/tex_gdef_tex4ht_math.tex        |  10 --
 .../tex_gdef_httex/tex_gdef_tex4ht_math.tmp        |   2 -
 .../tex_gdef_httex/tex_gdef_tex4ht_math.xref       |   1 -
 .../tex_gdef_httex/tex_gdef_tex4ht_tex.css         |   2 +
 .../tex_gdef_httex/tex_gdef_tex4ht_tex.html        |  38 +++++
 .../tex_gdef_httex/tex_gdef_tex4ht_tex.lg          |   7 +
 .../tex_gdef_httex/tex_gdef_tex4ht_tex.tex         |  11 ++
 tp/tests/tex_html/res_parser/tex_httex/tex.html    |  11 +-
 .../tex_httex/tex_tex4ht_displaymath.4ct           |   2 -
 .../tex_httex/tex_tex4ht_displaymath.4tc           |   1 -
 .../tex_httex/tex_tex4ht_displaymath.css           |  42 -----
 .../tex_httex/tex_tex4ht_displaymath.html          |  35 ----
 .../res_parser/tex_httex/tex_tex4ht_displaymath.lg |  54 ------
 .../tex_httex/tex_tex4ht_displaymath.tex           |   9 -
 .../tex_httex/tex_tex4ht_displaymath.tmp           |   2 -
 .../tex_httex/tex_tex4ht_displaymath.xref          |   1 -
 .../res_parser/tex_httex/tex_tex4ht_math.4ct       |   2 -
 .../res_parser/tex_httex/tex_tex4ht_math.4tc       |   1 -
 .../res_parser/tex_httex/tex_tex4ht_math.css       |  44 -----
 .../res_parser/tex_httex/tex_tex4ht_math.html      |  73 --------
 .../res_parser/tex_httex/tex_tex4ht_math.lg        |  54 ------
 .../res_parser/tex_httex/tex_tex4ht_math.tex       |  14 --
 .../res_parser/tex_httex/tex_tex4ht_math.tmp       |   2 -
 .../res_parser/tex_httex/tex_tex4ht_math.xref      |   1 -
 .../res_parser/tex_httex/tex_tex4ht_tex.css        |   1 +
 .../res_parser/tex_httex/tex_tex4ht_tex.html       |  65 +++++++
 .../res_parser/tex_httex/tex_tex4ht_tex.lg         |   2 +
 .../res_parser/tex_httex/tex_tex4ht_tex.tex        |  15 ++
 tp/tests/tex_html/tex_gdef.texi                    |   8 +
 101 files changed, 399 insertions(+), 1493 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 57160bd..dc3bbc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2021-08-17  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/init/tex4ht.pm (tex4ht_prepare, tex4ht_convert)
+       (tex4ht_process_format, tex4ht_process_command):
+       process commands in the input file order, using
+       Texinfo::Common::collect_commands_list_in_tree().
+       Prepare and process a file for tex4ht per format and 
+       not per @-command.
+
+2021-08-17  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Common.pm (collect_commands_list_in_tree):
        add function that collects commands from tree and keep them
        in the order in which they appear.
diff --git a/tp/init/tex4ht.pm b/tp/init/tex4ht.pm
index 1840847..9e4e4a5 100644
--- a/tp/init/tex4ht.pm
+++ b/tp/init/tex4ht.pm
@@ -23,13 +23,12 @@
 #
 
#-##############################################################################
 # To customize the command and the options, you could set
-# $Texinfo::TeX4HT::STYLE_MATH to latex/tex
-# $Texinfo::TeX4HT::STYLE_TEX to latex/texi
+# $Texinfo::TeX4HT::STYLE_MATH and $Texinfo::TeX4HT::STYLE_TEX to 
tex/latex/texi
 # and/or change
-# $Texinfo::TeX4HT::tex4ht_command_math 
-#    and $Texinfo::TeX4HT::tex4ht_options_math
-# $Texinfo::TeX4HT::tex4ht_command_tex, 
$Texinfo::TeX4HT::tex4ht_command_displaymath
+# $Texinfo::TeX4HT::tex4ht_command_tex
 #    and $Texinfo::TeX4HT::tex4ht_options_tex
+# $Texinfo::TeX4HT::tex4ht_command_latex, $Texinfo::TeX4HT::tex4ht_command_texi
+#    and $Texinfo::TeX4HT::tex4ht_options_latex and 
$Texinfo::TeX4HT::tex4ht_options_texi
 
 use strict;
 
@@ -52,33 +51,35 @@ package Texinfo::TeX4HT;
 use vars qw(
 $STYLE_MATH
 $STYLE_TEX
-$tex4ht_command_math
 $tex4ht_command_tex
-$tex4ht_command_displaymath
-$tex4ht_options_math
+$tex4ht_command_latex
+$tex4ht_command_texi
 $tex4ht_options_tex
+$tex4ht_options_latex
+$tex4ht_options_texi
 );
 
 $STYLE_MATH = 'tex' if (!defined($STYLE_MATH));
 $STYLE_TEX = 'tex' if (!defined($STYLE_TEX));
 
-if (!defined($tex4ht_command_math)) {
-  $tex4ht_command_math = 'httexi';
-  $tex4ht_command_math = 'htlatex' if ($STYLE_MATH eq 'latex');
-  $tex4ht_command_math = 'httex' if ($STYLE_MATH eq 'tex');
-}
+
 if (!defined($tex4ht_command_tex)) {
   $tex4ht_command_tex = 'httex';
-  $tex4ht_command_tex = 'htlatex' if ($STYLE_TEX eq 'latex');
-  $tex4ht_command_tex = 'httexi' if ($STYLE_TEX eq 'texi');
 }
-if (!defined($tex4ht_command_displaymath)) {
-  $tex4ht_command_displaymath = $tex4ht_command_tex;
+
+if (!defined($tex4ht_command_latex)) {
+  $tex4ht_command_latex = 'htlatex';
+}
+
+if (!defined($tex4ht_command_texi)) {
+  $tex4ht_command_texi = 'httexi';
 }
 
 }
 
 my %commands = ();
+# style of output
+my %formats = ();
 
 my $tex4ht_initial_dir;
 my $tex4ht_out_dir;
@@ -100,82 +101,96 @@ sub tex4ht_prepare($$)
   my $document_name = $self->{'document_name'};
   my $tex4ht_basename = "${document_name}_tex4ht";
 
-  # this initialization doesn't seems to be needed, but it is cleaner anyway
+  # this initialization doesn't seems to be needed, but it is cleaner anyway,
+  # in case there is more than one texinfo file processed.
+  # In that case, it is indeed better to clear the structures.  Note that
+  # even if the structures are not cleared, the results are ok, as everything
+  # that needs to be changed should be rewritten, so it does not matter
+  # if there are remaining results from the previous file.
   %commands = ();
+  %formats = ();
   $commands{'math'}->{'style'} = $Texinfo::TeX4HT::STYLE_MATH;
   $commands{'tex'}->{'style'} = $Texinfo::TeX4HT::STYLE_TEX;
-  $commands{'math'}->{'exec'} = $Texinfo::TeX4HT::tex4ht_command_math;
-  $commands{'tex'}->{'exec'} = $Texinfo::TeX4HT::tex4ht_command_tex;
   $commands{'displaymath'}->{'style'} = $Texinfo::TeX4HT::STYLE_TEX;
-  $commands{'displaymath'}->{'exec'} = 
$Texinfo::TeX4HT::tex4ht_command_displaymath;
+  $formats{'tex'}->{'exec'} = $Texinfo::TeX4HT::tex4ht_command_tex;
+  $formats{'latex'}->{'exec'} = $Texinfo::TeX4HT::tex4ht_command_latex;
+  $formats{'texi'}->{'exec'} = $Texinfo::TeX4HT::tex4ht_command_texi;
   my @replaced_commands = sort(keys(%commands));
-  my $collected_commands = 
Texinfo::Common::collect_commands_in_tree($document_root, \@replaced_commands);
-  foreach my $command (@replaced_commands) {
-    my $style = $commands{$command}->{'style'};
-    $commands{$command}->{'basename'} = $tex4ht_basename . "_$command";
+  my $collected_commands = Texinfo::Common::collect_commands_list_in_tree(
+                                        $document_root, \@replaced_commands);
+  my %format_collected_commands = ();
+  foreach my $root (@{$collected_commands}) {
+    my $command = $root->{'cmdname'};
+    my $format = $commands{$command}->{'style'};
+    push @{$format_collected_commands{$format}}, $root;
+    $commands{$command}->{'counter'}++;
+  }
+
+  foreach my $format (keys(%format_collected_commands)) {
+    $formats{$format}->{'basename'} = $tex4ht_basename . "_$format";
     my $suffix = '.tex';
-    $suffix = '.texi' if ($style eq 'texi');
-    $commands{$command}->{'basefile'} = $commands{$command}->{'basename'} . 
$suffix;
-    $commands{$command}->{'html_file'} = $commands{$command}->{'basename'} . 
'.html';
-    $commands{$command}->{'rfile'} = File::Spec->catfile($tex4ht_out_dir, 
-                                          $commands{$command}->{'basefile'});
-    my $rfile = $commands{$command}->{'rfile'};
-    $commands{$command}->{'counter'} = 0;
-    $commands{$command}->{'output_counter'} = 0;
-
-    if (scalar(@{$collected_commands->{$command}}) > 0) {
+    $suffix = '.texi' if ($format eq 'texi');
+    $formats{$format}->{'basefile'} = $formats{$format}->{'basename'} . 
$suffix;
+    $formats{$format}->{'html_file'} = $formats{$format}->{'basename'} . 
'.html';
+    $formats{$format}->{'rfile'} = File::Spec->catfile($tex4ht_out_dir,
+                                          $formats{$format}->{'basefile'});
+    my $rfile = $formats{$format}->{'rfile'};
+    $formats{$format}->{'counter'} = 0;
+    $formats{$format}->{'output_counter'} = 0;
+
+    if (scalar(@{$format_collected_commands{$format}}) > 0) {
       
       local *TEX4HT_TEXFILE;
       unless (open (*TEX4HT_TEXFILE, ">$rfile")) {
-        $self->document_warn(sprintf(__("tex4ht.pm: could not open %s: %s"), 
+        $self->document_warn(sprintf(__("tex4ht.pm: could not open %s: %s"),
                                       $rfile, $!));
         return 1;
       }
-      $commands{$command}->{'handle'} = *TEX4HT_TEXFILE;
+      $formats{$format}->{'handle'} = *TEX4HT_TEXFILE;
 
-      my $style = $commands{$command}->{'style'};
-      my $fh = $commands{$command}->{'handle'};
+      my $fh = $formats{$format}->{'handle'};
       my $comment = '@c';
-      $comment = '%' if ($style ne 'texi');
+      $comment = '%' if ($format ne 'texi');
       $comment .= " Automatically generated\n";
-      if ($style eq 'texi') {
+      if ($format eq 'texi') {
         print $fh "\\input texinfo
-\@setfilename $commands{$command}->{'basename'}.info\n";
+\@setfilename $formats{$format}->{'basename'}.info\n";
         print $fh "$comment";
       } else {
         print $fh "$comment";
-        if ($style eq 'latex') {
+        if ($format eq 'latex') {
           print $fh "\\documentstyle{article}\n\\begin{document}\n";
-        } elsif ($style eq 'tex') {
+        } elsif ($format eq 'tex') {
           print $fh "\\csname tex4ht\\endcsname\n";
         }
       }
-      foreach my $root (@{$collected_commands->{$command}}) {
-        $commands{$command}->{'counter'}++;
-        my $counter = $commands{$command}->{'counter'};
+      foreach my $root (@{$format_collected_commands{$format}}) {
+        $formats{$format}->{'counter'}++;
+        my $counter = $formats{$format}->{'counter'};
+        my $command = $root->{'cmdname'};
         my $tree;
         if ($command eq 'math') {
           $tree = $root->{'args'}->[0];
         } else {
           $tree = {'contents' => [@{$root->{'contents'}}]};
-          if ($tree->{'contents'}->[0] 
+          if ($tree->{'contents'}->[0]
               and $tree->{'contents'}->[0]->{'type'}
               and $tree->{'contents'}->[0]->{'type'} eq 
'empty_line_after_command') {
             shift @{$tree->{'contents'}};
           }
-          if ($tree->{'contents'}->[-1]->{'cmdname'} 
+          if ($tree->{'contents'}->[-1]->{'cmdname'}
               and $tree->{'contents'}->[-1]->{'cmdname'} eq 'end') {
             pop @{$tree->{'contents'}};
           }
         }
         my $text = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
-        $commands{$command}->{'commands'}->[$counter-1] = $root;
+        $formats{$format}->{'commands'}->[$counter-1] = $root;
 
         # write to tex file
         my ($before_comment_open, $after_comment_open, $before_comment_close,
             $after_comment_close);
 
-        if ($style eq 'texi') {
+        if ($format eq 'texi') {
           $before_comment_open = "\@verbatim\n\n";
           $after_comment_open = "\n\@end verbatim\n";
           $before_comment_close = "\@verbatim\n";
@@ -187,12 +202,12 @@ sub tex4ht_prepare($$)
           $after_comment_close = "\\Hnewline \\Hnewline}\n";
         }
   
-        my $begin_comment = "<!-- tex4ht_begin 
$commands{$command}->{'basename'} $command $counter -->";
+        my $begin_comment = "<!-- tex4ht_begin $formats{$format}->{'basename'} 
$command $counter -->";
         print $fh "$before_comment_open$begin_comment$after_comment_open";
         if ($command eq 'tex') {
           print $fh $text;
         } elsif ($command eq 'math') {
-          if ($style eq 'texi') {
+          if ($format eq 'texi') {
             print $fh '@math{' . $text . "}\n";
           } else {
             print $fh "\\IgnorePar \$" . $text . "\$";
@@ -200,22 +215,22 @@ sub tex4ht_prepare($$)
         } elsif ($command eq 'displaymath') {
           print $fh "\n\$\$" . $text . "\$\$\n";
         }
-        my $end_comment = "<!-- tex4ht_end $commands{$command}->{'basename'} 
$command $counter -->";
+        my $end_comment = "<!-- tex4ht_end $formats{$format}->{'basename'} 
$command $counter -->";
         print $fh "$before_comment_close$end_comment$after_comment_close";
       }
       # finish the tex file
-      if ($style eq 'latex') {
+      if ($format eq 'latex') {
         print $fh "\\end{document}\n";
-      } elsif ($style eq 'tex') {
+      } elsif ($format eq 'tex') {
         print $fh "\n\\bye\n";
       } else {
         print $fh "\n\@bye\n";
       }
       close ($fh);
-      # this has to be done during the 'process' phase, in 'output' it is 
+      # this has to be done during the 'process' phase, in 'output' it is
       # too late.
-      push @{$self->{'css_import_lines'}}, 
-         "\@import \"$commands{$command}->{'basename'}.css\";\n";
+      push @{$self->{'css_import_lines'}},
+         "\@import \"$formats{$format}->{'basename'}.css\";\n";
     }
   }
   return 1;
@@ -229,12 +244,12 @@ sub tex4ht_convert($)
                          $tex4ht_out_dir, $!));
     return 0;
   }
-  print STDERR "cwd($tex4ht_out_dir): " . Cwd::cwd() ."\n" 
+  print STDERR "cwd($tex4ht_out_dir): " . Cwd::cwd() ."\n"
     if ($self->get_conf('VERBOSE'));
 
   my $errors = 0;
-  foreach my $command (keys(%commands)) {
-    $errors += tex4ht_process_command($self, $command);
+  foreach my $format (keys(%formats)) {
+    $errors += tex4ht_process_format($self, $format);
   }
   unless (chdir $tex4ht_initial_dir) {
     $self->document_warn(sprintf(__(
@@ -244,31 +259,31 @@ sub tex4ht_convert($)
   return 1;
 }
 
-sub tex4ht_process_command($$) {
+sub tex4ht_process_format($$) {
   my $self = shift;
-  my $command = shift;
+  my $format = shift;
   
-  return 0 unless ($commands{$command}->{'counter'});
+  return 0 unless ($formats{$format}->{'counter'});
 
   $self->document_warn(sprintf(__("tex4ht.pm: output file missing: %s"),
-                               $commands{$command}->{'basefile'}))
-    unless (-f $commands{$command}->{'basefile'});
-  my $style = $commands{$command}->{'style'};
+                               $formats{$format}->{'basefile'}))
+    unless (-f $formats{$format}->{'basefile'});
   # now run tex4ht
   my $options = '';
-  if ($style eq 'math' and defined($Texinfo::TeX4HT::tex4ht_options_math)) {
-    $options = $Texinfo::TeX4HT::tex4ht_options_math 
-  } elsif ($style eq 'tex' and defined($Texinfo::TeX4HT::tex4ht_options_tex)) {
+  if ($format eq 'tex' and defined($Texinfo::TeX4HT::tex4ht_options_tex)) {
     $options = $Texinfo::TeX4HT::tex4ht_options_tex;
+  } elsif ($format eq 'latex' and 
defined($Texinfo::TeX4HT::tex4ht_options_latex)) {
+    $options = $Texinfo::TeX4HT::tex4ht_options_latex;
+  } elsif ($format eq 'texi' and 
defined($Texinfo::TeX4HT::tex4ht_options_texi)) {
+    $options = $Texinfo::TeX4HT::tex4ht_options_texi;
   }
 
-  my $cmd = "$commands{$command}->{'exec'} $commands{$command}->{'basefile'} 
$options";
+  my $cmd = "$formats{$format}->{'exec'} $formats{$format}->{'basefile'} 
$options";
   print STDERR "tex4ht command: $cmd\n" if ($self->get_conf('VERBOSE'));
   # do not use system in order to be sure that tex STDIN is not
   # mixed up with the main script STDIN.  It is important because
   # if tex fails, it will read from STDIN and the input may trigger
   # diverse actions by tex.
-  #if (system($cmd)) {
   if (not(open(TEX4HT, "|-", $cmd))) {
     $self->document_warn(sprintf(__(
                          "tex4ht.pm: command failed: %s"), $cmd));
@@ -282,9 +297,9 @@ sub tex4ht_process_command($$) {
   }
 
   # extract the html from the file created by tex4ht
-  my $html_basefile = $commands{$command}->{'html_file'};
+  my $html_basefile = $formats{$format}->{'html_file'};
   unless (open (TEX4HT_HTMLFILE, $html_basefile)) {
-    $self->document_warn(sprintf(__("tex4ht.pm: could not open %s: %s"), 
+    $self->document_warn(sprintf(__("tex4ht.pm: could not open %s: %s"),
                                   $html_basefile, $!));
     return 1;
   }
@@ -292,17 +307,17 @@ sub tex4ht_process_command($$) {
   my $line;
   while ($line = <TEX4HT_HTMLFILE>) {
     #print STDERR "$html_basefile: while $line";
-    if ($line =~ /!-- tex4ht_begin $commands{$command}->{'basename'} (\w+) 
(\d+) --/) {
+    if ($line =~ /!-- tex4ht_begin $formats{$format}->{'basename'} (\w+) (\d+) 
--/) {
       my $command = $1;
       my $count = $2;
       my $text = '';
       my $end_found = 0;
       while ($line = <TEX4HT_HTMLFILE>) {
         #print STDERR "while search $command $count $line";
-        if ($line =~ /!-- tex4ht_end $commands{$command}->{'basename'} 
$command $count --/) {
+        if ($line =~ /!-- tex4ht_end $formats{$format}->{'basename'} $command 
$count --/) {
           $got_count++;
           chomp($text) if ($command eq 'math');
-          
$commands{$command}->{'results'}->{$commands{$command}->{'commands'}->[$count-1]}
 = $text;
+          
$commands{$command}->{'results'}->{$formats{$format}->{'commands'}->[$count-1]} 
= $text;
           $end_found = 1;
           last;
         } else {
@@ -311,16 +326,16 @@ sub tex4ht_process_command($$) {
       }
       unless ($end_found) {
         $self->document_warn(sprintf(__(
-                               "tex4ht.pm: end of \@%s item %d not found"), 
-                                      $command, $count));
+                               "tex4ht.pm: end of %s item %d not found"),
+                                      $format, $count));
       }
     }
   }
-  if ($got_count != $commands{$command}->{'counter'}) {
+  if ($got_count != $formats{$format}->{'counter'}) {
     $self->document_warn(sprintf(__(
-       "tex4ht.pm: processing produced %d items in HTML; expected %d, the 
number of items found in the document for \@%s"), 
-                                 $got_count, $commands{$command}->{'counter'},
-                                 $command));
+       "tex4ht.pm: processing produced %d items in HTML; expected %d, the 
number of items found in the document for %s"),
+                                 $got_count, $formats{$format}->{'counter'},
+                                 $format));
   }
   close (TEX4HT_HTMLFILE);
   return 0;
@@ -331,7 +346,7 @@ sub tex4ht_do_tex($$$$)
   my $self = shift;
   my $cmdname = shift;;
   my $command = shift;
-  # return the resulting html 
+  # return the resulting html
   if (exists ($commands{$cmdname}->{'results'}->{$command})
       and defined($commands{$cmdname}->{'results'}->{$command})) {
     $commands{$cmdname}->{'output_counter'}++;
@@ -353,8 +368,8 @@ sub tex4ht_finish($)
     foreach my $command (keys(%commands)) {
       if ($commands{$command}->{'output_counter'} != 
$commands{$command}->{'counter'}) {
         $self->document_warn(sprintf(__(
-           "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the 
number of items found in the document for \@%s"), 
-                                  $commands{$command}->{'output_counter'}, 
+           "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the 
number of items found in the document for \@%s"),
+                                  $commands{$command}->{'output_counter'},
                                   $commands{$command}->{'counter'}, $command));
       }
     }
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex.html 
b/tp/tests/many_input_files/tex_t4ht_res/tex.html
index 4fcfb10..83d3973 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex.html
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex.html
@@ -14,8 +14,6 @@
 
 <style type="text/css">
 <!--
-@import "tex_tex4ht_displaymath.css";
-@import "tex_tex4ht_math.css";
 @import "tex_tex4ht_tex.css";
 
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -106,14 +104,13 @@ class="cmmi-10">sup</span>2
 </p>
 <p>Displaymath
 </p>
-<!--l. 5--><p class="indent" >
     <div class="math-display" >
 <img 
-src="tex_tex4ht_displaymath0x.png" alt="                        (      )2
-- - f(x) = -1&#x221A;---e@sup - 1  x--&#x03BC;-
-           &#x03C3; 2&#x03C0;        2   &#x03C3;
+src="tex_tex4ht_tex1x.png" alt="                        (      )
+           -1---       1  x--&#x03BC;- 2
+- - f(x) = &#x03C3;&#x221A;2&#x03C0;-e@sup - 2   &#x03C3;
 " class="math-display" ></div>
-<!--l. 7--><p class="indent" >     
+<!--l. 29--><p class="indent" >     
 
 <hr></div>
 <p><font size="-1">
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
index c163c42..5e0a50e 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex_complex.html
@@ -18,7 +18,6 @@ Some (I-D) \varphi(t) math. -->
 
 <style type="text/css">
 <!--
-@import "tex_complex_tex4ht_math.css";
 @import "tex_complex_tex4ht_tex.css";
 
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -85,7 +84,7 @@ class="cmmi-10">t</span>)  math.
 src="tex_complex_tex4ht_tex1x.png" alt="    &#8224;
 UwV
 " class="math-display" ></div>
-<!--l. 11--><p class="indent" >     
+<!--l. 13--><p class="indent" >     
 </p>
 <p>and math  <span 
 class="cmmi-10">&#x03D5;wV</span> <sup><span 
@@ -103,11 +102,11 @@ class="cmmi-7">t</span></sup> .
 <img 
 src="tex_complex_tex4ht_tex2x.png" alt="&#x03C9; = h(&#x03B7;,&#x03C6; )
 " class="math-display" ></div>
-<!--l. 16--><p class="indent" >     
+<!--l. 20--><p class="indent" >     
 
 <p>and math  <span 
 class="cmmi-10">h</span><img 
-src="tex_complex_tex4ht_math0x.png" alt="&#x03C8;&#x02D9;"  class="dot" 
><sup><span 
+src="tex_complex_tex4ht_tex3x.png" alt="&#x03C8;&#x02D9;"  class="dot" 
><sup><span 
 class="cmmi-7">&#x03D5;</span></sup> .
 </p>
 </div>
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.4ct 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.4ct
deleted file mode 100644
index 9998f62..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.4tc 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.4tc
deleted file mode 100644
index 4021816..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.css 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.css
deleted file mode 100644
index 9ed220d..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.css
+++ /dev/null
@@ -1,42 +0,0 @@
- 
-/* start css.sty */
-.cmmi-10{font-style: italic;}
-.cmmi-7{font-size:70%;font-style: italic;}
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git 
a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.html 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.html
deleted file mode 100644
index 5b1c7f5..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-    <title>tex_complex_tex4ht_math.html</title> 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> 
-<meta name="generator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<meta name="originator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<!-- html --> 
-<meta name="src" content="tex_complex_tex4ht_math.tex"> 
-<link rel="stylesheet" type="text/css" href="tex_complex_tex4ht_math.css"> 
-</head><body 
->
-<!--l. 3--><p class="indent" >     
- 
-<!-- tex4ht_begin tex_complex_tex4ht_math math 1 --> 
- (<span 
-class="cmmi-10">I </span><span 
-class="cmsy-10">- </span><span 
-class="cmmi-10">D</span>)<span 
-class="cmmi-10">&#x03C6;</span>(<span 
-class="cmmi-10">t</span>) 
-<!-- tex4ht_end tex_complex_tex4ht_math math 1 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_complex_tex4ht_math math 2 --> 
- <span 
-class="cmmi-10">&#x03D5;wV</span> <sup><span 
-class="cmmi-7">t</span></sup> 
-<!-- tex4ht_end tex_complex_tex4ht_math math 2 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_complex_tex4ht_math math 3 --> 
- <span 
-class="cmmi-10">h</span><img 
-src="tex_complex_tex4ht_math0x.png" alt="&#x03C8;&#x02D9;"  class="dot" 
><sup><span 
-class="cmmi-7">&#x03D5;</span></sup> 
-<!-- tex4ht_end tex_complex_tex4ht_math math 3 --> 
- 
-
-
-     
-</body></html> 
-
-
-
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.lg 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.lg
deleted file mode 100644
index c59632c..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.lg
+++ /dev/null
@@ -1,53 +0,0 @@
-htfcss: cmmi font-style: italic;
-htfcss: cmmib font-style: italic; font-weight: bold;
-File: tex_complex_tex4ht_math.html
-File: tex_complex_tex4ht_math.css
-File: tex_complex_tex4ht_math.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- needs --- tex_complex_tex4ht_math.idv[1] ==> tex_complex_tex4ht_math0x.png 
---
---- characters ---
-Font("cmr","10","10","100")
-Font("cmmi","10","10","100")
-Font("cmmi","7","7","100")
-Font("cmsy","10","10","100")
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tex 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tex
deleted file mode 100644
index 866acb5..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_math math 1 
-->\Hnewline}
-\IgnorePar $(I-D) \varphi(t)$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_math math 1 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_math math 2 
-->\Hnewline}
-\IgnorePar $\phi w V^t$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_math math 2 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_math math 3 
-->\Hnewline}
-\IgnorePar $h \dot \psi^\phi$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_math math 3 -->\Hnewline \Hnewline}
-
-\bye
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tmp 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tmp
deleted file mode 100644
index 41b58e2..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git 
a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.xref 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.xref
deleted file mode 100644
index 2af329c..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_math.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_complex_tex4ht_math.html}{1}%
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_tex.lg 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_tex.lg
index 32f0704..abea882 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_tex.lg
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_tex.lg
@@ -48,8 +48,10 @@ Css: table.pmatrix {width:100%;}
 --- needs --- tex_complex_tex4ht_tex.idv[1] ==> tex_complex_tex4ht_tex0x.png 
---
 --- needs --- tex_complex_tex4ht_tex.idv[2] ==> tex_complex_tex4ht_tex1x.png 
---
 --- needs --- tex_complex_tex4ht_tex.idv[3] ==> tex_complex_tex4ht_tex2x.png 
---
+--- needs --- tex_complex_tex4ht_tex.idv[4] ==> tex_complex_tex4ht_tex3x.png 
---
 --- characters ---
 Font("cmr","10","10","100")
 Font("cmmi","10","10","100")
 Font("cmmi","7","7","100")
+Font("cmsy","10","10","100")
 Font("cmsy","7","7","100")
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_tex.tex 
b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_tex.tex
index ad89a69..4793667 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_tex.tex
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex_complex_tex4ht_tex.tex
@@ -4,15 +4,21 @@
 $$\partial_{\eta} g(\eta(t),\varphi(t));
 $$
 \HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 1 -->\Hnewline 
\Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex tex 2 
-->\Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex math 2 
-->\Hnewline}
+\IgnorePar $(I-D) \varphi(t)$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_tex math 2 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex tex 3 
-->\Hnewline}
 $$
  U w V^\dagger
 $$
-\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 2 -->\Hnewline 
\Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex tex 3 
-->\Hnewline}
+\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 3 -->\Hnewline 
\Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex math 4 
-->\Hnewline}
+\IgnorePar $\phi w V^t$\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex 
math 4 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex tex 5 
-->\Hnewline}
 $$
 \omega = h ( \eta , \varphi) 
 $$
-\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 3 -->\Hnewline 
\Hnewline}
+\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 5 -->\Hnewline 
\Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex math 6 
-->\Hnewline}
+\IgnorePar $h \dot \psi^\phi$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_tex math 6 -->\Hnewline \Hnewline}
 
 \bye
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.4ct 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.4ct
deleted file mode 100644
index 9998f62..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.4tc 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.4tc
deleted file mode 100644
index 4021816..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.css 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.css
deleted file mode 100644
index faa0ef0..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.css
+++ /dev/null
@@ -1,42 +0,0 @@
- 
-/* start css.sty */
-.cmr-7{font-size:70%;}
-.cmmi-10{font-style: italic;}
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.html 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.html
deleted file mode 100644
index e1f909a..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-    <title>tex_tex4ht_displaymath.html</title> 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> 
-<meta name="generator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<meta name="originator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<!-- html --> 
-<meta name="src" content="tex_tex4ht_displaymath.tex"> 
-<link rel="stylesheet" type="text/css" href="tex_tex4ht_displaymath.css"> 
-</head><body 
->
-<!--l. 3--><p class="indent" >     
- 
-<!-- tex4ht_begin tex_tex4ht_displaymath displaymath 1 --> 
-
-<!--l. 5--><p class="indent" >
-    <div class="math-display" >
-<img 
-src="tex_tex4ht_displaymath0x.png" alt="                        (      )2
-- - f(x) = -1&#x221A;---e@sup - 1  x--&#x03BC;-
-           &#x03C3; 2&#x03C0;        2   &#x03C3;
-" class="math-display" ></div>
-<!--l. 7--><p class="indent" >     
-<!-- tex4ht_end tex_tex4ht_displaymath displaymath 1 --> 
- 
-
-
-     
-</body></html> 
-
-
-
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.lg 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.lg
deleted file mode 100644
index d46f55b..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.lg
+++ /dev/null
@@ -1,54 +0,0 @@
-htfcss: cmmi font-style: italic;
-htfcss: cmmib font-style: italic; font-weight: bold;
-File: tex_tex4ht_displaymath.html
-File: tex_tex4ht_displaymath.css
-File: tex_tex4ht_displaymath.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- needs --- tex_tex4ht_displaymath.idv[1] ==> tex_tex4ht_displaymath0x.png 
---
---- characters ---
-Font("cmr","10","10","100")
-Font("cmr","7","7","100")
-Font("cmmi","10","10","100")
-Font("cmsy","10","10","100")
-Font("cmex","10","10","100")
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.tex 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.tex
deleted file mode 100644
index 7e9d50d..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_displaymath 
displaymath 1 -->\Hnewline}
-
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
-$$
-\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_displaymath displaymath 1 
-->\Hnewline \Hnewline}
-
-\bye
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.tmp 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.tmp
deleted file mode 100644
index 41b58e2..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.xref 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.xref
deleted file mode 100644
index 8e3958c..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_displaymath.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_tex4ht_displaymath.html}{1}%
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.4ct 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.4ct
deleted file mode 100644
index 9998f62..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.4tc 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.4tc
deleted file mode 100644
index 4021816..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.css 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.css
deleted file mode 100644
index c002d15..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.css
+++ /dev/null
@@ -1,44 +0,0 @@
- 
-/* start css.sty */
-.cmr-7{font-size:70%;}
-.cmmi-10{font-style: italic;}
-.cmmi-7{font-size:70%;font-style: italic;}
-.cmmi-5{font-size:50%;font-style: italic;}
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.html 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.html
deleted file mode 100644
index 7b6f9c7..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-    <title>tex_tex4ht_math.html</title> 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> 
-<meta name="generator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<meta name="originator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<!-- html --> 
-<meta name="src" content="tex_tex4ht_math.tex"> 
-<link rel="stylesheet" type="text/css" href="tex_tex4ht_math.css"> 
-</head><body 
->
-<!--l. 3--><p class="indent" >     
- 
-<!-- tex4ht_begin tex_tex4ht_math math 1 --> 
-   <span 
-class="cmmi-7">x</span><sup><span 
-class="cmmi-5">i</span></sup> __
-<span 
-class="cmr-7">tan</span> <span 
-class="cmmi-7">y</span> 
-<!-- tex4ht_end tex_tex4ht_math math 1 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_tex4ht_math math 2 --> 
- <span 
-class="cmmi-10">a</span>@<span 
-class="cmmi-10">&#x00A0;b</span> 
-<!-- tex4ht_end tex_tex4ht_math math 2 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_tex4ht_math math 3 --> 
- @<span 
-class="cmmi-10">code</span><span 
-class="cmmi-10">mathcode</span><span 
-class="cmmi-10">a &#x003C; b</span> 
-<!-- tex4ht_end tex_tex4ht_math math 3 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_tex4ht_math math 4 --> 
- <span class="underline">@<span 
-class="cmmi-10">code</span><span 
-class="cmmi-10">math</span> code </span><span 
-class="cmex-10">&#x2211;</span>
-  <sub><span 
-class="cmmi-7">i</span></sub><span class="underline"><span 
-class="cmmi-10">f</span></span> 
-<!-- tex4ht_end tex_tex4ht_math math 4 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_tex4ht_math math 5 --> 
- <span 
-class="cmex-10">&#x2211;</span>
-  <sub><span 
-class="cmmi-7">i</span></sub><span 
-class="cmmi-10">f</span>(<span 
-class="cmmi-10">x</span>)@<span 
-class="cmmi-10">sup</span>2 
-<!-- tex4ht_end tex_tex4ht_math math 5 --> 
- 
-
-
-     
-</body></html> 
-
-
-
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.lg 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.lg
deleted file mode 100644
index 07e069f..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.lg
+++ /dev/null
@@ -1,54 +0,0 @@
-htfcss: cmmi font-style: italic;
-htfcss: cmmib font-style: italic; font-weight: bold;
-File: tex_tex4ht_math.html
-File: tex_tex4ht_math.css
-File: tex_tex4ht_math.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- characters ---
-Font("cmr","10","10","100")
-Font("cmr","7","7","100")
-Font("cmmi","10","10","100")
-Font("cmmi","7","7","100")
-Font("cmmi","5","5","100")
-Font("cmex","10","10","100")
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tex 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tex
deleted file mode 100644
index c12b69c..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 1 
-->\Hnewline}
-\IgnorePar ${x^i}\over{\tan y}$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_math math 1 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 2 
-->\Hnewline}
-\IgnorePar $a @\ b$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_math math 2 
-->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 3 
-->\Hnewline}
-\IgnorePar $@code{math code} a < b$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_math math 3 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 4 
-->\Hnewline}
-\IgnorePar $\underline{@code{math \hbox{ code }}} 
\sum_{i}{\underline{f}}$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_math math 4 
-->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 5 
-->\Hnewline}
-\IgnorePar $\sum_{i} f(x)@sup{2}$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_math math 5 -->\Hnewline \Hnewline}
-
-\bye
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tmp 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tmp
deleted file mode 100644
index 41b58e2..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.xref 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.xref
deleted file mode 100644
index 62af5b6..0000000
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_math.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_tex4ht_math.html}{1}%
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.css 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.css
index 3d1f352..c002d15 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.css
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.css
@@ -3,6 +3,7 @@
 .cmr-7{font-size:70%;}
 .cmmi-10{font-style: italic;}
 .cmmi-7{font-size:70%;font-style: italic;}
+.cmmi-5{font-size:50%;font-style: italic;}
 p{margin-top:0;margin-bottom:0}
 p.indent{text-indent:0;}
 p + p{margin-top:1em;}
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.lg 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.lg
index 43efefb..5ffca8c 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.lg
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.lg
@@ -46,10 +46,12 @@ Css: img.cdots{vertical-align:middle;}
 Css: div.pmatrix {text-align:center;}
 Css: table.pmatrix {width:100%;}
 --- needs --- tex_tex4ht_tex.idv[1] ==> tex_tex4ht_tex0x.png ---
+--- needs --- tex_tex4ht_tex.idv[2] ==> tex_tex4ht_tex1x.png ---
 --- characters ---
 Font("cmr","10","10","100")
 Font("cmr","7","7","100")
 Font("cmmi","10","10","100")
 Font("cmmi","7","7","100")
+Font("cmmi","5","5","100")
 Font("cmsy","10","10","100")
 Font("cmex","10","10","100")
diff --git a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.tex 
b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.tex
index cf52171..9d2bcf9 100644
--- a/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.tex
+++ b/tp/tests/many_input_files/tex_t4ht_res/tex_tex4ht_tex.tex
@@ -12,5 +12,20 @@ $$ \chi^2 = \sum_{i=1}^N
 
 tex \TeX 
 \HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex tex 2 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 3 
-->\Hnewline}
+\IgnorePar ${x^i}\over{\tan y}$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex 
math 3 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 4 
-->\Hnewline}
+\IgnorePar $a @\ b$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex math 4 
-->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 5 
-->\Hnewline}
+\IgnorePar $@code{math code} a < b$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_tex math 5 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 6 
-->\Hnewline}
+\IgnorePar $\underline{@code{math \hbox{ code }}} 
\sum_{i}{\underline{f}}$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex math 6 
-->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 7 
-->\Hnewline}
+\IgnorePar $\sum_{i} f(x)@sup{2}$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_tex math 7 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex displaymath 8 
-->\Hnewline}
+
+$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
+$$
+\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex displaymath 8 -->\Hnewline 
\Hnewline}
 
 \bye
diff --git a/tp/tests/tex_html/list-of-tests b/tp/tests/tex_html/list-of-tests
index 694fc09..c3444bd 100644
--- a/tp/tests/tex_html/list-of-tests
+++ b/tp/tests/tex_html/list-of-tests
@@ -6,7 +6,7 @@ tex_notex tex.texi
 tex_httex tex.texi --init tex4ht.pm --iftex
 tex_accents_httex tex_accents.texi --init tex4ht.pm --iftex
 tex_accents_l2h tex_accents.texi -c 'L2H 1' --iftex
-tex_gdef_httex tex_gdef.texi --init tex4ht.pm --iftex
+tex_gdef_httex tex_gdef.texi --init tex4ht.pm --iftex -D tex4ht
 tex_gdef_l2h tex_gdef.texi -c 'L2H 1' --iftex
 tex_gdef_mathjax tex_gdef.texi -c HTML_MATH=mathjax --iftex
 # No mediawki tests for now
diff --git a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
index c163c42..5e0a50e 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex.html
@@ -18,7 +18,6 @@ Some (I-D) \varphi(t) math. -->
 
 <style type="text/css">
 <!--
-@import "tex_complex_tex4ht_math.css";
 @import "tex_complex_tex4ht_tex.css";
 
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -85,7 +84,7 @@ class="cmmi-10">t</span>)  math.
 src="tex_complex_tex4ht_tex1x.png" alt="    &#8224;
 UwV
 " class="math-display" ></div>
-<!--l. 11--><p class="indent" >     
+<!--l. 13--><p class="indent" >     
 </p>
 <p>and math  <span 
 class="cmmi-10">&#x03D5;wV</span> <sup><span 
@@ -103,11 +102,11 @@ class="cmmi-7">t</span></sup> .
 <img 
 src="tex_complex_tex4ht_tex2x.png" alt="&#x03C9; = h(&#x03B7;,&#x03C6; )
 " class="math-display" ></div>
-<!--l. 16--><p class="indent" >     
+<!--l. 20--><p class="indent" >     
 
 <p>and math  <span 
 class="cmmi-10">h</span><img 
-src="tex_complex_tex4ht_math0x.png" alt="&#x03C8;&#x02D9;"  class="dot" 
><sup><span 
+src="tex_complex_tex4ht_tex3x.png" alt="&#x03C8;&#x02D9;"  class="dot" 
><sup><span 
 class="cmmi-7">&#x03D5;</span></sup> .
 </p>
 </div>
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.4ct 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.4ct
deleted file mode 100644
index 9998f62..0000000
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.4tc 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.4tc
deleted file mode 100644
index 4021816..0000000
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.css 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.css
deleted file mode 100644
index 9ed220d..0000000
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.css
+++ /dev/null
@@ -1,42 +0,0 @@
- 
-/* start css.sty */
-.cmmi-10{font-style: italic;}
-.cmmi-7{font-size:70%;font-style: italic;}
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html
deleted file mode 100644
index 5b1c7f5..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-    <title>tex_complex_tex4ht_math.html</title> 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> 
-<meta name="generator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<meta name="originator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<!-- html --> 
-<meta name="src" content="tex_complex_tex4ht_math.tex"> 
-<link rel="stylesheet" type="text/css" href="tex_complex_tex4ht_math.css"> 
-</head><body 
->
-<!--l. 3--><p class="indent" >     
- 
-<!-- tex4ht_begin tex_complex_tex4ht_math math 1 --> 
- (<span 
-class="cmmi-10">I </span><span 
-class="cmsy-10">- </span><span 
-class="cmmi-10">D</span>)<span 
-class="cmmi-10">&#x03C6;</span>(<span 
-class="cmmi-10">t</span>) 
-<!-- tex4ht_end tex_complex_tex4ht_math math 1 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_complex_tex4ht_math math 2 --> 
- <span 
-class="cmmi-10">&#x03D5;wV</span> <sup><span 
-class="cmmi-7">t</span></sup> 
-<!-- tex4ht_end tex_complex_tex4ht_math math 2 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_complex_tex4ht_math math 3 --> 
- <span 
-class="cmmi-10">h</span><img 
-src="tex_complex_tex4ht_math0x.png" alt="&#x03C8;&#x02D9;"  class="dot" 
><sup><span 
-class="cmmi-7">&#x03D5;</span></sup> 
-<!-- tex4ht_end tex_complex_tex4ht_math math 3 --> 
- 
-
-
-     
-</body></html> 
-
-
-
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.lg 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.lg
deleted file mode 100644
index c59632c..0000000
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.lg
+++ /dev/null
@@ -1,53 +0,0 @@
-htfcss: cmmi font-style: italic;
-htfcss: cmmib font-style: italic; font-weight: bold;
-File: tex_complex_tex4ht_math.html
-File: tex_complex_tex4ht_math.css
-File: tex_complex_tex4ht_math.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- needs --- tex_complex_tex4ht_math.idv[1] ==> tex_complex_tex4ht_math0x.png 
---
---- characters ---
-Font("cmr","10","10","100")
-Font("cmmi","10","10","100")
-Font("cmmi","7","7","100")
-Font("cmsy","10","10","100")
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tex 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tex
deleted file mode 100644
index 866acb5..0000000
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_math math 1 
-->\Hnewline}
-\IgnorePar $(I-D) \varphi(t)$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_math math 1 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_math math 2 
-->\Hnewline}
-\IgnorePar $\phi w V^t$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_math math 2 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_math math 3 
-->\Hnewline}
-\IgnorePar $h \dot \psi^\phi$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_math math 3 -->\Hnewline \Hnewline}
-
-\bye
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tmp 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tmp
deleted file mode 100644
index 41b58e2..0000000
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.xref 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.xref
deleted file mode 100644
index 2af329c..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_math.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_complex_tex4ht_math.html}{1}%
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.html 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.html
index d3c9239..1b64ee5 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.html
@@ -25,26 +25,54 @@ src="tex_complex_tex4ht_tex0x.png" 
alt="&#x2202;&#x03B7;g(&#x03B7;(t),&#x03C6;(t
  
   
  
-<!-- tex4ht_begin tex_complex_tex4ht_tex tex 2 --> 
+<!-- tex4ht_begin tex_complex_tex4ht_tex math 2 --> 
+ (<span 
+class="cmmi-10">I </span><span 
+class="cmsy-10">- </span><span 
+class="cmmi-10">D</span>)<span 
+class="cmmi-10">&#x03C6;</span>(<span 
+class="cmmi-10">t</span>) 
+<!-- tex4ht_end tex_complex_tex4ht_tex math 2 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_complex_tex4ht_tex tex 3 --> 
 
     <div class="math-display" >
 <img 
 src="tex_complex_tex4ht_tex1x.png" alt="    &#8224;
 UwV
 " class="math-display" ></div>
-<!--l. 11--><p class="indent" >     
-<!-- tex4ht_end tex_complex_tex4ht_tex tex 2 --> 
+<!--l. 13--><p class="indent" >     
+<!-- tex4ht_end tex_complex_tex4ht_tex tex 3 --> 
  
   
  
-<!-- tex4ht_begin tex_complex_tex4ht_tex tex 3 --> 
+<!-- tex4ht_begin tex_complex_tex4ht_tex math 4 --> 
+ <span 
+class="cmmi-10">&#x03D5;wV</span> <sup><span 
+class="cmmi-7">t</span></sup> 
+<!-- tex4ht_end tex_complex_tex4ht_tex math 4 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_complex_tex4ht_tex tex 5 --> 
 
     <div class="math-display" >
 <img 
 src="tex_complex_tex4ht_tex2x.png" alt="&#x03C9; = h(&#x03B7;,&#x03C6; )
 " class="math-display" ></div>
-<!--l. 16--><p class="indent" >     
-<!-- tex4ht_end tex_complex_tex4ht_tex tex 3 --> 
+<!--l. 20--><p class="indent" >     
+<!-- tex4ht_end tex_complex_tex4ht_tex tex 5 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_complex_tex4ht_tex math 6 --> 
+ <span 
+class="cmmi-10">h</span><img 
+src="tex_complex_tex4ht_tex3x.png" alt="&#x03C8;&#x02D9;"  class="dot" 
><sup><span 
+class="cmmi-7">&#x03D5;</span></sup> 
+<!-- tex4ht_end tex_complex_tex4ht_tex math 6 --> 
  
 
 
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.lg 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.lg
index 32f0704..abea882 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.lg
+++ b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.lg
@@ -48,8 +48,10 @@ Css: table.pmatrix {width:100%;}
 --- needs --- tex_complex_tex4ht_tex.idv[1] ==> tex_complex_tex4ht_tex0x.png 
---
 --- needs --- tex_complex_tex4ht_tex.idv[2] ==> tex_complex_tex4ht_tex1x.png 
---
 --- needs --- tex_complex_tex4ht_tex.idv[3] ==> tex_complex_tex4ht_tex2x.png 
---
+--- needs --- tex_complex_tex4ht_tex.idv[4] ==> tex_complex_tex4ht_tex3x.png 
---
 --- characters ---
 Font("cmr","10","10","100")
 Font("cmmi","10","10","100")
 Font("cmmi","7","7","100")
+Font("cmsy","10","10","100")
 Font("cmsy","7","7","100")
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.tex 
b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.tex
index ad89a69..4793667 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.tex
+++ b/tp/tests/tex_html/res_parser/tex_complex_httex/tex_complex_tex4ht_tex.tex
@@ -4,15 +4,21 @@
 $$\partial_{\eta} g(\eta(t),\varphi(t));
 $$
 \HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 1 -->\Hnewline 
\Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex tex 2 
-->\Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex math 2 
-->\Hnewline}
+\IgnorePar $(I-D) \varphi(t)$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_tex math 2 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex tex 3 
-->\Hnewline}
 $$
  U w V^\dagger
 $$
-\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 2 -->\Hnewline 
\Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex tex 3 
-->\Hnewline}
+\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 3 -->\Hnewline 
\Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex math 4 
-->\Hnewline}
+\IgnorePar $\phi w V^t$\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex 
math 4 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex tex 5 
-->\Hnewline}
 $$
 \omega = h ( \eta , \varphi) 
 $$
-\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 3 -->\Hnewline 
\Hnewline}
+\HCode{\Hnewline <!-- tex4ht_end tex_complex_tex4ht_tex tex 5 -->\Hnewline 
\Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_complex_tex4ht_tex math 6 
-->\Hnewline}
+\IgnorePar $h \dot \psi^\phi$\HCode{\Hnewline <!-- tex4ht_end 
tex_complex_tex4ht_tex math 6 -->\Hnewline \Hnewline}
 
 \bye
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
index 4ad8a96..f2feb74 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign.html
@@ -14,7 +14,6 @@
 
 <style type="text/css">
 <!--
-@import "tex_eqalign_tex4ht_displaymath.css";
 @import "tex_eqalign_tex4ht_tex.css";
 
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -46,7 +45,7 @@ ul.no-bullet {list-style: none}
 <!--l. 5--><p class="indent" >
     <div class="math-display" >
 <img 
-src="tex_eqalign_tex4ht_displaymath0x.png" alt="                               
     &#x222B;
+src="tex_eqalign_tex4ht_tex0x.png" alt="                                    
&#x222B;
 [3.1]                                  v(t)dt = u(t)+ C
                                     &#x222B;
 [3.2]                                  v(t)dt = u(t)+ H
@@ -56,12 +55,12 @@ src="tex_eqalign_tex4ht_displaymath0x.png" alt="
 
     <div class="math-display" >
 <img 
-src="tex_eqalign_tex4ht_tex0x.png" alt="                                    
&#x222B;
+src="tex_eqalign_tex4ht_tex1x.png" alt="                                    
&#x222B;
 [3.1]                                  v(t)dt = u(t)+ C
                                     &#x222B;
 [3.2]                                  v(t)dt = u(t)+ H
 " class="math-display" ></div>
-<!--l. 8--><p class="indent" >     
+<!--l. 16--><p class="indent" >     
 
 <hr></div>
 <p><font size="-1">
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.4ct
 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.4ct
deleted file mode 100644
index 9998f62..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.4tc
 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.4tc
deleted file mode 100644
index 4021816..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.css
 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.css
deleted file mode 100644
index 14d3398..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.css
+++ /dev/null
@@ -1,41 +0,0 @@
- 
-/* start css.sty */
-.cmmi-10{font-style: italic;}
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.html
 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.html
deleted file mode 100644
index b75aede..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-    <title>tex_eqalign_tex4ht_displaymath.html</title> 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> 
-<meta name="generator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<meta name="originator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<!-- html --> 
-<meta name="src" content="tex_eqalign_tex4ht_displaymath.tex"> 
-<link rel="stylesheet" type="text/css" 
href="tex_eqalign_tex4ht_displaymath.css"> 
-</head><body 
->
-<!--l. 3--><p class="indent" >     
- 
-<!-- tex4ht_begin tex_eqalign_tex4ht_displaymath displaymath 1 --> 
-
-<!--l. 5--><p class="indent" >
-    <div class="math-display" >
-<img 
-src="tex_eqalign_tex4ht_displaymath0x.png" alt="                               
     &#x222B;
-[3.1]                                  v(t)dt = u(t)+ C
-                                    &#x222B;
-[3.2]                                  v(t)dt = u(t)+ H
-" class="math-display" ></div>
-<!--l. 10--><p class="indent" >     
-<!-- tex4ht_end tex_eqalign_tex4ht_displaymath displaymath 1 --> 
- 
-
-
-     
-</body></html> 
-
-
-
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.lg
 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.lg
deleted file mode 100644
index d119b26..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.lg
+++ /dev/null
@@ -1,52 +0,0 @@
-htfcss: cmmi font-style: italic;
-htfcss: cmmib font-style: italic; font-weight: bold;
-File: tex_eqalign_tex4ht_displaymath.html
-File: tex_eqalign_tex4ht_displaymath.css
-File: tex_eqalign_tex4ht_displaymath.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- needs --- tex_eqalign_tex4ht_displaymath.idv[1] ==> 
tex_eqalign_tex4ht_displaymath0x.png ---
---- characters ---
-Font("cmr","10","10","100")
-Font("cmmi","10","10","100")
-Font("cmex","10","10","100")
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.tex
 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.tex
deleted file mode 100644
index e9c87bc..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_eqalign_tex4ht_displaymath 
displaymath 1 -->\Hnewline}
-
-$$\leqalignno{
-   \int v(t)\, dt &= u(t) + C&[3.1]\cr
-   \int v(t)\, dt &= u(t) + H&[3.2]\cr
-}
-$$
-\HCode{\Hnewline <!-- tex4ht_end tex_eqalign_tex4ht_displaymath displaymath 1 
-->\Hnewline \Hnewline}
-
-\bye
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.tmp
 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.tmp
deleted file mode 100644
index 41b58e2..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.xref
 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.xref
deleted file mode 100644
index 2b0a291..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_displaymath.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_eqalign_tex4ht_displaymath.html}{1}%
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.html 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.html
index 43b0af7..92439eb 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.html
@@ -14,8 +14,9 @@
 >
 <!--l. 3--><p class="indent" >     
  
-<!-- tex4ht_begin tex_eqalign_tex4ht_tex tex 1 --> 
+<!-- tex4ht_begin tex_eqalign_tex4ht_tex displaymath 1 --> 
 
+<!--l. 5--><p class="indent" >
     <div class="math-display" >
 <img 
 src="tex_eqalign_tex4ht_tex0x.png" alt="                                    
&#x222B;
@@ -23,8 +24,22 @@ src="tex_eqalign_tex4ht_tex0x.png" alt="                     
               &#x2
                                     &#x222B;
 [3.2]                                  v(t)dt = u(t)+ H
 " class="math-display" ></div>
-<!--l. 8--><p class="indent" >     
-<!-- tex4ht_end tex_eqalign_tex4ht_tex tex 1 --> 
+<!--l. 10--><p class="indent" >     
+<!-- tex4ht_end tex_eqalign_tex4ht_tex displaymath 1 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_eqalign_tex4ht_tex tex 2 --> 
+
+    <div class="math-display" >
+<img 
+src="tex_eqalign_tex4ht_tex1x.png" alt="                                    
&#x222B;
+[3.1]                                  v(t)dt = u(t)+ C
+                                    &#x222B;
+[3.2]                                  v(t)dt = u(t)+ H
+" class="math-display" ></div>
+<!--l. 16--><p class="indent" >     
+<!-- tex4ht_end tex_eqalign_tex4ht_tex tex 2 --> 
  
 
 
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.lg 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.lg
index 81606cc..0242d09 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.lg
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.lg
@@ -46,6 +46,7 @@ Css: img.cdots{vertical-align:middle;}
 Css: div.pmatrix {text-align:center;}
 Css: table.pmatrix {width:100%;}
 --- needs --- tex_eqalign_tex4ht_tex.idv[1] ==> tex_eqalign_tex4ht_tex0x.png 
---
+--- needs --- tex_eqalign_tex4ht_tex.idv[2] ==> tex_eqalign_tex4ht_tex1x.png 
---
 --- characters ---
 Font("cmr","10","10","100")
 Font("cmmi","10","10","100")
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.tex 
b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.tex
index ac104c9..90b92f1 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.tex
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_httex/tex_eqalign_tex4ht_tex.tex
@@ -1,10 +1,18 @@
 % Automatically generated
 \csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_eqalign_tex4ht_tex tex 1 
-->\Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_eqalign_tex4ht_tex 
displaymath 1 -->\Hnewline}
+
+$$\leqalignno{
+   \int v(t)\, dt &= u(t) + C&[3.1]\cr
+   \int v(t)\, dt &= u(t) + H&[3.2]\cr
+}
+$$
+\HCode{\Hnewline <!-- tex4ht_end tex_eqalign_tex4ht_tex displaymath 1 
-->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_eqalign_tex4ht_tex tex 2 
-->\Hnewline}
 $$\leqalignno{
    \int v(t)\, dt &= u(t) + C&[3.1]\cr
    \int v(t)\, dt &= u(t) + H&[3.2]\cr
 }$$
-\HCode{\Hnewline <!-- tex4ht_end tex_eqalign_tex4ht_tex tex 1 -->\Hnewline 
\Hnewline}
+\HCode{\Hnewline <!-- tex4ht_end tex_eqalign_tex4ht_tex tex 2 -->\Hnewline 
\Hnewline}
 
 \bye
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
index 738d387..de28d13 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef.html
@@ -14,8 +14,6 @@
 
 <style type="text/css">
 <!--
-@import "tex_gdef_tex4ht_displaymath.css";
-@import "tex_gdef_tex4ht_math.css";
 @import "tex_gdef_tex4ht_tex.css";
 
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -47,7 +45,23 @@ ul.no-bullet {list-style: none}
 
 
 
+<p> <span 
+class="cmr-7">def</span>
+  <span 
+class="cmsy-10">&#x2261;</span> <span 
+class="cmmi-10">a </span><span 
+class="cmsy-10">&#x2261; </span><span 
+class="cmmi-10">b</span><img 
+src="tex_gdef_tex4ht_tex0x.png" alt="&#x221A; --
+  64"  class="sqrt" > 
+</p>
 
+    <div class="math-display" >
+<img 
+src="tex_gdef_tex4ht_tex1x.png" alt="       &#x221A; --
+de&#x2261;fa &#x2261; b 64
+" class="math-display" ></div>
+<!--l. 16--><p class="indent" >     
 
 <hr></div>
 <p><font size="-1">
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.4ct 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.4ct
deleted file mode 100644
index 9998f62..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.4tc 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.4tc
deleted file mode 100644
index 4021816..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.css 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.css
deleted file mode 100644
index e1151d9..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.css
+++ /dev/null
@@ -1,40 +0,0 @@
- 
-/* start css.sty */
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.html 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.html
deleted file mode 100644
index 5241c2d..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.lg 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.lg
deleted file mode 100644
index d19ae06..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.lg
+++ /dev/null
@@ -1,47 +0,0 @@
-File: tex_gdef_tex4ht_displaymath.html
-File: tex_gdef_tex4ht_displaymath.css
-File: tex_gdef_tex4ht_displaymath.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- characters ---
-Font("cmr","10","10","100")
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex
deleted file mode 100644
index 819ceea..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_displaymath 
displaymath 1 -->\Hnewline}
-
-$$ \Desig \testmacro \otest
-$$
-\HCode{\Hnewline <!-- tex4ht_end tex_gdef_tex4ht_displaymath displaymath 1 
-->\Hnewline \Hnewline}
-
-\bye
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tmp 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tmp
deleted file mode 100644
index 41b58e2..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.xref 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.xref
deleted file mode 100644
index 92e9107..0000000
--- 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_displaymath.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_gdef_tex4ht_displaymath.html}{1}%
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.4ct 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.4ct
deleted file mode 100644
index 9998f62..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.4tc 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.4tc
deleted file mode 100644
index 4021816..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.css 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.css
deleted file mode 100644
index e1151d9..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.css
+++ /dev/null
@@ -1,40 +0,0 @@
- 
-/* start css.sty */
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.html 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.html
deleted file mode 100644
index 5241c2d..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.lg 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.lg
deleted file mode 100644
index 9d22ef2..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.lg
+++ /dev/null
@@ -1,47 +0,0 @@
-File: tex_gdef_tex4ht_math.html
-File: tex_gdef_tex4ht_math.css
-File: tex_gdef_tex4ht_math.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- characters ---
-Font("cmr","10","10","100")
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tex 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tex
deleted file mode 100644
index 8a16795..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_math math 1 
-->\Hnewline}
-\IgnorePar $\def\otest{\sqrt{64}} $\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_math math 1 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_math math 2 
-->\Hnewline}
-\IgnorePar $\gdef\testmacro{a \equiv b} $\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_math math 2 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_math math 3 
-->\Hnewline}
-\IgnorePar $\Desig \testmacro \otest$\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_math math 3 -->\Hnewline \Hnewline}
-
-\bye
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tmp 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tmp
deleted file mode 100644
index 41b58e2..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.xref 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.xref
deleted file mode 100644
index e42f563..0000000
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_math.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_gdef_tex4ht_math.html}{1}%
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.css 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.css
index e1151d9..faa0ef0 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.css
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.css
@@ -1,5 +1,7 @@
  
 /* start css.sty */
+.cmr-7{font-size:70%;}
+.cmmi-10{font-style: italic;}
 p{margin-top:0;margin-bottom:0}
 p.indent{text-indent:0;}
 p + p{margin-top:1em;}
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.html 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.html
index 03f2526..1f9395f 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.html
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.html
@@ -18,6 +18,44 @@
    
 <!-- tex4ht_end tex_gdef_tex4ht_tex tex 1 --> 
  
+  
+ 
+<!-- tex4ht_begin tex_gdef_tex4ht_tex math 2 --> 
+  
+<!-- tex4ht_end tex_gdef_tex4ht_tex math 2 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_gdef_tex4ht_tex math 3 --> 
+  
+<!-- tex4ht_end tex_gdef_tex4ht_tex math 3 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_gdef_tex4ht_tex math 4 --> 
+ <span 
+class="cmr-7">def</span>
+  <span 
+class="cmsy-10">&#x2261;</span> <span 
+class="cmmi-10">a </span><span 
+class="cmsy-10">&#x2261; </span><span 
+class="cmmi-10">b</span><img 
+src="tex_gdef_tex4ht_tex0x.png" alt="&#x221A; --
+  64"  class="sqrt" > 
+<!-- tex4ht_end tex_gdef_tex4ht_tex math 4 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_gdef_tex4ht_tex displaymath 5 --> 
+
+    <div class="math-display" >
+<img 
+src="tex_gdef_tex4ht_tex1x.png" alt="       &#x221A; --
+de&#x2261;fa &#x2261; b 64
+" class="math-display" ></div>
+<!--l. 16--><p class="indent" >     
+<!-- tex4ht_end tex_gdef_tex4ht_tex displaymath 5 --> 
+ 
 
 
      
diff --git a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.lg 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.lg
index b0eb4bb..d14638c 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.lg
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.lg
@@ -1,3 +1,5 @@
+htfcss: cmmi font-style: italic;
+htfcss: cmmib font-style: italic; font-weight: bold;
 File: tex_gdef_tex4ht_tex.html
 File: tex_gdef_tex4ht_tex.css
 File: tex_gdef_tex4ht_tex.tmp
@@ -43,5 +45,10 @@ Css: table.leqalignno, table.eqalignno {width:100%;}
 Css: img.cdots{vertical-align:middle;}
 Css: div.pmatrix {text-align:center;}
 Css: table.pmatrix {width:100%;}
+--- needs --- tex_gdef_tex4ht_tex.idv[1] ==> tex_gdef_tex4ht_tex0x.png ---
+--- needs --- tex_gdef_tex4ht_tex.idv[2] ==> tex_gdef_tex4ht_tex1x.png ---
 --- characters ---
 Font("cmr","10","10","100")
+Font("cmr","7","7","100")
+Font("cmmi","10","10","100")
+Font("cmsy","10","10","100")
diff --git 
a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.tex 
b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.tex
index 5d470fc..a74d023 100644
--- a/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.tex
+++ b/tp/tests/tex_html/res_parser/tex_gdef_httex/tex_gdef_tex4ht_tex.tex
@@ -3,5 +3,16 @@
 \HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_tex tex 1 
-->\Hnewline}
   \gdef\Desig{\buildrel \rm def \over \equiv}
 \HCode{\Hnewline <!-- tex4ht_end tex_gdef_tex4ht_tex tex 1 -->\Hnewline 
\Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_tex math 2 
-->\Hnewline}
+\IgnorePar $\gdef\otest{\sqrt{64}} $\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_tex math 2 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_tex math 3 
-->\Hnewline}
+\IgnorePar $\gdef\testmacro{a \equiv b} $\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_tex math 3 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_tex math 4 
-->\Hnewline}
+\IgnorePar $\Desig \testmacro \otest$\HCode{\Hnewline <!-- tex4ht_end 
tex_gdef_tex4ht_tex math 4 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_gdef_tex4ht_tex displaymath 5 
-->\Hnewline}
+
+$$ \Desig \testmacro \otest
+$$
+\HCode{\Hnewline <!-- tex4ht_end tex_gdef_tex4ht_tex displaymath 5 
-->\Hnewline \Hnewline}
 
 \bye
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex.html 
b/tp/tests/tex_html/res_parser/tex_httex/tex.html
index 4fcfb10..83d3973 100644
--- a/tp/tests/tex_html/res_parser/tex_httex/tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex/tex.html
@@ -14,8 +14,6 @@
 
 <style type="text/css">
 <!--
-@import "tex_tex4ht_displaymath.css";
-@import "tex_tex4ht_math.css";
 @import "tex_tex4ht_tex.css";
 
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -106,14 +104,13 @@ class="cmmi-10">sup</span>2
 </p>
 <p>Displaymath
 </p>
-<!--l. 5--><p class="indent" >
     <div class="math-display" >
 <img 
-src="tex_tex4ht_displaymath0x.png" alt="                        (      )2
-- - f(x) = -1&#x221A;---e@sup - 1  x--&#x03BC;-
-           &#x03C3; 2&#x03C0;        2   &#x03C3;
+src="tex_tex4ht_tex1x.png" alt="                        (      )
+           -1---       1  x--&#x03BC;- 2
+- - f(x) = &#x03C3;&#x221A;2&#x03C0;-e@sup - 2   &#x03C3;
 " class="math-display" ></div>
-<!--l. 7--><p class="indent" >     
+<!--l. 29--><p class="indent" >     
 
 <hr></div>
 <p><font size="-1">
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.4ct 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.4ct
deleted file mode 100644
index 9998f62..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.4tc 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.4tc
deleted file mode 100644
index 4021816..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.css 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.css
deleted file mode 100644
index faa0ef0..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.css
+++ /dev/null
@@ -1,42 +0,0 @@
- 
-/* start css.sty */
-.cmr-7{font-size:70%;}
-.cmmi-10{font-style: italic;}
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.html 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.html
deleted file mode 100644
index e1f909a..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-    <title>tex_tex4ht_displaymath.html</title> 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> 
-<meta name="generator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<meta name="originator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<!-- html --> 
-<meta name="src" content="tex_tex4ht_displaymath.tex"> 
-<link rel="stylesheet" type="text/css" href="tex_tex4ht_displaymath.css"> 
-</head><body 
->
-<!--l. 3--><p class="indent" >     
- 
-<!-- tex4ht_begin tex_tex4ht_displaymath displaymath 1 --> 
-
-<!--l. 5--><p class="indent" >
-    <div class="math-display" >
-<img 
-src="tex_tex4ht_displaymath0x.png" alt="                        (      )2
-- - f(x) = -1&#x221A;---e@sup - 1  x--&#x03BC;-
-           &#x03C3; 2&#x03C0;        2   &#x03C3;
-" class="math-display" ></div>
-<!--l. 7--><p class="indent" >     
-<!-- tex4ht_end tex_tex4ht_displaymath displaymath 1 --> 
- 
-
-
-     
-</body></html> 
-
-
-
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.lg 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.lg
deleted file mode 100644
index d46f55b..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.lg
+++ /dev/null
@@ -1,54 +0,0 @@
-htfcss: cmmi font-style: italic;
-htfcss: cmmib font-style: italic; font-weight: bold;
-File: tex_tex4ht_displaymath.html
-File: tex_tex4ht_displaymath.css
-File: tex_tex4ht_displaymath.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- needs --- tex_tex4ht_displaymath.idv[1] ==> tex_tex4ht_displaymath0x.png 
---
---- characters ---
-Font("cmr","10","10","100")
-Font("cmr","7","7","100")
-Font("cmmi","10","10","100")
-Font("cmsy","10","10","100")
-Font("cmex","10","10","100")
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.tex 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.tex
deleted file mode 100644
index 7e9d50d..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_displaymath 
displaymath 1 -->\Hnewline}
-
-$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
-$$
-\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_displaymath displaymath 1 
-->\Hnewline \Hnewline}
-
-\bye
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.tmp 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.tmp
deleted file mode 100644
index 41b58e2..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.xref 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.xref
deleted file mode 100644
index 8e3958c..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_displaymath.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_tex4ht_displaymath.html}{1}%
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.4ct 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.4ct
deleted file mode 100644
index 9998f62..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.4ct
+++ /dev/null
@@ -1,2 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi 
-\par 
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.4tc 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.4tc
deleted file mode 100644
index 4021816..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.4tc
+++ /dev/null
@@ -1 +0,0 @@
-\expandafter\ifx\csname doTocEntry\endcsname\relax \expandafter\endinput\fi
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.css 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.css
deleted file mode 100644
index c002d15..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.css
+++ /dev/null
@@ -1,44 +0,0 @@
- 
-/* start css.sty */
-.cmr-7{font-size:70%;}
-.cmmi-10{font-style: italic;}
-.cmmi-7{font-size:70%;font-style: italic;}
-.cmmi-5{font-size:50%;font-style: italic;}
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; 
hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-p.item {text-indent:-2em; margin-left:2em;}
-p.itemitem {text-indent:-2em; margin-left:4em;}
-span.item, span.itemitem {width:2em; margin-right:0.4em;}
-td.eqalign3 { text-align:right; margin-left:10em;}
-.eqalign td { white-space: nowrap; }
-div.eqalign {text-align:center;}
-td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-.leqalignno td, .eqalignno td { white-space: nowrap; }
-.leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: normal; 
}
-table.leqalignno, table.eqalignno {width:100%;}
-img.cdots{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-/* end css.sty */
-
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.html 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.html
deleted file mode 100644
index 7b6f9c7..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"  
-  "http://www.w3.org/TR/html4/loose.dtd";>  
-<html > 
-<head>
-
-    <title>tex_tex4ht_math.html</title> 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> 
-<meta name="generator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<meta name="originator" content="TeX4ht (https://tug.org/tex4ht/)"> 
-<!-- html --> 
-<meta name="src" content="tex_tex4ht_math.tex"> 
-<link rel="stylesheet" type="text/css" href="tex_tex4ht_math.css"> 
-</head><body 
->
-<!--l. 3--><p class="indent" >     
- 
-<!-- tex4ht_begin tex_tex4ht_math math 1 --> 
-   <span 
-class="cmmi-7">x</span><sup><span 
-class="cmmi-5">i</span></sup> __
-<span 
-class="cmr-7">tan</span> <span 
-class="cmmi-7">y</span> 
-<!-- tex4ht_end tex_tex4ht_math math 1 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_tex4ht_math math 2 --> 
- <span 
-class="cmmi-10">a</span>@<span 
-class="cmmi-10">&#x00A0;b</span> 
-<!-- tex4ht_end tex_tex4ht_math math 2 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_tex4ht_math math 3 --> 
- @<span 
-class="cmmi-10">code</span><span 
-class="cmmi-10">mathcode</span><span 
-class="cmmi-10">a &#x003C; b</span> 
-<!-- tex4ht_end tex_tex4ht_math math 3 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_tex4ht_math math 4 --> 
- <span class="underline">@<span 
-class="cmmi-10">code</span><span 
-class="cmmi-10">math</span> code </span><span 
-class="cmex-10">&#x2211;</span>
-  <sub><span 
-class="cmmi-7">i</span></sub><span class="underline"><span 
-class="cmmi-10">f</span></span> 
-<!-- tex4ht_end tex_tex4ht_math math 4 --> 
- 
-  
- 
-<!-- tex4ht_begin tex_tex4ht_math math 5 --> 
- <span 
-class="cmex-10">&#x2211;</span>
-  <sub><span 
-class="cmmi-7">i</span></sub><span 
-class="cmmi-10">f</span>(<span 
-class="cmmi-10">x</span>)@<span 
-class="cmmi-10">sup</span>2 
-<!-- tex4ht_end tex_tex4ht_math math 5 --> 
- 
-
-
-     
-</body></html> 
-
-
-
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.lg 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.lg
deleted file mode 100644
index 07e069f..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.lg
+++ /dev/null
@@ -1,54 +0,0 @@
-htfcss: cmmi font-style: italic;
-htfcss: cmmib font-style: italic; font-weight: bold;
-File: tex_tex4ht_math.html
-File: tex_tex4ht_math.css
-File: tex_tex4ht_math.tmp
-Css: p{margin-top:0;margin-bottom:0}
-Css: p.indent{text-indent:0;}
-Css: p + p{margin-top:1em;}
-Css: p + div, p + pre {margin-top:1em;}
-Css: div + p, pre + p {margin-top:1em;}
-Css: a { overflow-wrap: break-word; word-wrap: break-word; word-break: 
break-word; hyphens: auto; }
-Css: @media print {div.crosslinks {visibility:hidden;}}
-Css: a img { border-top: 0; border-left: 0; border-right: 0; }
-Font_Css("4"): .small-caps{font-variant: small-caps; }
-Font_Css("10"): .htf-cmbx {font-weight: bold; font-style:normal;}
-Font_Css("12"): .htf-calligraphy {font-family:cursive}
-Font_Css("14"): .htf-italic {font-style: italic;}
-Font_Css("16"): .htf-bold {font-weight: bold;}
-Font_Css("12"): .htf-calligraphy-bold {font-family:cursive ; font-weight: 
bold; }
-Css: center { margin-top:1em; margin-bottom:1em; }
-Css: td center { margin-top:0em; margin-bottom:0em; }
-Css: .Canvas { position:relative; }
-Css: img.math{vertical-align:middle;}
-Css: div.par-math-display, div.math-display{text-align:center;}
-Css: .obeylines-h,.obeylines-v {white-space: nowrap; }
-Css: div.obeylines-v p { margin-top:0; margin-bottom:0; }
-Css: .overline{ text-decoration:overline; }
-Css: .overline img{ border-top: 1px solid black; }
-Css: td.displaylines {text-align:center; white-space:nowrap;}
-Css: .centerline {text-align:center;}
-Css: .rightline {text-align:right;}
-Css: .underline{ text-decoration:underline; }
-Css: .underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-Css: div.proclaim { margin-top: 1em; margin-bottom: 1em; }
-Css: p.item {text-indent:-2em; margin-left:2em;}
-Css: p.itemitem {text-indent:-2em; margin-left:4em;}
-Css: span.item, span.itemitem {width:2em; margin-right:0.4em;}
-Css: td.eqalign3 { text-align:right; margin-left:10em;}
-Css: .eqalign td { white-space: nowrap; }
-Css: div.eqalign {text-align:center;}
-Css: td.eqalignno3, td.leqalignno3 { text-align:right; margin-left:10em;}
-Css: .leqalignno td, .eqalignno td { white-space: nowrap; }
-Css: .leqalignno td.noalign, .eqalignno td.noalign { width:5%; white-space: 
normal; }
-Css: table.leqalignno, table.eqalignno {width:100%;}
-Css: img.cdots{vertical-align:middle;}
-Css: div.pmatrix {text-align:center;}
-Css: table.pmatrix {width:100%;}
---- characters ---
-Font("cmr","10","10","100")
-Font("cmr","7","7","100")
-Font("cmmi","10","10","100")
-Font("cmmi","7","7","100")
-Font("cmmi","5","5","100")
-Font("cmex","10","10","100")
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tex 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tex
deleted file mode 100644
index c12b69c..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-% Automatically generated
-\csname tex4ht\endcsname
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 1 
-->\Hnewline}
-\IgnorePar ${x^i}\over{\tan y}$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_math math 1 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 2 
-->\Hnewline}
-\IgnorePar $a @\ b$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_math math 2 
-->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 3 
-->\Hnewline}
-\IgnorePar $@code{math code} a < b$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_math math 3 -->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 4 
-->\Hnewline}
-\IgnorePar $\underline{@code{math \hbox{ code }}} 
\sum_{i}{\underline{f}}$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_math math 4 
-->\Hnewline \Hnewline}
-\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_math math 5 
-->\Hnewline}
-\IgnorePar $\sum_{i} f(x)@sup{2}$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_math math 5 -->\Hnewline \Hnewline}
-
-\bye
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tmp 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tmp
deleted file mode 100644
index 41b58e2..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.tmp
+++ /dev/null
@@ -1,2 +0,0 @@
- 
-/* css.sty */
\ No newline at end of file
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.xref 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.xref
deleted file mode 100644
index 62af5b6..0000000
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_math.xref
+++ /dev/null
@@ -1 +0,0 @@
-\:CrossWord{)F1F-}{tex_tex4ht_math.html}{1}%
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.css 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.css
index 3d1f352..c002d15 100644
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.css
+++ b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.css
@@ -3,6 +3,7 @@
 .cmr-7{font-size:70%;}
 .cmmi-10{font-style: italic;}
 .cmmi-7{font-size:70%;font-style: italic;}
+.cmmi-5{font-size:50%;font-style: italic;}
 p{margin-top:0;margin-bottom:0}
 p.indent{text-indent:0;}
 p + p{margin-top:1em;}
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.html 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.html
index dc9379b..139e443 100644
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.html
+++ b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.html
@@ -33,6 +33,71 @@ src="tex_tex4ht_tex0x.png" alt="     N  (            )2
 <!--l. 13--><p class="indent" >    tex TeX 
 <!-- tex4ht_end tex_tex4ht_tex tex 2 --> 
  
+  
+ 
+<!-- tex4ht_begin tex_tex4ht_tex math 3 --> 
+   <span 
+class="cmmi-7">x</span><sup><span 
+class="cmmi-5">i</span></sup> __
+<span 
+class="cmr-7">tan</span> <span 
+class="cmmi-7">y</span> 
+<!-- tex4ht_end tex_tex4ht_tex math 3 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_tex4ht_tex math 4 --> 
+ <span 
+class="cmmi-10">a</span>@<span 
+class="cmmi-10">&#x00A0;b</span> 
+<!-- tex4ht_end tex_tex4ht_tex math 4 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_tex4ht_tex math 5 --> 
+ @<span 
+class="cmmi-10">code</span><span 
+class="cmmi-10">mathcode</span><span 
+class="cmmi-10">a &#x003C; b</span> 
+<!-- tex4ht_end tex_tex4ht_tex math 5 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_tex4ht_tex math 6 --> 
+ <span class="underline">@<span 
+class="cmmi-10">code</span><span 
+class="cmmi-10">math</span> code </span><span 
+class="cmex-10">&#x2211;</span>
+  <sub><span 
+class="cmmi-7">i</span></sub><span class="underline"><span 
+class="cmmi-10">f</span></span> 
+<!-- tex4ht_end tex_tex4ht_tex math 6 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_tex4ht_tex math 7 --> 
+ <span 
+class="cmex-10">&#x2211;</span>
+  <sub><span 
+class="cmmi-7">i</span></sub><span 
+class="cmmi-10">f</span>(<span 
+class="cmmi-10">x</span>)@<span 
+class="cmmi-10">sup</span>2 
+<!-- tex4ht_end tex_tex4ht_tex math 7 --> 
+ 
+  
+ 
+<!-- tex4ht_begin tex_tex4ht_tex displaymath 8 --> 
+
+    <div class="math-display" >
+<img 
+src="tex_tex4ht_tex1x.png" alt="                        (      )
+           -1---       1  x--&#x03BC;- 2
+- - f(x) = &#x03C3;&#x221A;2&#x03C0;-e@sup - 2   &#x03C3;
+" class="math-display" ></div>
+<!--l. 29--><p class="indent" >     
+<!-- tex4ht_end tex_tex4ht_tex displaymath 8 --> 
+ 
 
 
      
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.lg 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.lg
index 43efefb..5ffca8c 100644
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.lg
+++ b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.lg
@@ -46,10 +46,12 @@ Css: img.cdots{vertical-align:middle;}
 Css: div.pmatrix {text-align:center;}
 Css: table.pmatrix {width:100%;}
 --- needs --- tex_tex4ht_tex.idv[1] ==> tex_tex4ht_tex0x.png ---
+--- needs --- tex_tex4ht_tex.idv[2] ==> tex_tex4ht_tex1x.png ---
 --- characters ---
 Font("cmr","10","10","100")
 Font("cmr","7","7","100")
 Font("cmmi","10","10","100")
 Font("cmmi","7","7","100")
+Font("cmmi","5","5","100")
 Font("cmsy","10","10","100")
 Font("cmex","10","10","100")
diff --git a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.tex 
b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.tex
index cf52171..9d2bcf9 100644
--- a/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.tex
+++ b/tp/tests/tex_html/res_parser/tex_httex/tex_tex4ht_tex.tex
@@ -12,5 +12,20 @@ $$ \chi^2 = \sum_{i=1}^N
 
 tex \TeX 
 \HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex tex 2 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 3 
-->\Hnewline}
+\IgnorePar ${x^i}\over{\tan y}$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex 
math 3 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 4 
-->\Hnewline}
+\IgnorePar $a @\ b$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex math 4 
-->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 5 
-->\Hnewline}
+\IgnorePar $@code{math code} a < b$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_tex math 5 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 6 
-->\Hnewline}
+\IgnorePar $\underline{@code{math \hbox{ code }}} 
\sum_{i}{\underline{f}}$\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex math 6 
-->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex math 7 
-->\Hnewline}
+\IgnorePar $\sum_{i} f(x)@sup{2}$\HCode{\Hnewline <!-- tex4ht_end 
tex_tex4ht_tex math 7 -->\Hnewline \Hnewline}
+\HCode{\Hnewline \Hnewline <!-- tex4ht_begin tex_tex4ht_tex displaymath 8 
-->\Hnewline}
+
+$$-- f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
+$$
+\HCode{\Hnewline <!-- tex4ht_end tex_tex4ht_tex displaymath 8 -->\Hnewline 
\Hnewline}
 
 \bye
diff --git a/tp/tests/tex_html/tex_gdef.texi b/tp/tests/tex_html/tex_gdef.texi
index 9a31367..94f9254 100644
--- a/tp/tests/tex_html/tex_gdef.texi
+++ b/tp/tests/tex_html/tex_gdef.texi
@@ -9,7 +9,15 @@
 
 @c MathJax process LaTeX commands in math environments
 @c trailing space is needed for latex2html
+@c tex4ht httex does not keep the definition with \def
+@c in @math, which seems correct as \def is only defined
+@c within the math group
+@ifset tex4ht
+@math{\gdef\otest{\sqrt{64}} }
+@end ifset
+@ifclear tex4ht
 @math{\def\otest{\sqrt{64}} }
+@end ifclear
 
 @c MathJax doesn't get \gdef
 @math{\gdef\testmacro{a \equiv b} }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]