isodoc 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa741392b5d89abbcf094f509b027de84b74d1bc543d8395a587b7a556db543
-  data.tar.gz: 4e9b4445b54e495a5cbfbecfa43ccde77b28923b5a569dc8ccbe464f672b05c0
+  metadata.gz: 60180ddd274fec56a00a852e6068ef112c6b743c94a022022de6f52bd7ad8d68
+  data.tar.gz: bbaa6413c5205ee6e1e3abc7debce481537d291161f8600ffa3363920242c698
 SHA512:
-  metadata.gz: cb34c6d612f0a0b814df38a0851831fdfbaece00e05532af45445db8e07851aefff9e4cea8af3d7ebb0e48ae6d6a809b6a5c5f03571982e21099eb993ee3a7c1
-  data.tar.gz: 21b9ca3ed5740d82f8f41a26897ed76e5a7b6c6603c79c71db5467b2e9220315cd876b12b78709b9a2415357aa861399cd78000e4050d15fe5c736bd6d1de0a0
+  metadata.gz: 1d2acafc4783382f3f16fc09503cc8ade62cbacfec22c350122d22fc32820b16600cb53795061ab590a31bbdc2bc03edb1be22a7e916607da8161c1df332c3d5
+  data.tar.gz: 82fc816103195b36a79c3ffc578b008166eb7f0b2180acb11e74f71ed58f41ab23b88ea0c1f903e60976c45639b9eecc97ed743b0b10b86efea41ad17d179cb2

data/isodoc.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "nokogiri", ">= 1.10.4"
   spec.add_dependency "thread_safe"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "html2doc", "~> 0.9.0"
+  spec.add_dependency "html2doc", "~> 1.0.0"
   spec.add_dependency "liquid"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "sassc", "~> 2.2.1"

data/lib/isodoc/base_style/blocks.scss

@@ -45,10 +45,6 @@
 @mixin sourceBlock($colorBg, $colorFg: null) {
   @include monospaceBlockStyle();
 
-  .SourceTitle {
-    @include blockTitle();
-  }
-
   @if $colorFg {
     color: $colorFg;
   }
@@ -59,7 +55,7 @@
   padding: 1.5em;
   margin: 2em 0 1em 0;
   overflow-y: auto;
-  overflow-x: scroll;;
+  overflow-x: scroll;
 }
 
 @mixin pseudocodeBlock($colorBg, $colorFg: null) {

data/lib/isodoc/function/cleanup.rb

@@ -161,5 +161,13 @@ module IsoDoc::Function
 
     def symbols_cleanup(docxml)
     end
+
+    def table_footnote_reference_format(a)
+      a
+    end
+
+    def footnote_reference_format(a)
+      a
+    end
   end
 end

data/lib/isodoc/html_function/postprocess.rb

@@ -27,9 +27,9 @@ module IsoDoc::HtmlFunction
     end
 
     def html_cleanup(x)
-      footnote_backlinks(html_toc(
+      footnote_format(footnote_backlinks(html_toc(
         term_header((html_footnote_filter(html_preface(htmlstyle(x))))))
-                        )
+                        ))
     end
 
     def htmlstylesheet
@@ -199,8 +199,20 @@ module IsoDoc::HtmlFunction
       docxml
     end
 
+    def footnote_format(docxml)
+      docxml.xpath("//a[@epub:type = 'footnote']/sup").each do |x|
+        footnote_reference_format(x)
+      end
+      docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
+                   "//span[@class = 'TableFootnoteRef']").each do |x|
+        table_footnote_reference_format(x)
+      end
+      docxml
+    end
+
     def sourcecode_highlighter
-      '<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>'
+      '<script src="https://cdn.rawgit.com/google/code-prettify/master/'\
+        'loader/run_prettify.js"></script>'
     end
 
     MATHJAX_ADDR =

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.18".freeze
+  VERSION = "1.0.19".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -17,8 +17,8 @@ module IsoDoc::WordFunction
     end
 
     def make_body1(body, _docxml)
-      FileUtils.rm_rf tmpimagedir
-      FileUtils.mkdir tmpimagedir
+      #FileUtils.rm_rf tmpimagedir
+      #FileUtils.mkdir tmpimagedir
       body.div **{ class: "WordSection1" } do |div1|
         div1.p { |p| p << "&nbsp;" } # placeholder
       end

data/lib/isodoc/word_function/postprocess.rb

@@ -73,6 +73,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       word_image_caption(docxml)
       word_section_breaks(docxml)
       authority_cleanup(docxml)
+      word_footnote_format(docxml)
       docxml
     end
 
@@ -208,5 +209,18 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
         ins << m.remove
       end
     end
+
+    def word_footnote_format(docxml)
+      # the content is in a[@epub:type = 'footnote']//sup, but in Word, 
+      # we need to inject content around the autonumbered footnote reference
+      docxml.xpath("//a[@epub:type = 'footnote']").each do |x|
+        footnote_reference_format(x)
+      end
+      docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
+                   "//span[@class = 'TableFootnoteRef']").each do |x|
+        table_footnote_reference_format(x)
+      end
+      docxml
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement