avv2word 1.1.32 → 1.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31e19ebe56e8f9af6892a0f3c9e425d314fde6898672952f34ff7f5000d23ff7
-  data.tar.gz: 2a750cc0c1e6fc0f52e71b1755909dc1bfa613896e196b394e84f9ad10a3a37b
+  metadata.gz: 4dba72f05d26da97e550a062c06917cd8ae4bc0d0aeca8e3ea50b698d1ea37a9
+  data.tar.gz: d20f014128c0e5f421b1c8367969562335f224c6e82fef83da088c41b04f47ce
 SHA512:
-  metadata.gz: 9e5f606383a872b1d64149604df9546d69ae76774e9c78a57f46f73cc97b6db0bf9ab8a27721368132e170afb365a5a09e9d437a169479ef9157d1dc8036e70b
-  data.tar.gz: ece605d7fd55a4d00b6003774297afab490a4ab241d6347342d13c098db97f54230f4cbe5c918bdd4719c4e192bd3eb25d1a6d5027cc56ce876598be6995a4f1
+  metadata.gz: 7ffb19037b6d64ad5a066b2c76d81f7e46c42e2dc5f96e32b5cb1845dcb76a7f79ac97a189b7f339e5fbb336e2869a55d8746dfc2fc40b8e40904ad39bf78b90
+  data.tar.gz: 7c3207c55fd8e6e4779d5714b9f4086deab434470dc43212c66ad46d19867aa1ca56cbc894717989babb698499b801c69c1e43c4bb9fd0b80f4b392a8cb87bbe

data/lib/avv2word/document.rb

@@ -100,6 +100,10 @@ module Avv2word
       def footnotes_xml_file
         'word/footnotes.xml'
       end
+
+      def styles_xml_file
+        'word/styles.xml'
+      end
     end
 
     def initialize(template_path)
@@ -184,6 +188,7 @@ module Avv2word
       local_images(header, :header) if @header
       
       add_footnotes(source.css("footnote").map{ |footnote| footnote.text })
+      add_comments(source.css("comment")) unless source.css("comment").empty?
     end
 
     def transform_doc_xml(source, extras = false)
@@ -194,7 +199,28 @@ module Avv2word
 
     private
 
