isodoc 2.10.6 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9d6fb9b45b43931c09ae2961532d650434c834c94adf40ae698afdab0098dfd
-  data.tar.gz: eebae6b266587daad1ed883ff44a69914dece3ccfbf34e5135b811536f8b276e
+  metadata.gz: c38cf2267396e98d1de955feacbd9002b32d6f076593c414d8395eea21f08510
+  data.tar.gz: 433c3e2d54797e3f22eb693f714163f4c3ac523a7584730872e1f7316b2dec81
 SHA512:
-  metadata.gz: cb7fca64087faf90b1581e9bbeed9809f2ce4253b876eaf8374450cd4fc2c44a5dece2d91febdd0b70914a98ceefaa3f16887303167d378f6ef0d2a83c223041
-  data.tar.gz: f190c3e9d07ff55030a409a7455e79d7f5bcf6813e0c5b0034f632616e78460539c9472a1df9983a574537357c69df0007a0cd308f67f974ffa294602ca2345d
+  metadata.gz: b36c7d9e7676ba7df00d34bb78797649b683a454776605249861978cf4ec5df3bdf61b7e4f05ec4e6644f62ac15aaa2e840cb5c36afb654e5c3d5457ddbd023e
+  data.tar.gz: bce31398c2b4b23f8e4b1a3192a73564f69ebfc0859320aff702c8eb3d2eadc9ae84e05275d6be1a54abb2a1be1146786925c2452a9e7ae8caac3d285f10beb6

data/isodoc.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf"
-  spec.add_dependency "mn-requirements", "~> 0.3.4"
+  spec.add_dependency "mn-requirements", "~> 0.4.0"
 
   spec.add_dependency "relaton-render", "~> 0.7.1"
   spec.add_dependency "roman-numerals"
@@ -55,5 +55,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 "xml-c14n"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/isodoc/function/utils.rb

@@ -213,10 +213,9 @@ module IsoDoc
         %w(example requirement recommendation permission
            note table figure sourcecode).freeze
 
-      def labelled_ancestor(elem)
-        #!elem.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-1]
+      def labelled_ancestor(elem, exceptions = [])
         !elem.ancestors.map(&:name)
-          .intersection(LABELLED_ANCESTOR_ELEMENTS).empty?
+          .intersection(LABELLED_ANCESTOR_ELEMENTS - exceptions).empty?
       end
 
       def emf?(type)

data/lib/isodoc/metadata.rb

@@ -14,7 +14,7 @@ module IsoDoc
     end
 
     def initialize(lang, script, locale, i18n, fonts_options = {})
-      @metadata = { lang: lang, script: script }
+      @metadata = { lang:, script: }
       DATETYPES.each { |w| @metadata["#{w.gsub('-', '_')}date".to_sym] = "XXX" }
       @lang = lang
       @script = script
@@ -29,10 +29,6 @@ module IsoDoc
       @metadata
     end
 
-    def labels
-      @labels
-    end
-
     def set(key, value)
       @metadata[key] = value
     end
@@ -44,12 +40,12 @@ module IsoDoc
     end
 
     def doctype(isoxml, _out)
-      b = isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}"))&.text || return
-      set(:doctype, status_print(b))
-      b1 = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}"))&.text || b
-      set(:doctype_display, status_print(b1))
-      b = isoxml&.at(ns("//bibdata/ext/subdoctype#{NOLANG}"))&.text || return
-      set(:subdoctype, status_print(b))
+      b = isoxml.at(ns("//bibdata/ext/doctype#{NOLANG}")) || return
+      set(:doctype, status_print(b.text))
+      b1 = isoxml.at(ns("//bibdata/ext/doctype#{currlang}")) || b
+      set(:doctype_display, status_print(b1.text))
+      b = isoxml.at(ns("//bibdata/ext/subdoctype#{NOLANG}")) || return
+      set(:subdoctype, status_print(b.text))
     end
 
     def docstatus(xml, _out)
@@ -59,11 +55,11 @@ module IsoDoc
       s1 = xml.at(ns("//bibdata/status/stage#{currlang}")) || s
       set(:stage, status_print(s.text))
       s1 and set(:stage_display, status_print(s1.text))
