isodoc 2.12.1 → 2.12.3

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -104,8 +104,10 @@ module IsoDoc
         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,
-                         "#{title}, #{i + 1}", 2)
+          t = c.at(ns("./title"))
+          tt = "#{semx(clause, title, clause.name)}" \
+            "<span class='fmt-comma'>,</span> #{semx(c, i + 1)}"
+          preface_names1(c, t ? semx(c, t.text, c.name) : nil, tt, 2)
         end
       end
 
@@ -113,15 +115,18 @@ module IsoDoc
         label = title || parent_title
         preface_name_anchors(clause, level, title || parent_title)
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-          preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i + 1}",
+          t = c.at(ns("./title"))
+          preface_names1(c, t ? semx(c, t.text, c.name) : nil,
+                         "#{label} #{semx(c, i + 1)}",
                          level + 1)
         end
       end
 
       def preface_name_anchors(clause, level, title)
+        xref = semx(clause, title, clause.name)
         @anchors[clause["id"]] =
           { label: nil, level:,
-            xref: title, title: nil,
+            xref:, title: nil,
             type: "clause", elem: @labels["clause"] }
       end
 
@@ -136,20 +141,32 @@ module IsoDoc
       def section_names(clause, num, lvl)
         unnumbered_section_name?(clause) and return num
         num.increment(clause)
-        section_name_anchors(clause, num.print, lvl)
+        lbl = semx(clause, num.print)
+        section_name_anchors(clause, lbl, lvl)
         clause.xpath(ns(SUBCLAUSES))
-          .each_with_object(clause_counter(0, prefix: num.print)) do |c, i|
-          section_names1(c, i.increment(c).print, lvl + 1)
+          .each_with_object(clause_counter(0)) do |c, i|
+          section_names1(c, lbl, i.increment(c).print, lvl + 1)
         end
         num
       end
 
-      def section_names1(clause, num, level)
+      def clause_number_semx(parentnum, clause, num)
+        if clause["branch-number"]
+                semx(clause, clause["branch-number"])
+        elsif parentnum.nil?
+          semx(clause, num)
+              else
+                "#{parentnum}#{delim_wrap(clausesep)}#{semx(clause, num)}"
+              end
+      end
+
+      def section_names1(clause, parentnum, num, level)
         unnumbered_section_name?(clause) and return num
-        section_name_anchors(clause, num, level)
-        i = clause_counter(0, prefix: num)
+        lbl = clause_number_semx(parentnum, clause, num)
+        section_name_anchors(clause, lbl, level)
+        i = clause_counter(0)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          section_names1(c, i.increment(c).print, level + 1)
+          section_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
 
@@ -162,10 +179,16 @@ module IsoDoc
         false
       end
 
+      def clausesep
+        "."
+      end
+
       def section_name_anchors(clause, num, level)
+        xref = labelled_autonum(@labels["clause"], num)
+        label = num
+        c = clause_title(clause) and title = semx(clause, c, "title")
         @anchors[clause["id"]] =
-          { label: num, xref: "#{@labels['clause']} #{num}",
-            title: clause_title(clause), level:, type: "clause",
+          { label:, xref:, title:, level:, type: "clause",
             elem: @labels["clause"] }
       end
 
@@ -173,44 +196,53 @@ module IsoDoc
         obl = "(#{@labels['inform_annex']})"
         clause["obligation"] == "normative" and
           obl = "(#{@labels['norm_annex']})"
+        obl = "<span class='fmt-obligation'>#{l10n obl}</fmt>"
         title = Common::case_with_markup(@labels["annex"], "capital",
                                          @script)
-        "<strong>#{title} #{num}</strong><br/>#{obl}"
+        s = labelled_autonum(title, num)
+        "<strong><span class='fmt-caption-label'>#{s}</span></strong><br/>#{obl}"
       end
 
       def annex_name_anchors(clause, num, level)
         label = num
         level == 1 && clause.name == "annex" and
-          label = annex_name_lbl(clause, num)
+          label = annex_name_lbl(clause, label)
+        xref = labelled_autonum(@labels["annex"], num)
+        c = clause_title(clause) and title = semx(clause, c, "title")
         @anchors[clause["id"]] =
-          { label:,
+          { label:, xref:, title:,
             elem: @labels["annex"], type: "clause",
-            subtype: "annex", value: num.to_s, level:,
-            title: clause_title(clause),
-            xref: "#{@labels['annex']} #{num}" }
+            subtype: "annex", value: num.to_s, level: }
       end
 
       def annex_names(clause, num)
-        annex_name_anchors(clause, num, 1)
+        label = semx(clause, num)
+        annex_name_anchors(clause, label, 1)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
-                       num.to_s, 1)
+                       nil, num.to_s, 1)
         else
           clause.xpath(ns(SUBCLAUSES))
-            .each_with_object(clause_counter(0, prefix: num)) do |c, i|
-            annex_names1(c, i.increment(c).print, 2)
+            .each_with_object(clause_counter(0)) do |c, i|
+            annex_names1(c, label, i.increment(c).print, 2)
           end
         end
-        hierarchical_asset_names(clause, num)
+        hierarchical_asset_names(clause, label)
       end
 
-      def annex_names1(clause, num, level)
-        annex_name_anchors(clause, num, level)
-        i = clause_counter(0, prefix: num)
+      def annex_names1(clause, parentnum, num, level)
+        lbl = clause_number_semx(parentnum, clause, num)
+        annex_name_anchors1(clause, lbl, level)
+        i = clause_counter(0)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          annex_names1(c, i.increment(c).print, level + 1)
+          annex_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
+
+      # subclauses of Annexes
+      def annex_name_anchors1(clause, num, level)
+        annex_name_anchors(clause, num, level)
+      end
     end
   end
 end

data/lib/isodoc/xref/xref_util.rb

@@ -14,7 +14,7 @@ end
 
 module IsoDoc
   module XrefGen
-    module Blocks
+    module Util
       def blank?(text)
         text.nil? || text.empty?
       end
@@ -43,6 +43,48 @@ module IsoDoc
 
       CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
                  "./references".freeze
