From: Paul Hänsch <paul@plutz.net>
Date: Tue, 29 Sep 2020 20:55:13 +0000 (+0200)
Subject: handle various forms of html line breaks
X-Git-Url: http://git.plutz.net/?p=invoices;a=commitdiff_plain;h=a43bdf62b432327b8ba1cff4a6c3812d5cb84b91;hp=03f63c16708fc0d1deb6b6f68d33a3d29461b4fd

handle various forms of html line breaks
---

diff --git a/odtgen.sh b/odtgen.sh
index 5efbcc2..67232a9 100755
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -127,13 +127,13 @@ odt_content(){
 	        </draw:frame><draw:frame draw:style-name="fr2" draw:name="Rahmen2" text:anchor-type="paragraph" svg:width="1.8228in">
 	          <draw:text-box fo:min-height="1.8992in">
 	            <text:p text:style-name="P5"><!--
-                 -->$(HTML "$sender" |sed -r 's;(&#13\;)?&#10\;;<text:line-break/>;g')<!--
+                 -->$(HTML "$sender" |sed -r 's;(&#13\;)?&#10\;|(&#x0?[Dd]\;)?&#x0?[aA]\;|\r?$;<text:line-break/>;g')<!--
 	         --></text:p>
 	          </draw:text-box>
 	        </draw:frame><draw:frame draw:style-name="fr3" draw:name="Rahmen1" text:anchor-type="paragraph" svg:y="1.3799in" svg:width="3.4398in">
 	          <draw:text-box fo:min-height="1.3311in">
 	            <text:p text:style-name="P3"><!--
-                   -->$(HTML "$client" |sed -r 's;(&#13\;)?&#10\;;<text:line-break/>;g')<!--
+                   -->$(HTML "$client" |sed -r 's;(&#13\;)?&#10\;|(&#x0?[Dd]\;)?&#x0?[aA]\;|\r?$;<text:line-break/>;g')<!--
 	           --></text:p>
 	          </draw:text-box>
 	        </draw:frame><text:span text:style-name="T3">Rechnung ${number}</text:span>