Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / SL / Template / LaTeX.pm

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index bc03eb3..293db2e 100644 (file)
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -83,6 +83,8 @@ sub _format_html {
   $content =~ s{ (?:\ |\s)+ }{ }gx;
   $content =~ s{ (?:\ |\s)+$ }{}gx;
   $content =~ s{ (?: <br/?> )+$ }{}gx;
+  $content =~ s{ <ul>\s*</ul> | <ol>\s*</ol> }{}igx;
+  $content =~ s{ (?: <p>\s*</p>\s* )+ \Z }{}imgx;
 
   my @parts = grep { $_ } map {
     if (substr($_, 0, 1) eq '<') {