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 1d0905b821b14cb26546295f1211bb7f648ffa1b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Aug 17 22:42:04 2021 +0200

    * 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.
    * tp/init/latex2html.pm (l2h_process): use
    Texinfo::Common::collect_commands_list_in_tree() to
    collect @-commands in order and process them in order too.
---
 ChangeLog                                          |  9 +++
 tp/Texinfo/Common.pm                               | 42 ++++++++++
 tp/init/latex2html.pm                              | 50 ++++++------
 .../tex_l2h_res/tex_complex-l2h_cache.pm           |  8 +-
 .../many_input_files/tex_l2h_res/tex_complex.html  | 10 +--
 .../tex_l2h_res/tex_complex_l2h.html               | 42 +++++-----
 .../tex_l2h_res/tex_complex_l2h.tex                | 12 +--
 .../tex_l2h_res/tex_complex_l2h_images.tex         | 16 ++--
 .../res_parser/formatting_singular/chapter.html    | 54 ++++++-------
 .../formatting_singular/sing-l2h_cache.pm          | 18 ++---
 .../res_parser/formatting_singular/sing_l2h.html   | 90 +++++++++++-----------
 .../res_parser/formatting_singular/sing_l2h.tex    | 54 ++++++-------
 .../formatting_singular/sing_l2h_images.tex        | 38 ++++-----
 .../tex_complex_l2h/tex_complex-l2h_cache.pm       |  8 +-
 .../res_parser/tex_complex_l2h/tex_complex.html    | 10 +--
 .../tex_complex_l2h/tex_complex_l2h.html           | 42 +++++-----
 .../res_parser/tex_complex_l2h/tex_complex_l2h.tex | 12 +--
 .../tex_complex_l2h/tex_complex_l2h_images.tex     | 16 ++--
 .../tex_eqalign_l2h/tex_eqalign-l2h_cache.pm       |  6 +-
 .../res_parser/tex_eqalign_l2h/tex_eqalign.html    |  6 +-
 .../tex_eqalign_l2h/tex_eqalign_l2h.html           |  6 +-
 .../res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex |  6 +-
 .../tex_eqalign_l2h/tex_eqalign_l2h_images.tex     |  3 +-
 23 files changed, 306 insertions(+), 252 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4dcf9a9..57160bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 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.
+       * tp/init/latex2html.pm (l2h_process): use 
+       Texinfo::Common::collect_commands_list_in_tree() to
+       collect @-commands in order and process them in order too.
+
+2021-08-17  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Common.pm (find_innermost_accent_contents)
        (float_name_caption, labels_information), 
        tp/Texinfo/Convert/Converter.pm (sort_element_counts),
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 00a623e..c0fdb63 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1927,6 +1927,41 @@ sub _collect_commands_in_tree($$)
   }
 }
 
+sub collect_commands_list_in_tree($$)
+{
+  my $root = shift;
+  my $commands_list = shift;
+
+  my $collected_commands_list = [];
+  my $commands_hash = {};
+  foreach my $command_name (@$commands_list) {
+    $commands_hash->{$command_name} = 1;
+  }
+  _collect_commands_list_in_tree($root, $commands_hash, 
$collected_commands_list);
+  return $collected_commands_list;
+}
+
+sub _collect_commands_list_in_tree($$$);
+sub _collect_commands_list_in_tree($$$)
+{
+  my $current = shift;
+  my $commands_hash = shift;
+  my $collected_commands_list = shift;
+
+  if (defined($current->{'cmdname'})
+      and defined($commands_hash->{$current->{'cmdname'}})) {
+    push @{$collected_commands_list}, $current;
+  }
+  foreach my $key ('args', 'contents') {
+    if ($current->{$key}) {
+      foreach my $child (@{$current->{$key}}) {
+        _collect_commands_list_in_tree($child, $commands_hash, 
+                                       $collected_commands_list);
+      }
+    }
+  }
+}
+
 # Not used.
 sub _collect_references($$);
 sub _collect_references($$)
@@ -3077,6 +3112,13 @@ in the I<$commands_list> array reference and values 
arrays of
 tree elements corresponding to those @-command found in I<$tree>
 by traversing the tree.
 
+=item collect_commands_list_in_tree($tree, $commands_list)
+
+Return a list reference containing the tree elements corresponding
+to the @-commands names specified in the I<$commands_list> found
+in I<$tree> by traversing the tree.  The order of the @-commands
+should be kept.
+
 =back
 
 =head1 SEE ALSO
diff --git a/tp/init/latex2html.pm b/tp/init/latex2html.pm
index 5abf001..3e67abe 100644
--- a/tp/init/latex2html.pm
+++ b/tp/init/latex2html.pm
@@ -208,35 +208,31 @@ sub l2h_process($$)
                    or $self->get_conf('L2H_SKIP'));
 
   my @replaced_commands = ('tex', 'math', 'displaymath');
-  my $collected_commands = 
Texinfo::Common::collect_commands_in_tree($document_root, \@replaced_commands);
-  foreach my $command (@replaced_commands) {
-    ## we rely on @tex and @math being recorded as 'global commands'
-    #if ($self->{'extra'}->{$command}) {
-    if (scalar(@{$collected_commands->{$command}}) > 0) {
-      my $counter = 0;
-      #foreach my $root (@{$self->{'extra'}->{$command}}) {
-      foreach my $root (@{$collected_commands->{$command}}) {
-        $counter++;
-        my $tree;
-        if ($command eq 'math') {
-          $tree = $root->{'args'}->[0];
-        } else {
-          $tree = {'contents' => [@{$root->{'contents'}}]};
-          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'} 
-              and $tree->{'contents'}->[-1]->{'cmdname'} eq 'end') {
-            pop @{$tree->{'contents'}};
-          }
+  my $collected_commands = Texinfo::Common::collect_commands_list_in_tree(
+                                        $document_root, \@replaced_commands);
+  my $counter = 0;
+  if (scalar(@{$collected_commands})) {
+    foreach my $root (@{$collected_commands}) {
+      my $command = $root->{'cmdname'};
+      $counter++;
+      my $tree;
+      if ($command eq 'math') {
+        $tree = $root->{'args'}->[0];
+      } else {
+        $tree = {'contents' => [@{$root->{'contents'}}]};
+        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'} 
+           and $tree->{'contents'}->[-1]->{'cmdname'} eq 'end') {
+          pop @{$tree->{'contents'}};
         }
-        my $text = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
-        #$text .= "\n" if ($command eq 'tex');
-        l2h_to_latex($self, $command, $text, $counter);
-        $commands_counters{$root} = $counter;
       }
+      my $text = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
+      l2h_to_latex($self, $command, $text, $counter);
+      $commands_counters{$root} = $counter;
     }
   }
   $status = l2h_finish_to_latex($self);
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm 
b/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm
index 3305f48..bfa642f 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_complex-l2h_cache.pm
@@ -10,7 +10,7 @@ U w V^\dagger
  -->
 
 <IMG
- STYLE="height: 2.31ex; vertical-align: -0.12ex; " SRC="tex_complex_2.svg"
+ STYLE="height: 2.31ex; vertical-align: -0.12ex; " SRC="tex_complex_3.svg"
  ALT="$\displaystyle U w V^\dagger
 $">
 </DIV>
@@ -27,7 +27,7 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_3.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_5.svg"
  ALT="$\displaystyle \omega = h ( \eta , \varphi)
 $">
 </DIV>
@@ -54,12 +54,12 @@ $l2h_cache{$l2h_cache_key} = q|<!-- MATH
  $(I-D) \varphi(t)$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_2.svg"
  ALT="$(I-D) \varphi(t)$"></SPAN>|;
 
 $l2h_cache_key = q/$\phi w V^t$/;
 $l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_5.svg"
+ STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_4.svg"
  ALT="$\phi w V^t$"></SPAN>|;
 
 $l2h_cache_key = q/$h \dot \psi^\phi$/;
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex_complex.html 
b/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
index 3ecebdc..48d3110 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_complex.html
@@ -60,7 +60,7 @@ $">
  $(I-D) \varphi(t)$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_2.svg"
  ALT="$(I-D) \varphi(t)$"></SPAN> math.
 </p><hr>
 
@@ -86,7 +86,7 @@ $">
  $(I-D) \varphi(t)$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_2.svg"
  ALT="$(I-D) \varphi(t)$"></SPAN> math.
 </p>
 <p>Tex:
@@ -98,14 +98,14 @@ U w V^\dagger
  -->
 
 <IMG
- STYLE="height: 2.31ex; vertical-align: -0.12ex; " SRC="tex_complex_2.svg"
+ STYLE="height: 2.31ex; vertical-align: -0.12ex; " SRC="tex_complex_3.svg"
  ALT="$\displaystyle U w V^\dagger
 $">
 </DIV>
 
 </p>
 <p>and math <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_5.svg"
+ STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_4.svg"
  ALT="$\phi w V^t$"></SPAN>.
 </p>
 <p>Now there is a footnote<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
@@ -123,7 +123,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_3.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_5.svg"
  ALT="$\displaystyle \omega = h ( \eta , \varphi)
 $">
 </DIV>
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html 
b/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html
index b409f4e..f358db1 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.html
@@ -37,6 +37,16 @@ $">
 <!-- l2h_end tex_complex_l2h 1 -->
 
 <!-- l2h_begin tex_complex_l2h 2 -->
+<!-- MATH
+ $(I-D) \varphi(t)$
+ -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " 
SRC="tex_complex_l2h_img2.svg"
+ ALT="$(I-D) \varphi(t)$"></SPAN>
+
+<!-- l2h_end tex_complex_l2h 2 -->
+
+<!-- l2h_begin tex_complex_l2h 3 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -45,15 +55,22 @@ U w V^\dagger
  -->
 
 <IMG
- STYLE="height: 2.31ex; vertical-align: -0.12ex; " 
SRC="tex_complex_l2h_img2.svg"
+ STYLE="height: 2.31ex; vertical-align: -0.12ex; " 
SRC="tex_complex_l2h_img3.svg"
  ALT="$\displaystyle U w V^\dagger
 $">
 </DIV>
 
 
-<!-- l2h_end tex_complex_l2h 2 -->
+<!-- l2h_end tex_complex_l2h 3 -->
 
-<!-- l2h_begin tex_complex_l2h 3 -->
+<!-- l2h_begin tex_complex_l2h 4 -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.52ex; vertical-align: -0.57ex; " 
SRC="tex_complex_l2h_img4.svg"
+ ALT="$\phi w V^t$"></SPAN>
+
+<!-- l2h_end tex_complex_l2h 4 -->
+
+<!-- l2h_begin tex_complex_l2h 5 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -62,29 +79,12 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " 
SRC="tex_complex_l2h_img3.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " 
SRC="tex_complex_l2h_img5.svg"
  ALT="$\displaystyle \omega = h ( \eta , \varphi)
 $">
 </DIV>
 
 
-<!-- l2h_end tex_complex_l2h 3 -->
-
-<!-- l2h_begin tex_complex_l2h 4 -->
-<!-- MATH
- $(I-D) \varphi(t)$
- -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " 
SRC="tex_complex_l2h_img4.svg"
- ALT="$(I-D) \varphi(t)$"></SPAN>
-
-<!-- l2h_end tex_complex_l2h 4 -->
-
-<!-- l2h_begin tex_complex_l2h 5 -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.52ex; vertical-align: -0.57ex; " 
SRC="tex_complex_l2h_img5.svg"
- ALT="$\phi w V^t$"></SPAN>
-
 <!-- l2h_end tex_complex_l2h 5 -->
 
 <!-- l2h_begin tex_complex_l2h 6 -->
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.tex 
b/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.tex
index 071359f..8431099 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.tex
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h.tex
@@ -17,9 +17,7 @@ $$
 
 <!-- l2h_begin tex_complex_l2h 2 -->
 \end{rawhtml}
-$$
- U w V^\dagger
-$$
+$(I-D) \varphi(t)$
 \begin{rawhtml}
 <!-- l2h_end tex_complex_l2h 2 -->
 
@@ -29,7 +27,7 @@ $$
 <!-- l2h_begin tex_complex_l2h 3 -->
 \end{rawhtml}
 $$
-\omega = h ( \eta , \varphi) 
+ U w V^\dagger
 $$
 \begin{rawhtml}
 <!-- l2h_end tex_complex_l2h 3 -->
@@ -39,7 +37,7 @@ $$
 
 <!-- l2h_begin tex_complex_l2h 4 -->
 \end{rawhtml}
-$(I-D) \varphi(t)$
+$\phi w V^t$
 \begin{rawhtml}
 <!-- l2h_end tex_complex_l2h 4 -->
 
@@ -48,7 +46,9 @@ $(I-D) \varphi(t)$
 
 <!-- l2h_begin tex_complex_l2h 5 -->
 \end{rawhtml}
-$\phi w V^t$
+$$
+\omega = h ( \eta , \varphi) 
+$$
 \begin{rawhtml}
 <!-- l2h_end tex_complex_l2h 5 -->
 
diff --git a/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex 
b/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex
index 5ae79f0..650e2e8 100644
--- a/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex
+++ b/tp/tests/many_input_files/tex_l2h_res/tex_complex_l2h_images.tex
@@ -125,28 +125,28 @@ $%
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay21}%
-$\displaystyle U w V^\dagger
-$%
+\lthtmlinlinemathA{tex2html_wrap_inline8}%
+$(I-D) \varphi(t)$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay23}%
-$\displaystyle \omega = h ( \eta , \varphi) 
+\lthtmlinlinemathA{tex2html_wrap_indisplay22}%
+$\displaystyle U w V^\dagger
 $%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
 \lthtmlinlinemathA{tex2html_wrap_inline12}%
-$(I-D) \varphi(t)$%
+$\phi w V^t$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline14}%
-$\phi w V^t$%
+\lthtmlinlinemathA{tex2html_wrap_indisplay25}%
+$\displaystyle \omega = h ( \eta , \varphi) 
+$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html 
b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
index 85f6256..8c77048 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/chapter.html
@@ -919,7 +919,7 @@ but , ,
  $- -a {\frac{1}{2}} @minus{}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_2.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_1.svg"
  ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -998,7 +998,7 @@ After clickstyle &rArr;
  -->
 
 <IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_4.svg"
+ STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_2.svg"
  ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
 \lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
 $">
@@ -1017,7 +1017,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_5.svg"
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_3.svg"
  ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @dotless{i} 
@dotless{j} @\lq {...
 ...@ogonek{a} a@sup{h}@sub{l}
 @* @ @ @
@@ -1040,7 +1040,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_4.svg"
  ALT="$\displaystyle @click{}
 @U{0075}
 @TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} ...
@@ -1060,7 +1060,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_7.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_5.svg"
  ALT="$\displaystyle @quotedblleft{} @quotedblright{}
 @quoteleft{} @quoteright{} @quo...
 ...guilsinglleft{}
@@ -1076,7 +1076,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_8.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
  ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @t{t} @sansserif{sansserif} 
@slanted{slanted}
 $">
 </DIV>
@@ -1309,7 +1309,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
  -->
 
 <IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_9.svg"
+ STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_7.svg"
  ALT="$\displaystyle disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $">
@@ -1581,7 +1581,7 @@ html ''
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_1.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_8.svg"
  ALT="$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$">
 </DIV>
  &rdquo;
@@ -1607,7 +1607,7 @@ html ''
  $- -a@minus{} {\frac{1}{2}}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
  ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
 </p>
 <p><code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img src="f-ile.jpg" 
alt="altjk _&quot; %@">
@@ -1851,7 +1851,7 @@ but , ,
  $- -a {\frac{1}{2}} @minus{}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_2.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_1.svg"
  ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -1930,7 +1930,7 @@ After clickstyle &rArr;
  -->
 
 <IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_4.svg"
+ STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_2.svg"
  ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
 \lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
 $">
@@ -1949,7 +1949,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_5.svg"
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_3.svg"
  ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @dotless{i} 
@dotless{j} @\lq {...
 ...@ogonek{a} a@sup{h}@sub{l}
 @* @ @ @
@@ -1972,7 +1972,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_4.svg"
  ALT="$\displaystyle @click{}
 @U{0075}
 @TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} ...
@@ -1992,7 +1992,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_7.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_5.svg"
  ALT="$\displaystyle @quotedblleft{} @quotedblright{}
 @quoteleft{} @quoteright{} @quo...
 ...guilsinglleft{}
@@ -2008,7 +2008,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_8.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
  ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @t{t} @sansserif{sansserif} 
@slanted{slanted}
 $">
 </DIV>
@@ -2241,7 +2241,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
  -->
 
 <IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_9.svg"
+ STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_7.svg"
  ALT="$\displaystyle disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $">
@@ -2513,7 +2513,7 @@ html ''
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_1.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_8.svg"
  ALT="$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$">
 </DIV>
  &rdquo;
@@ -2539,7 +2539,7 @@ html ''
  $- -a@minus{} {\frac{1}{2}}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
  ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
 </p>
 <p><code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img src="f-ile.jpg" 
alt="altjk _&quot; %@">
@@ -2789,7 +2789,7 @@ but , ,
  $- -a {\frac{1}{2}} @minus{}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_2.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_1.svg"
  ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
 <code>@option{--a}</code> <samp>--a</samp>
 <code>@r{--a}</code> <span class="roman">&ndash;a</span>
@@ -2872,7 +2872,7 @@ After clickstyle &rArr;
  -->
 
 <IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_4.svg"
+ STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_2.svg"
  ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
 \lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
 $">
@@ -2892,7 +2892,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_5.svg"
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_3.svg"
  ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @dotless{i} 
@dotless{j} @\lq {...
 ...@ogonek{a} a@sup{h}@sub{l}
 @* @ @ @
@@ -2916,7 +2916,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_4.svg"
  ALT="$\displaystyle @click{}
 @U{0075}
 @TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} ...
@@ -2937,7 +2937,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_7.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_5.svg"
  ALT="$\displaystyle @quotedblleft{} @quotedblright{}
 @quoteleft{} @quoteright{} @quo...
 ...guilsinglleft{}
@@ -2954,7 +2954,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_8.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
  ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @t{t} @sansserif{sansserif} 
@slanted{slanted}
 $">
 </DIV>
@@ -3238,7 +3238,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
  -->
 
 <IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_9.svg"
+ STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_7.svg"
  ALT="$\displaystyle disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $">
@@ -3544,7 +3544,7 @@ html ''
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_1.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_8.svg"
  ALT="$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$">
 </DIV>
  &rdquo;
@@ -3575,7 +3575,7 @@ html ''
  $- -a@minus{} {\frac{1}{2}}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
  ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
 
 <code>@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img src="f-ile.jpg" 
alt="altjk _&quot; %@">
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm 
b/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
index a574c21..d78a142 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing-l2h_cache.pm
@@ -19,7 +19,7 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  -->
 
 <IMG
- STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_5.svg"
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_3.svg"
  ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @dotless{i} 
@dotless{j} @\lq {...
 ...@ogonek{a} a@sup{h}@sub{l}
 @* @ @ @
@@ -39,7 +39,7 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_8.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
  ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @t{t} @sansserif{sansserif} 
@slanted{slanted}
 $">
 </DIV>
@@ -67,7 +67,7 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_6.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_4.svg"
  ALT="$\displaystyle @click{}
 @U{0075}
 @TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} ...
@@ -93,7 +93,7 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_7.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_5.svg"
  ALT="$\displaystyle @quotedblleft{} @quotedblright{}
 @quoteleft{} @quoteright{} @quo...
 ...guilsinglleft{}
@@ -114,7 +114,7 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  -->
 
 <IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_4.svg"
+ STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_2.svg"
  ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
 \lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
 $">
@@ -130,7 +130,7 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_1.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_8.svg"
  ALT="$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$">
 </DIV>
  &rdquo;|;
@@ -147,7 +147,7 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
  -->
 
 <IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_9.svg"
+ STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_7.svg"
  ALT="$\displaystyle disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $">
@@ -159,7 +159,7 @@ $l2h_cache{$l2h_cache_key} = q|<!-- MATH
  $- -a {\frac{1}{2}} @minus{}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_2.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_1.svg"
  ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>|;
 
 $l2h_cache_key = q/$--a@minus{} {\frac{1}{2}}$/;
@@ -167,6 +167,6 @@ $l2h_cache{$l2h_cache_key} = q|<!-- MATH
  $- -a@minus{} {\frac{1}{2}}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_3.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_9.svg"
  ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>|;
 1;
\ No newline at end of file
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
index 08cd2fa..876beb3 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.html
@@ -20,42 +20,16 @@
 <BODY >
 
 <!-- l2h_begin sing_l2h 1 -->
-<DIV CLASS="displaymath">
-<!-- MATH
- \begin{displaymath}
-\partial_t \eta (t) = g(\eta(t),\varphi(t))
-\end{displaymath}
- -->
-
-<IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_l2h_img1.svg"
- ALT="$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$">
-</DIV>
- &rdquo;
-
-<!-- l2h_end sing_l2h 1 -->
-
-<!-- l2h_begin sing_l2h 2 -->
 <!-- MATH
  $- -a {\frac{1}{2}} @minus{}$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_l2h_img2.svg"
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_l2h_img1.svg"
  ALT="$--a {\frac{1}{2}} @minus{}$"></SPAN>
 
-<!-- l2h_end sing_l2h 2 -->
-
-<!-- l2h_begin sing_l2h 3 -->
-<!-- MATH
- $- -a@minus{} {\frac{1}{2}}$
- -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_l2h_img3.svg"
- ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
-
-<!-- l2h_end sing_l2h 3 -->
+<!-- l2h_end sing_l2h 1 -->
 
-<!-- l2h_begin sing_l2h 4 -->
+<!-- l2h_begin sing_l2h 2 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -65,16 +39,16 @@
  -->
 
 <IMG
- STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_l2h_img4.svg"
+ STYLE="height: 2.54ex; vertical-align: -0.57ex; " SRC="sing_l2h_img2.svg"
  ALT="$\displaystyle @strong{\lq\lq simple-double--three---four----''} @w{aa}
 \lq @w{}\lq simple-double-@w{}-three---four----'@w{}'@*
 $">
 </DIV>
 
 
-<!-- l2h_end sing_l2h 4 -->
+<!-- l2h_end sing_l2h 2 -->
 
-<!-- l2h_begin sing_l2h 5 -->
+<!-- l2h_begin sing_l2h 3 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -88,7 +62,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_l2h_img5.svg"
+ STYLE="height: 2.67ex; vertical-align: -0.70ex; " SRC="sing_l2h_img3.svg"
  ALT="$\displaystyle @''u @''{U} @~n @^a @'e @=o @\lq i @'{e} @dotless{i} 
