avv2word 1.1.24 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5adcd0d32263c2586dfe65607921889a80110b94f8fe85c78f6871250c70b266
-  data.tar.gz: 15e76efc594d918ec0c6b5f91294c88fd33e35ca553bd68bc9aafb417cb84b90
+  metadata.gz: 584b66ad878fab4c6338ddd18e606f8baffdbb53f31886d32f8d206f4d01a54f
+  data.tar.gz: 3cd1e0b36e30b1a74fd6097496c5e0dfedab517f97ba243cf96f938166a5eef6
 SHA512:
-  metadata.gz: b51a33290a1b68f97b212f5b40787fb8cffb75405fd5894b19cb6fb92f4875ae0cea28c9043106a9c86cca3e3af73015830f74e1b60a9ec9366145fb47f58fa1
-  data.tar.gz: 49e3e3ec00a6dbf879491f02384a0c11c13708e908fdbcbcc841d94443e0a453d9b154475c89a69ec0fd1fb6dadf6e0647b160306e89cd197ff0138a31eed098
+  metadata.gz: c87cb3a5de9392f64dfb8b2f6abfc6cac647e1b34ce0b8e2716306db54462b36c91907f6feea1b1c1f78b9f59e46a034a9f19dc26846ffa0f9993fb686dbdc4b
+  data.tar.gz: cd7e5a942c485f3210d50c6de52a415618334d2a814986cfe1e63b00fb181eaac5c0aa76f2d8f6378c439595e142ea6d98e936a6f3d7cf76af3910812d84e7b2

data/lib/avv2word/document.rb

@@ -49,7 +49,7 @@ module Avv2word
 
       def create(content, template_name = nil, extras = false)
         content = extract_images_html(content)
-        content = escape_footnotes(content)
+        ## content = escape_footnotes(content)
         template_name += extension if template_name && !template_name.end_with?(extension)
         document = new(template_file(template_name))
         document.replace_files(content, extras)
@@ -150,8 +150,6 @@ module Avv2word
 
           %w( word/_rels/header.xml.rels
               word/_rels/footer.xml.rels
-              word/footnotes.xml
-              word/endnotes.xml
           ).each do |f|
             if @replaceable_files[f]
               out.put_next_entry f
@@ -179,7 +177,7 @@ module Avv2word
       transform_and_replace(original_source, xslt_path('relations'), Document.relations_xml_file)
       source = xslt(stylesheet_name: 'cleanup').transform(original_source)
 
-      add_footnotes(source.css("footnote").map{ |footnote| footnote.text })
+      # add_footnotes(source.css("footnote").map{ |footnote| footnote.text })
 
       transform_and_replace(source, xslt_path('numbering'), Document.numbering_xml_file)
       transform_doc_xml(source, extras)

data/lib/avv2word/version.rb

@@ -1,3 +1,3 @@
 module Avv2word
-  VERSION = '1.1.24'
+  VERSION = '1.1.25'
 end

data/lib/avv2word/xslt/base.xslt

@@ -391,6 +391,16 @@
             <w:vertAlign w:val="superscript"/>
           </w:rPr>
         </xsl:if>
+
+        <xsl:if test="ancestor::*[@data-avv-color]">
+          <xsl:variable name="color">
+            <xsl:value-of select="../@data-avv-color | ../../@data-avv-color | ../../../@data-avv-color | ../../../../@data-avv-color"/>
+          </xsl:variable>
+          <w:rPr>
+            <w:color w:val="{$color}"/>
+          </w:rPr>
+        </xsl:if>
+
         <w:t xml:space="preserve"><xsl:value-of select="."/></w:t>
       </w:r>
     </xsl:if>

data/lib/avv2word/xslt/cleanup.xslt

@@ -60,6 +60,10 @@
   <xsl:template match="strike"><s><xsl:apply-templates/></s></xsl:template>
   <xsl:template match="strong"><b><xsl:apply-templates/></b></xsl:template>
 
+  <xsl:template match="u[@data-avv-color]"><xsl:variable name="color"><xsl:value-of select="./@data-avv-color"/></xsl:variable><u data-avv-color="{$color}"><xsl:apply-templates/></u></xsl:template>
+  <xsl:template match="em[@data-avv-color]"><xsl:variable name="color"><xsl:value-of select="./@data-avv-color"/></xsl:variable><i data-avv-color="{$color}"><xsl:apply-templates/></i></xsl:template>
+  <xsl:template match="strong[@data-avv-color]"><xsl:variable name="color"><xsl:value-of select="./@data-avv-color"/></xsl:variable><b data-avv-color="{$color}"><xsl:apply-templates/></b></xsl:template>
+
   <!-- Block elements transformations -->
   <xsl:template match="section"><div class="{@class}" style="{@style}"><xsl:apply-templates/></div></xsl:template>
   <xsl:template match="article"><div  class="{@class}" style="{@style}"><xsl:apply-templates/></div></xsl:template>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avv2word
 version: !ruby/object:Gem::Version
-  version: 1.1.24
+  version: 1.1.25
 platform: ruby
 authors:
 - Marián Bilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack