isodoc 3.1.6 → 3.1.7

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,4 +1,5 @@
 require_relative "clause_order"
+require_relative "xref_sect_asset"
 
 module IsoDoc
   module XrefGen
@@ -58,22 +59,6 @@ module IsoDoc
         end
       end
 
-      # preempt clause notes with all other types of note (ISO default)
-      def asset_anchor_names(doc)
-        (@parse_settings.empty? || @parse_settings[:assets]) or return
-        middle_section_asset_names(doc)
-        termnote_anchor_names(doc)
-        termexample_anchor_names(doc)
-        note_anchor_names(doc.xpath(ns("//table | //figure")))
-        sections = doc.xpath(ns(sections_xpath))
-        note_anchor_names(sections)
-        admonition_anchor_names(sections)
-        example_anchor_names(sections)
-        list_anchor_names(sections)
-        deflist_anchor_names(sections)
-        bookmark_anchor_names(doc)
-      end
-
       def clause_title(clause, use_elem_name: false)
         ret = clause.at(ns("./title"))&.text
         if use_elem_name && ret.blank?
@@ -83,9 +68,6 @@ module IsoDoc
         end
       end
 
-      SUBCLAUSES =
-        "./clause | ./references | ./term  | ./terms | ./definitions".freeze
-
       # in StanDoc, prefaces have no numbering; they are referenced only by title
       def preface_names(clause)
         unnumbered_names(clause)
@@ -103,7 +85,7 @@ module IsoDoc
         clause.nil? and return
         title = clause_title(clause, use_elem_name: true)
         preface_name_anchors(clause, 1, title)
-        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+        clause.xpath(ns(subclauses)).each_with_index do |c, i|
           t = c.at(ns("./title"))
           tt = "#{semx(clause, title, clause.name)}" \
             "<span class='fmt-comma'>,</span> #{semx(c, i + 1)}"
@@ -114,7 +96,7 @@ module IsoDoc
       def preface_names1(clause, title, parent_title, level)
         label = title || parent_title
         preface_name_anchors(clause, level, title || parent_title)
-        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+        clause.xpath(ns(subclauses)).each_with_index do |c, i|
           t = c.at(ns("./title"))
           preface_names1(c, t ? semx(c, t.text, c.name) : nil,
                          "#{label} #{semx(c, i + 1)}",
@@ -131,20 +113,12 @@ module IsoDoc
             type: "clause", elem: @labels["clause"] }
       end
 
-      def middle_section_asset_names(doc)
-        middle_sections =
-          "//clause[@type = 'scope'] | #{@klass.norm_ref_xpath} | " \
-          "//sections/terms | //preface/* | " \
-          "//sections/definitions | //clause[parent::sections]"
-        sequential_asset_names(doc.xpath(ns(middle_sections)))
-      end
-
       def section_names(clause, num, lvl)
         unnumbered_section_name?(clause) and return num
         num.increment(clause)
         lbl = semx(clause, num.print)
         section_name_anchors(clause, lbl, lvl)
-        clause.xpath(ns(SUBCLAUSES))
+        clause.xpath(ns(subclauses))
           .each_with_object(clause_counter(0)) do |c, i|
           section_names1(c, lbl, i.increment(c).print, lvl + 1)
         end
@@ -153,12 +127,12 @@ module IsoDoc
 
       def clause_number_semx(parentnum, clause, num)
         if clause["branch-number"]
-                semx(clause, clause["branch-number"])
+          semx(clause, clause["branch-number"])
         elsif parentnum.nil?
           semx(clause, num)
-              else
-                "#{parentnum}#{delim_wrap(clausesep)}#{semx(clause, num)}"
-              end
+        else
+          "#{parentnum}#{delim_wrap(clausesep)}#{semx(clause, num)}"
+        end
       end
 
       def section_names1(clause, parentnum, num, level)
@@ -166,7 +140,7 @@ module IsoDoc
         lbl = clause_number_semx(parentnum, clause, num)
         section_name_anchors(clause, lbl, level)
         i = clause_counter(0)
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
+        clause.xpath(ns(subclauses)).each do |c|
           section_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
@@ -218,13 +192,14 @@ module IsoDoc
       end
 
       def annex_names(clause, num)
+        appendix_names(clause, num)
         label = semx(clause, num)
         annex_name_anchors(clause, label, 1)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
                        nil, num.to_s, 1)
         else
-          clause.xpath(ns(SUBCLAUSES))
+          clause.xpath(ns(subclauses))
             .each_with_object(clause_counter(0)) do |c, i|
             annex_names1(c, label, i.increment(c).print, 2)
           end
@@ -236,7 +211,7 @@ module IsoDoc
         lbl = clause_number_semx(parentnum, clause, num)
         annex_name_anchors1(clause, lbl, level)
         i = clause_counter(0)
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
+        clause.xpath(ns(subclauses)).each do |c|
           annex_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
@@ -245,6 +220,33 @@ module IsoDoc
       def annex_name_anchors1(clause, num, level)
         annex_name_anchors(clause, num, level)
       end
+
+      def appendix_names(clause, _num)
+        i = clause_counter(0)
+        clause.xpath(ns("./appendix")).each do |c|
+          i.increment(c)
+          num = semx(c, i.print)
+          lbl = labelled_autonum(@labels["appendix"], num)
+          @anchors[c["id"]] =
+            anchor_struct(i.print, c, @labels["appendix"],
+                          "clause").merge(level: 2, subtype: "annex",
+                                          container: clause["id"])
+          j = clause_counter(0)
+          c.xpath(ns("./clause | ./references")).each do |c1|
+            appendix_names1(c1, lbl, j.increment(c1).print, 3, clause["id"])
+          end
+        end
+      end
+
+      def appendix_names1(clause, parentnum, num, level, container)
+        num = clause_number_semx(parentnum, clause, num)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level,
+                                   container: container }
+        i = clause_counter(0)
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          appendix_names1(c, num, i.increment(c).print, level + 1, container)
+        end
+      end
     end
   end
 end

data/lib/isodoc/xref/xref_util.rb

@@ -68,7 +68,7 @@ module IsoDoc
 
       SECTIONS_XPATH =
         "//foreword | //introduction | //acknowledgements | " \
-        "//preface/abstract | " \
+        "//executivesummary | //preface/abstract | " \
         "//preface/terms | //preface/definitions | //preface/references | " \
         "//preface/clause | //sections/terms | //annex | " \
         "//sections/clause | //sections/definitions | " \
@@ -91,6 +91,33 @@ module IsoDoc
         CHILD_SECTIONS
       end
 
+      SUBCLAUSES =
+        "./clause | ./references | ./term  | ./terms | ./definitions".freeze
+
+      def subclauses
+        SUBCLAUSES
+      end
+
+      FIRST_LVL_REQ_RULE = <<~XPATH.freeze
+        [not(ancestor::permission or ancestor::requirement or ancestor::recommendation)]
+      XPATH
+
+      FIRST_LVL_REQ = <<~XPATH.freeze
+        .//permission#{FIRST_LVL_REQ_RULE} | .//requirement#{FIRST_LVL_REQ_RULE} | .//recommendation#{FIRST_LVL_REQ_RULE}
+      XPATH
+
+      def first_lvl_req
+        FIRST_LVL_REQ
+      end
+
+      REQ_CHILDREN = <<~XPATH.freeze
+        ./permission | ./requirement | ./recommendation
+      XPATH
+
+      def req_children
+        REQ_CHILDREN
+      end
+
       # if hierarchically marked up node in label already,
       # leave alone, else wrap in semx
       def semx(node, label, element = "autonum")

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

@@ -9,6 +9,7 @@ section: قسم
 foreword: تمهيد
 abstract: ملخص
 acknowledgements: شكر
+executivesummary: الملخص التنفيذي
 termsdef: مصطلحات معرفة
 termsdefsymbolsabbrev: المصطلحات والتعريفات والرموز والاختصارات
 termsdefsymbols: المصطلحات والتعريفات والرموز

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

@@ -9,6 +9,7 @@ introduction: Einführung
 foreword: Vorwort
 abstract: Abstrakt
 acknowledgements: Danksagung
+executivesummary: Zusammenfassung
 termsdef: Begriffe und Definitionen
 termsdefsymbolsabbrev: Begriffe, Definitionen, Symbole und abgekürzte Begriffe
 termsdefsymbols: Begriffe, Definitionen und Symbole

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

@@ -8,6 +8,7 @@ introduction: Introduction
 foreword: Foreword
 abstract: Abstract
 acknowledgements: Acknowledgements
+executivesummary: Executive summary
 termsdef: Terms and definitions
 termsdefsymbolsabbrev: Terms, definitions, symbols and abbreviated terms
 termsdefsymbols: Terms, definitions and symbols

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

@@ -8,6 +8,7 @@ introduction: Introducción
 foreword: Prólogo
 abstract: Resumen
 acknowledgements: Agradecimientos
+executivesummary: Resumen ejecutivo
 termsdef: Términos y definiciones
 termsdefsymbolsabbrev: Términos, definiciones, símbolos y términos abreviados
 termsdefsymbols: Términos, definiciones y símbolos

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

@@ -8,6 +8,7 @@ introduction: Introduction
 foreword: Avant-propos
 abstract: Résumé
 acknowledgements: Remerciements
+executivesummary: Résumé exécutif
 termsdef: Termes et définitions
 termsdefsymbolsabbrev: Termes, définitions, symboles et termes abrégés
 termsdefsymbols: Termes, définitions et symboles

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

@@ -8,6 +8,7 @@ introduction: 序文
 foreword: まえがき
 abstract: はじめに
 acknowledgements: 謝辞
+executivesummary: エグゼクティブサマリー
 termsdef: 用語及び定義
 termsdefsymbolsabbrev: 用語及び定義並びに記号及び略語
 termsdefsymbols: 用語及び定義並びに記号

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

@@ -8,6 +8,7 @@ introduction: Введение
 foreword: Предисловие
 abstract: Реферат
 acknowledgements: Подтверждения
+executivesummary: Управляющее резюме
 termsdef: Термины и определения
 termsdefsymbolsabbrev: Термины, определения, символы и сокращенные термины
 termsdefsymbols: Термины, определения и символы

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

@@ -8,6 +8,7 @@ introduction: 引言
 foreword: 前言
 abstract: 摘要
 acknowledgements: 致謝
+executivesummary: 执行摘要
 termsdef: 术语和定义
 termsdefsymbolsabbrev: 术语、定义、符号、代号和缩略语
 termsdefsymbols: 术语、定义、符号和代号

data/lib/isodoc.rb

@@ -5,7 +5,6 @@ require "uuidtools"
 require "base64"
 require "mime/types"
 require "image_size"
-require "set"
 require "html2doc"
 require "liquid"
 require "htmlentities"
@@ -22,6 +21,7 @@ require "isodoc/headlesshtml_convert"
 require "isodoc/presentation_xml_convert"
 require "isodoc/xref"
 require "isodoc/i18n"
+require "isodoc/css_border_parser"
 require "metanorma/output"
 require "relaton/render-isodoc/general"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-15 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -399,6 +399,8 @@ files:
 - lib/isodoc/common.rb
 - lib/isodoc/convert.rb
 - lib/isodoc/css.rb
+- lib/isodoc/css_border_parser.rb
+- lib/isodoc/css_border_parser_vars.rb
 - lib/isodoc/function.rb
 - lib/isodoc/function/blocks.rb
 - lib/isodoc/function/blocks_example_note.rb
@@ -476,6 +478,7 @@ files:
 - 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_asset.rb
 - lib/isodoc/xref/xref_sect_gen.rb
 - lib/isodoc/xref/xref_util.rb
 - lib/isodoc/xslfo_convert.rb