isodoc 3.2.5 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9fdc30bd68584b0e694c4ebc052d9d5c9377ff0b97d470bf9a71b422cc4c01d
-  data.tar.gz: 6eb37637765b514734b06b12beaee5769884636b9163844d6bfd8396e4beff49
+  metadata.gz: a931ab5244c4320d81c3d050af1135ea7abc6e8f353cab6f000bc1fb70fd5526
+  data.tar.gz: db5d97c194f42a1b99b0839b2ae13b246871f7d353d44ea146a1ca3fc36dd18f
 SHA512:
-  metadata.gz: d8368550186c0826ce9f4cf4634b2c00970622eae12ed79582e8ef4002d88349e019a2a641877acf51747513f57d97a3d5bcf98695c5f58f638bec986b73331d
-  data.tar.gz: c57d4d8f9a1c32fdef6f3828ee5b11d798de609e80cb72f0eec89a980235d28e5dbabd64431a9c683bbd430f406ddee169547c1af4dfe4bf15c2cfdbfa490d52
+  metadata.gz: eee3ba25e7638d1d972cf86950eea148f11fdd713b8ad126eaffc375715624d060fe7c562a7ab1c5764ad92943f36c401e3a1a49ca614a3a13f5a8439950ea6a
+  data.tar.gz: 13004963d08b08371fe5c5ca24da18ac1321aebb849a97dc3ee23e26653f2d7dadf91bd8eb5aca50a2fe0014930927e21a0f4d80c8689edb3268a324d854358f

data/lib/isodoc/base_style/all.css

@@ -138,16 +138,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;

data/lib/isodoc/base_style/reset.css

@@ -138,16 +138,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
-a.TableFootnoteRef + a.TableFootnoteRef::before {
-  content: ", ";
-  vertical-align: super;
-}
-
 a.TableFootnoteRef, span.TableFootnoteRef,
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super;

data/lib/isodoc/base_style/reset.scss

@@ -145,16 +145,6 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef::before {
-    content: ", ";
-    vertical-align: super;
-  }
-
-a.TableFootnoteRef + a.TableFootnoteRef::before { 
-    content: ", ";
-    vertical-align: super; 
-  }
-
 a.TableFootnoteRef, span.TableFootnoteRef, 
 a.FootnoteRef, span.FootnoteRef {
   vertical-align: super; 

data/lib/isodoc/css.rb

@@ -88,7 +88,6 @@ module IsoDoc
     def compile_scss(modified_stylesheet)
       SassC::Engine
         .new(modified_stylesheet, quiet_deps: true, syntax: :scss,
-                                  silence_deprecations: %w(mixed-decls),
                                   importer: SasscImporter)
         .render.gsub(/__WORD__/, "")
     end

data/lib/isodoc/function/to_word_html.rb

@@ -166,7 +166,7 @@ module IsoDoc
           when "image" then image_parse(node, out, nil)
           when "sourcecode" then sourcecode_parse(node, out)
           when "pre" then pre_parse(node, out)
-          when "annotation" then annotation_parse(node, out)
+          when "callout-annotation" then annotation_parse(node, out)
           when "term" then termdef_parse(node, out)
           when "preferred" then semx_term_parse(node, out)
           when "fmt-preferred" then term_parse(node, out)

data/lib/isodoc/gem_tasks.rb

@@ -118,7 +118,7 @@ module IsoDoc
         sheet_content = File.read(filename, encoding: "UTF-8")
           .gsub(%r<([a-z])\.([0-9])(?=[^{}]*{)>m, "\\1.__WORD__\\2")
         SassC::Engine.new(%<@use "variables" as *;\n#{sheet_content}>,
-                          syntax: :scss, importer: SasscImporter)
+                          syntax: :scss, quiet_deps: true, importer: SasscImporter)
           .render.gsub(/__WORD__/, "")
       end
     end

data/lib/isodoc/html_function/postprocess.rb

@@ -25,10 +25,9 @@ module IsoDoc
       end
 
       def html_cleanup(html)
-        html = term_header(html_footnote_filter(html_preface(htmlstyle(html))))
-        html = footnote_backlinks(html)
-        html = mathml(html_list_clean(remove_placeholder_paras(html)))
-        html_toc(heading_anchors(sourcecode_cleanup(html)))
+        html = term_header(html_preface(htmlstyle(html)))
+        html = html_list_clean(remove_placeholder_paras(html_footnote(html)))
+        html_toc(heading_anchors(sourcecode_cleanup(mathml(html))))
       end
 
       def heading_anchors(html)

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -13,8 +13,7 @@ module IsoDoc
       end
 
       def htmlstylesheet(file)
-        return if file.nil?
-
+        file.nil? and return
         file.open if file.is_a?(Tempfile)
         stylesheet = file.read
         xml = Nokogiri::XML("<style/>")
@@ -26,8 +25,7 @@ module IsoDoc
       end
 
       def htmlstyle(docxml)
-        return docxml unless @htmlstylesheet
-
+        @htmlstylesheet or return docxml
         head = docxml.at("//*[local-name() = 'head']")
         head << htmlstylesheet(@htmlstylesheet)
         s = htmlstylesheet(@htmlstylesheet_override) and head << s
@@ -53,10 +51,10 @@ module IsoDoc
       def authority_cleanup1(docxml, klass)
         dest = docxml.at("//div[@id = 'boilerplate-#{klass}-destination']")
         auth = docxml.at("//div[@id = 'boilerplate-#{klass}' or " \
-                         "@class = 'boilerplate-#{klass}']")
-        auth&.xpath(".//h1[not(text())] | .//h2[not(text())]")&.each(&:remove)
-        auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-        dest and auth and dest.replace(auth.remove)
+                         "@class = 'boilerplate-#{klass}']") or return
+        auth.xpath(".//h1[not(text())] | .//h2[not(text())]").each(&:remove)
+        auth.xpath(".//h1 | .//h2").each { |h| h["class"] = "IntroTitle" }
+        dest && auth and dest.replace(auth.remove)
       end
 
       def authority_cleanup(docxml)
