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

[karl at gnu.org.ua]

Author: karl
Date: 2015-04-02 02:22:33 +0300 (Thu, 02 Apr 2015)
New Revision: 146

Modified:
   trunk/lit/ChangeLog
   trunk/lit/Makefile
   trunk/lit/tex4ht-ooffice.tex
Log:
for ooffice: configure wrapfig to avoid spurious </p>; https://puszcza.gnu.org.ua/bugs/?247

Modified: trunk/lit/ChangeLog
===================================================================
--- trunk/lit/ChangeLog	2015-02-17 23:52:40 UTC (rev 145)
+++ trunk/lit/ChangeLog	2015-04-01 23:22:33 UTC (rev 146)
@@ -1,3 +1,8 @@
+2015-04-01  Michal Hoftich  <michal.h21 at gmail.com>
+
+	* tex4ht-ooffice.tex: configure wrapfig to avoid spurious \par.
+	https://puszcza.gnu.org.ua/bugs/?247
+
 2015-02-17  Michal Hoftich  <michal.h21 at gmail.com>
 
 	* tex4ht-4ht.tex (spanish.4ht): fix missing csname when Spanish

Modified: trunk/lit/Makefile
===================================================================
--- trunk/lit/Makefile	2015-02-17 23:52:40 UTC (rev 145)
+++ trunk/lit/Makefile	2015-04-01 23:22:33 UTC (rev 146)
@@ -18,7 +18,7 @@
   book.4ht listings.4ht multicol.4ht quoting.4ht \
   scrartcl.4ht scrbook.4ht scrreprt.4ht \
   spanish.4ht \
-  titlesec.4ht tocloft.4ht
+  titlesec.4ht tocloft.4ht wrapfig.4ht
 # and many, many more.
 
 derived += $(tex4ht_bibtex2_derived)

Modified: trunk/lit/tex4ht-ooffice.tex
===================================================================
--- trunk/lit/tex4ht-ooffice.tex	2015-02-17 23:52:40 UTC (rev 145)
+++ trunk/lit/tex4ht-ooffice.tex	2015-04-01 23:22:33 UTC (rev 146)
@@ -11651,9 +11651,31 @@
 }
 >>>
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section{wrapfig}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\<configure ooffice wrapfig\><<<
+\pend:def\WFclear{%
+\let\orig:par\par%
+\def\par{\let\par\orig:par}%
+}%
+\append:def\WFclear{\let\par\orig:par}
 
+\Configure{wrapfloat}
+    {\ifvmode\IgnorePar\EndP
+       \HCode{<text:p><text:span text:class-name="wrapfig-\WFplace">}%
+       \def\endWrap{\ifvmode\IgnorePar\fi\EndP\HCode{</text:span></text:p>}\par}%
+     \else
+       \HCode{<text:span text:class-name="wrapfig-\WFplace">}\bgroup
+       \def\endWrap{\egroup\HCode{</text:span>}}%
+     \fi
+    }
+    {\endWrap}
+>>>>
 
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \chapter{Notes}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%