isodoc 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e082597aff2415338a5b2da3d30bc03c00fd4c27d4e582084680efea7e54ecd6
-  data.tar.gz: cc31894370e9a50dde359a87b691c05fdf20845bc00052012d562a74b1113872
+  metadata.gz: 6f70c0cba186e39bd9deeabc346d5665abee6eafaea99ce59c6ae126d468a401
+  data.tar.gz: 5a697a7da8270b68b1f325c6565de311b79ec13f64cd5b1420e942df91bd1a22
 SHA512:
-  metadata.gz: bdab9417834b8ecba230e865f7c140d27dc6d41dbb95b15b9d95335e423d36d423541c78c062220125fef4de2b7228c027f432429cb021badf6189eece6e7462
-  data.tar.gz: b903fc09c60b5ff0881f258f21f991c2770f6b1a5df434ac9964cc105de402b7eef75f5d5b9c7f97e9dd1abf7926226a68e217de03fab7c0f9bde314cf279927
+  metadata.gz: 33ee7e92975ca29141b268e7a376dc9ca546bcf80a4d9c66f25c722e26480c475f5b978e7909b1fa66a69817eb28454842ef186e966267ca544aed3bb767af75
+  data.tar.gz: b5a1c0cf97f04fe1dc30e0bccb87f50a83da3d059ed4d46a05580b433054c5f8abdd7fb64d89cdaf458127f469c3e7f00b0d4015f1a2e91aec5dfb9198dd82c5

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.4)
+    isodoc (0.9.5)
       asciimath
       html2doc (~> 0.8.1)
       htmlentities (~> 4.3.4)
       liquid
       metanorma (~> 0.2.7)
       nokogiri
+      rake (~> 12.0)
       roman-numerals
       ruby-xslt
       sassc (~> 1.12.1)
@@ -98,14 +99,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.2)
+    rubocop (0.60.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.10.0)
     ruby-xslt (0.9.10)
     ruby_dep (1.5.0)
@@ -139,7 +140,6 @@ DEPENDENCIES
   guard (~> 2.14)
   guard-rspec (~> 4.7)
   isodoc!
-  rake (~> 12.0)
   rspec (~> 3.6)
   rubocop (~> 0.50)
   simplecov (~> 0.15)

data/isodoc.gemspec

@@ -39,13 +39,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roman-numerals"
   spec.add_dependency "sassc", "~> 1.12.1"
   spec.add_dependency "metanorma", "~> 0.2.7"
+  spec.add_dependency "rake", "~> 12.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 0.50"
   spec.add_development_dependency "simplecov", "~> 0.15"

data/lib/isodoc/function/section.rb

@@ -105,7 +105,7 @@ module IsoDoc::Function
     end
 
     def term_defs_boilerplate(div, source, term, preface)
-      source.each { |s| @anchors[s["bibitemid"]] or warn "#{s['bibitemid']} not referenced" }
+      source.each { |s| @anchors[s["bibitemid"]] or warn "term source #{s['bibitemid']} not referenced" }
       if source.empty? && term.nil?
         div << @no_terms_boilerplate
       else

data/lib/isodoc/html_function/html.rb

@@ -42,8 +42,9 @@ module IsoDoc::HtmlFunction
     end
 
     def toHTML(result, filename)
-      result = script_cdata(from_xhtml(html_cleanup(to_xhtml(result))))
+      result = (from_xhtml(html_cleanup(to_xhtml(result))))
       result = populate_template(result, :html)
+      result = script_cdata(from_xhtml(move_images(to_xhtml(result))))
       File.open("#{filename}.html", "w:UTF-8") do |f|
         f.write(result)
       end
@@ -51,7 +52,7 @@ module IsoDoc::HtmlFunction
 
     def html_cleanup(x)
       footnote_backlinks(html_toc(
-        term_header(move_images(html_footnote_filter(html_preface(htmlstyle(x))))))
+        term_header((html_footnote_filter(html_preface(htmlstyle(x))))))
                         )
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.4".freeze
+  VERSION = "0.9.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement