avv2word 1.1.35 → 1.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22649a981aaa0b261182f3879383dc816926f93f2d339a9a6ba6094b6e1e705b
-  data.tar.gz: f245d794707684a9ba796ad549b27476cd382dbf09104b48dbbba36c127eb145
+  metadata.gz: fb52c5deb88c67448608c3af250a1773ea4a9ad115f4542ed82fd3c74be2a3d5
+  data.tar.gz: 9d1cbc3acde39f6af4a0ed2b71fe7665fa5f7622d53cdb0f0ea969d67067cb10
 SHA512:
-  metadata.gz: 9036348f988e8bb170ae4d1cf971ae64960a88c2ecc60742e6adbd1a75fa943750ba1f55bea579c9513c062caad4a69c0c3d7867d411e42b13c99097ceef568c
-  data.tar.gz: d33165d44bc3092a5eb248e2e3f0795d272ff3d079308e8bff85b13e285d4932c674f8d1f29ca010df562825643406444add570e63e35c90d731bdead0c82ad9
+  metadata.gz: 65b1c15f4dc463c8cf651a9707ba4f0280b67913020e2aadd5a38c6028169f9a97200905edc78aa4aff68bc94cc352652410e43ddb228cf26a7405d1854245b2
+  data.tar.gz: 1622e8b3a15022bbe4878e3a628ff055d2921832a3e0c3989b3c1088f03b9c52962733417ba9c97cfb2724bf7e675f6f2048350d5875a30bd66574270daba7f6

data/lib/avv2word/document.rb

@@ -269,8 +269,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.35'
+  VERSION = '1.1.36'
 end

data/lib/avv2word/xslt/base.xslt

@@ -280,7 +280,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:
 

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... -->

metadata

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