-    def add_footnotes(footnotes)
+    def add_comments(comments)
+      @replaceable_files["word/comments.xml"] = %(<?xml version="1.0" encoding="UTF-8"?><w:comments xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape" mc:Ignorable="w14 w15 w16se w16cid wp14">)
+      comments.each_with_index do |comment,id|
+        time = comment.attributes["time"].value # 2020-04-29T11:49:00Z
+        author = comment.attributes["author"].value
+        message = comment.attributes["message"].value
+        initials = comment.attributes["initials"].value
+        comment_generator = %Q(<w:comment w:id="#{id}" w:author="#{author}" w:date="#{time}" w:initials="#{initials}"><w:p w14:paraId="2F08968D" w14:textId="06CE6739" w:rsidR="009A6661" w:rsidRDefault="009A6661"><w:pPr><w:pStyle w:val="CommentText"/></w:pPr><w:r><w:rPr><w:rStyle w:val="CommentReference"/></w:rPr><w:annotationRef/></w:r><w:r><w:t>#{message}</w:t></w:r></w:p></w:comment>)
+        @replaceable_files["word/comments.xml"] += comment_generator
+      end
+      @replaceable_files["word/comments.xml"] += "</w:comments>"
+
+      rels = Nokogiri::XML(@replaceable_files["word/_rels/document.xml.rels"])
+      new_rel = %(<Relationship Id="rIdXX" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments" Target="comments.xml"/>)
+      new_rel.sub!(/XX/, (rels.xpath("//xmlns:Relationship").size+1).to_s )
+      rels.children.first << Nokogiri::XML.parse(new_rel).child
+      @replaceable_files["word/_rels/document.xml.rels"] = rels.to_xml
+
+      insert_nodes_to_xml(Document.content_types_xml_file, ['<Override PartName="/word/comments.xml" ContentType="application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml"/>'])
+    end
+
+     def add_footnotes(footnotes)
       if footnotes.empty?
         @replaceable_files["word/footnotes.xml"] = ""
         return
@@ -247,8 +273,8 @@ module Avv2word
           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="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:rsid w:val="008D12FB"/><w:rPr><w:sz w:val="16"/></w:rPr></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: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
@@ -261,15 +287,10 @@ module Avv2word
       @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
+      insert_nodes_to_xml(Document.content_types_xml_file, [
+          # '<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"/>'
+      ])
     end
 
     def inject_relations(relations, noko_html_source)
@@ -363,5 +384,20 @@ module Avv2word
       #return the amended source to be saved into the zip
       doc.to_s
     end
+
+    def insert_nodes_to_xml(target_xml_file, inputs)
+      xml_content =
+          if @replaceable_files[target_xml_file]
+            Nokogiri::XML(@replaceable_files[target_xml_file])
+          else
+            Zip::File.open(@template_path) do |zipfile|
+              Nokogiri::XML.parse(zipfile.read(target_xml_file))
+            end
+          end
+      inputs.each do |new_node|
+        xml_content.children.first << Nokogiri::XML.parse(new_node).child
+      end
+      @replaceable_files[target_xml_file] = xml_content.to_xml
+    end
   end
 end

data/lib/avv2word/version.rb

@@ -1,3 +1,3 @@
 module Avv2word
-  VERSION = '1.1.32'
+  VERSION = '1.1.37'
 end

data/lib/avv2word/xslt/base.xslt

@@ -208,12 +208,16 @@
     <xsl:variable name="ilvl" select="@level"></xsl:variable>
     <xsl:variable name="toc-ref" select="@toc-ref" />
     <xsl:variable name="cross-ref" select="@cross-ref" />
+    <xsl:variable name="docx-style" select="@data-docx-style" />
     <w:p>
       <w:pPr>
         <xsl:choose>
           <xsl:when test="string-length(normalize-space($toc-ref)) > 0">
             <w:pStyle w:val="Heading{$ilvl+1}"/>
           </xsl:when>
+          <xsl:when test="string-length($docx-style) > 0">
+            <w:pStyle w:val="{$docx-style}"/>
+          </xsl:when>
           <xsl:otherwise>
             <w:pStyle w:val="ListParagraph"/>
           </xsl:otherwise>
@@ -280,7 +284,7 @@
     </w:p>
   </xsl:template>
 
-  <xsl:template match="text()[not(parent::li) and not(parent::td) and not(parent::pre) and (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)]">
+  <xsl:template match="text()[(parent::li) and not(parent::td) and not(parent::pre) and (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)]">
     <xsl:comment>
         In the following situation:
 
@@ -413,6 +417,7 @@
   <xsl:template name="text-alignment">
     <xsl:param name="class" select="@class" />
     <xsl:param name="style" select="@style" />
+    <xsl:param name="docx-style" select="@data-docx-style" />
     <xsl:param name="line-height" select="@line-height" />
     <xsl:param name="margin-bottom" select="@margin-bottom" />
     <xsl:param name="margin-top" select="@margin-top" />
@@ -506,6 +511,9 @@
         <w:jc w:val="{$alignment}"/>
       </xsl:when>
     </xsl:choose>
+        <xsl:if test="string-length($docx-style) > 0">
+          <w:pStyle w:val="{$docx-style}"/>
+        </xsl:if>
       </w:pPr>
   </xsl:template>
 
@@ -585,4 +593,16 @@
     </w:del>
   </xsl:template>
 
+  <xsl:template match="comment">
+    <xsl:number level="any" count="comment" format="1"/>
+    <w:commentRangeStart w:id="{format-number(count(preceding::comment),'0')}"/>
+      <w:r>
+        <w:t xml:space="preserve"><xsl:value-of select="."/></w:t>
+      </w:r>
+    <w:commentRangeEnd w:id="{format-number(count(preceding::comment),'0')}"/>
+    <w:r>
+      <w:commentReference w:id="{format-number(count(preceding::comment),'0')}"/>
+    </w:r>
+  </xsl:template>
+
 </xsl:stylesheet>

data/lib/avv2word/xslt/inline_elements.xslt

@@ -18,7 +18,7 @@
       <xsl:attribute name="style"><xsl:value-of select="../@style"/></xsl:attribute>
       <xsl:call-template name="inlineElement"/>
     </div>
-    <xsl:apply-templates select="following-sibling::node()[not((self::a|self::b|self::i|self::s|self::span|self::sub|self::sup|self::u|self::text())[parent::div|parent::li|parent::td])][1]"/>
+    <xsl:apply-templates select="following-sibling::node()[not((self::a|self::b|self::i|self::s|self::span|self::sub|self::sup|self::u|self::delete|self::insert|self::cross-ref|self::text())[parent::div|parent::li|parent::td])][1]"/>
   </xsl:template>
 
   <!-- get following inline elements... -->
@@ -36,6 +36,6 @@
     <xsl:copy>
       <xsl:apply-templates select="@*|node()[1]"/>
     </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()|self::insert|self::delete]"/>
+    <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()|self::insert|self::delete|self::cross-ref]"/>
   </xsl:template>
 </xsl:stylesheet>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avv2word
 version: !ruby/object:Gem::Version
-  version: 1.1.32
+  version: 1.1.37
 platform: ruby
 authors:
 - Marián Bilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack