htmltoooxml 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7d9fb91ab66c01d35e2098755d1c92dd4514527aa9df071581595abb9577290
-  data.tar.gz: f889a3c88a6364ae5bae4090f9b35f517554cc74f2f19b8bebc390273c0cefaa
+  metadata.gz: 8d12ae5bf06909c848928c71822e240d56058de0dba36703665087102218f4d6
+  data.tar.gz: 78477ed4db7f153f7be6b6ca39870b41ba0b1c507a5c1d974da64f8471cb02af
 SHA512:
-  metadata.gz: c5cfd53a6d76249e77bb7c7c508447b1c248cd14aa145e7dd9d17f28e3ca66c467d5ac7693c5d267c84d3f0daa6a92cde5046ee7d2b5c04aaa8f02546c5f76f7
-  data.tar.gz: 32d8807a3b1cf160397346c0e5244c5b690875b5daba5125ee2003e47da39bda4f1c27eeb7f54452f3cd41d8cad460379074dd5b74b933933332a13064ed3235
+  metadata.gz: 480484bdfc7fb53a444527c6f0f7cfc6854d6fe081bdd0031656a5b65728120071b0f7702d4e89717662870332b0895b7e2cb07b435ccc68f7e78ebaec72a66d
+  data.tar.gz: 5382528f32867ecf04da597d8dcb43d2611a67464a7395ee3b1cce4c68df57a6e3e583dd9f41d21b4400a10f609cc2e9d66e10d97717089a650f564537f4ccfd

data/lib/htmltoooxml/version.rb

@@ -1,3 +1,3 @@
 module Htmltoooxml
-  VERSION = "0.4.0"
+  VERSION = "0.4.3"
 end

data/lib/htmltoooxml/xslt/base.xslt

@@ -51,25 +51,19 @@
     </a:p>
   </xsl:template>
 
-
   <xsl:template match="br[not(ancestor::p) and not(ancestor::div) and not(ancestor::td|ancestor::li) or
                           (preceding-sibling::div or following-sibling::div or preceding-sibling::p or following-sibling::p)]">
-    <a:p>
-      <a:r></a:r>
-    </a:p>
+    <a:p><a:endParaRPr/></a:p>
   </xsl:template>
 
   <xsl:template match="br[(ancestor::li or ancestor::td) and
                           (preceding-sibling::div or following-sibling::div or preceding-sibling::p or following-sibling::p)]">
-    <a:r>
-      <a:br />
-    </a:r>
+    <xsl:apply-templates />
+    <a:p><a:endParaRPr/></a:p>
   </xsl:template>
 
   <xsl:template match="br">
-    <a:r>
-      <a:br />
-    </a:r>
+    <a:p><a:endParaRPr/></a:p>
   </xsl:template>
 
   <xsl:template match="pre">
@@ -81,6 +75,14 @@
   <xsl:template match="div[not(ancestor::li) and not(ancestor::td) and not(ancestor::th) and not(ancestor::p) and not(descendant::div) and not(descendant::p) and not(descendant::h1) and not(descendant::h2) and not(descendant::h3) and not(descendant::h4) and not(descendant::h5) and not(descendant::h6) and not(descendant::table) and not(descendant::li) and not (descendant::pre)]">
     <xsl:comment>Divs should create a p if nothing above them has and nothing below them will</xsl:comment>
     <a:p>
+      <a:pPr>
+        <a:spcBef>
+          <a:spcPts val="200"/>
+        </a:spcBef>
+        <a:spcAft>
+          <a:spcPts val="600"/>
+        </a:spcAft>
+      </a:pPr>
       <xsl:call-template name="text-alignment" />
       <xsl:apply-templates />
     </a:p>
@@ -94,6 +96,14 @@
   <xsl:template match="body/h1|body/h2|body/h3|body/h4|body/h5|body/h6|h1|h2|h3|h4|h5|h6">
     <xsl:variable name="length" select="string-length(name(.))"/>
     <a:p>
+      <a:pPr>
+        <a:spcBef>
+          <a:spcPts val="200"/>
+        </a:spcBef>
+        <a:spcAft>
+          <a:spcPts val="600"/>
+        </a:spcAft>
+      </a:pPr>
       <a:r>
         <a:rPr b="1" dirty="0"/>
         <a:t><xsl:value-of select="."/></a:t>
@@ -103,6 +113,14 @@
 
   <xsl:template match="p[not(ancestor::li)]">
     <a:p>
+      <a:pPr>
+        <a:spcBef>
+          <a:spcPts val="200"/>
+        </a:spcBef>
+        <a:spcAft>
+          <a:spcPts val="600"/>
+        </a:spcAft>
+      </a:pPr>
       <xsl:call-template name="text-alignment" />
       <xsl:apply-templates />
     </a:p>
@@ -259,9 +277,7 @@
 
   <xsl:template match="div[contains(concat(' ', @class, ' '), ' -page-break ')]">
     <a:p>
-      <a:r>
-        <a:br a:type="page" />
-      </a:r>
+      <a:endParaRPr/>
     </a:p>
     <xsl:apply-templates />
   </xsl:template>
@@ -271,23 +287,19 @@
   <xsl:template match="text()">
     <xsl:if test="string-length(.) > 0">
       <a:r>
-        <xsl:if test="ancestor::i">
-         <a:rPr  dirty="0" i="1"/>
-        </xsl:if>
-        <xsl:if test="ancestor::b">
-          <a:rPr dirty="0" b="1"/>
-        </xsl:if>
-        <xsl:if test="ancestor::u">
-          <a:rPr dirty="0"/>
-        </xsl:if>
-        <xsl:if test="ancestor::s">
-          <a:rPr dirty="0"/>
-        </xsl:if>
-        <xsl:if test="ancestor::sub">
-          <a:rPr dirty="0"/>
-        </xsl:if>
-        <xsl:if test="ancestor::sup">
-          <a:rPr dirty="0"/>
+        <xsl:if test="ancestor::i | ancestor::b | ancestor::u | ancestor::s | ancestor::sub | ancestor::sup">
+          <xsl:element name="a:rPr">
+            <xsl:attribute name="dirty">0</xsl:attribute>
+            <xsl:if test="ancestor::i">
+              <xsl:attribute name="i">1</xsl:attribute>
+            </xsl:if>
+            <xsl:if test="ancestor::b">
+              <xsl:attribute name="b">1</xsl:attribute>
+            </xsl:if>
+            <xsl:if test="ancestor::u">
+              <xsl:attribute name="u">sng</xsl:attribute>
+            </xsl:if>
+          </xsl:element>
         </xsl:if>
         <a:t><xsl:value-of select="."/></a:t>
       </a:r>

data/lib/htmltoooxml/xslt/html_to_ooxml.xslt

@@ -30,6 +30,9 @@
   <xsl:template match="p">
     <a:p>
       <a:pPr marL="0" indent="0">
+        <a:spcBef>
+          <a:spcPts val="200"/>
+        </a:spcBef>
         <a:spcAft>
           <a:spcPts val="600"/>
         </a:spcAft>
@@ -304,4 +307,4 @@
       </a:pPr>
     </xsl:if>
   </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

data/lib/htmltoooxml/xslt/inline_elements.xslt

@@ -1,7 +1,7 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:output encoding="utf-8" omit-xml-declaration="yes" indent="yes" />
 
-  <xsl:strip-space elements="*"/>
+  <xsl:preserve-space elements="p div span b i u s sub sup a"/>
 
   <xsl:template match="node()|@*">
     <xsl:copy>
@@ -37,4 +37,4 @@
     </xsl:copy>
     <xsl:apply-templates select="following-sibling::node()[1][self::a|self::b|self::i|self::s|self::span|self::sub|self::sup|self::u|self::text()]"/>
   </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmltoooxml
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Justin Boynton
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +115,7 @@ homepage: https://github.com/stylefoundry
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Parse HTML and convert to open office xml for powerpoint
 test_files: []