htmltoword 0.1.1 → 0.1.2

data/lib/htmltoword/version.rb

@@ -1,3 +1,3 @@
 module Htmltoword
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/xslt/html_to_wordml.xslt

@@ -132,6 +132,9 @@
   </xsl:template>
 
   <xsl:template match="span[contains(concat(' ', @class, ' '), ' h ')]">
+    <xsl:comment>
+        This template adds MS Word highlighting ability.
+      </xsl:comment>
     <xsl:variable name="color">
       <xsl:choose>
         <xsl:when test="./@data-style='pink'">magenta</xsl:when>
@@ -140,12 +143,26 @@
         <xsl:otherwise><xsl:value-of select="./@data-style"/></xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
-    <w:r>
-      <w:rPr>
-        <w:highlight w:val="{$color}"/>
-      </w:rPr>
-      <w:t xml:space="preserve"><xsl:value-of select="."/></w:t>
-    </w:r>
+    <xsl:choose>
+      <xsl:when test="preceding-sibling::h1 or preceding-sibling::h2 or preceding-sibling::h3 or preceding-sibling::h4 or preceding-sibling::h5 or preceding-sibling::h6 or preceding-sibling::table or preceding-sibling::p or preceding-sibling::ol or preceding-sibling::ul or preceding-sibling::div or following-sibling::h1 or following-sibling::h2 or following-sibling::h3 or following-sibling::h4 or following-sibling::h5 or following-sibling::h6 or following-sibling::table or following-sibling::p or following-sibling::ol or following-sibling::ul or following-sibling::div">
+        <w:p>
+          <w:r>
+            <w:rPr>
+              <w:highlight w:val="{$color}"/>
+            </w:rPr>
+            <w:t xml:space="preserve"><xsl:value-of select="."/></w:t>
+          </w:r>
+        </w:p>
+      </xsl:when>
+      <xsl:otherwise>
+        <w:r>
+          <w:rPr>
+            <w:highlight w:val="{$color}"/>
+          </w:rPr>
+          <w:t xml:space="preserve"><xsl:value-of select="."/></w:t>
+        </w:r>
+      </xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
 
   <xsl:template match="div[contains(concat(' ', @class, ' '), ' -page-break ')]">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: htmltoword
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack