metanorma-iho 1.0.8 → 1.0.9

data/lib/isodoc/iho/init.rb

@@ -23,8 +23,8 @@ module IsoDoc
       end
 
       def bibrenderer(options = {})
-        ::Relaton::Render::Iho::General.new(options.merge(language: @lang,
-                                                          i18nhash: @i18n.get))
+        ::Relaton::Render::Iho::General.new(options
+          .merge(language: @lang, i18nhash: @i18n.get))
       end
 
       def info(isoxml, out)

data/lib/isodoc/iho/presentation_xml_convert.rb

@@ -18,15 +18,15 @@ _bib)
       def middle_title(docxml); end
 
       def preface_rearrange(doc)
-        preface_move(doc.at(ns("//preface/abstract")),
+        preface_move(doc.xpath(ns("//preface/abstract")),
                      %w(foreword executivesummary introduction clause acknowledgements), doc)
-        preface_move(doc.at(ns("//preface/foreword")),
+        preface_move(doc.xpath(ns("//preface/foreword")),
                      %w(executivesummary introduction clause acknowledgements), doc)
-        preface_move(doc.at(ns("//preface/executivesummary")),
+        preface_move(doc.xpath(ns("//preface/executivesummary")),
                      %w(introduction clause acknowledgements), doc)
-        preface_move(doc.at(ns("//preface/introduction")),
+        preface_move(doc.xpath(ns("//preface/introduction")),
                      %w(clause acknowledgements), doc)
-        preface_move(doc.at(ns("//preface/acknowledgements")),
+        preface_move(doc.xpath(ns("//preface/acknowledgements")),
                      %w(), doc)
       end
 
@@ -117,10 +117,6 @@ _bib)
         end
       end
 
-      def clausedelim
-        ""
-      end
-
       def omit_docid_prefix(prefix)
         prefix == "IHO" and return true
         super
@@ -139,6 +135,15 @@ _bib)
         defn.elements.last << s
       end
 
+       def clausedelim
+        ""
+      end
+
+       def clause(docxml)
+         super
+         docxml.xpath(ns("//executivesummary | //appendix")).each { |x| clause1(x) }
+       end
+
       include Init
     end
   end

data/lib/isodoc/iho/xref.rb

@@ -16,17 +16,19 @@ module IsoDoc
 
       def annex_name_lbl(clause, num)
         lbl = annexlbl(clause["obligation"] == "informative")
-        l10n("<strong>#{lbl} #{num}</strong>")
+        s = labelled_autonum(lbl, num)
+        l10n("<strong>#{s}</strong>")
       end
 
       def annex_names(clause, num)
-        appendix_names(clause, num)
-        lbl = annexlbl(clause["obligation"] == "informative")
+        lbl = semx(clause, num)
+        appendix_names(clause, lbl)
+        elem = annexlbl(clause["obligation"] == "informative")
         @anchors[clause["id"]] =
-          { label: annex_name_lbl(clause, num), type: "clause", elem: lbl,
-            xref: l10n("#{lbl} #{num}"), level: 1, value: num }
+          { label: annex_name_lbl(clause, lbl), type: "clause", elem: elem,
+            xref: labelled_autonum(elem, lbl), level: 1, value: num }
         annex_names_recurse(clause, num)
-        annex_asset_names(clause, num, lbl)
+        annex_asset_names(clause, num, elem)
       end
 
       def annex_names_recurse(clause, num)
@@ -37,20 +39,25 @@ module IsoDoc
         clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
           .each do |c|
           i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", 2)
+          annex_names1(c, semx(clause, num), i.print, 2)
         end
       end
 
+      # avoid ambiguity of Table 1-1 being in Appendix 1 or Clause 1
       def annex_asset_names(clause, num, lbl)
-        @annex_prefix = lbl
-        hierarchical_asset_names(clause, num)
-        @annex_prefix = nil
+        #@annex_prefix = lbl
+        #require "debug"; binding.b
+        #hierarchical_asset_names(clause, num)
+        n = num
+        clause["obligation"] == "informative" and n = labelled_autonum(lbl, num)
+        hierarchical_asset_names(clause, n)
+        #@annex_prefix = nil
       end
 
-      def anchor_struct_value(lbl, elem)
-        @annex_prefix and lbl = l10n("#{@annex_prefix} #{lbl}")
-        super
-      end
+      #def anchor_struct_value(lbl, elem)
+        #@annex_prefix and lbl = l10n("<span class='fmt-element-name'>#{@annex_prefix}</span> #{lbl}")
+        #super
+      #end
 
       def clause_order_main(docxml)
         if docxml.at(ns("//bibliography//references[@normative = 'true']")) ||
@@ -79,7 +86,7 @@ module IsoDoc
 
       def annex_anchor_names(docxml)
         clause_order_annex(docxml).each_with_index do |a, i|
-          n = i.zero? ? Counter.new("@", skip_i: true) : Counter.new
+          n = i.zero? ? Counter.new("@") : Counter.new
           docxml.xpath(ns(a[:path]))
             .each do |c|
             annex_names(c, n.increment(c).print)
@@ -88,16 +95,17 @@ module IsoDoc
         end
       end
 
-      def annex_names1(clause, num, level)
-        lbl = annexlbl(clause.at("./ancestor::xmlns:annex/@obligation")
+      def annex_names1(clause, parentnum, num, level)
+        elem = annexlbl(clause.at("./ancestor::xmlns:annex/@obligation")
             .text == "informative")
+        lbl = clause_number_semx(parentnum, clause, num)
         @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{lbl} #{num}"),
+          { label: lbl, xref: labelled_autonum(elem, lbl),
             level: level, type: "clause" }
-        i = Counter.new(0, prefix: num)
+        i = Counter.new(0)
         clause.xpath(ns("./clause | ./references | ./terms | ./definitions"))
           .each do |c|
-          annex_names1(c, i.increment(c).print, level + 1)
+          annex_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
 
@@ -106,20 +114,22 @@ module IsoDoc
         clause.xpath(ns("./appendix")).each do |c|
           i.increment(c)
           @anchors[c["id"]] =
-            anchor_struct(i.print, nil, @labels["appendix"], "clause")
+            anchor_struct(i.print, c, @labels["appendix"], "clause", { container: true })
           @anchors[c["id"]][:level] = 2
           @anchors[c["id"]][:container] = clause["id"]
         end
       end
 
-      def section_names1(clause, num, level)
+      def section_names1(clause, parentnum, num, level)
+        lbl = clause_number_semx(parentnum, clause, num)
         @anchors[clause["id"]] =
-          { label: num, level: level,
-            xref: l10n("#{@labels['subclause']} #{num}"),
+          { label: lbl, level: level,
+            #xref: l10n("#{@labels['subclause']} #{num}"),
+            xref: labelled_autonum(@labels['subclause'], lbl),
             type: "clause", elem: @labels["subclause"] }
-        i = Counter.new(0, prefix: num)
+        i = Counter.new(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
 

data/lib/metanorma/iho/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.0 -->
+<!-- VERSION v1.4.1 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">

data/lib/metanorma/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iho
-    VERSION = "1.0.8".freeze
+    VERSION = "1.0.9".freeze
   end
 end

data/metanorma-iho.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.7.2"
+  spec.add_dependency "metanorma-generic", "~> 2.7.3"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iho
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 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: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: 2.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: 2.7.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement