[tex4ht-commits] [SCM] tex4ht updated: r539 - trunk/lit

[michal_h21 at gnu.org.ua]

Author: michal_h21
Date: 2019-03-16 17:24:35 +0200 (Sat, 16 Mar 2019)
New Revision: 539

Modified:
   trunk/lit/ChangeLog
   trunk/lit/tex4ht-ooffice.tex
Log:
Fix for wrapfig paragraphs

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2019-03-15 22:45:58 UTC (rev 538)
+++ trunk/lit/ChangeLog	2019-03-16 15:24:35 UTC (rev 539)
@@ -1,3 +1,8 @@
+2019-03-16  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-ooffice.tex (ooffice.4ht): the wrapfix configuration generated
+	nested paragraphs, leading to a non-valid ODF file. 
+
 2019-03-15  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-html5.tex (html5.4ht): use semantic elements for floats,

Modified: trunk/lit/tex4ht-ooffice.tex
===================================================================
--- trunk/lit/tex4ht-ooffice.tex	2019-03-15 22:45:58 UTC (rev 538)
+++ trunk/lit/tex4ht-ooffice.tex	2019-03-16 15:24:35 UTC (rev 539)
@@ -11755,6 +11755,7 @@
 \section{wrapfig}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+
 \<configure ooffice wrapfig\><<<
 \pend:def\WFclear{%
 \let\orig:par\par%
@@ -11763,15 +11764,14 @@
 \append:def\WFclear{\let\par\orig:par}
 
 \Configure{wrapfloat}
-    {\ifvmode\IgnorePar\EndP
-       \HCode{<text:p><text:span text:class-names="wrapfig-\WFplace">}%
-       \def\endWrap{\ifvmode\IgnorePar\fi\EndP\HCode{</text:span></text:p>}\par}%
-     \else
-       \HCode{<text:span text:class-names="wrapfig-\WFplace">}\bgroup
-       \def\endWrap{\egroup\HCode{</text:span>}}%
-     \fi
-    }
-    {\endWrap}
+{\ifvmode \IgnorePar\fi \EndP%
+\HCode{<text:section text:name="wrapfig-\WFplace"  ><text:p>}\bgroup\HtmlParOff}
+{\ifvmode \IgnorePar\fi\EndP%
+ \HCode{</text:p></text:section>}%
+ \HtmlParOn\egroup%
+ \csname par\endcsname\ShowPar%
+}
+
 >>>>
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%