@dotless{j} @\lq {...
 ...@ogonek{a} a@sup{h}@sub{l}
 @* @ @ @
@@ -98,9 +72,9 @@ $">
 </DIV>
 
 
-<!-- l2h_end sing_l2h 5 -->
+<!-- l2h_end sing_l2h 3 -->
 
-<!-- l2h_begin sing_l2h 6 -->
+<!-- l2h_begin sing_l2h 4 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -115,7 +89,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img6.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img4.svg"
  ALT="$\displaystyle @click{}
 @U{0075}
 @TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} ...
@@ -125,9 +99,9 @@ $">
 </DIV>
 
 
-<!-- l2h_end sing_l2h 6 -->
+<!-- l2h_end sing_l2h 4 -->
 
-<!-- l2h_begin sing_l2h 7 -->
+<!-- l2h_begin sing_l2h 5 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -139,7 +113,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img7.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img5.svg"
  ALT="$\displaystyle @quotedblleft{} @quotedblright{}
 @quoteleft{} @quoteright{} @quo...
 ...guilsinglleft{}
@@ -148,9 +122,9 @@ $">
 </DIV>
 
 
-<!-- l2h_end sing_l2h 7 -->
+<!-- l2h_end sing_l2h 5 -->
 
-<!-- l2h_begin sing_l2h 8 -->
+<!-- l2h_begin sing_l2h 6 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -159,15 +133,15 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img8.svg"
+ STYLE="height: 2.29ex; vertical-align: -0.57ex; " SRC="sing_l2h_img6.svg"
  ALT="$\displaystyle @b{b} @i{i} @r{r} @sc{sc} @t{t} @sansserif{sansserif} 
@slanted{slanted}
 $">
 </DIV>
 
 
-<!-- l2h_end sing_l2h 8 -->
+<!-- l2h_end sing_l2h 6 -->
 
-<!-- l2h_begin sing_l2h 9 -->
+<!-- l2h_begin sing_l2h 7 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -177,13 +151,39 @@ f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 
2}\left({x-\mu \over \sigma}\
  -->
 
 <IMG
- STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_l2h_img9.svg"
+ STYLE="height: 6.26ex; vertical-align: -2.32ex; " SRC="sing_l2h_img7.svg"
  ALT="$\displaystyle disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $">
 </DIV>
 
 
+<!-- l2h_end sing_l2h 7 -->
+
+<!-- l2h_begin sing_l2h 8 -->
+<DIV CLASS="displaymath">
+<!-- MATH
+ \begin{displaymath}
+\partial_t \eta (t) = g(\eta(t),\varphi(t))
+\end{displaymath}
+ -->
+
+<IMG
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="sing_l2h_img8.svg"
+ ALT="$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$">
+</DIV>
+ &rdquo;
+
+<!-- l2h_end sing_l2h 8 -->
+
+<!-- l2h_begin sing_l2h 9 -->
+<!-- MATH
+ $- -a@minus{} {\frac{1}{2}}$
+ -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.98ex; vertical-align: -0.92ex; " SRC="sing_l2h_img9.svg"
+ ALT="$--a@minus{} {\frac{1}{2}}$"></SPAN>
+
 <!-- l2h_end sing_l2h 9 -->
 <BR>
 <HR>
diff --git a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.tex 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.tex
index a3ce947..113953d 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.tex
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h.tex
@@ -7,7 +7,7 @@
 
 <!-- l2h_begin sing_l2h 1 -->
 \end{rawhtml}
-$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
+$--a {\frac{1}{2}} @minus{}$
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 1 -->
 
@@ -16,7 +16,9 @@ $$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
 
 <!-- l2h_begin sing_l2h 2 -->
 \end{rawhtml}
-$--a {\frac{1}{2}} @minus{}$
+$$@strong{``simple-double--three---four----''} @w{aa}
+`@w{}`simple-double-@w{}-three---four----'@w{}'@*
+$$
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 2 -->
 
@@ -25,7 +27,13 @@ $--a {\frac{1}{2}} @minus{}$
 
 <!-- l2h_begin sing_l2h 3 -->
 \end{rawhtml}
-$--a@minus{} {\frac{1}{2}}$
+$$@"u @"{U} @~n @^a @'e @=o @`i @'{e} @dotless{i} @dotless{j} @`{@=E}
+@l{} @,{@'C} @,{@'C} @,c @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
+@u{a} @ubaraccent{a} @udotaccent{a} @v{a} @ogonek{a} a@sup{h}@sub{l}
+@* @ @  @
+@- @| @: @! @? @. @@ @} @{ @/
+@today{}
+$$
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 3 -->
 
@@ -34,8 +42,13 @@ $--a@minus{} {\frac{1}{2}}$
 
 <!-- l2h_begin sing_l2h 4 -->
 \end{rawhtml}
-$$@strong{``simple-double--three---four----''} @w{aa}
-`@w{}`simple-double-@w{}-three---four----'@w{}'@*
+$$@click{}
+@U{0075}
+@TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} @enddots{} @equiv{}
+@error{} @expansion{} @minus{} @point{} @print{} @result{}
+@aa{} @AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
+@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
+@registeredsymbol{} @ordf{} @ordm{} @comma{} 
 $$
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 4 -->
@@ -45,12 +58,10 @@ $$
 
 <!-- l2h_begin sing_l2h 5 -->
 \end{rawhtml}
-$$@"u @"{U} @~n @^a @'e @=o @`i @'{e} @dotless{i} @dotless{j} @`{@=E}
-@l{} @,{@'C} @,{@'C} @,c @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
-@u{a} @ubaraccent{a} @udotaccent{a} @v{a} @ogonek{a} a@sup{h}@sub{l}
-@* @ @  @
-@- @| @: @! @? @. @@ @} @{ @/
-@today{}
+$$@quotedblleft{} @quotedblright{} 
+@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
+@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
+@guilsinglright{} @textdegree{} @euro{} @arrow{} @leq{} @geq{}
 $$
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 5 -->
@@ -60,13 +71,7 @@ $$
 
 <!-- l2h_begin sing_l2h 6 -->
 \end{rawhtml}
-$$@click{}
-@U{0075}
-@TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} @enddots{} @equiv{}
-@error{} @expansion{} @minus{} @point{} @print{} @result{}
-@aa{} @AA{} @ae{} @oe{} @AE{} @OE{} @o{} @O{} @ss{} @l{} @L{} @DH{}
-@TH{} @dh{} @th{} @exclamdown{} @questiondown{} @pounds{}
-@registeredsymbol{} @ordf{} @ordm{} @comma{} 
+$$@b{b} @i{i} @r{r} @sc{sc} @t{t} @sansserif{sansserif} @slanted{slanted}
 $$
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 6 -->
@@ -76,10 +81,8 @@ $$
 
 <!-- l2h_begin sing_l2h 7 -->
 \end{rawhtml}