-      (i = xml&.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
+      (i = xml.at(ns("//bibdata/status/substage#{NOLANG}"))&.text) and
         set(:substage, i)
-      (i1 = xml&.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
+      (i1 = xml.at(ns("//bibdata/status/substage#{currlang}"))&.text || i) and
         set(:substage_display, i1)
-      (i2 = xml&.at(ns("//bibdata/status/iteration"))&.text) and
+      (i2 = xml.at(ns("//bibdata/status/iteration"))&.text) and
         set(:iteration, i2)
       set(:unpublished, unpublished(s.text))
       unpublished(s.text) && set(:stageabbr, stage_abbr(s.text))

data/lib/isodoc/metadata_contributor.rb

@@ -67,20 +67,15 @@ module IsoDoc
       publisher = []
       xml.xpath(ns("//bibdata/contributor[xmlns:role/@type = 'publisher']/" \
                    "organization")).each do |org|
-        name = extract_variant(org.at(ns("./name")))
-        agency1 = org.at(ns("./abbreviation"))&.text || name
-        publisher << name if name
+        name = org.at(ns("./name[@language = '#{@lang}']")) ||
+          org.at(ns("./name"))
+        agency1 = org.at(ns("./abbreviation"))&.text || name&.text
+        publisher << name.text if name
         agency = iso?(org) ? "ISO/#{agency}" : "#{agency}#{agency1}/"
       end
       [agency, publisher]
     end
 
-    def extract_variant(node)
-      node.nil? and return node
-      x = node.at(ns("./variant[@language = '#{@lang}']")) and node = x
-      node.text
-    end
-
     def agency(xml)
       agency, publisher = agency1(xml)
       set(:agency, agency.sub(%r{/$}, ""))

data/lib/isodoc/presentation_function/erefs.rb

@@ -38,9 +38,9 @@ module IsoDoc
       ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
                                                           node))
       node.delete("droploc") unless droploc
-      eref_localities1({ target: target, number: "pl",
+      eref_localities1({ target:, number: "pl",
                          type: refs.first.at(ns("./locality/@type")).text,
-                         from: l10n(ret[1..-1].join), node: node, lang: @lang })
+                         from: l10n(ret[1..-1].join), node:, lang: @lang })
     end
 
     def can_conflate_eref_rendering?(refs)
@@ -143,9 +143,9 @@ module IsoDoc
     def eref_localities0(ref, _idx, target, node)
       if ref["type"] == "whole" then @i18n.wholeoftext
       else
-        eref_localities1({ target: target, type: ref["type"], number: "sg",
+        eref_localities1({ target:, type: ref["type"], number: "sg",
                            from: ref.at(ns("./referenceFrom"))&.text,
-                           upto: ref.at(ns("./referenceTo"))&.text, node: node,
+                           upto: ref.at(ns("./referenceTo"))&.text, node:,
                            lang: @lang })
       end
     end

data/lib/isodoc/presentation_function/image.rb

@@ -38,23 +38,26 @@ module IsoDoc
 
       svg = Base64.strict_decode64(elem["src"]
         .sub(%r{^data:image/svg\+xml;(charset=[^;]+;)?base64,}, ""))
-      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^>]*>/, "")) do |config|
-        config.huge
-      end
+      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^>]*>/, ""), &:huge)
       elem["src"] = ""
       elem.children = x
     end
 
     def figure1(elem)
-      return sourcecode1(elem) if elem["class"] == "pseudocode" ||
-        elem["type"] == "pseudocode"
-      return if elem.at(ns("./figure")) && !elem.at(ns("./name"))
-
+      elem["class"] == "pseudocode" || elem["type"] == "pseudocode" and
+        return sourcecode1(elem)
+      figure_label?(elem) or return nil
       lbl = @xrefs.anchor(elem["id"], :label, false) or return
+      # no xref, no label: this can be set in xref
       prefix_name(elem, block_delim,
                   l10n("#{figure_label(elem)} #{lbl}"), "name")
     end
 
+    def figure_label?(elem)
+      elem.at(ns("./figure")) && !elem.at(ns("./name")) and return false
+      true
+    end
+
     def figure_label(elem)
       klass = elem["class"] || "figure"
       klasslbl = @i18n.get[klass] || klass

data/lib/isodoc/presentation_function/inline.rb

@@ -64,6 +64,7 @@ module IsoDoc
       get_linkend(node)
     end
 
+    # there should be no //variant in bibdata now
     def variant(xml)
       b = xml.xpath(ns("//bibdata//variant"))
       (xml.xpath(ns("//variant")) - b).each { |f| variant1(f) }

data/lib/isodoc/presentation_function/metadata.rb

@@ -22,7 +22,7 @@ module IsoDoc
     end
 
     def save_attachment(attachment, dir)
-      n = File.join(dir, attachment["name"])
+      n = File.join(dir, File.basename(attachment["name"]))
       c = attachment.text.sub(%r{^data:[^;]+;(?:charset=[^;]+;)?base64,}, "")
       File.open(n, "wb") { |f| f.write(Base64.strict_decode64(c)) }
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.10.6".freeze
+  VERSION = "2.11.0".freeze
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -137,15 +137,16 @@ module IsoDoc
         c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
         list.xpath(ns("./li")).each do |li|
           bare_label, label =
