metanorma-iso 1.9.2 → 1.9.6

data/lib/isodoc/iso/metadata.rb

@@ -2,7 +2,7 @@ require "isodoc"
 
 module IsoDoc
   module Iso
-    class  Metadata < IsoDoc::Metadata
+    class Metadata < IsoDoc::Metadata
       def initialize(lang, script, i18n)
         super
         set(:tc, "XXXX")
@@ -14,17 +14,17 @@ module IsoDoc
         set(:obsoletes_part, nil)
       end
 
-      def status_abbrev(stage, substage, iter, draft, doctype)
+      def status_abbrev(stage, _substage, iter, draft, doctype)
         return "" unless stage
 
         if %w(technical-report technical-specification).include?(doctype)
           stage = "DTS" if stage == "DIS"
           stage = "FDTS" if stage == "FDIS"
         end
-        if %w(PWI NWIP WD CD).include?(stage)
-          stage += iter if iter
+        if %w(PWI NWIP WD CD).include?(stage) && iter
+          stage += iter
         end
-        stage = "Pre" + stage if draft =~ /^0\./
+        stage = "Pre#{stage}" if /^0\./.match?(draft)
         stage
       end
 
@@ -48,14 +48,14 @@ module IsoDoc
       end
 
       def unpublished(status)
-        status.to_i > 0 && status.to_i < 60
+        status.to_i.positive? && status.to_i < 60
       end
 
       def docid(isoxml, _out)
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'ISO']"))
         set(:docnumber, dn&.text)
         tcdn = isoxml.xpath(ns("//bibdata/docidentifier[@type = 'iso-tc']"))
-        set(:tc_docnumber, tcdn.map { |n| n.text })
+        set(:tc_docnumber, tcdn.map(&:text))
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-with-lang']"))
         set(:docnumber_lang, dn&.text)
         dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'iso-reference']"))
@@ -87,6 +87,7 @@ module IsoDoc
 
       def part_title(part, partnum, subpartnum, lang)
         return "" unless part
+
         suffix = @c.encode(part.text, :hexadecimal)
         partnum = "#{partnum}&ndash;#{subpartnum}" if partnum && subpartnum
         suffix = "#{part_label(lang)}&nbsp;#{partnum}: " + suffix if partnum
@@ -125,10 +126,14 @@ module IsoDoc
       end
 
       def title_parts(isoxml, lang)
-        [isoxml.at(ns("//bibdata//title[@type='title-intro' and @language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-main' and @language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-part' and @language='#{lang}']")),
-         isoxml.at(ns("//bibdata//title[@type='title-amd' and @language='#{lang}']"))]
+        [isoxml.at(ns("//bibdata//title[@type='title-intro' and "\
+                      "@language='#{lang}']")),
+         isoxml.at(ns("//bibdata//title[@type='title-main' and "\
+                      "@language='#{lang}']")),
+         isoxml.at(ns("//bibdata//title[@type='title-part' and "\
+                      "@language='#{lang}']")),
+         isoxml.at(ns("//bibdata//title[@type='title-amd' and "\
+                      "@language='#{lang}']"))]
       end
 
       def title(isoxml, _out)
@@ -139,7 +144,10 @@ module IsoDoc
         set(:doctitlemain, @c.encode(main ? main.text : "", :hexadecimal))
         main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
         set(:doctitle, main)
-        set(:doctitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
+        if intro
+          set(:doctitleintro,
+              @c.encode(intro ? intro.text : "", :hexadecimal))
+        end
         set(:doctitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
         set(:doctitlepart, @c.encode(part.text, :hexadecimal)) if part
         set(:doctitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
@@ -155,7 +163,10 @@ module IsoDoc
         set(:docsubtitlemain, @c.encode(main ? main.text : "", :hexadecimal))
         main = compose_title(main, intro, part, partnumber, subpartnumber, lang)
         set(:docsubtitle, main)
-        set(:docsubtitleintro, @c.encode(intro ? intro.text : "", :hexadecimal)) if intro
+        if intro
+          set(:docsubtitleintro,
+              @c.encode(intro ? intro.text : "", :hexadecimal))
+        end
         set(:docsubtitlepartlabel, part_prefix(partnumber, subpartnumber, lang))
         set(:docsubtitlepart, @c.encode(part.text, :hexadecimal)) if part
         set(:docsubtitleamdlabel, amd_prefix(amdnumber, lang)) if amdnumber
@@ -173,8 +184,8 @@ module IsoDoc
 
       def tc(xml)
         tc_num = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@number"))
-        tc_type = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@type"))&.
-          text || "TC"
+        tc_type = xml.at(ns("//bibdata/ext/editorialgroup/technical-committee/@type"))
+          &.text || "TC"
         if tc_num
           tcid = "#{tc_type} #{tc_num.text}"
           set(:tc,  tcid)
@@ -212,7 +223,8 @@ module IsoDoc
         ics = []
         isoxml.xpath(ns("//bibdata/ext/ics/code")).each { |i| ics << i.text }
         set(:ics, ics.empty? ? nil : ics.join(", "))
-        a = isoxml.at(ns("//bibdata/ext/horizontal")) and set(:horizontal, a.text)
+        a = isoxml.at(ns("//bibdata/ext/horizontal")) and set(:horizontal,
+                                                              a.text)
       end
     end
   end

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -45,13 +45,15 @@ module IsoDoc
         prefix_name(node, " — ", lbl, "name")
       end
 
+      def eref_delim(delim, type)
+        if delim == ";" then ";"
+        else type == "list" ? "" : delim
+        end
+      end
+
       def eref_localities1_zh(target, type, from, upto, node, delim)
         subsection = from&.text&.match(/\./)
-        ret = if delim == ";"
-                ";"
-              else
-                type == "list" ? "" : delim
-              end
+        ret = eref_delim(delim, type)
         ret += " 第#{from.text}" if from
         ret += "–#{upto.text}" if upto
         loc = (@i18n.locality[type] || type.sub(/^locality:/, "").capitalize)
@@ -68,11 +70,9 @@ module IsoDoc
         subsection = from&.text&.match(/\./)
         type = type.downcase
         lang == "zh" and
-          return l10n(eref_localities1_zh(target, type, from, upto, node, delim))
-        ret = if delim == ";" then ";"
-              else
-                type == "list" ? "" : delim
-              end
+          return l10n(eref_localities1_zh(target, type, from, upto, node,
+                                          delim))
+        ret = eref_delim(delim, type)
         ret += eref_locality_populate(type, node) unless subsection &&
           type == "clause" || type == "list" ||
           target.match(/^IEV$|^IEC 60050-/)
@@ -113,31 +113,39 @@ module IsoDoc
       end
 
       def concept(docxml)
-        docxml.xpath(ns("//terms//concept")).each_with_object({}) do |f, m|
+        docxml.xpath(ns("//term//concept")).each_with_object({}) do |f, m|
           concept_term(f, m)
         end
         docxml.xpath(ns("//concept")).each do |node|
-          concept_render(node, node["ital"] || "false", node["ref"] || "false")
+          concept_render(node, ital: node["ital"] || "false",
+                               ref: node["ref"] || "false",
+                               linkref: node["linkref"] || "true",
+                               linkmention: node["linkmention"] || "false")
         end
       end
 
       def concept_term(node, seen)
         term = node&.at(ns("./refterm"))&.to_xml
         if term && seen[term]
-          concept_render(node, node["ital"] || "false", node["ref"] || "false")
-        else concept_render(node, node["ital"] || "true", node["ref"] || "true")
+          concept_render(node, ital: node["ital"] || "false",
+                               ref: node["ref"] || "false",
+                               linkref: node["linkref"] || "true",
+                               linkmention: node["linkmention"] || "false")
+        else concept_render(node, ital: node["ital"] || "true",
+                                  ref: node["ref"] || "true",
+                                  linkref: node["linkref"] || "true",
+                                  linkmention: node["linkmention"] || "false")
         end
         seen[term] = true if term
         seen
       end
 
-      def concept1_ref(node, ref)
-        if r = node.at(ns("./xref | ./eref | ./termref"))
-          return r.remove if ref == "false"
-
-          r.name == "termref" and
-            r.replace(@i18n.term_defined_in.sub(/%/, r.to_xml)) or
-            r.replace("(#{r.to_xml})")
+      def concept1_ref_content(ref)
+        if ref.name == "termref"
+          ref.replace(@i18n.term_defined_in.sub(/%/,
+                                                ref.to_xml))
+        else
+          ref.replace("(#{ref.to_xml})")
         end
       end
 
@@ -160,7 +168,7 @@ module IsoDoc
         # i = display_order_at(docxml, "//sections/definitions", i)
         # i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
         i = display_order_xpath(docxml, "//sections/clause[not(@type = 'scope')] | "\
-                                "//sections/terms | //sections/definitions", i)
+                                        "//sections/terms | //sections/definitions", i)
         i = display_order_xpath(docxml, "//annex", i)
         i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
         display_order_xpath(docxml, "//indexsect", i)

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.9.2".freeze
+    VERSION = "1.9.6".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["open.source@ribose.com"]
 
   spec.summary       = "metanorma-iso lets you write ISO standards "\
-    "in AsciiDoc."
+                       "in AsciiDoc."
   spec.description   = <<~DESCRIPTION
     metanorma-iso lets you write ISO standards in AsciiDoc syntax.
 
@@ -47,4 +47,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "vcr", "~> 5.0.0"
+  spec.add_development_dependency "webmock"
 end