-$$@quotedblleft{} @quotedblright{} 
-@quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
-@guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
-@guilsinglright{} @textdegree{} @euro{} @arrow{} @leq{} @geq{}
+$$disp--laymath
+f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $$
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 7 -->
@@ -89,8 +92,7 @@ $$
 
 <!-- l2h_begin sing_l2h 8 -->
 \end{rawhtml}
-$$@b{b} @i{i} @r{r} @sc{sc} @t{t} @sansserif{sansserif} @slanted{slanted}
-$$
+$$\partial_t \eta (t) = g(\eta(t),\varphi(t))$$ ''
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 8 -->
 
@@ -99,9 +101,7 @@ $$
 
 <!-- l2h_begin sing_l2h 9 -->
 \end{rawhtml}
-$$disp--laymath
-f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
-$$
+$--a@minus{} {\frac{1}{2}}$
 \begin{rawhtml}
 <!-- l2h_end sing_l2h 9 -->
 
diff --git 
a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex 
b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
index 406e967..29526b1 100644
--- a/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/formatting_singular/sing_l2h_images.tex
@@ -118,25 +118,13 @@
 % !!! IMAGES START HERE !!!
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay124}%
-$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$%
-\lthtmlindisplaymathZ
-\lthtmlcheckvsize\clearpage}
-
-{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline107}%
+\lthtmlinlinemathA{tex2html_wrap_inline105}%
 $--a {\frac{1}{2}} @minus{}$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline109}%
-$--a@minus{} {\frac{1}{2}}$%
-\lthtmlindisplaymathZ
-\lthtmlcheckvsize\clearpage}
-
-{\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay128}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay125}%
 $\displaystyle @strong{``simple-double--three---four----''} @w{aa}
 `@w{}`simple-double-@w{}-three---four----'@w{}'@*
 $%
@@ -144,7 +132,7 @@ $%
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay130}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay127}%
 $\displaystyle @"u @"{U} @~n @^a @'e @=o @`i @'{e} @dotless{i} @dotless{j} 
