isodoc 2.11.4 → 2.12.1

data/lib/isodoc/presentation_function/terms.rb

@@ -109,11 +109,20 @@ module IsoDoc
       docxml.xpath(ns("//termnote")).each { |f| termnote1(f) }
     end
 
+    def termnote_delim(_elem)
+      l10n(": ")
+    end
+
     def termnote1(elem)
-      lbl = l10n(@xrefs.anchor(elem["id"], :label) || "???")
+      lbl = termnote_label(elem)
       prefix_name(elem, "", lower2cap(lbl), "name")
     end
 
+    def termnote_label(elem)
+      lbl = @xrefs.anchor(elem["id"], :label) || "???"
+      l10n "#{lbl}#{termnote_delim(elem)}"
+    end
+
     def termdefinition(docxml)
       docxml.xpath(ns("//term[definition]")).each do |f|
         termdefinition1(f)
@@ -123,6 +132,7 @@ module IsoDoc
     def termdefinition1(elem)
       unwrap_definition(elem)
       multidef(elem) if elem.xpath(ns("./definition")).size > 1
+      termdomain(elem)
     end
 
     def multidef(elem)
@@ -144,6 +154,13 @@ module IsoDoc
       end
     end
 
+    def termdomain(elem)
+      d = elem.at(ns(".//domain")) or return
+      p = elem.at(ns(".//definition//p")) or return
+      p.add_first_child "<#{d.to_xml}>  "
+      d["hidden"] = true
+    end
+
     def termsource(docxml)
       docxml.xpath(ns("//termsource")).each { |f| termsource_modification(f) }
       docxml.xpath(ns("//termsource")).each { |f| termsource1(f) }
@@ -176,5 +193,14 @@ module IsoDoc
       when "adapted" then @i18n.adapted
       end
     end
+
+    def term(docxml)
+      docxml.xpath(ns("//term")).each { |f| term1(f) }
+    end
+
+    def term1(elem)
+      lbl = @xrefs.anchor(elem["id"], :label) or return
+      prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
+    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -55,9 +55,10 @@ module IsoDoc
       # feeds middle_title
       # triggers xrefs reparse, so put references before all other sections,
       # which alter titles and thus can alter xrefs
-      rearrange_clauses docxml # feeds toc, display_order, clausetitle, 
+      rearrange_clauses docxml # feeds toc, display_order, clausetitle,
       # clause, middle_title
       middle_title docxml
+      missing_title docxml # feeds clause
       annex docxml
       clause docxml # feeds clausetitle
       term docxml
@@ -79,6 +80,8 @@ module IsoDoc
       admonition docxml
       source docxml
       ol docxml
+      dl docxml
+      quote docxml
       permission docxml
       requirement docxml
       recommendation docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.11.4".freeze
+  VERSION = "2.12.1".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -111,7 +111,7 @@ module IsoDoc
           insert_tab(p, 1)
           node.first_element_child.children.each { |n| parse(n, p) }
         end
-        node.element_children[1..-1].each { |n| parse(n, div) }
+        node.element_children[1..].each { |n| parse(n, div) }
       end
 
       def note_parse1(node, div)
@@ -131,7 +131,7 @@ module IsoDoc
           div.p class: "Note" do |p|
             if name
               name.children.each { |n| parse(n, p) }
-              p << termnote_delim
+              p << " "
             end
             para_then_remainder(node.first_element_child, node, p, div)
           end
@@ -165,7 +165,7 @@ module IsoDoc
             parse(node.at(ns("./stem")), div)
             insert_tab(div, 1)
             if lbl = node&.at(ns("./name"))&.text
-              div << "(#{lbl})"
+              div << lbl
             end
           end
         end

data/lib/isodoc/xref/clause_order.rb

@@ -17,10 +17,10 @@ module IsoDoc
           { path: "//sections/clause[@type = 'scope']" },
           { path: @klass.norm_ref_xpath },
           { path: "//sections/terms | " \
-            "//sections/clause[descendant::terms]" },
+            "//sections/clause[descendant::terms]", multi: true },
           { path: "//sections/definitions | " \
             "//sections/clause[descendant::definitions]" \
-            "[not(descendant::terms)]" },
+            "[not(descendant::terms)]", multi: true },
           { path: @klass.middle_clause(docxml), multi: true },
         ]
       end

data/lib/isodoc/xref/xref_anchor.rb