-            list_item_value(li, c, depth, { list_anchor: list_anchor, prev_label: prev_label,
+            list_item_value(li, c, depth, { list_anchor:, prev_label:,
                                             refer_list: depth == 1 ? refer_list : nil })
           li["id"] and @anchors[li["id"]] =
                          { label: bare_label, bare_xref: "#{label})",
                            xref: "#{label})",
-                           type: "listitem", refer_list: refer_list,
+                           type: "listitem", 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, refer_list)
+            list_item_anchor_names(ol, list_anchor, depth + 1, label,
+                                   refer_list)
           end
         end
       end
@@ -227,7 +228,7 @@ module IsoDoc
       def bookmark_anchor_names(xml)
         xml.xpath(ns(".//bookmark")).noblank.each do |n|
           _parent, id = id_ancestor(n)
-          #container = bookmark_container(parent)
+          # container = bookmark_container(parent)
           @anchors[n["id"]] = { type: "bookmark", label: nil, value: nil,
                                 xref: @anchors.dig(id, :xref) || "???",
                                 container: @anchors.dig(id, :container) }

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -28,6 +28,7 @@ module IsoDoc
         c = Counter.new
         j = 0
         clause.xpath(ns(self.class::FIGURE_NO_CLASS)).noblank.each do |t|
+          # labelled_ancestor(t, %w(figure)) and next # disable nested figure labelling
           j = subfigure_increment(j, c, t)
           sequential_figure_body(j, c, t, "figure", container:)
         end
@@ -40,6 +41,7 @@ module IsoDoc
         clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
           .each do |t|
           c[t["class"]] ||= Counter.new
+          # labelled_ancestor(t, %w(figure)) and next
           j = subfigure_increment(j, c[t["class"]], t)
           sequential_figure_body(j, c[t["class"]], t, t["class"],
                                  container:)
@@ -157,7 +159,7 @@ container: false)
         c = Counter.new
         j = 0
         clause.xpath(ns(self.class::FIGURE_NO_CLASS)).noblank.each do |t|
-          # next if labelled_ancestor(t) && t.ancestors("figure").empty?
+          # labelled_ancestor(t, %w(figure)) and next
           j = subfigure_increment(j, c, t)
           hierarchical_figure_body(num, j, c, t, "figure")
         end
@@ -169,6 +171,7 @@ container: false)
         j = 0
         clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
           .noblank.each do |t|
+          # labelled_ancestor(t, %w(figure)) and next
           c[t["class"]] ||= Counter.new
           j = subfigure_increment(j, c[t["class"]], t)
           hierarchical_figure_body(num, j, c[t["class"]], t, t["class"])

data/lib/isodoc-yaml/i18n-ja.yaml

@@ -52,28 +52,28 @@ note: 注記
 note_xref: 注記
 termnote: 注釈%
 list: リスト
-deflist: Definition List
+deflist: 定義リスト
 figure: 図
 diagram: Diagram
 formula: 式
-inequality: Formula
+inequality: 式
 table: 表
-requirement: 要求事項
-recommendation: 推奨事項
-permission: 許容事項
+requirement: 要求
+recommendation: 推奨
+permission: 許可
 box: Box
 index: 索引
 standard_no: 規格番号
 number: 番号
 # Modspec
-recommendationtest: Recommendation test
-requirementtest: Requirement test
-permissiontest: Permission test
-recommendationclass: Recommendations class
-requirementclass: Requirements class
-permissionclass: Permissions class
-abstracttest: Abstract test
-conformanceclass: Conformance class
+recommendationtest: 推奨テスト
+requirementtest: 要件テスト
+permissiontest: 許可テスト
+recommendationclass: 推奨群
+requirementclass: 要件群
+permissionclass: 許可群
+abstracttest: 抽象テスト
+conformanceclass: 適合性テスト群
 key: 記号説明
 example: 例
 example_xref: 例
@@ -110,12 +110,12 @@ month_november: November
 month_december: December
 obligation: Obligation
 admonition: {
-  danger: Danger,
+  danger: 危険です,
   warning: 警告,
-  caution: Caution,
-  important: Important,
-  safety precautions: Safety Precautions,
-  editorial: Editorial Note
+  caution: 注意,
+  important: 重要,
+  safety precautions: 安全上の注意,
+  editorial: 編集者注
 }
 locality: {
                       section: Section,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.10.6
+  version: 2.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   isodoc converts documents in the IsoDoc document model into
   Microsoft Word and HTML.