@`{@=E}
 @l{} @,{@'C} @,{@'C} @,c @H{a} @dotaccent{a} @ringaccent{a} @tieaccent{a}
 @u{a} @ubaraccent{a} @udotaccent{a} @v{a} @ogonek{a} a@sup{h}@sub{l}
@@ -156,7 +144,7 @@ $%
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay132}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay129}%
 $\displaystyle @click{}
 @U{0075}
 @TeX{} @LaTeX{} @bullet{} @copyright{} @dots{} @enddots{} @equiv{}
@@ -169,7 +157,7 @@ $%
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay134}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay131}%
 $\displaystyle @quotedblleft{} @quotedblright{} 
 @quoteleft{} @quoteright{} @quotedblbase{} @quotesinglbase{} @guillemetleft{}
 @guillemetright{} @guillemotleft{} @guillemotright{} @guilsinglleft{}
@@ -179,19 +167,31 @@ $%
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay136}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay133}%
 $\displaystyle @b{b} @i{i} @r{r} @sc{sc} @t{t} @sansserif{sansserif} 
@slanted{slanted}
 $%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay138}%
+\lthtmlinlinemathA{tex2html_wrap_indisplay135}%
 $\displaystyle disp--laymath
 f(x) = {1 \over \sigma \sqrt{2\pi}}e@sup{-{1 \over 2}\left({x-\mu \over 
\sigma}\right)^2}
 $%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
+{\newpage\clearpage
+\lthtmlinlinemathA{tex2html_wrap_indisplay137}%
+$\displaystyle \partial_t \eta (t) = g(\eta(t),\varphi(t))$%
+\lthtmlindisplaymathZ
+\lthtmlcheckvsize\clearpage}
+
+{\newpage\clearpage
+\lthtmlinlinemathA{tex2html_wrap_inline121}%
+$--a@minus{} {\frac{1}{2}}$%
+\lthtmlindisplaymathZ
+\lthtmlcheckvsize\clearpage}
+
 
 \end{document}
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm 
b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm
index 3305f48..bfa642f 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex-l2h_cache.pm
@@ -10,7 +10,7 @@ U w V^\dagger
  -->
 
 <IMG
- STYLE="height: 2.31ex; vertical-align: -0.12ex; " SRC="tex_complex_2.svg"
+ STYLE="height: 2.31ex; vertical-align: -0.12ex; " SRC="tex_complex_3.svg"
  ALT="$\displaystyle U w V^\dagger
 $">
 </DIV>
@@ -27,7 +27,7 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_3.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_5.svg"
  ALT="$\displaystyle \omega = h ( \eta , \varphi)
 $">
 </DIV>
@@ -54,12 +54,12 @@ $l2h_cache{$l2h_cache_key} = q|<!-- MATH
  $(I-D) \varphi(t)$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_2.svg"
  ALT="$(I-D) \varphi(t)$"></SPAN>|;
 
 $l2h_cache_key = q/$\phi w V^t$/;
 $l2h_cache{$l2h_cache_key} = q|<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_5.svg"
+ STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_4.svg"
  ALT="$\phi w V^t$"></SPAN>|;
 
 $l2h_cache_key = q/$h \dot \psi^\phi$/;
diff --git a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html 
b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
index 3ecebdc..48d3110 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex.html
@@ -60,7 +60,7 @@ $">
  $(I-D) \varphi(t)$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_2.svg"
  ALT="$(I-D) \varphi(t)$"></SPAN> math.
 </p><hr>
 
@@ -86,7 +86,7 @@ $">
  $(I-D) \varphi(t)$
  -->
 <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_4.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_2.svg"
  ALT="$(I-D) \varphi(t)$"></SPAN> math.
 </p>
 <p>Tex:
@@ -98,14 +98,14 @@ U w V^\dagger
  -->
 
 <IMG
- STYLE="height: 2.31ex; vertical-align: -0.12ex; " SRC="tex_complex_2.svg"
+ STYLE="height: 2.31ex; vertical-align: -0.12ex; " SRC="tex_complex_3.svg"
  ALT="$\displaystyle U w V^\dagger
 $">
 </DIV>
 
 </p>
 <p>and math <SPAN CLASS="MATH"><IMG
- STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_5.svg"
+ STYLE="height: 2.52ex; vertical-align: -0.57ex; " SRC="tex_complex_4.svg"
  ALT="$\phi w V^t$"></SPAN>.
 </p>
 <p>Now there is a footnote<a id="DOCF1" href="#FOOT1"><sup>1</sup></a>
@@ -123,7 +123,7 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_3.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " SRC="tex_complex_5.svg"
  ALT="$\displaystyle \omega = h ( \eta , \varphi)
 $">
 </DIV>
diff --git a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html 
b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html
index b409f4e..f358db1 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html
+++ b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.html
@@ -37,6 +37,16 @@ $">
 <!-- l2h_end tex_complex_l2h 1 -->
 
 <!-- l2h_begin tex_complex_l2h 2 -->
+<!-- MATH
+ $(I-D) \varphi(t)$
+ -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " 
SRC="tex_complex_l2h_img2.svg"
+ ALT="$(I-D) \varphi(t)$"></SPAN>
+
+<!-- l2h_end tex_complex_l2h 2 -->
+
+<!-- l2h_begin tex_complex_l2h 3 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -45,15 +55,22 @@ U w V^\dagger
  -->
 
 <IMG
- STYLE="height: 2.31ex; vertical-align: -0.12ex; " 
SRC="tex_complex_l2h_img2.svg"
+ STYLE="height: 2.31ex; vertical-align: -0.12ex; " 
SRC="tex_complex_l2h_img3.svg"
  ALT="$\displaystyle U w V^\dagger
 $">
 </DIV>
 
 
-<!-- l2h_end tex_complex_l2h 2 -->
+<!-- l2h_end tex_complex_l2h 3 -->
 
-<!-- l2h_begin tex_complex_l2h 3 -->
+<!-- l2h_begin tex_complex_l2h 4 -->
+<SPAN CLASS="MATH"><IMG
+ STYLE="height: 2.52ex; vertical-align: -0.57ex; " 
SRC="tex_complex_l2h_img4.svg"
+ ALT="$\phi w V^t$"></SPAN>
+
+<!-- l2h_end tex_complex_l2h 4 -->
+
+<!-- l2h_begin tex_complex_l2h 5 -->
 <DIV CLASS="displaymath">
 <!-- MATH
  \begin{displaymath}
@@ -62,29 +79,12 @@ $">
  -->
 
 <IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " 
SRC="tex_complex_l2h_img3.svg"
+ STYLE="height: 2.55ex; vertical-align: -0.70ex; " 
SRC="tex_complex_l2h_img5.svg"
  ALT="$\displaystyle \omega = h ( \eta , \varphi)
 $">
 </DIV>
 
 
-<!-- l2h_end tex_complex_l2h 3 -->
-
-<!-- l2h_begin tex_complex_l2h 4 -->
-<!-- MATH
- $(I-D) \varphi(t)$
- -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.55ex; vertical-align: -0.70ex; " 
SRC="tex_complex_l2h_img4.svg"
- ALT="$(I-D) \varphi(t)$"></SPAN>
-
-<!-- l2h_end tex_complex_l2h 4 -->
-
-<!-- l2h_begin tex_complex_l2h 5 -->
-<SPAN CLASS="MATH"><IMG
- STYLE="height: 2.52ex; vertical-align: -0.57ex; " 
SRC="tex_complex_l2h_img5.svg"
- ALT="$\phi w V^t$"></SPAN>
-
 <!-- l2h_end tex_complex_l2h 5 -->
 
 <!-- l2h_begin tex_complex_l2h 6 -->
diff --git a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.tex 
b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.tex
index 071359f..8431099 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h.tex
@@ -17,9 +17,7 @@ $$
 
 <!-- l2h_begin tex_complex_l2h 2 -->
 \end{rawhtml}
-$$
- U w V^\dagger
-$$
+$(I-D) \varphi(t)$
 \begin{rawhtml}
 <!-- l2h_end tex_complex_l2h 2 -->
 
@@ -29,7 +27,7 @@ $$
 <!-- l2h_begin tex_complex_l2h 3 -->
 \end{rawhtml}
 $$
-\omega = h ( \eta , \varphi) 
+ U w V^\dagger
 $$
 \begin{rawhtml}
 <!-- l2h_end tex_complex_l2h 3 -->
@@ -39,7 +37,7 @@ $$
 
 <!-- l2h_begin tex_complex_l2h 4 -->
 \end{rawhtml}
-$(I-D) \varphi(t)$
+$\phi w V^t$
 \begin{rawhtml}
 <!-- l2h_end tex_complex_l2h 4 -->
 
@@ -48,7 +46,9 @@ $(I-D) \varphi(t)$
 
 <!-- l2h_begin tex_complex_l2h 5 -->
 \end{rawhtml}
-$\phi w V^t$
+$$
+\omega = h ( \eta , \varphi) 
+$$
 \begin{rawhtml}
 <!-- l2h_end tex_complex_l2h 5 -->
 
diff --git 
a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex 
b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex
index 5ae79f0..650e2e8 100644
--- a/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/tex_complex_l2h/tex_complex_l2h_images.tex
@@ -125,28 +125,28 @@ $%
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay21}%
-$\displaystyle U w V^\dagger
-$%
+\lthtmlinlinemathA{tex2html_wrap_inline8}%
+$(I-D) \varphi(t)$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_indisplay23}%
-$\displaystyle \omega = h ( \eta , \varphi) 
+\lthtmlinlinemathA{tex2html_wrap_indisplay22}%
+$\displaystyle U w V^\dagger
 $%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
 \lthtmlinlinemathA{tex2html_wrap_inline12}%
-$(I-D) \varphi(t)$%
+$\phi w V^t$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
 {\newpage\clearpage
-\lthtmlinlinemathA{tex2html_wrap_inline14}%
-$\phi w V^t$%
+\lthtmlinlinemathA{tex2html_wrap_indisplay25}%
+$\displaystyle \omega = h ( \eta , \varphi) 
+$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign-l2h_cache.pm 
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign-l2h_cache.pm
index 4b077f7..dd6dfb6 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign-l2h_cache.pm
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign-l2h_cache.pm
@@ -19,7 +19,8 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  ALT="$\displaystyle \leqalignno{
 \int v(t)\, dt &amp;= u(t) + C&amp;[3.1]\cr
 \int v(t)\, dt &amp;= u(t) + H&amp;[3.2]\cr
-}$">
+}
+$">
 </DIV>
 |;
 
@@ -42,7 +43,8 @@ $l2h_cache{$l2h_cache_key} = q|<DIV CLASS="displaymath">
  ALT="$\displaystyle \leqalignno{
 \int v(t)\, dt &amp;= u(t) + C&amp;[3.1]\cr
 \int v(t)\, dt &amp;= u(t) + H&amp;[3.2]\cr
-}$">
+}
+$">
 </DIV>
 |;
 1;
\ No newline at end of file
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html 
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
index 33a669f..efae781 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign.html
@@ -54,7 +54,8 @@ ul.no-bullet {list-style: none}
  ALT="$\displaystyle \leqalignno{
 \int v(t)\, dt &amp;= u(t) + C&amp;[3.1]\cr
 \int v(t)\, dt &amp;= u(t) + H&amp;[3.2]\cr
-}$">
+}
+$">
 </DIV>
 
 <DIV CLASS="displaymath">
@@ -72,7 +73,8 @@ ul.no-bullet {list-style: none}
  ALT="$\displaystyle \leqalignno{
 \int v(t)\, dt &amp;= u(t) + C&amp;[3.1]\cr
 \int v(t)\, dt &amp;= u(t) + H&amp;[3.2]\cr
-}$">
+}
+$">
 </DIV>
 
 
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.html 
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.html
index c7b9db0..9f3aa63 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.html
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.html
@@ -35,7 +35,8 @@
  ALT="$\displaystyle \leqalignno{
 \int v(t)\, dt &amp;= u(t) + C&amp;[3.1]\cr
 \int v(t)\, dt &amp;= u(t) + H&amp;[3.2]\cr
-}$">
+}
+$">
 </DIV>
 
 
@@ -57,7 +58,8 @@
  ALT="$\displaystyle \leqalignno{
 \int v(t)\, dt &amp;= u(t) + C&amp;[3.1]\cr
 \int v(t)\, dt &amp;= u(t) + H&amp;[3.2]\cr
-}$">
+}
+$">
 </DIV>
 
 
diff --git a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex 
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex
index 2b7b07a..2136817 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h.tex
@@ -10,7 +10,8 @@
 $$\leqalignno{
    \int v(t)\, dt &= u(t) + C&[3.1]\cr
    \int v(t)\, dt &= u(t) + H&[3.2]\cr
-}$$
+}
+$$
 \begin{rawhtml}
 <!-- l2h_end tex_eqalign_l2h 1 -->
 
@@ -22,8 +23,7 @@ $$\leqalignno{
 $$\leqalignno{
    \int v(t)\, dt &= u(t) + C&[3.1]\cr
    \int v(t)\, dt &= u(t) + H&[3.2]\cr
-}
-$$
+}$$
 \begin{rawhtml}
 <!-- l2h_end tex_eqalign_l2h 2 -->
 
diff --git 
a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h_images.tex 
b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h_images.tex
index a7580b1..63fce76 100644
--- a/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h_images.tex
+++ b/tp/tests/tex_html/res_parser/tex_eqalign_l2h/tex_eqalign_l2h_images.tex
@@ -122,7 +122,8 @@
 $\displaystyle \leqalignno{
    \int v(t)\, dt &= u(t) + C&[3.1]\cr
    \int v(t)\, dt &= u(t) + H&[3.2]\cr
-}$%
+}
+$%
 \lthtmlindisplaymathZ
 \lthtmlcheckvsize\clearpage}
 



reply via email to

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