avv2word 1.1.21 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12608a2eee602a49862149373bcca101d30c41dda0f01299aafcddc82339fc5d
-  data.tar.gz: 777335a6b1c245634f6f5c489838c586fe44c281fdf628deb089550b0281143e
+  metadata.gz: 18ca63416516a26399bd8a8bc4fdb124b154a5378a75402a4fe73f1beb7a4513
+  data.tar.gz: 46ea7f727f63f50582f3ab6a4b017a860b6005be74f5e3a7e6ec2a0502cb7588
 SHA512:
-  metadata.gz: 6844840f037c70f8643ff54f21f533fb55f68606879aa72f4c41266e483e8183a138ade09c9dec28154f783a01271da4ff45518707c4218037616a4d10c2932e
-  data.tar.gz: 51790dc531a1be5fd1aac15e5194f13a835e6534635c255cbc4eacd2cd01aba2982b44cab2531ca484199d93973fa46f54158902ca3b75d1612317d11433540b
+  metadata.gz: 4cd938448158a6c89947bf8333f69524c6569df29ad205baa9e74acd431d1119ee20dfe38768709f1dc6c467ef615487e3ed38425e35ae505a90e77600a976a8
+  data.tar.gz: 6c09d87a1fd542ce1a5251cc9031e5bb8b9089f344189c50036090ed80fc1fe0d8bbfba29c74c85fb300155e782e6293fc6518c95f50be341dc0ab348eb5f4e4

data/lib/avv2word/document.rb

@@ -208,15 +208,66 @@ module Avv2word
         fn_node2.xpath("w:p/w:r/w:t").first.content = " " + footnote
       end
       fn_node.remove
-
       @replaceable_files["word/footnotes.xml"] = doc.to_xml
+
       # add relation
       rels = Nokogiri::XML(@replaceable_files["word/_rels/document.xml.rels"])
-      new_rel = '<Relationship Id="rIdXX" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes" Target="footnotes.xml"/>'
-      new_rel.sub!(/XX/, (rels.xpath("//xmlns:Relationship").size+1).to_s )
-      new_rel = Nokogiri::XML.parse(new_rel).child
-      rels.children.first << new_rel
+      [ #'<Relationship Id="rIdXX" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes" Target="endnotes.xml"/>',
+      '<Relationship Id="rIdXX" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes" Target="footnotes.xml"/>'
+      ].each do |new_rel|
+        new_rel.sub!(/XX/, (rels.xpath("//xmlns:Relationship").size+1).to_s )
+        rels.children.first << Nokogiri::XML.parse(new_rel).child
+      end
       @replaceable_files["word/_rels/document.xml.rels"] = rels.to_xml