@@ -163,8 +161,7 @@ module IsoDoc
       end
 
       def inject_script(doc)
-        return doc unless @scripts
-
+        @scripts or return doc
         scripts = File.read(@scripts, encoding: "UTF-8")
         scripts_override = ""
         @scripts_override and

data/lib/isodoc/html_function/postprocess_footnotes.rb

@@ -1,25 +1,18 @@
 module IsoDoc
   module HtmlFunction
     module Html
-      def update_footnote_filter(fnote, xref, idx, seen)
-        if seen[fnote.text]
-          xref.at("./sup").content = seen[fnote.text][:num].to_s
-          fnote.remove unless xref["href"] == seen[fnote.text][:href]
-          xref["href"] = seen[fnote.text][:href]
-        else
-          seen[fnote.text] = { num: idx, href: xref["href"] }
-          xref.at("./sup").content = idx.to_s
-          idx += 1
-        end
-        [idx, seen]
+      def html_footnote(html)
+        footnote_delimit(footnote_backlinks(html))
       end
 
-      def html_footnote_filter(docxml)
-        seen = {}
-        i = 1
-        docxml.xpath('//a[@class = "FootnoteRef"]').each do |x|
-          fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
-          i, seen = update_footnote_filter(fn, x, i, seen)
+      def footnote_delimit(docxml)
+        k = %w(FootnoteRef TableFootnoteRef)
+        docxml.xpath("//a").each do |a|
+          k.include?(a["class"]) or next
+          a1 = a.next_element or next
+          k.include?(a1["class"]) or next
+          sup = a.at("./sup") and a = sup
+          a << ", "
         end
         docxml
       end
@@ -37,14 +30,19 @@ module IsoDoc
       def footnote_backlinks(docxml)
         seen = {}
         docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
-          (seen[x["href"]] and next) or seen[x["href"]] = true
-          fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
+          fn = footnote_backlink?(x, docxml, seen) or next
+          seen[x["href"]] = true
           footnote_backlinks1(x, fn)
           x["id"] ||= "fnref:#{i + 1}"
           fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
         end
         docxml
       end