@@ -31,7 +31,7 @@ module IsoDoc
 
       def anchor_struct_label(lbl, elem)
         case elem
-        when @labels["appendix"] then l10n("#{elem} #{lbl}")
+        when @labels["appendix"] then "#{elem} #{lbl}"
         else
           lbl.to_s
         end

data/lib/isodoc/xref/xref_counter.rb

@@ -1,4 +1,5 @@
 require "roman-numerals"
+require "twitter_cldr"
 
 module IsoDoc
   module XrefGen
@@ -26,6 +27,7 @@ module IsoDoc
         @style = opts[:numerals]
         @skip_i = opts[:skip_i]
         @prefix = opts[:prefix]
+        @separator = opts[:separator] || "."
         @base = ""
         if num.is_a? String
           if /^\d+$/.match?(num)
@@ -139,7 +141,8 @@ module IsoDoc
       end
 
       def increment(node)
-        @unnumbered = node["unnumbered"] == "true" || node["hidden"] == "true" and return self
+        @unnumbered = node["unnumbered"] == "true" ||
+          node["hidden"] == "true" and return self
         reset_overrides
         if node["subsequence"] != @subseq &&
             !(blank?(node["subsequence"]) && blank?(@subseq))
@@ -150,12 +153,23 @@ module IsoDoc
         self
       end
 
+      def style_number(num)
+        num.nil? and return num
+        case @style
+        when :roman then RomanNumerals.to_roman(num)
+        when :japanese then num.localize(:ja).spellout
+        else num
+        end
+      end
+
       def print
         @unnumbered and return nil
         @prefix_override and return @prefix_override
         num = @number_override || @num
-        out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
-        "#{@prefix}#{@base}#{out}#{@letter_override || @letter}"
+        out = style_number(num)
+        prefix = @prefix
+        prefix &&= "#{prefix}#{@separator}"
+        "#{prefix}#{@base}#{out}#{@letter_override || @letter}"
       end
 
       def ol_type(list, depth)
@@ -176,6 +190,7 @@ module IsoDoc
         when :alphabet_upper then (64 + @num).chr.to_s
         when :roman then RomanNumerals.to_roman(@num).downcase
         when :roman_upper then RomanNumerals.to_roman(@num).upcase
+        when :japanese then num.localize(:ja).spellout
         end
       end
     end

data/lib/isodoc/xref/xref_counter_types.rb

@@ -0,0 +1,13 @@
+require_relative "xref_counter"
+
+module IsoDoc
+  class Xref
+    def clause_counter(num = 0, opts = { numerals: :arabic })
+      ::IsoDoc::XrefGen::Counter.new(num, opts)
+    end
+
+    def list_counter(num = 0, opts = { numerals: :arabic })
+      ::IsoDoc::XrefGen::Counter.new(num, opts)
+    end
+  end
+end

data/lib/isodoc/xref/xref_gen.rb

@@ -33,8 +33,7 @@ module IsoDoc
       end
 
       def increment_label(elems, node, counter, increment: true)
-        return "" if elems.size == 1 && !node["number"]
-
+        elems.size == 1 && !node["number"] and return ""
         counter.increment(node) if increment
         " #{counter.print}"
       end
@@ -48,7 +47,7 @@ module IsoDoc
               { label: termnote_label(c.print), type: "termnote",
                 value: c.print, elem: @labels["termnote"],
                 container: t["id"],
-                xref: l10n("#{@labels['note_xref']} #{c.print}") }
+                xref: "#{@labels['note_xref']} #{c.print}" }
           end
         end
       end
@@ -64,7 +63,7 @@ module IsoDoc
               { label: idx, type: "termexample",
                 value: idx, elem: @labels["example_xref"],
                 container: t["id"],
-                xref: l10n("#{@labels['example_xref']} #{idx}") }
+                xref: "#{@labels['example_xref']} #{idx}" }
           end
         end
       end
@@ -123,7 +122,7 @@ module IsoDoc
         sections.each do |s|
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
-          c = Counter.new
+          c = list_counter
           notes.noblank.each do |n|
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list", false)
@@ -134,7 +133,7 @@ module IsoDoc
       end
 
       def list_item_anchor_names(list, list_anchor, depth, prev_label, refer_list)