+
+      # settings
+      if @replaceable_files["word/settings.xml"]
+        sets = Nokogiri::XML(@replaceable_files["word/settings.xml"])
+      else
+        sets = nil
+        Zip::File.open(@template_path) do |zipfile|
+          sets = Nokogiri::XML.parse(zipfile.read("word/settings.xml"))
+        end
+      end
+      ['<w:footnotePr><w:footnote w:id="-1"/><w:footnote w:id="0"/></w:footnotePr>',
+      #'<w:endnotePr><w:endnote w:id="-1"/><w:endnote w:id="0"/></w:endnotePr>'
+      ].each do |new_type|
+        sets.children.first << Nokogiri::XML.parse(new_type).child
+      end
+      @replaceable_files["word/settings.xml"] = sets.to_xml
+
+      # styles
+      if @replaceable_files["word/styles.xml"]
+        styles = Nokogiri::XML(@replaceable_files["word/styles.xml"])
+      else
+        styles = nil
+        Zip::File.open(@template_path) do |zipfile|
+          styles = Nokogiri::XML.parse(zipfile.read("word/styles.xml"))
+        end
+      end
+      [ '<w:style w:type="paragraph" w:styleId="FootnoteText"><w:name w:val="footnote text"/><w:basedOn w:val="Normal"/><w:link w:val="FootnoteTextChar"/><w:uiPriority w:val="99"/><w:semiHidden/><w:unhideWhenUsed/><w:rsid w:val="008D12FB"/></w:style>',
+        '<w:style w:type="character" w:customStyle="1" w:styleId="FootnoteTextChar"><w:name w:val="Footnote Text Char"/><w:basedOn w:val="DefaultParagraphFont"/><w:link w:val="FootnoteText"/><w:uiPriority w:val="99"/><w:semiHidden/><w:rsid w:val="008D12FB"/></w:style>',
+        '<w:style w:type="character" w:styleId="FootnoteReference"><w:name w:val="footnote reference"/><w:basedOn w:val="DefaultParagraphFont"/><w:uiPriority w:val="99"/><w:semiHidden/><w:unhideWhenUsed/><w:rsid w:val="008D12FB"/><w:rPr><w:vertAlign w:val="superscript"/></w:rPr></w:style>'
+      ].each do |new_style|
+        styles.children.first << Nokogiri::XML.parse(new_style).child
+      end
+      [ '<w:lsdException w:name="footnote text" w:semiHidden="1" w:unhideWhenUsed="1"/>',
+        '<w:lsdException w:name="footnote reference" w:semiHidden="1" w:unhideWhenUsed="1"/>'
+      ].each do |new_latent_style|
+        styles.xpath("/w:styles/w:latentStyles").first << Nokogiri::XML.parse(new_latent_style).child
+      end
+      @replaceable_files["word/styles.xml"] = styles.to_xml
+
+      # content type
+      Zip::File.open(@template_path) do |zipfile|
+        types = Nokogiri::XML.parse(zipfile.read("[Content_Types].xml"))
+        [ # '<Override PartName="/word/endnotes.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml"/>',
+        '<Override PartName="/word/footnotes.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml"/>'
+        ].each do |new_type|
+          types.children.first << Nokogiri::XML.parse(new_type).child
+        end
+        @replaceable_files["[Content_Types].xml"] = types.to_xml
+      end
     end
 
     def inject_image_relations(relations, noko_html_source)

data/lib/avv2word/version.rb

@@ -1,3 +1,3 @@
 module Avv2word
-  VERSION = '1.1.21'
+  VERSION = '1.1.22'
 end

data/lib/avv2word/xslt/footnote.xslt

@@ -15,7 +15,6 @@
                 xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
                 xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
                 mc:Ignorable="w14 wp14">
-
   <xsl:template match="footnote">
     <xsl:number level="any" count="footnote" format="1"/>
     <w:r>
@@ -23,7 +22,6 @@
         <w:rStyle w:val="FootnoteReference"/>
       </w:rPr>
       <w:footnoteReference w:id="{format-number(count(preceding::footnote)+1,'0')}"/>
-      <xsl:apply-templates select="@*|node()"/>
     </w:r>
   </xsl:template>
 </xsl:stylesheet>

data/lib/avv2word/xslt/numbering.xslt

@@ -74,6 +74,7 @@
             <xsl:with-param name="hanging" select="@hanging"/>
             <xsl:with-param name="style-format" select="@style-format"/>
             <xsl:with-param name="indented-first" select="@indented-first"/>
+            <xsl:with-param name="data-start" select="@data-start"/>
           </xsl:call-template>
           <xsl:call-template name="item"/>
         </w:abstractNum>
@@ -86,6 +87,7 @@
           <xsl:with-param name="hanging" select="@hanging"/>
           <xsl:with-param name="style-format" select="@style-format"/>
           <xsl:with-param name="indented-first" select="@indented-first"/>
+          <xsl:with-param name="data-start" select="@data-start"/>
         </xsl:call-template>
         <xsl:call-template name="item"/>
       </xsl:when>
@@ -121,8 +123,9 @@
     <xsl:param name="hanging" />
     <xsl:param name="style-format" />
     <xsl:param name="indented-first" />
+    <xsl:param name="data-start"/>
     <w:lvl w:ilvl="{$ilvl}">
-      <w:start w:val="1"/>
+      <w:start w:val="{$data-start}"/>
       <w:numFmt w:val="{func:substring-before-if-contains($style, ',')}"/>
       <w:lvlText w:val="{$style-format}"/>
       <w:lvlJc w:val="left"/>

metadata

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