+
+      def footnote_backlink?(elem, docxml, seen)
+        seen[elem["href"]] and return
+        docxml.at(%<//*[@id = '#{elem['href'].sub(/^#/, '')}']>)
+      end
     end
   end
 end

data/lib/isodoc/metadata.rb

@@ -84,11 +84,6 @@ module IsoDoc
       status_print(docstatus).split(/ /).map { |s| s[0].upcase }.join
     end
 
-    # KILL
-    def unpublishedx(status)
-      !status.casecmp("published").zero?
-    end
-
     def status_print(status)
       status.split(/[- ]/).map do |w|
         letters = w.chars

data/lib/isodoc/presentation_function/footnotes.rb

@@ -3,7 +3,8 @@ module IsoDoc
     def footnote_collect(fnotes)
       seen = {}
       fnotes.each_with_object([]) do |x, m|
-        seen[x["reference"]] or m << fnbody(x, seen)
+        x["reference"] or next # ignore semx-only footnotes
+        b = fnbody(x, seen) and m << b
         x["target"] = seen[x["reference"]]
         ref = x["hiddenref"] == "true" ? "" : fn_ref_label(x)
         x << <<~FNOTE.strip
@@ -21,6 +22,7 @@ module IsoDoc
     end
 
     def fnbody(fnote, seen)
+      add_fnbody?(fnote, seen) or return nil
       body = Nokogiri::XML::Node.new("fmt-fn-body", fnote.document)
       add_id(body)
       body["target"] = fnote["id"]
@@ -31,6 +33,10 @@ module IsoDoc
       body
     end
 
+    def add_fnbody?(fnote, seen)
+      !seen[fnote["reference"]]
+    end
+
     def insert_fn_body_ref(fnote, body)
       ins = body.at(ns(".//p")) ||
         body.at(ns("./semx")).children.first.before("<p> </p>").previous
@@ -80,13 +86,21 @@ module IsoDoc
     end
 
     def non_document_footnotes(docxml)
-      table_fns = docxml.xpath(ns("//table//fn")) -
+      table_footnotes(docxml) + figure_footnotes(docxml)
+    end
+
+    def table_footnotes(docxml)
+      docxml.xpath(ns("//table//fn")) -
         docxml.xpath(ns("//table/name//fn")) -
-        docxml.xpath(ns("//table/fmt-name//fn"))
-      fig_fns = docxml.xpath(ns("//figure//fn")) -
+        docxml.xpath(ns("//table/fmt-name//fn")) -
+        docxml.xpath(ns("//fmt-provision/table//fn")) +
+        docxml.xpath(ns("//fmt-provision/table//table//fn"))
+    end
+
+    def figure_footnotes(docxml)
+      docxml.xpath(ns("//figure//fn")) -
         docxml.xpath(ns("//figure/name//fn")) -
         docxml.xpath(ns("//figure/fmt-name//fn"))
-      table_fns + fig_fns
     end
 
     def filter_document_footnotes(sects, excl)
@@ -108,7 +122,10 @@ module IsoDoc
 
     def renumber_document_footnote(fnote, idx, seen)
       fnote["original-reference"] = fnote["reference"]
-      if seen[fnote["reference"]]
+      if sem_xml_descendant?(fnote)
+        fnote.delete("reference")
+        return idx
+      elsif seen[fnote["reference"]]
         fnote["reference"] = seen[fnote["reference"]]
       else
         seen[fnote["reference"]] = idx
@@ -190,7 +207,8 @@ module IsoDoc
     def comment_to_bookmark_attrs(elem, bookmark, start: true)
       bookmark["target"] = elem["id"]
       if start then bookmark["end"] = elem["to"]
-      else bookmark["start"] = elem["from"] end
+      else bookmark["start"] = elem["from"]
+      end
       %w(author date).each { |k| bookmark[k] = elem[k] }
     end
 

data/lib/isodoc/presentation_function/refs.rb

@@ -3,12 +3,12 @@ require_relative "docid"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def references(docxml)
-      bibliography_bibitem_number(docxml)
       @ref_renderings = references_render(docxml)
       docxml.xpath(ns("//references/bibitem")).each do |x|
         bibitem(x, @ref_renderings)
         reference_name(x)
       end
+      bibliography_bibitem_number(docxml)
       hidden_items(docxml)
       move_norm_ref_to_sections(docxml)
     end
@@ -174,7 +174,7 @@ module IsoDoc
             else norm_ref_entry_code(ordinal, idents, ids, standard, datefn,
                                      bib)
             end
-      bib << "<biblio-tag>#{ret}</biblio-tag>"
+      bib.add_first_child("<biblio-tag>#{ret}</biblio-tag>")
     end
 
     def norm_ref_entry_code(_ordinal, idents, _ids, _standard, datefn, _bib)

data/lib/isodoc/presentation_function/section.rb

@@ -71,10 +71,15 @@ module IsoDoc
       if unnumbered_clause?(elem)
         prefix_name(elem, {}, nil, "title")
       else
-        prefix_name(elem, { caption: annex_delim(elem) }, lbl, "title")
+        prefix_name(elem, { caption: annex_delim_override(elem) }, lbl, "title")
       end
     end
 
+    def annex_delim_override(elem)
+      m = elem.document.root.at(ns("//presentation-metadata/annex-delim"))
+      m ? to_xml(m.children) : annex_delim(elem)
+    end
+
     def annex_delim(_elem)
       "<br/><br/>"
     end

data/lib/isodoc/presentation_function/terms.rb

@@ -96,10 +96,11 @@ module IsoDoc
       p.add_first_child "<#{to_xml(d1)}>  "
     end
 
+    # TODO should I wrap fmt-definition//termsource in fmt-termsource,
+    # in order to preserve termsource attributes?
+    # differentiating term and nonterm source under designations is not worth it
     def termsource(docxml)
       copy_baselevel_termsource(docxml)
-      # TODO should I wrap fmt-definition//termsource in fmt-termsource, in order to preserve termsource attributes?
-      # differentiating term and nonterm source under designations is not worth it
       docxml.xpath(ns("//fmt-termsource/source | //fmt-definition//source | //fmt-preferred//source | //fmt-admitted//source | //fmt-deprecates//source"))
         .each do |f|
         termsource_modification(f)

data/lib/isodoc/presentation_function/title.rb

@@ -3,10 +3,23 @@ require_relative "refs"
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def middle_title(docxml)
-      s = docxml.at(ns("//sections")) or return
-      t = @meta.get[:doctitle]
-      t.nil? || t.empty? and return
-      s.add_first_child "<p class='zzSTDTitle1'>#{t}</p>"
+      sections = docxml.at(ns("//sections")) or return
+      template = middle_title_get_template(docxml) or return
+      title = populate_template(template, nil) or return
+      title.strip.empty? and return
+      Nokogiri::XML(title).root.text.strip.empty? and return
+      sections.add_first_child title
+    end
+
+    def middle_title_get_template(docxml)
+      m = docxml.at(ns("//presentation-metadata/middle-title"))
+      template = m ? to_xml(m.children) : middle_title_template
+      template&.strip&.empty? and template = nil
+      template
+    end
+
+    def middle_title_template
+      "<p class='zzSTDTitle1'>{{ doctitle }}</p>"
     end
 
     def missing_title(docxml)
@@ -79,7 +92,8 @@ module IsoDoc
         if prev.name == "floating-title"
           ret << prev
           p = prev
-        else break end
+        else break
+        end
       end
       ret
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.2.5".freeze
+  VERSION = "3.2.7".freeze
 end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -131,18 +131,19 @@ module IsoDoc
       def sequential_permission_body(id, parent_id, elem, label, klass, model,
 container: false)
         lbl = parent_id ? "#{parent_id}#{subreqt_separator}#{id}" : id
-        @anchors[elem["id"]] = model.postprocess_anchor_struct(
+        e = elem["id"]
+        @anchors[e] = model.postprocess_anchor_struct(
           elem, anchor_struct(lbl, elem,
                               label, klass, { unnumb: elem["unnumbered"], container: })
         )
-        @anchors[elem["id"]][:semx] = semx(elem, lbl)
+        @anchors[e][:semx] = semx(elem, lbl)
         if parent_id
           x = "#{subreqt_separator(markup: true)}#{semx(elem, id)}"
-          @anchors[elem["id"]][:semx] = @anchors[elem.parent["id"]][:semx] + x
-          @anchors[elem["id"]][:label] =
-            "<span class='fmt-element-name'>#{label}</span> #{@anchors[elem['id']][:semx]}"
-          @anchors[elem["id"]][:xref] =
-            "<span class='fmt-element-name'>#{label}</span> #{@anchors[elem['id']][:semx]}"
+          @anchors[e][:semx] = @anchors[elem.parent["id"]][:semx] + x
+          @anchors[e][:label] =
+            "<span class='fmt-element-name'>#{label}</span> #{@anchors[e][:semx]}"
+          @anchors[e][:xref] =
+            "<span class='fmt-element-name'>#{label}</span> #{@anchors[e][:semx]}"
         end
         model.permission_parts(elem, id, label, klass).each do |n|
           @anchors[n[:id]] = anchor_struct(n[:number], n[:elem], n[:label],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64