texinfo/tp Texinfo/Convert/HTML.pm init/tex4ht.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/10/12 07:33:14

Modified files:
        tp/Texinfo/Convert: HTML.pm 
        tp/init        : tex4ht.pm 

Log message:
        No css lines formatting if NO_CSS is set.
        Better handling of spaces in tex4ht generated output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.181&r2=1.182
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/init/tex4ht.pm?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- Texinfo/Convert/HTML.pm     11 Oct 2011 22:41:54 -0000      1.181
+++ Texinfo/Convert/HTML.pm     12 Oct 2011 07:33:13 -0000      1.182
@@ -4348,6 +4348,8 @@
 {
   my $self = shift;
 
+  return if ($self->get_conf('NO_CSS'));
+
   my $css_refs = $self->get_conf('CSS_REFS');
 
   return if (address@hidden>{'css_import_lines'}} and 
address@hidden>{'css_rule_lines'}}

Index: init/tex4ht.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/init/tex4ht.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- init/tex4ht.pm      11 Oct 2011 21:40:29 -0000      1.1
+++ init/tex4ht.pm      12 Oct 2011 07:33:13 -0000      1.2
@@ -148,7 +148,12 @@
         if ($command eq 'math') {
           $tree = $root->{'args'}->[0];
         } else {
-          $tree = {'contents' => $root->{'contents'}};
+          $tree = {'contents' => address@hidden>{'contents'}}]};
+          if ($tree->{'contents'}->[0] 
+              and $tree->{'contents'}->[0]->{'type'}
+              and $tree->{'contents'}->[0]->{'type'} eq 
'empty_line_after_command') {
+            shift @{$tree->{'contents'}};
+          }
         }
         my $text = Texinfo::Convert::Texinfo::convert($tree);
         $commands{$command}->{'commands'}->[$counter-1] = $root;
@@ -262,7 +267,7 @@
         #print STDERR "while search $command $count $line";
         if ($line =~ /!-- tex4ht_end $commands{$command}->{'basename'} 
$command $count --/) {
           $got_count++;
-          chomp($text);
+          chomp($text) if ($command eq 'math');
           
$commands{$command}->{'results'}->{$commands{$command}->{'commands'}->[$count-1]}
 = $text;
           $end_found = 1;
           last;