isodoc 2.1.0.2 → 2.1.2.1

data/lib/isodoc/gem_tasks.rb

@@ -8,14 +8,20 @@ module IsoDoc
   module GemTasks
     extend Rake::DSL if defined? Rake::DSL
 
+    @@css_list = []
+
     module_function
 
+    def self.css_list
+      @@css_list
+    end
+
     def install
       rule ".css" => [proc { |tn| tn.sub(/\.css$/, ".scss") }] do |current_task|
         puts(current_task)
         compile_scss_task(current_task)
       rescue StandardError => e
-        notify_borken_compilation(e, current_task)
+        notify_broken_compilation(e, current_task)
       end
 
       scss_files = Rake::FileList["lib/**/*.scss"]
@@ -40,25 +46,27 @@ module IsoDoc
       end
     end
 
-    def notify_borken_compilation(error, current_task)
+    def interactive?
+      ENV["CI"] == nil
+    end
+
+    def notify_broken_compilation(error, current_task)
       puts("Cannot compile #{current_task} because of #{error.message}")
+      return unless interactive?
+
       puts("continue anyway[y|n]?")
-      answer = STDIN.gets.strip
-      if %w[y yes].include?(answer.strip.downcase)
-        puts("Cannot compile #{current_task} because of #{error.message}")
-      else
-        exit(0)
-      end
+      answer = $stdin.gets.strip
+      exit(0) unless %w[y yes].include?(answer.strip.downcase)
     end
 
     def git_cache_compiled_files
-      CLEAN.each do |css_file|
+      @@css_list.each do |css_file|
         sh "git add #{css_file}"
       end
     end
 
     def git_rm_compiled_files
-      CLEAN.each do |css_file|
+      @@css_list.each do |css_file|
         sh "git rm --cached #{css_file}"
       end
     end
@@ -129,6 +137,7 @@ module IsoDoc
       File.open(compiled_path, "w:UTF-8") do |f|
         f.write(content)
       end
+      @@css_list << compiled_path
       CLEAN << compiled_path
     end
   end

data/lib/isodoc/html_function/html.rb

@@ -20,7 +20,7 @@ module IsoDoc
         return if @bare
 
         body.div **{ class: "title-section" } do |div1|
-          div1.p { |p| p << "&nbsp;" } # placeholder
+          div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
@@ -29,7 +29,7 @@ module IsoDoc
         return if @bare
 
         body.div **{ class: "prefatory-section" } do |div2|
-          div2.p { |p| p << "&nbsp;" } # placeholder
+          div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end

data/lib/isodoc/i18n.rb

@@ -23,3 +23,22 @@ module IsoDoc
     end
   end
 end
+
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |_, v1, v2|
+      if Hash === v1 && Hash === v2
+        v1.merge(v2, &merger)
+      elsif Array === v1 && Array === v2
+        v1 | v2
+      elsif [:undefined, nil,
+             :nil].include?(v2)
+        v1
+      else
+        v2
+      end
+    }
+    merge(second.to_h, &merger)
+  end
+end
+

data/lib/isodoc/metadata.rb

@@ -11,8 +11,8 @@ module IsoDoc
       Common::ns(xpath)
     end
 
-    def l10n(a, b, c)
-      @i18n.l10n(a, b, c)
+    def l10n(expr, lang, script)
+      @i18n.l10n(expr, lang, script)
     end
 
     def initialize(lang, script, i18n, fonts_options = {})

data/lib/isodoc/presentation_function/block.rb

@@ -31,7 +31,7 @@ module IsoDoc
       return if labelled_ancestor(elem)
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, " — ",
+      prefix_name(elem, " — ",
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 
@@ -60,7 +60,7 @@ module IsoDoc
             else
               l10n("#{@i18n.example} #{n[:label]}")
             end
-      prefix_name(elem, " — ", lbl, "name")
+      prefix_name(elem, " — ", lbl, "name")
     end
 
     def note(docxml)
@@ -130,7 +130,7 @@ module IsoDoc
       return if elem["unnumbered"] && !elem.at(ns("./name"))
 
       n = @xrefs.anchor(elem["id"], :label, false)
-      prefix_name(elem, " — ", l10n("#{lower2cap @i18n.table} #{n}"),
+      prefix_name(elem, " — ", l10n("#{lower2cap @i18n.table} #{n}"),
                   "name")
     end
 

data/lib/isodoc/presentation_function/image.rb

@@ -32,7 +32,7 @@ module IsoDoc
       return if elem.at(ns("./figure")) && !elem.at(ns("./name"))
 
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
-      prefix_name(elem, " — ",
+      prefix_name(elem, " — ",
                   l10n("#{lower2cap @i18n.figure} #{lbl}"), "name")
     end
 

data/lib/isodoc/presentation_function/inline.rb

@@ -158,7 +158,7 @@ module IsoDoc
     # TODO: move to localization file
     def eref_localities1_zh(_target, type, from, upto, node)
       ret = "第#{from}" if from
-      ret += "–#{upto}" if upto
+      ret += "–#{upto}" if upto
       loc = eref_locality_populate(type, node)
       ret += " #{loc}" unless node["droploc"] == "true"
       ret
@@ -172,19 +172,20 @@ module IsoDoc
         return l10n(eref_localities1_zh(target, type, from, upto, node))
       ret = eref_locality_populate(type, node)
       ret += " #{from}" if from
-      ret += "–#{upto}" if upto
+      ret += "–#{upto}" if upto
       l10n(ret)
     end
 
     def eref_locality_populate(type, node)
       return "" if node["droploc"] == "true"
 
-      loc = @i18n.locality[type] || type.sub(/^locality:/, "")
-      loc = case node["case"]
+      loc = type.sub(/^locality:/, "")
+      ret = @i18n.locality[loc] || loc
+      ret = case node["case"]
             when "lowercase" then loc.downcase
-            else Metanorma::Utils.strict_capitalize_first(loc)
+            else Metanorma::Utils.strict_capitalize_first(ret)
             end
-      " #{loc}"
+      " #{ret}"
     end
 
     def xref(docxml)
@@ -226,6 +227,12 @@ module IsoDoc
       end
     end
 
+    def identifier(docxml)
+      docxml.xpath(ns("//identifier")).each do |n|
+        n.name = "tt"
+      end
+    end
+
     private
 
     def found_matching_variant_sibling(node)

data/lib/isodoc/presentation_function/section.rb

@@ -56,7 +56,7 @@ module IsoDoc
 
     def single_term_clause(elem)
       t = elem.at(ns("./terms | ./definitions | ./references"))
-      t.at(ns("./title")).remove
+      t.at(ns("./title"))&.remove
       t.xpath(ns(".//clause | .//terms | .//definitions | .//references"))
         .each do |c|
           tit = c.at(ns("./title")) or return
@@ -84,6 +84,8 @@ module IsoDoc
     end
 
     def bibitem(xml)
+      @xrefs.klass.implicit_reference(xml) and
+        xml["hidden"] = "true"
       bibrender(xml)
     end
 

data/lib/isodoc/presentation_function/xrefs.rb

@@ -26,24 +26,39 @@ module IsoDoc
     def anchor_linkend1(node)
       linkend = @xrefs.anchor(node["target"], :xref)
       container = @xrefs.anchor(node["target"], :container, false)
-      (container && get_note_container_id(node) != container &&
-       @xrefs.get[node["target"]]) and
+      prefix_container?(container, node) and
         linkend = prefix_container(container, linkend, node["target"])
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
+    def prefix_container?(container, node)
+      type = @xrefs.anchor(node["target"], :type)
+      container &&
+        get_note_container_id(node, type) != container &&
+        @xrefs.get[node["target"]]
+    end
+
     def combine_xref_locations(node)
       locs = gather_xref_locations(node)
       linkend = if can_conflate_xref_rendering?(locs)
-                  out = locs.each { |l| l[:target] = anchor_value(l[:target]) }
-                  l10n("#{locs.first[:elem]} #{combine_conn(out)}")
+                  combine_conflated_xref_locations(locs)
                 else
-                  out = locs.each { |l| l[:target] = anchor_linked1(l[:node]) }
+                  out = locs.each { |l| l[:target] = anchor_linkend1(l[:node]) }
                   l10n(combine_conn(out))
                 end
       capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
+    def combine_conflated_xref_locations(locs)
+      out = locs.each { |l| l[:target] = anchor_value(l[:target]) }
+      ret = l10n("#{locs.first[:elem]} #{combine_conn(out)}")
+      container = @xrefs.anchor(locs.first[:node]["target"], :container,
+                                false)
+      prefix_container?(container, locs.first[:node]) and
+        ret = prefix_container(container, ret, locs.first[:node]["target"])
+      ret
+    end
+
     def gather_xref_locations(node)
       node.xpath(ns("./location")).each_with_object([]) do |l, m|
         type = @xrefs.anchor(l["target"], :type)
@@ -74,7 +89,8 @@ module IsoDoc
     end
 
     def can_conflate_xref_rendering?(locs)
-      !locs.all? { |l| l[:container].nil? } &&
+      (locs.all? { |l| l[:container].nil? } ||
+       locs.all? { |l| l[:container] == locs.first[:container] }) &&
         locs.all? { |l| l[:type] == locs[0][:type] }
     end
 

data/lib/isodoc/presentation_xml_convert.rb

@@ -68,6 +68,7 @@ module IsoDoc
       quotesource docxml
       mathml docxml
       variant docxml
+      identifier docxml
     end
 
     def terms(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.1.0.2".freeze
+  VERSION = "2.1.2.1".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -20,7 +20,7 @@ module IsoDoc
 
       def make_body1(body, _docxml)
         body.div **{ class: "WordSection1" } do |div1|
-          div1.p { |p| p << "&nbsp;" } # placeholder
+          div1.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
@@ -34,7 +34,7 @@ module IsoDoc
           introduction docxml, div2
           preface docxml, div2
           acknowledgements docxml, div2
-          div2.p { |p| p << "&nbsp;" } # placeholder
+          div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
@@ -64,7 +64,7 @@ module IsoDoc
       def para_parse(node, out)
         out.p **attr_code(para_attrs(node)) do |p|
           unless @termdomain.empty?
-            p << "&lt;#{@termdomain}&gt; "
+            p << "&#x3c;#{@termdomain}&#x3e; "
             @termdomain = ""
           end
           node.children.each { |n| parse(n, p) unless n.name == "note" }
@@ -92,8 +92,10 @@ module IsoDoc
       end
 
       def dl_parse_table(node, out)
+        list_title_parse(node, out)
         out.table **{ class: "dl" } do |v|
-          node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
+          node.elements.select { |n| dt_dd?(n) }
+            .each_slice(2) do |dt, dd|
             dl_parse_table1(v, dt, dd)
           end
           dl_parse_notes(node, v)
@@ -112,11 +114,12 @@ module IsoDoc
       end
 
       def dl_parse_notes(node, out)
-        return if node.elements.reject { |n| dt_dd? n }.empty?
+        remainder = node.elements.reject { |n| dt_dd?(n) || n.name == "name" }
+        return if remainder.empty?
 
         out.tr do |tr|
           tr.td **{ colspan: 2 } do |td|
-            node.elements.reject { |n| dt_dd? n }.each { |n| parse(n, td) }
+            remainder.each { |n| parse(n, td) }
           end
         end
       end

data/lib/isodoc/word_function/postprocess.rb

@@ -187,7 +187,7 @@ module IsoDoc
           next unless t.children.empty?
 
           t["style"] = t["style"].sub(/;?$/, ";font-size:0pt;")
-          t.children = " "
+          t.children = " "
         end
       end
 

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -60,7 +60,7 @@ module IsoDoc
           <span lang="EN-GB"><span
             style='mso-element:field-begin'></span><span
             style='mso-spacerun:yes'>&#xA0;</span>TOC
-            \\o &quot;1-#{level}&quot; \\h \\z \\u <span
+            \\o "1-#{level}" \\h \\z \\u <span
             style='mso-element:field-separator'></span></span>
         TOC
       end
@@ -68,7 +68,7 @@ module IsoDoc
       WORD_TOC_SUFFIX1 = <<~TOC.freeze
         <p class="MsoToc1"><span lang="EN-GB"><span
           style='mso-element:field-end'></span></span><span
-          lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
+          lang="EN-GB"><o:p>&#xA0;</o:p></span></p>
       TOC
 
       def make_WordToC(docxml, level)
@@ -86,7 +86,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle&quot;
+        \\h \\z \\t "RecommendationTitle,RecommendationTestTitle,recommendationtitle,recommendationtesttitle"
         <span style='mso-element:field-separator'></span></span>
       TOC
 
@@ -94,7 +94,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;TableTitle,tabletitle&quot; <span
+        \\h \\z \\t "TableTitle,tabletitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 
@@ -102,7 +102,7 @@ module IsoDoc
         <span lang="EN-GB"><span
         style='mso-element:field-begin'></span><span
         style='mso-spacerun:yes'>&#xA0;</span>TOC
-        \\h \\z \\t &quot;FigureTitle,figuretitle&quot; <span
+        \\h \\z \\t "FigureTitle,figuretitle" <span
         style='mso-element:field-separator'></span></span>
       TOC
 

data/lib/isodoc/xref/xref_gen.rb

@@ -43,7 +43,7 @@ module IsoDoc
       end
 
       def termnote_anchor_names(docxml)
-        docxml.xpath(ns("//term[termnote]")).each do |t|
+        docxml.xpath(ns("//*[termnote]")).each do |t|
           c = Counter.new
           t.xpath(ns("./termnote")).reject { |n| blank?(n["id"]) }.each do |n|
             c.increment(n)
@@ -57,7 +57,7 @@ module IsoDoc
       end
 
       def termexample_anchor_names(docxml)
-        docxml.xpath(ns("//term[termexample]")).each do |t|
+        docxml.xpath(ns("//*[termexample]")).each do |t|
           examples = t.xpath(ns("./termexample"))
           c = Counter.new
           examples.reject { |n| blank?(n["id"]) }.each do |n|
@@ -148,12 +148,12 @@ module IsoDoc
         c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
         list.xpath(ns("./li")).each do |li|
           label = c.increment(li).listlabel(list, depth)
-          label = "#{prev_label}.#{label}" unless prev_label.empty?
+          label = "#{prev_label}) #{label}" unless prev_label.empty?
           label = "#{list_anchor[:xref]} #{label}" if refer_list
           li["id"] and @anchors[li["id"]] =
-                         { xref: "#{label})", type: "listitem",
-                           container: list_anchor[:container] }
-          li.xpath(ns("./ol")).each do |ol|
+                         { xref: "#{label})", type: "listitem", refer_list:
+                           refer_list, container: list_anchor[:container] }
+          (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
             list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.1.0.2
+  version: 2.1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -399,17 +385,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
-- ".hound.yml"
-- ".oss-guides.rubocop.yml"
-- ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
 - README.adoc
-- Rakefile
-- bin/rspec
 - isodoc.gemspec
 - lib/isodoc-yaml/i18n-ar.yaml
 - lib/isodoc-yaml/i18n-de.yaml
@@ -419,15 +398,23 @@ files:
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
+- lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
 - lib/isodoc/base_style/bands.scss
+- lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss
+- lib/isodoc/base_style/coverpage.css
 - lib/isodoc/base_style/coverpage.scss
+- lib/isodoc/base_style/defaults.css
 - lib/isodoc/base_style/defaults.scss
+- lib/isodoc/base_style/metanorma_word.css
 - lib/isodoc/base_style/metanorma_word.scss
+- lib/isodoc/base_style/nav.css
 - lib/isodoc/base_style/nav.scss
+- lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
 - lib/isodoc/base_style/scripts.html
+- lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
@@ -498,51 +485,11 @@ files:
 - lib/metanorma/output/xslfo.rb
 - lib/relaton/render/config.yml
 - lib/relaton/render/general.rb
-- spec/assets/header.html
-- spec/assets/html.scss
-- spec/assets/html_override.css
-- spec/assets/htmlcover.html
-- spec/assets/htmlintro.html
-- spec/assets/i18n.yaml
-- spec/assets/iso.xml
-- spec/assets/odf.emf
-- spec/assets/odf.svg
-- spec/assets/odf1.svg
-- spec/assets/outputtest/a.xml
-- spec/assets/outputtest/iso.international-standard.xsl
-- spec/assets/rice_image1
-- spec/assets/rice_image1.png
-- spec/assets/scripts.html
-- spec/assets/scripts_override.html
-- spec/assets/std.css
-- spec/assets/word.css
-- spec/assets/word_override.css
-- spec/assets/wordcover.html
-- spec/assets/wordintro.html
-- spec/isodoc/blocks_spec.rb
-- spec/isodoc/cleanup_spec.rb
-- spec/isodoc/footnotes_spec.rb
-- spec/isodoc/form_spec.rb
-- spec/isodoc/i18n_spec.rb
-- spec/isodoc/inline_spec.rb
-- spec/isodoc/lists_spec.rb
-- spec/isodoc/metadata_spec.rb
-- spec/isodoc/postproc_spec.rb
-- spec/isodoc/presentation_xml_spec.rb
-- spec/isodoc/ref_spec.rb
-- spec/isodoc/section_spec.rb
-- spec/isodoc/table_spec.rb
-- spec/isodoc/terms_spec.rb
-- spec/isodoc/utils_spec.rb
-- spec/isodoc/xref_numbering_spec.rb
-- spec/isodoc/xref_spec.rb
-- spec/isodoc/xslfo_convert_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -557,8 +504,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  rake:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/inkscape-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,24 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/rubygems-release.yml@main
-    with:
-      next_version: ${{ github.event.inputs.next_version }}
-      event_name: ${{ github.event_name }}
-    secrets:
-      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.hound.yml

@@ -1,5 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-ruby:
-  enabled: true
-  config_file: .rubocop.yml