X-Git-Url: http://git.plutz.net/?p=invoices;a=blobdiff_plain;f=odtgen.sh;fp=odtgen.sh;h=abed2db2028e43f153aee28ec1d4f2701e8000f0;hp=1dfa5e87083d736bdc31035e19f81d7b14e12da0;hb=c8a6c9bc6dd73d69073e64e2ed388654544ba697;hpb=d64bc5cc4be52c25c529d8693afb79aa84dec30a

diff --git a/odtgen.sh b/odtgen.sh
index 1dfa5e8..abed2db 100755
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -178,8 +178,8 @@ odt_content(){
 	          </table:table-row>
 	        </table:table-header-rows>
 		$(sed 1d "invoices/$id" |while read -r time work hours; do
-                   time="$(UNSTRING "${time#time=}" |sed 's;\r;<text:line-break/>;g')"
-                   work="$(UNSTRING "${work#work=}" |sed 's;\r;<text:line-break/>;g')"
+                   time="$(UNSTRING "${time#time=}" |sed -r 's;(&#13\;)?&#10\;|(&#x0?[Dd]\;)?&#x0?[aA]\;|\r?$;<text:line-break/>;g')"
+                   work="$(UNSTRING "${work#work=}" |sed -r 's;(&#13\;)?&#10\;|(&#x0?[Dd]\;)?&#x0?[aA]\;|\r?$;<text:line-break/>;g')"
                   hours="$(UNSTRING "${hours#hours=}")"
 		  cat <<-TROW
 			<table:table-row>