avv2word 1.1.34 → 1.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ac8c2201742521a8490bbfc7d4dd37c48b266a55a0433523eb77673c2a4f7e1
-  data.tar.gz: f07a18f6d7e78f77ad2514f83bed08289d9e556ccbbc13741fd0583fdc0e3d6b
+  metadata.gz: 59f44cae1d61b429b6ceb5f036cb04e70aaaae15150b022613bc96c364ea780b
+  data.tar.gz: a4c70ccaa942030d0956237f742dce592e9ac22be38fb77bcb046be3f2e6e592
 SHA512:
-  metadata.gz: 12578f80fa3c9bbd6e406a2f81ce125c0af34042d898aad7888e2f50233d3341c3604ed8103f92efdf4361029d425e45c67e74c906782a84022f8e37cf910e54
-  data.tar.gz: 23e13191db0523d71321d8507136e1e499bb39e49da54586f7596311043a9141bffaaffc1c1d192ddf1e71613f404fb0e125429f8d3e45fa3c6e1270c945f645
+  metadata.gz: e7aea5342d342836f05899292734da481f06271aca81a032907033d2fab6e8d0a5e458bddc5d429dc11f76a46a7cbe237e02c98d7706a92bf71f175d9686f4b5
+  data.tar.gz: b562e13f6c6a6faaf68466df39d0ffe791c87156bc51699d399d60e6fcfd9370e5c8554856fb43de8136b85a4a6f2b7d71243d165a820722d6bd4278600ba807

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)
@@ -269,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:rPr><w:sz w:val="14"/></w:rPr></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

data/lib/avv2word/version.rb

@@ -1,3 +1,3 @@
 module Avv2word
-  VERSION = '1.1.34'
+  VERSION = '1.1.39'
 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>
 
@@ -571,7 +579,7 @@
     <xsl:number level="any" count="insert" format="1"/>
     <w:ins w:id="{format-number(count(preceding::insert)+1,'0')}">
       <w:r>
-        <w:t><xsl:value-of select="."/></w:t>
+        <w:t xml:space="preserve"><xsl:value-of select="."/></w:t>
       </w:r>
     </w:ins>
   </xsl:template>
@@ -580,7 +588,7 @@
     <xsl:number level="any" count="delete" format="1"/>
     <w:del w:id="{format-number(count(preceding::delete)+1,'0')}">
       <w:r>
-        <w:delText><xsl:value-of select="."/></w:delText>
+        <w:delText xml:space="preserve"><xsl:value-of select="."/></w:delText>
       </w:r>
     </w:del>
   </xsl:template>

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::delete|self::insert|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>

data/lib/avv2word/xslt/tables.xslt

@@ -32,14 +32,15 @@
         <xsl:choose>
           <xsl:when test="string-length(normalize-space($ind_left)) > 0">
             <w:tblW w:w="{9360 - $ind_left}" w:type="dxa"/>
+            <!--table indent left-->
+            <w:tblInd w:w="{115 + $ind_left}" w:type="dxa"/>
           </xsl:when>
           <xsl:otherwise>
             <w:tblW w:w="9360" w:type="dxa"/>
+            <w:tblInd w:w="115" w:type="dxa"/>
           </xsl:otherwise>
         </xsl:choose>
 
-        <!--table indent left-->
-        <w:tblInd w:w="{$ind_left}" w:type="dxa"/>
         <!--table indent left, top; works in word without margin(?), not in libre-->
         <!--<w:tblpPr w:leftFromText="180" w:rightFromText="180" w:vertAnchor="text" w:horzAnchor="page" w:tblpX="{$ind_left}" w:tblpY="{$ind_top}"/>-->
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avv2word
 version: !ruby/object:Gem::Version
-  version: 1.1.34
+  version: 1.1.39
 platform: ruby
 authors:
 - Marián Bilas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack