isodoc 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 640ee57a7cd7a28d8cb4c7c071fe5e84972145276996061e509c67d91b5cd151
-  data.tar.gz: 64296e42e9a5c6228b2fd0b66ef277e884647f6a1fb323d01f097388d31ada91
+  metadata.gz: a8b88a6aed03f811db7d034a9eac97cbce2110e5efb1ba78d70c6c8666af1b66
+  data.tar.gz: 814cbba6debefab5d23c5beb9764438160aeee1937c18279a53bde60bd49c5bf
 SHA512:
-  metadata.gz: 9a4e5052eade557aaea4684cb222adc48357d00bbcbbf70d05e9d89adc54853aad657d75b63bcb36cab9594c1520aeb7e41eddf0c9228001c01849517c6cbbb1
-  data.tar.gz: '01519d2826ab2d80b0f76b89c1cceccbbc7750138e311a4f00480794748c8aeb3e7a3557f892a85065a973ff619002f185e10cd4f9599a3247c484ca9147a440'
+  metadata.gz: de5040ab72de3052667440ac395eabc311621f0361979d9a5d637091e8e263547bf7723e3b7d19c995985252f14db4a9123eec1d0315a8f0fca0c062e0c79d3d
+  data.tar.gz: 53d2892698b75cfc7a8a40f7c921e810830b177f450b9187aa273e8479ecdaa937b0b58b9469bd616a3f7c8841d8c7ec0794a9e75185aada63c6a87580590edb

data/lib/isodoc/base_style/blocks.scss

@@ -32,7 +32,7 @@
 }
 
 @mixin figureBlock() {
-  .FigureTitle, .figure-title {
+  figcaption {
     @include blockTitle();
   }
 

data/lib/isodoc/function/blocks.rb

@@ -5,8 +5,8 @@ module IsoDoc
     module Blocks
       def figure_name_parse(_node, div, name)
         name.nil? and return
-        div.p class: "FigureTitle", style: "text-align:center;" do |p|
-          name.children.each { |n| parse(n, p) }
+        div.figcaption do |p|
+          children_parse(name, p)
         end
       end
 
@@ -23,7 +23,7 @@ module IsoDoc
       end
 
       def figure_parse1(node, out)
-        out.div **figure_attrs(node) do |div|
+        out.figure **figure_attrs(node) do |div|
           node.children.each do |n|
             parse(n, div) unless n.name == "fmt-name"
           end

data/lib/isodoc/function/blocks_example_note.rb

@@ -65,8 +65,9 @@ module IsoDoc
 
       def starts_with_para?(node)
         elem = block_body_first_elem(node) or return
-        elem.name == "p" || elem.elements.first&.name == "p" ||
-          block_body_first_elem(elem)&.name == "p"
+        elem.name == "p" || block_body_first_elem(elem)&.name == "p" ||
+          elem.elements.first&.name == "semx" &&
+            block_body_first_elem(elem.elements.first)&.name == "p"
       end
 
       def note_p_class

data/lib/isodoc/function/inline.rb

@@ -127,22 +127,13 @@ module IsoDoc
         [HTMLEntities.new.encode(a), /^[[0-9,.+-]]*$/.match?(a)]
       end
 
-      def image_title_parse(out, caption)
-        unless caption.nil?
-          out.p class: "FigureTitle", style: "text-align:center;" do |p|
-            p.b { |b| b << caption.to_s }
-          end
-        end
-      end
-
-      def image_parse(node, out, caption)
+      def image_parse(node, out)
         attrs = { src: node["src"],
                   height: node["height"] || "auto",
                   width: node["width"] || "auto",
                   title: node["title"],
                   alt: node["alt"] }
         image_body_parse(node, attrs, out)
-        image_title_parse(out, caption)
       end
 
       def image_body_parse(_node, attrs, out)

data/lib/isodoc/function/table.rb

@@ -2,9 +2,15 @@ module IsoDoc
   module Function
     module Table
       def table_title_parse(node, out)
-        name = node.at(ns("./fmt-name")) or return
-        out.p class: "TableTitle", style: "text-align:center;" do |p|
-          name&.children&.each { |n| parse(n, p) }
+        name = node.at(ns("./fmt-name"))
+        summ =  node["summary"]
+        name || summ or return
+        # out.p class: "TableTitle", style: "text-align:center;" do |p|
+        out.caption do |p|
+          children_parse(name, p)
+          summ and p.span style: "display:none" do |s|
+            s << summ
+          end
         end
       end
 
@@ -64,15 +70,6 @@ module IsoDoc
         style
       end
 
-      def tcaption(node, table)
-        node["summary"] or return
-        table.caption do |c|
-          c.span style: "display:none" do |s|
-            s << node["summary"]
-          end
-        end
-      end
-
       def colgroup(node, table)
         colgroup = node.at(ns("./colgroup")) or return
         table.colgroup do |cg|
@@ -84,8 +81,8 @@ module IsoDoc
 
       def table_parse(node, out)
         @in_table = true
-        table_title_parse(node, out)
         out.table **table_attrs(node) do |t|
+          table_title_parse(node, t)
           table_parse_core(node, t)
           table_parse_tail(node, t)
         end
@@ -101,7 +98,6 @@ module IsoDoc
       end
 
       def table_parse_core(node, out)
-        tcaption(node, out)
         colgroup(node, out)
         thead_parse(node, out)
         tbody_parse(node, out)

data/lib/isodoc/function/to_word_html.rb

@@ -163,7 +163,7 @@ module IsoDoc
           when "table" then table_parse(node, out)
           when "figure" then figure_parse(node, out)
           when "example", "termexample" then example_parse(node, out)
-          when "image" then image_parse(node, out, nil)
+          when "image" then image_parse(node, out)
           when "sourcecode" then sourcecode_parse(node, out)
           when "pre" then pre_parse(node, out)
           when "callout-annotation" then annotation_parse(node, out)

data/lib/isodoc/html_function/html.rb

@@ -106,8 +106,8 @@ module IsoDoc
       def svg_supply_viewbox(svg)
         svg["viewbox"] and return
         svg["height"] && svg["width"] or return
-        h = svg["height"].sub(/[^0-9]+$/, "")
-        w = svg["width"].sub(/[^0-9]+$/, "")
+        h = svg["height"].to_s[/\d+/].to_s
+        w = svg["width"].to_s[/\d+/].to_s
         h.to_i.positive? && w.to_i.positive? or return
         svg["viewbox"] = "0 0 #{w} #{h}"
       end

data/lib/isodoc/presentation_function/autonum.rb

@@ -114,9 +114,9 @@ module IsoDoc
     def prefix_container_fmt_xref_label(container, xref)
       container or return xref
       container_container = prefix_container_container(container)
+      container_xref = @xrefs.anchor(container, :xref, false)
       container_label =
-        prefix_container_fmt_xref_label(container_container,
-                                        @xrefs.anchor(container, :xref, false))
+        prefix_container_fmt_xref_label(container_container, container_xref)
       l10n(connectives_spans(@i18n.nested_xref
         .sub("%1", "<span class='fmt-xref-container'>#{esc container_label}</span>")
         .sub("%2", xref || "[Unknown]")))
@@ -124,6 +124,7 @@ module IsoDoc
 
     def prefix_container_container(container)
       container_container = @xrefs.anchor(container, :container, false)
+      container_container == container and return nil
       if @xrefs.anchor(container, :type) == "bibitem"
         p = @bibitem_lookup[container].parent
         p and container_container ||= p["id"]

data/lib/isodoc/presentation_xml_convert.rb

@@ -61,6 +61,7 @@ module IsoDoc
       @bibitem_lookup ||= docxml.xpath(ns("//references/bibitem"))
         .each_with_object({}) do |b, m|
           m[b["id"]] = b
+          m[b["anchor"]] = b
       end
     end
 

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.4.4".freeze
+  VERSION = "3.4.5".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -160,6 +160,23 @@ module IsoDoc
           end
         end
       end
+
+      def figure_parse1(node, out)
+        out.div **figure_attrs(node) do |div|
+          node.children.each do |n|
+            parse(n, div) unless n.name == "fmt-name"
+          end
+          figure_name_parse(node, div, node.at(ns("./fmt-name")))
+        end
+      end
+
+      def figure_name_parse(_node, div, name)
+        name.nil? and return
+        div.p class: "FigureTitle",
+              style: "text-align:center;" do |p|
+          name.children.each { |n| parse(n, p) }
+        end
+      end
     end
   end
 end

data/lib/isodoc/word_function/inline.rb

@@ -41,13 +41,12 @@ module IsoDoc
         save_dataimage(node["src"])
       end
 
-      def image_parse(node, out, caption)
+      def image_parse(node, out)
         emf_attributes(node)
         attrs = { src: imgsrc(node),
                   height: node["height"], alt: node["alt"],
                   title: node["title"], width: node["width"] }
         out.img **attr_code(attrs)
-        image_title_parse(out, caption)
       end
 
       def emf_attributes(node)

data/lib/isodoc/word_function/table.rb

@@ -104,6 +104,13 @@ module IsoDoc
         end
       end
 
+      def table_title_parse(node, out)
+        name = node.at(ns("./fmt-name")) or return
+        out.p class: "TableTitle", style: "text-align:center;" do |p|
+          name&.children&.each { |n| parse(n, p) }
+        end
+      end
+
       def table_parse(node, out)
         @in_table = true
         table_title_parse(node, out)
@@ -115,13 +122,6 @@ module IsoDoc
         end
         @in_table = false
       end
-
-      def table_parse_core(node, out)
-        colgroup(node, out)
-        thead_parse(node, out)
-        tbody_parse(node, out)
-        tfoot_parse(node, out)
-      end
     end
   end
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -174,6 +174,24 @@ module IsoDoc
         end
       end
 
+      def para_anchor_names(sections)
+        sections.each do |s|
+          notes = s.xpath(ns("./p"))
+          para_anchor_names1(notes, Counter.new)
+          para_anchor_names(s.xpath(ns(child_sections)))
+        end
+      end
+
+      def para_anchor_names1(notes, counter)
+        notes.noblank.each do |n|
+          counter.increment(n)
+          @anchors[n["id"]] =
+            anchor_struct(counter.print, n,
+                          @labels["para_xref"], "paragraph",
+                          { container: true, unnumb: false })
+        end
+      end
+
       def id_ancestor(node)
         parent = nil
         node.ancestors.each do |a|

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -21,10 +21,10 @@ module IsoDoc
         j = 0
         clause.xpath(ns(self.class::FIGURE_NO_CLASS)).noblank
           .each_with_object(Counter.new) do |t, c|
-          # labelled_ancestor(t, %w(figure)) and next # disable nested figure labelling
-          j = subfigure_increment(j, c, t)
-          sublabel = subfigure_label(j)
-          figure_anchor(t, sublabel, c.print, "figure", container: container)
+            # labelled_ancestor(t, %w(figure)) and next # disable nested figure labelling
+            j = subfigure_increment(j, c, t)
+            sublabel = subfigure_label(j)
+            figure_anchor(t, sublabel, c.print, "figure", container: container)
         end
         sequential_figure_class_names(clause, container:)
       end
@@ -33,11 +33,11 @@ module IsoDoc
         j = 0
         clause.xpath(ns(".//figure[@class][not(@class = 'pseudocode')]"))
           .each_with_object({}) do |t, c|
-          c[t["class"]] ||= Counter.new
-          j = subfigure_increment(j, c[t["class"]], t)
-          sublabel = subfigure_label(j)
-          figure_anchor(t, sublabel, c[t["class"]].print, t["class"],
-                        container: container)
+            c[t["class"]] ||= Counter.new
+            j = subfigure_increment(j, c[t["class"]], t)
+            sublabel = subfigure_label(j)
+            figure_anchor(t, sublabel, c[t["class"]].print, t["class"],
+                          container: container)
         end
       end
 
@@ -84,48 +84,48 @@ module IsoDoc
       def sequential_table_names(clause, container: false)
         clause.xpath(ns(".//table")).noblank
           .each_with_object(Counter.new) do |t, c|
-          @anchors[t["id"]] = anchor_struct(
-            c.increment(t).print, t, @labels["table"], "table",
-            { unnumb: t["unnumbered"], container: container }
-          )
-          nested_notes(t)
+            @anchors[t["id"]] = anchor_struct(
+              c.increment(t).print, t, @labels["table"], "table",
+              { unnumb: t["unnumbered"], container: container }
+            )
+            nested_notes(t)
         end
       end
 
       def sequential_formula_names(clause, container: false)
         clause.xpath(ns(".//formula")).noblank
           .each_with_object(Counter.new) do |t, c|
-          @anchors[t["id"]] = anchor_struct(
-            c.increment(t).print, t,
-            t["inequality"] ? @labels["inequality"] : @labels["formula"],
-            "formula", { unnumb: t["unnumbered"], container: true }
-          )
-          @anchors[t["id"]][:bare_xref] = @anchors[t["id"]][:label]
+            @anchors[t["id"]] = anchor_struct(
+              c.increment(t).print, t,
+              t["inequality"] ? @labels["inequality"] : @labels["formula"],
+              "formula", { unnumb: t["unnumbered"], container: true }
+            )
+            @anchors[t["id"]][:bare_xref] = @anchors[t["id"]][:label]
         end
       end
 
       def sequential_permission_names(clause, container: true)
         clause.xpath(ns(first_lvl_req)).noblank
           .each_with_object(ReqCounter.new) do |t, c|
-          m = @reqt_models.model(t["model"])
-          klass, label = reqt2class_label(t, m)
-          id = c.increment(label, t).print
-          sequential_permission_body(id, nil, t, label, klass, m,
-                                     container:)
-          sequential_permission_children(t, id, klass, container:)
+            m = @reqt_models.model(t["model"])
+            klass, label = reqt2class_label(t, m)
+            id = c.increment(label, t).print
+            sequential_permission_body(id, nil, t, label, klass, m,
+                                       container:)
+            sequential_permission_children(t, id, klass, container:)
         end
       end
 
       def sequential_permission_children(elem, lbl, klass, container: false)
         elem.xpath(ns(req_children)).noblank
           .each_with_object(ReqCounter.new) do |t, c|
-          m = @reqt_models.model(t["model"])
-          klass, label = reqt2class_nested_label(t, m)
-          ctr = c.increment(label, t).print
-          id = "#{lbl}#{subreqt_separator}#{ctr}"
-          sequential_permission_body(ctr, lbl, t, label, klass, m,
-                                     container:)
-          sequential_permission_children(t, id, klass, container:)
+            m = @reqt_models.model(t["model"])
+            klass, label = reqt2class_nested_label(t, m)
+            ctr = c.increment(label, t).print
+            id = "#{lbl}#{subreqt_separator}#{ctr}"
+            sequential_permission_body(ctr, lbl, t, label, klass, m,
+                                       container:)
+            sequential_permission_children(t, id, klass, container:)
         end
       end
 

data/lib/isodoc/xref/xref_sect_asset.rb

@@ -11,6 +11,7 @@ module IsoDoc
         note_anchor_names(sections)
         admonition_anchor_names(sections)
         example_anchor_names(sections)
+        para_anchor_names(sections)
         list_anchor_names(sections)
         deflist_anchor_names(sections)
         bookmark_anchor_names(doc)

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

@@ -55,6 +55,7 @@ OrdinalRules: digits-ordinal
 note: ملاحظة
 note_xref: ملاحظة
 termnote: ملاحظة % للقيد
+para_xref: فقرة
 list: قائمة
 deflist: قائمة تعريف
 figure: شكل

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

@@ -67,6 +67,7 @@ OrdinalRules:
 note: HINWEIS
 note_xref: Hinweis
 termnote: Hinweis % zum Eintrag
+para_xref: Absatz
 list: Liste
 deflist: Definitionsliste
 figure: Abbildung

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

@@ -58,6 +58,7 @@ OrdinalRules: digits-ordinal
 note: NOTE
 note_xref: Note
 termnote: Note % to entry
+para_xref: Paragraph
 list: List
 deflist: Definition List
 figure: Figure

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

@@ -65,6 +65,7 @@ OrdinalRules:
 note: NOTA
 note_xref: Nota
 termnote: Nota % a la entrada
+para_xref: Párrafo
 list: Lista
 deflist: Lista de definiciones
 figure: Figura

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

@@ -62,6 +62,7 @@ OrdinalRules:
 note: NOTE
 note_xref: Note
 termnote: Note % à l’article
+para_xref: Alinéa
 figure: Figure
 diagram: Diagramme
 formula: Formule

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

@@ -55,6 +55,7 @@ OrdinalRules: digits-ordinal
 note: 注記
 note_xref: 注記
 termnote: 注釈%
+para_xref: 段落
 list: リスト
 deflist: 定義リスト
 figure: 図

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

@@ -129,6 +129,7 @@ OrdinalRules:
 note: ПРИМЕЧАНИЕ
 note_xref: Примечание
 termnote: Примечание % к определению
+para_xref: Абзац
 list: Список
 deflist: Список определений
 figure: Рисунок

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

@@ -56,6 +56,7 @@ OrdinalRules: digits-ordinal
 note: 注
 note_xref: 注
 termnote: 注%
+para_xref: 段
 figure: 图
 diagram: 图表
 formula: 公式

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-16 00:00:00.000000000 Z
+date: 2026-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64