HTML-zu-LaTeX/OpenDocument:   durch normale Leerzeichen ersetzen

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 4bb4ce63de5ad531bc3faff7755dbb0f775dad12..23e2ed0aeaa1456dfe4334fb6741fe33c6256960 100644 (file)
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -71,7 +71,7 @@ sub _format_html {
 
   $content =~ s{ \r+ }{}gx;
   $content =~ s{ \n+ }{ }gx;
-  $content =~ s{ \s+ }{ }gx;
+  $content =~ s{ (?:\ |\s)+ }{ }gx;
 
   my @parts = map {
     if (substr($_, 0, 1) eq '<') {

diff --git a/SL/Template/OpenDocument.pm b/SL/Template/OpenDocument.pm
index 085fa25dbd3e638bc7c5f060eff5ac58fcf0761c..85184c01986ff6b0f9971258967af27830081f1b 100644 (file)
--- a/SL/Template/OpenDocument.pm
+++ b/SL/Template/OpenDocument.pm
@@ -73,7 +73,7 @@ sub _format_html {
   $content                      =~ s{ ^<p> | </p>$ }{}gx;
   $content                      =~ s{ \r+ }{}gx;
   $content                      =~ s{ \n+ }{ }gx;
-  $content                      =~ s{ \s+ }{ }gx;
+  $content                      =~ s{ (?:\&nbsp;|\s)+ }{ }gx;
 
   my $in_p                      = 1;
   my $p_start_tag               = qq|<text:p text:style-name="@{[ $self->{current_text_style} ]}">|;