-        c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
+        c = list_counter(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:, prev_label:,
@@ -188,7 +187,7 @@ module IsoDoc
 
       def deflist_term_anchor_names(list, list_anchor)
         list.xpath(ns("./dt")).each do |li|
-          label = l10n("#{list_anchor[:xref]}: #{dt2xreflabel(li)}")
+          label = "#{list_anchor[:xref]}: #{dt2xreflabel(li)}"
           li["id"] and @anchors[li["id"]] =
                          { xref: label, type: "deflistitem",
                            container: list_anchor[:container] }

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -8,9 +8,6 @@ module IsoDoc
           annex_anchor_names(xml)
           back_clauses_anchor_names(xml)
         end
-        if @klass.bibrender && (@parse_settings.empty? || @parse_settings[:refs])
-          references(xml)
-        end
       end
 
       def annex_anchor_names(xml)
@@ -33,11 +30,7 @@ module IsoDoc
         end
       end
 
-      def references(docxml)
-        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-          reference_names(ref)
-        end
-      end
+      # NOTE: references processing has moved to Presentation XML
 
       def initial_anchor_names(xml)
         if @parse_settings.empty? || @parse_settings[:clauses]
@@ -56,7 +49,7 @@ module IsoDoc
       end
 
       def main_anchor_names(xml)
-        n = Counter.new
+        n = clause_counter
         clause_order_main(xml).each do |a|
           xml.xpath(ns(a[:path])).each do |c|
             section_names(c, n, 1)
@@ -83,8 +76,9 @@ module IsoDoc
 
       def clause_title(clause, use_elem_name: false)
         ret = clause.at(ns("./title"))&.text
-        if use_elem_name && !ret
-          clause.name.capitalize
+        if use_elem_name && ret.blank?
+          @i18n.labels[clause.name]&.capitalize ||
+            clause.name.capitalize
         else ret
         end
       end
@@ -107,11 +101,11 @@ module IsoDoc
 
       def unnumbered_names(clause)
         clause.nil? and return
-        preface_name_anchors(clause, 1,
-                             clause_title(clause, use_elem_name: true))
+        title = clause_title(clause, use_elem_name: true)
+        preface_name_anchors(clause, 1, title)
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
           preface_names1(c, c.at(ns("./title"))&.text,
-                         "#{clause_title(clause)}, #{i + 1}", 2)
+                         "#{title}, #{i + 1}", 2)
         end
       end
 
@@ -144,7 +138,7 @@ module IsoDoc
         num.increment(clause)
         section_name_anchors(clause, num.print, lvl)
         clause.xpath(ns(SUBCLAUSES))
-          .each_with_object(Counter.new(0, prefix: "#{num.print}.")) do |c, i|
+          .each_with_object(clause_counter(0, prefix: num.print)) do |c, i|
           section_names1(c, i.increment(c).print, lvl + 1)
         end
         num
@@ -153,7 +147,7 @@ module IsoDoc
       def section_names1(clause, num, level)
         unnumbered_section_name?(clause) and return num
         section_name_anchors(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+        i = clause_counter(0, prefix: num)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           section_names1(c, i.increment(c).print, level + 1)
         end
@@ -170,18 +164,18 @@ module IsoDoc
 
       def section_name_anchors(clause, num, level)
         @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{@labels['clause']} #{num}"),
+          { label: num, xref: "#{@labels['clause']} #{num}",
             title: clause_title(clause), level:, type: "clause",
             elem: @labels["clause"] }
       end
 
       def annex_name_lbl(clause, num)
-        obl = l10n("(#{@labels['inform_annex']})")
+        obl = "(#{@labels['inform_annex']})"
         clause["obligation"] == "normative" and
-          obl = l10n("(#{@labels['norm_annex']})")
+          obl = "(#{@labels['norm_annex']})"
         title = Common::case_with_markup(@labels["annex"], "capital",
                                          @script)
-        l10n("<strong>#{title} #{num}</strong><br/>#{obl}")
+        "<strong>#{title} #{num}</strong><br/>#{obl}"
       end
 
       def annex_name_anchors(clause, num, level)
@@ -203,7 +197,7 @@ module IsoDoc
                        num.to_s, 1)
         else
           clause.xpath(ns(SUBCLAUSES))
-            .each_with_object(Counter.new(0, prefix: "#{num}.")) do |c, i|
+            .each_with_object(clause_counter(0, prefix: num)) do |c, i|
             annex_names1(c, i.increment(c).print, 2)
           end
         end
@@ -212,20 +206,11 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         annex_name_anchors(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+        i = clause_counter(0, prefix: num)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           annex_names1(c, i.increment(c).print, level + 1)
         end
       end
-
-      def reference_names(ref)
-        ids = @klass.bibitem_ref_code(ref)
-        identifiers = @klass.render_identifier(ids)
-        reference = @klass
-          .docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
-                      identifiers[:ordinal] || identifiers[:doi])
-        @anchors[ref["id"]] = { xref: reference }
-      end
     end
   end
 end

data/lib/isodoc/xref/xref_util.rb

@@ -6,6 +6,12 @@ module Enumerable
   end
 end
 
+class Object
+  def blank?
+    nil? || empty?
+  end
+end
+
 module IsoDoc
   module XrefGen
     module Blocks

data/lib/isodoc/xref.rb

@@ -1,5 +1,6 @@
 require_relative "xref/xref_anchor"
 require_relative "xref/xref_counter"
+require_relative "xref/xref_counter_types"
 require_relative "xref/xref_gen_seq"
 require_relative "xref/xref_gen"
 require_relative "xref/xref_sect_gen"
@@ -17,25 +18,31 @@ module IsoDoc
 
     # Note: if bibrender is no passed in, do not parse references
     def initialize(lang, script, klass, i18n, options = {})
-      @anchors = {}
+      initialize_empty
       @lang = lang
       @script = script
       @klass = klass
       @options = options
-      @i18n = i18n
-      @labels = @i18n.get
-      @klass.i18n = @i18n
+      initialize_i18n(i18n)
       @klass.bibrender ||= options[:bibrender]
-      @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
-        .new({
-               default: "default", lang:, script:,
-               labels: @i18n.get
-             })
-      @i18n
+        .new({ default: "default", lang:, script:,
+               labels: @i18n.get })
+    end
+
+    def initialize_empty
+      @c = HTMLEntities.new
+      @anchors = {}
       @parse_settings = {}
     end
 
+    def initialize_i18n(i18n)
+      @i18n = i18n
+      @labels = @i18n.get
+      @klass.i18n = @i18n
+      @locale = @options[:locale]
+    end
+
     def get
       @anchors
     end
@@ -66,9 +73,18 @@ module IsoDoc
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       asset_anchor_names(docxml)
+      localise_anchors
       @parse_settings = {}
     end
 
+    def localise_anchors
+      @anchors.each_value do |v|
+        v[:label] &&= l10n(v[:label])
+        v[:value] &&= l10n(v[:value])
+        v[:xref] &&= l10n(v[:xref])
+      end
+    end
+
     def ns(xpath)
       Common::ns(xpath)
     end

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

@@ -96,18 +96,18 @@ version: version
 toc_figures: List of figures
 toc_tables: List of tables
 toc_recommendations: List of recommendations
-month_january: January
-month_february: February
-month_march: March
-month_april: April
-month_may: May
-month_june: June
-month_july: July
-month_august: August
-month_september: September
-month_october: October
-month_november: November
-month_december: December
+month_january: 1月
+month_february: 2月
+month_march: 3月
+month_april: 4月
+month_may: 5月
+month_june: 6月
+month_july: 7月
+month_august: 8月
+month_september: 9月
+month_october: 10月
+month_november: 11月
+month_december: 12月
 obligation: Obligation
 admonition: {
   danger: 危険です,
@@ -118,7 +118,7 @@ admonition: {
   editorial: 編集者注
 }
 locality: {
-                      section: Section,
+                      section: セクション,
                       clause: 箇条,
                       subclause: 細分箇条,
                       part: 部,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.12.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.08'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.08'
 - !ruby/object:Gem::Dependency
   name: mn-requirements
   requirement: !ruby/object:Gem::Requirement
@@ -421,6 +421,7 @@ files:
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
 - lib/isodoc/presentation_function/concepts.rb
+- lib/isodoc/presentation_function/docid.rb
 - lib/isodoc/presentation_function/erefs.rb
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb
@@ -451,6 +452,7 @@ files:
 - lib/isodoc/xref/clause_order.rb
 - lib/isodoc/xref/xref_anchor.rb
 - lib/isodoc/xref/xref_counter.rb
+- lib/isodoc/xref/xref_counter_types.rb
 - lib/isodoc/xref/xref_gen.rb
 - lib/isodoc/xref/xref_gen_seq.rb
 - lib/isodoc/xref/xref_sect_gen.rb