+
+      def child_sections
+        CHILD_SECTIONS
+      end
+
+      # if hierarchically marked up node in label already,
+      # leave alone, else wrap in semx
+      def semx(node, label, element = "autonum")
+        label = label.to_s
+        id = node["id"] || node[:id]
+        /<semx element='[^']+' source='#{id}'/.match?(label) and return label
+        l = stripsemx(label)
+        %(<semx element='#{element}' source='#{id}'>#{l}</semx>)
+      end
+
+      # assume parent is already semantically annotated with semx
+      def hiersemx(parent, parentlabel, counter, element, sep: nil)
+        sep ||= hier_separator(markup: true)
+        "#{semx(parent, parentlabel)}#{sep}#{semx(element, counter.print)}"
+      end
+
+      def delim_wrap(delim, klass = "fmt-autonum-delim")
+        delim.blank? and return ""
+        "<span class='#{klass}'>#{delim}</span>"
+      end
+
+      def stripsemx(elem)
+        elem.nil? and return elem
+        xml = Nokogiri::XML::DocumentFragment.parse(elem)
+        xml.traverse do |x|
+          x.name == "semx" ||
+            (x.name == "span" && /^fmt-/.match?(x["class"])) and
+            x.replace(x.children)
+        end
+        xml.to_xml(indent: 0, encoding: "UTF-8",
+                   save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+      end
+
+      def labelled_autonum(label, autonum)
+        label.blank? and return autonum
+        l10n("<span class='fmt-element-name'>#{label}</span> #{autonum}")
+      end
     end
   end
 end

data/lib/isodoc/xref.rb

@@ -4,6 +4,7 @@ require_relative "xref/xref_counter_types"
 require_relative "xref/xref_gen_seq"
 require_relative "xref/xref_gen"
 require_relative "xref/xref_sect_gen"
+require_relative "xref/xref_util"
 require_relative "class_utils"
 require_relative "function/utils"
 
@@ -92,5 +93,7 @@ module IsoDoc
     def l10n(text, lang = @lang, script = @script, locale = @locale)
       @i18n.l10n(text, lang, script, locale)
     end
+
+    include ::IsoDoc::XrefGen::Util
   end
 end

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

@@ -33,15 +33,15 @@ internal_external_terms_boilerplate: |
   لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.
 no_information_available: "[لا توجد معلومات متاحة]"
 term_defined_in: "(%)"
-binary_and: "%1 و %2"
-multiple_and: "%1, و %2"
-binary_or: "%1 او %2"
-multiple_or: "%1, او %2"
-chain_and: "%1 و %2"
-chain_or: "%1 او %2"
-chain_from: "%1 %من 2"
-chain_to: "من %1 إلى %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>ﻭ</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>ﻭ</conn> %2"
+binary_or: "%1 <conn>ﺍﻭ</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>ﺍﻭ</conn> %2"
+chain_and: "%1 <conn>ﻭ</conn> %2"
+chain_or: "%1 <conn>ﺍﻭ</conn> %2"
+chain_from: "%1 <conn>%ﻢﻧ</conn> 2"
+chain_to: "<conn>ﻢﻧ</conn> %1 <conn>ﺈﻟﻯ</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender]
 SpelloutRules:

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

@@ -35,15 +35,15 @@ internal_external_terms_boilerplate: |
           Für die Zwecke dieses Dokuments gelten die in % und im Folgenden aufgeführten Begriffe und Definitionen.
 no_information_available: "[KEINE INFORMATION VERFÜGBAR]"
 term_defined_in: "(%)"
-binary_and: "%1 und %2"
-multiple_and: "%1, und %2"
-binary_or: "%1 oder %2"
-multiple_or: "%1, oder %2"
-chain_and: "%1 und %2"
-chain_or: "%1 oder %2"
-chain_from: "%1 von %2"
-chain_to: "%1 bis %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>und</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>und</conn> %2"
+binary_or: "%1 <conn>oder</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>oder</conn> %2"
+chain_and: "%1 <conn>und</conn> %2"
+chain_or: "%1 <conn>oder</conn> %2"
+chain_from: "%1 <conn>von</conn> %2"
+chain_to: "%1 <conn>bis</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:

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

@@ -38,15 +38,15 @@ internal_external_terms_boilerplate: |
       For the purposes of this document, the terms and definitions given in % and the following apply.
 no_information_available: "[NO INFORMATION AVAILABLE]"
 term_defined_in: "(%)"
-binary_and: "%1 and %2"
-multiple_and: "%1, and %2"
-binary_or: "%1 or %2"
-multiple_or: "%1, or %2"
-chain_and: "%1 and %2"
-chain_or: "%1 or %2"
-chain_from: "%1 from %2"
-chain_to: "%1 to %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>and</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>and</conn> %2"
+binary_or: "%1 <conn>or</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>or</conn> %2"
+chain_and: "%1 <conn>and</conn> %2"
+chain_or: "%1 <conn>or</conn> %2"
+chain_from: "%1 <conn>from</conn> %2"
+chain_to: "%1 <conn>to</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal

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

@@ -37,15 +37,15 @@ internal_external_terms_boilerplate: |
           Para los propósitos de este documento, se aplican los términos y definiciones dados en % y los siguientes.
 no_information_available: "[NO HAY INFORMACIÓN DISPONIBLE]"
 term_defined_in: "(%)"
-binary_and: "%1 y %2"
-multiple_and: "%1, y %2"
-binary_or: "%1 o %2"
-multiple_or: "%1, o %2"
-chain_and: "%1 y %2"
-chain_or: "%1 o %2"
-chain_from: "%1 del %2"
-chain_to: "%1 al %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>y<//conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>y</conn> %2"
+binary_or: "%1 <conn>o</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>o</conn> %2"
+chain_and: "%1 <conn>y</conn> %2"
+chain_or: "%1 <conn>o</conn> %2"
+chain_from: "%1 <conn>del</conn> %2"
+chain_to: "%1 <conn>al</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:

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

@@ -34,15 +34,15 @@ internal_external_terms_boilerplate: |
           Pour les besoins du présent document, les termes et définitions de % ainsi que les suivants, s’appliquent.
 no_information_available: "[PAS D’INFORMATION DISPONIBLE]"
 term_defined_in: "(%)"
-binary_and: "%1 et %2"
-multiple_and: "%1, et %2"
-binary_or: "%1 ou %2"
-multiple_or: "%1, ou %2"
-chain_and: "%1 et %2"
-chain_or: "%1 ou %2"
-chain_from: "%1 de %2"
-chain_to: "%1 à %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>et</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>et</conn> %2"
+binary_or: "%1 <conn>ou</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>ou</conn> %2"
+chain_and: "%1 <conn>et</conn> %2"
+chain_or: "%1 <conn>ou</conn> %2"
+chain_from: "%1 <conn>de</conn> %2"
+chain_to: "%1 <conn>à</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:

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

@@ -34,16 +34,16 @@ internal_external_terms_boilerplate: |
           この規格で用いる主な用語及び定義は，次によるほか，% による。
 no_information_available: "[情報はありません]"
 term_defined_in: "(%)"
-binary_and: "%1 and %2"
-multiple_and: "%1, and %2"
-binary_or: "%1 or %2"
-multiple_or: "%1, or %2"
-chain_and: "%1 and %2"
-chain_or: "%1 or %2"
-chain_from: "%1 from %2"
-chain_to: "%1～%2"
-nested_xref: "%1の%2"
-list_nested_xref: "%1の%2"
+binary_and: "%1 <conn>及び</conn> %2"
+multiple_and: "%1<enum-comma>、</enum-comma>%2"
+binary_or: "%1 <conn>または</conn> %2"
+multiple_or: "%1<enum-comma>、</enum-comma> <conn>または</conn> %2"
+chain_and: "%1 <conn>及び</conn> %2"
+chain_or: "%1 <conn>または</conn> %2"
+chain_from: "%1 <conn>から</conn> %2"
+chain_to: "%1<conn>～</conn>%2"
+nested_xref: "%1<conn>の</conn>%2"
+list_nested_xref: "%1<conn>の</conn>%2"
 no_conflate_xref_locations: true
 ordinal_keys: []
 SpelloutRules: spellout-ordinal

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

@@ -37,15 +37,15 @@ internal_external_terms_boilerplate: |
           Для целей этого документа применяются термины и определения, данные в % и следующие.
 no_information_available: "[ИНФОРМАЦИЯ ОТСУТСТВУЕТ]"
 term_defined_in: "(%)"
-binary_and: "%1 и %2"
-multiple_and: "%1, и %2"
-binary_or: "%1 или %2"
-multiple_or: "%1, или %2"
-chain_and: "%1 и %2"
-chain_or: "%1 или %2"
-chain_from: "%1 от %2"
-chain_to: "%1 до %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>и</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>и</conn> %2"
+binary_or: "%1 <conn>или</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>или</conn> %2"
+chain_and: "%1 <conn>и</conn> %2"
+chain_or: "%1 <conn>или</conn> %2"
+chain_from: "%1 <conn>от</conn> %2"
+chain_to: "%1 <conn>до</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number,case]
 SpelloutRules:

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -36,15 +36,15 @@ internal_external_terms_boilerplate: |
           % 界定的以及下列术语和定义适用于本文件。
 no_information_available: "[无资料]"
 term_defined_in: "（%）"
-binary_and: "%1和%2"
-multiple_and: "%1、和%2"
-binary_or: "%1或%2"
-multiple_or: "%1、或%2"
-chain_and: "%1和%2"
-chain_or: "%1或%2"
-chain_from: "%1从%2"
-chain_to: "%1到%2"
-nested_xref: "%1, %2"
+binary_and: "%1<conn>和</conn>%2"
+multiple_and: "%1<enum-comma>、</enum-comma><conn>和</conn>%2"
+binary_or: "%1<conn>或</conn>%2"
+multiple_or: "%1<enum-comma>、</enum-comma><conn>或</conn>%2"
+chain_and: "%1<conn>和</conn>%2"
+chain_or: "%1<conn>或</conn>%2"
+chain_from: "%1<conn>从</conn>%2"
+chain_to: "%1<conn>到</conn>%2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal

data/lib/nokogiri/xml/node.rb

@@ -7,6 +7,7 @@ module Nokogiri
         else
           children.first.previous = content
         end
+        self
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.12.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -418,6 +418,7 @@ files:
 - lib/isodoc/metadata_contributor.rb
 - lib/isodoc/metadata_date.rb
 - lib/isodoc/pdf_convert.rb
+- lib/isodoc/presentation_function/autonum.rb
 - lib/isodoc/presentation_function/bibdata.rb
 - lib/isodoc/presentation_function/block.rb
 - lib/isodoc/presentation_function/concepts.rb
@@ -432,6 +433,7 @@ files:
 - lib/isodoc/presentation_function/section.rb
 - lib/isodoc/presentation_function/sourcecode.rb
 - lib/isodoc/presentation_function/terms.rb
+- lib/isodoc/presentation_function/title.rb
 - lib/isodoc/presentation_function/xrefs.rb
 - lib/isodoc/presentation_xml_convert.rb
 - lib/isodoc/sassc_importer.rb