isodoc 2.11.0 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c38cf2267396e98d1de955feacbd9002b32d6f076593c414d8395eea21f08510
-  data.tar.gz: 433c3e2d54797e3f22eb693f714163f4c3ac523a7584730872e1f7316b2dec81
+  metadata.gz: 806dd6df2ad1f9acfbebcc324d1c2b88b035c3242b9655ee1c82c7a7eb3d40cc
+  data.tar.gz: 1bc15cb526e0bbd4f8151facf0c20567ee2776046a325bb4dac96ce9e7eee40b
 SHA512:
-  metadata.gz: b36c7d9e7676ba7df00d34bb78797649b683a454776605249861978cf4ec5df3bdf61b7e4f05ec4e6644f62ac15aaa2e840cb5c36afb654e5c3d5457ddbd023e
-  data.tar.gz: bce31398c2b4b23f8e4b1a3192a73564f69ebfc0859320aff702c8eb3d2eadc9ae84e05275d6be1a54abb2a1be1146786925c2452a9e7ae8caac3d285f10beb6
+  metadata.gz: 356559fad5bb12c0bc7e8cfec04f2c7bb625be430f702a21d825d7fc5c03e0ac037e5d7490f7712d1294b9151997fac54125ff751f88a9cd8ae51412ce36e2bc
+  data.tar.gz: a8579583084ad8ca0956a927ddd4e4ef1b386bc4979676ee8edd8f866b4031e6411764e5f49f62e2c293f0eadf83f04caccfcfcd0a0d70360bbd31a27999d215

data/lib/isodoc/base_style/all.css

@@ -222,6 +222,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #standard-band {
   background-color: #0AC442; }
 

data/lib/isodoc/base_style/reset.css

@@ -221,3 +221,43 @@ h5:hover > a.anchor,
 h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
+
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }

data/lib/isodoc/base_style/reset.scss

@@ -223,3 +223,50 @@ h6:hover>a.anchor,
 .inline-header:hover>a.anchor{
 visibility:visible;
 }
+
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out;
+}
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px;
+}
+
+.active, .collapsible:hover {
+  background-color: #555;
+}
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px;
+}
+
+.active:after {
+  content: "\25b2";
+}
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0;
+}
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0;
+}

data/lib/isodoc/base_style/scripts.html

@@ -185,3 +185,21 @@ $('#toggle').on('click', function(){
 anchors.add('h1, h2, h3, h4');
 </script>
 
+<script>
+// use .collapsible element to toggle visibility of element following it
+var coll = document.getElementsByClassName("collapsible");
+var i;
+
+for (i = 0; i < coll.length; i++) {
+  coll[i].addEventListener("click", function() {
+    this.classList.toggle("active");
+    var content = this.nextElementSibling;
+    if (content.style.maxHeight){
+      content.style.maxHeight = null;
+    } else {
+      content.style.maxHeight = content.scrollHeight + "px";
+    }
+  });
+}
+</script>
+

data/lib/isodoc/function/cleanup.rb

@@ -89,7 +89,8 @@ module IsoDoc
           if n.nil?
             x.name = "p"
           else
-            n.children.first.previous = x.remove
+            #n.children.first.previous = x.remove
+            n.add_first_child(x.remove)
           end
         end
         docxml

data/lib/isodoc/function/section.rb

@@ -83,7 +83,8 @@ module IsoDoc
       # subclause
       def symbols_parse(isoxml, out)
         isoxml.at(ns("./title")) or
-          isoxml.children.first.previous = "<title>#{@i18n.symbols}</title>"
+          #isoxml.children.first.previous = "<title>#{@i18n.symbols}</title>"
+          isoxml.add_first_child "<title>#{@i18n.symbols}</title>"
         clause_parse(isoxml, out)
       end
 

data/lib/isodoc/function/utils.rb

@@ -1,4 +1,5 @@
 require "metanorma-utils"
+require_relative "../../nokogiri/xml/node"
 
 module IsoDoc
   module Function
@@ -27,8 +28,8 @@ module IsoDoc
         [1..count].each { out << tab }
       end
 
-      def noko(&block)
-        Metanorma::Utils::noko_html(&block)
+      def noko(&)
+        Metanorma::Utils::noko_html(&)
       end
 
       def attr_code(attributes)
@@ -40,8 +41,7 @@ module IsoDoc
       DOCTYPE_HDR = "<!DOCTYPE html SYSTEM " \
                     '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
 
-      HUGESTRICT =
-        Nokogiri::XML::ParseOptions::HUGE |
+      HUGESTRICT = Nokogiri::XML::ParseOptions::HUGE |
         Nokogiri::XML::ParseOptions::STRICT
 
       def to_xhtml(xml)
@@ -62,7 +62,7 @@ module IsoDoc
       end
 
       def to_xhtml_prep(xml)
-        xml.gsub!(/<\?xml[^>]*>/, "")
+        xml.gsub!(/<\?xml[^<>]*>/, "")
         xml.include?("<!DOCTYPE ") || (xml = DOCTYPE_HDR + xml)
         numeric_escapes(xml)
       end
@@ -130,8 +130,8 @@ module IsoDoc
 
       def header_strip(hdr)
         h1 = to_xhtml_fragment(hdr.to_s.gsub(%r{<br\s*/>}, " ")
-          .gsub(%r{</?p(\s[^>]+)?>}, "")
-          .gsub(/<\/?h[123456][^>]*>/, "").gsub(/<\/?b[^>]*>/, "").dup)
+          .gsub(%r{</?p(\s[^<>]+)?>}, "")
+          .gsub(/<\/?h[123456][^<>]*>/, "").gsub(/<\/?b[^<>]*>/, "").dup)
         h1.traverse do |x|
           if x.name == "span" && x["style"]&.include?("mso-tab-count")
             x.replace(" ")
@@ -243,7 +243,7 @@ module IsoDoc
         win = !!((RUBY_PLATFORM =~ /(win|w)(32|64)$/) ||
                  (RUBY_PLATFORM =~ /mswin|mingw/))
         if win
-          path.gsub!(%{/}, "\\")
+          path.tr!(%{/}, "\\")
           path[/\s/] ? "\"#{path}\"" : path
         else path
         end

data/lib/isodoc/gem_tasks.rb

@@ -82,7 +82,7 @@ module IsoDoc
 
     def comment_out_liquid(text)
       text.split("\n").map do |line|
-        if line.match?(/{({|%).+(}|%)}/)
+        if line.match?(/(?<!{){({|%)(?![{%]).+(}|%)}/)
           "/* LIQUID_COMMENT#{line}LIQUID_COMMENT */"
         else
           line

data/lib/isodoc/html_function/postprocess.rb

@@ -20,8 +20,8 @@ module IsoDoc
       end
 
       def html5(doc)
-        doc.sub(%r{<!DOCTYPE html [^>]+>}, "<!DOCTYPE html>")
-          .sub(%r{<\?xml[^>]+>}, "")
+        doc.sub(%r{<!DOCTYPE html [^<>]+>}, "<!DOCTYPE html>")
+          .sub(%r{<\?xml[^<>]+>}, "")
       end
 
       def html_cleanup(html)

data/lib/isodoc/html_function/postprocess_cover.rb

@@ -6,9 +6,9 @@ module IsoDoc
   module HtmlFunction
     module Html
       def script_cdata(result)
-        result.gsub(%r{<script([^>]*)>\s*<!\[CDATA\[}m, "<script\\1>")
+        result.gsub(%r{<script([^<>]*)>\s*<!\[CDATA\[}m, "<script\\1>")
           .gsub(%r{\]\]>\s*</script>}, "</script>")
-          .gsub(%r{<!\[CDATA\[\s*<script([^>]*)>}m, "<script\\1>")
+          .gsub(%r{<!\[CDATA\[\s*<script([^<>]*)>}m, "<script\\1>")
           .gsub(%r{</script>\s*\]\]>}, "</script>")
       end
 
@@ -82,7 +82,8 @@ module IsoDoc
       def html_cover(docxml)
         doc = to_xhtml_fragment(File.read(@htmlcoverpage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="title-section"]')
-        d.children.first.add_previous_sibling(
+        #d.children.first.add_previous_sibling(
+        d.add_first_child(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )
       end
@@ -90,7 +91,8 @@ module IsoDoc
       def html_intro(docxml)
         doc = to_xhtml_fragment(File.read(@htmlintropage, encoding: "UTF-8"))
         d = docxml.at('//div[@class="prefatory-section"]')
-        d.children.first.add_previous_sibling(
+        #d.children.first.add_previous_sibling(
+        d.add_first_child(
           populate_template(doc.to_xml(encoding: "US-ASCII"), :html),
         )
       end

data/lib/isodoc/html_function/postprocess_footnotes.rb

@@ -1,59 +1,64 @@
-module IsoDoc::HtmlFunction
-  module Html
-    def update_footnote_filter(fn, x, i, seen)
-      if seen[fn.text]
-        x.at("./sup").content = seen[fn.text][:num].to_s
-        fn.remove unless x["href"] == seen[fn.text][:href]
-        x["href"] = seen[fn.text][:href]
-      else
-        seen[fn.text] = { num: i, href: x["href"] }
-        x.at("./sup").content = i.to_s
-        i += 1
+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]
       end
-      [i, seen]
-    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 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)
+        end
+        docxml
       end
-      docxml
-    end
 
-    def footnote_backlinks1(x, fn)
-      xdup = x.dup
-      xdup.remove["id"]
-      if fn.elements.empty?
-        fn.children.first.previous = xdup
-      else
-        fn.elements.first.children.first.previous = xdup
+      def footnote_backlinks1(xref, footnote)
+        xdup = xref.dup
+        xdup.remove["id"]
+        if footnote.elements.empty?
+          #footnote.children.empty? and footnote << " "
+          #footnote.children.first.previous = xdup
+          footnote.add_first_child xdup
+        else
+          #footnote.elements.first.children.first.previous = xdup
+          footnote.elements.first.add_first_child xdup
+        end
       end
-    end
 
-    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
-        footnote_backlinks1(x, fn)
-        x["id"] ||= "fnref:#{i + 1}"
-        fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
+      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
+          footnote_backlinks1(x, fn)
+          x["id"] ||= "fnref:#{i + 1}"
+          fn.add_child "<a href='##{x['id']}'>&#x21A9;</a>"
+        end
+        docxml
       end
-      docxml
-    end
 
-    def footnote_format(docxml)
-      docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
-        footnote_reference_format(x)
-      end
-      docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
-                   "//span[@class = 'TableFootnoteRef']").each do |x|
-        table_footnote_reference_format(x)
+      def footnote_format(docxml)
+        docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
+          footnote_reference_format(x)
+        end
+        docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
+                     "//span[@class = 'TableFootnoteRef']").each do |x|
+          table_footnote_reference_format(x)
+        end
+        docxml
       end
-      docxml
     end
   end
 end

data/lib/isodoc/presentation_function/block.rb

@@ -6,7 +6,7 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def lower2cap(text)
       /^[[:upper:]][[:upper:]]/.match?(text) and return text
-      text.capitalize
+      text&.capitalize
     end
 
     def block_delim
@@ -16,8 +16,9 @@ module IsoDoc
     def prefix_name(node, delim, number, elem)
       number.nil? || number.empty? and return
       unless name = node.at(ns("./#{elem}"))
-        (node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
-          node.children.first.previous = "<#{elem}></#{elem}>"
+        #(node.children.empty? and node.add_child("<#{elem}></#{elem}>")) or
+        #  node.children.first.previous = "<#{elem}></#{elem}>"
+        node.add_first_child "<#{elem}></#{elem}>"
         name = node.children.first
       end
       if name.children.empty? then name.add_child(cleanup_entities(number.strip))

data/lib/isodoc/presentation_function/erefs.rb

@@ -40,7 +40,7 @@ module IsoDoc
       node.delete("droploc") unless droploc
       eref_localities1({ target:, number: "pl",
                          type: refs.first.at(ns("./locality/@type")).text,
-                         from: l10n(ret[1..-1].join), node:, lang: @lang })
+                         from: l10n(ret[1..].join), node:, lang: @lang })
     end
 
     def can_conflate_eref_rendering?(refs)
@@ -48,16 +48,13 @@ module IsoDoc
         refs.all? { |r| r.name == "localityStack" } &&
         refs.all? { |r| r.xpath(ns("./locality")).size == 1 }) or return false
       first = refs.first.at(ns("./locality/@type")).text
-      refs.all? do |r|
-        r.at(ns("./locality/@type")).text == first
-      end
+      refs.all? { |r| r.at(ns("./locality/@type")).text == first }
     end
 
     def resolve_eref_connectives(locs)
       locs = resolve_comma_connectives(locs)
       locs = resolve_to_connectives(locs)
-      return locs if locs.size < 3
-
+      locs.size < 3 and return locs
       locs = locs.each_slice(2).with_object([]) do |a, m|
         m << { conn: a[0], label: a[1] }
       end
@@ -150,7 +147,6 @@ module IsoDoc
       end
     end
 
-    # def eref_localities1_zh(_target, type, from, upto, node)
     def eref_localities1_zh(opt)
       ret = "第#{opt[:from]}" if opt[:from]
       ret += "&#x2013;#{opt[:upto]}" if opt[:upto]
@@ -159,11 +155,9 @@ module IsoDoc
       ret
     end
 
-    # def eref_localities1(target, type, from, upto, node, lang = "en")
     def eref_localities1(opt)
       opt[:type] == "anchor" and return nil
       opt[:lang] == "zh" and
-        # return l10n(eref_localities1_zh(target, type, from, upto, node))
         return l10n(eref_localities1_zh(opt))
       ret = eref_locality_populate(opt[:type], opt[:node], opt[:number])
       ret += " #{opt[:from]}" if opt[:from]
@@ -188,7 +182,7 @@ module IsoDoc
         .each do |e|
         href = eref_target(e) or next
         e.xpath(ns("./locality | ./localityStack")).each(&:remove)
-        if /^#/.match?(href) then eref2xref(e)
+        if href[:type] == :anchor then eref2xref(e)
         else eref2link1(e, href)
         end
       end
@@ -203,7 +197,9 @@ module IsoDoc
     end
 
     def eref2link1(node, href)
-      repl = "<link target='#{href}'>#{node.children}</link>"
+      url = href[:link]
+      att = href[:type] == :attachment ? "attachment='true'" : ""
+      repl = "<link #{att} target='#{url}'>#{node.children}</link>"
       node["type"] == "footnote" and repl = "<sup>#{repl}</sup>"
       node.replace(repl)
     end
@@ -215,20 +211,29 @@ module IsoDoc
     end
 
     def eref_target(node)
-      url = suffix_url(eref_url(node["bibitemid"]))
+      u = eref_url(node["bibitemid"]) or return nil
+      url = suffix_url(u[:link])
       anchor = node.at(ns(".//locality[@type = 'anchor']"))
-      return url if url.nil? || /^#/.match?(url) || !anchor
+      /^#/.match?(url) || !anchor and return { link: url, type: u[:type] }
+      { link: "#{url}##{anchor.text.strip}", type: u[:type] }
+    end
 
-      "#{url}##{anchor.text.strip}"
+    def eref_url_prep(id)
+      @bibitem_lookup.nil? and return nil
+      @bibitem_lookup[id]
     end
 
     def eref_url(id)
-      @bibitem_lookup.nil? and return nil
-      b = @bibitem_lookup[id] or return nil
-      url = b.at(ns("./uri[@type = 'citation'][@language = '#{@lang}']")) ||
-        b.at(ns("./uri[@type = 'citation']")) and return url.text
-      b["hidden"] == "true" and return b.at(ns("./uri"))&.text
-      "##{id}"
+      b = eref_url_prep(id) or return nil
+      %i(attachment citation).each do |x|
+        u = b.at(ns("./uri[@type = '#{x}'][@language = '#{@lang}']")) ||
+          b.at(ns("./uri[@type = '#{x}']")) and return { link: u.text, type: x }
+      end
+      if b["hidden"] == "true"
+        u = b.at(ns("./uri")) or return nil
+        { link: u.text, type: :citation }
+      else { link: "##{id}", type: :anchor }
+      end
     end
   end
 end

data/lib/isodoc/presentation_function/image.rb

@@ -38,7 +38,7 @@ module IsoDoc
 
       svg = Base64.strict_decode64(elem["src"]
         .sub(%r{^data:image/svg\+xml;(charset=[^;]+;)?base64,}, ""))
-      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^>]*>/, ""), &:huge)
+      x = Nokogiri::XML.fragment(svg.sub(/<\?xml[^<>]*>/, ""), &:huge)
       elem["src"] = ""
       elem.children = x
     end
@@ -77,7 +77,8 @@ module IsoDoc
     def svg_emf_double(img)
       if emf?(img["mimetype"])
         img = emf_encode(img)
-        img.children.first.previous = emf_to_svg(img)
+        #img.children.first.previous = emf_to_svg(img)
+        img.add_first_child emf_to_svg(img)
       elsif img["mimetype"] == "image/svg+xml"
         src = svg_to_emf(img) or return
         img.add_child("<emf/>")

data/lib/isodoc/presentation_function/metadata.rb

@@ -24,7 +24,7 @@ module IsoDoc
     def save_attachment(attachment, dir)
       n = File.join(dir, File.basename(attachment["name"]))
       c = attachment.text.sub(%r{^data:[^;]+;(?:charset=[^;]+;)?base64,}, "")
-      File.open(n, "wb") { |f| f.write(Base64.strict_decode64(c)) }
+      File.open(n, "wb") { |f| f.write(Base64.decode64(c)) }
     end
 
     def extension_insert(xml, path = [])

data/lib/isodoc/presentation_function/reqt.rb

@@ -2,19 +2,22 @@ module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def recommendation(docxml)
       docxml.xpath(ns("//recommendation")).each do |f|
-        recommendation1(f, lower2cap(@i18n.recommendation))
+        recommendation1(f, lower2cap(f["class"]) ||
+                        lower2cap(@i18n.recommendation))
       end
     end
 
     def requirement(docxml)
       docxml.xpath(ns("//requirement")).each do |f|
-        recommendation1(f, lower2cap(@i18n.requirement))
+        recommendation1(f, lower2cap(f["class"]) ||
+                        lower2cap(@i18n.requirement))
       end
     end
 
     def permission(docxml)
       docxml.xpath(ns("//permission")).each do |f|
-        recommendation1(f, lower2cap(@i18n.permission))
+        recommendation1(f, lower2cap(f["class"]) ||
+                        lower2cap(@i18n.permission))
       end
     end
 

data/lib/isodoc/presentation_function/section.rb

@@ -6,8 +6,8 @@ module IsoDoc
       s = docxml.at(ns("//sections")) or return
       t = @meta.get[:doctitle]
       t.nil? || t.empty? and return
-      s.children.first.previous =
-        "<p class='zzSTDTitle1'>#{t}</p>"
+      #s.children.first.previous =
+      s.add_first_child "<p class='zzSTDTitle1'>#{t}</p>"
     end
 
     def clause(docxml)
@@ -21,12 +21,17 @@ module IsoDoc
       end
     end
 
+    def unnumbered_clause?(elem)
+      !elem.ancestors("boilerplate, metanorma-extension").empty? ||
+        @suppressheadingnumbers || elem["unnumbered"] ||
+        elem.at("./ancestor::*[@unnumbered = 'true']")
+    end
+
     def clause1(elem)
       level = @xrefs.anchor(elem["id"], :level, false) ||
         (elem.ancestors("clause, annex").size + 1)
       t = elem.at(ns("./title")) and t["depth"] = level
-      !elem.ancestors("boilerplate, metanorma-extension").empty? ||
-        @suppressheadingnumbers || elem["unnumbered"] and return
+      unnumbered_clause?(elem) and return
       lbl = @xrefs.anchor(elem["id"], :label,
                           elem.parent.name != "sections") or return
       prefix_name(elem, "<tab/>", "#{lbl}#{clausedelim}", "title")
@@ -65,6 +70,7 @@ module IsoDoc
       if t = elem.at(ns("./title"))
         t.children = "<strong>#{to_xml(t.children)}</strong>"
       end
+      unnumbered_clause?(elem) and return
       prefix_name(elem, "<br/><br/>", lbl, "title")
     end
 
@@ -242,7 +248,8 @@ module IsoDoc
     def toc_refs(docxml)
       docxml.xpath(ns("//toc//xref[text()]")).each do |x|
         lbl = @xrefs.anchor(x["target"], :label) or next
-        x.children.first.previous = "#{lbl}<tab/>"
+        #x.children.first.previous = "#{lbl}<tab/>"
+        x.add_first_child "#{lbl}<tab/>"
       end
     end
   end

data/lib/isodoc/presentation_function/terms.rb

@@ -9,7 +9,8 @@ module IsoDoc
     end
 
     def deprecates(elem)
-      elem.children.first.previous = @i18n.l10n("#{@i18n.deprecated}: ")
+      #elem.children.first.previous = @i18n.l10n("#{@i18n.deprecated}: ")
+      elem.add_first_child @i18n.l10n("#{@i18n.deprecated}: ")
     end
 
     def admits(elem); end

data/lib/isodoc/presentation_function/xrefs.rb

@@ -116,7 +116,7 @@ module IsoDoc
       node.xpath(ns("./location")).each_with_object([]) do |l, m|
         type = @xrefs.anchor(l["target"], :type)
         m << { conn: l["connective"], target: l["target"],
-               type: type, node: l, elem: @xrefs.anchor(l["target"], :elem),
+               type:, node: l, elem: @xrefs.anchor(l["target"], :elem),
                container: @xrefs.anchor(l["target"], :container, false) ||
                  %w(termnote).include?(type) }
       end
@@ -132,13 +132,13 @@ module IsoDoc
 
     def combine_conn(list)
       list.size == 1 and list.first[:label]
-      if list[1..-1].all? { |l| l[:conn] == "and" }
+      if list[1..].all? { |l| l[:conn] == "and" }
         @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "and")
-      elsif list[1..-1].all? { |l| l[:conn] == "or" }
+      elsif list[1..].all? { |l| l[:conn] == "or" }
         @i18n.boolean_conj(list.map { |l| loc2xref(l) }, "or")
       else
         ret = loc2xref(list[0])
-        list[1..-1].each { |l| ret = i18n_chain_boolean(ret, l) }
+        list[1..].each { |l| ret = i18n_chain_boolean(ret, l) }
         ret
       end
     end
@@ -156,7 +156,7 @@ module IsoDoc
     end
 
     def capitalise_xref(node, linkend, label)
-      linktext = linkend.gsub(/<[^>]+>/, "")
+      linktext = linkend.gsub(/<[^<>]+>/, "")
       (label && !label.empty? && /^#{Regexp.escape(label)}/.match?(linktext)) ||
         linktext[0, 1].match?(/\p{Upper}/) and return linkend
       node["case"] and

data/lib/isodoc/presentation_xml_convert.rb

@@ -55,7 +55,8 @@ module IsoDoc
       # feeds middle_title
       # triggers xrefs reparse, so put references before all other sections,
       # which alter titles and thus can alter xrefs
-      rearrange_clauses docxml # feeds toc, display_order, clausetitle, clause, middle_title
+      rearrange_clauses docxml # feeds toc, display_order, clausetitle, 
+      # clause, middle_title
       middle_title docxml
       annex docxml
       clause docxml # feeds clausetitle

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.11.0".freeze
+  VERSION = "2.11.2".freeze
 end

data/lib/isodoc/word_function/postprocess_cover.rb

@@ -22,7 +22,8 @@ module IsoDoc
         cover = File.read(@wordcoverpage, encoding: "UTF-8")
         cover = populate_template(cover, :word)
         coverxml = to_word_xhtml_fragment(cover)
-        ins.children.first.previous = coverxml.to_xml(encoding: "US-ASCII")
+        #ins.children.first.previous = coverxml.to_xml(encoding: "US-ASCII")
+        ins.add_first_child coverxml.to_xml(encoding: "US-ASCII")
       end
 
       def word_intro(docxml, level)
@@ -31,7 +32,8 @@ module IsoDoc
                            docxml, level)
         intro = populate_template(intro, :word)
         introxml = to_word_xhtml_fragment(intro)
-        ins.children.first.previous = introxml.to_xml(encoding: "US-ASCII")
+        #ins.children.first.previous = introxml.to_xml(encoding: "US-ASCII")
+        ins.add_first_child introxml.to_xml(encoding: "US-ASCII")
       end
 
       # add namespaces for Word fragments

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -132,6 +132,7 @@ container: false)
       end
 
       def reqt2class_label(elem, model)
+        elem["class"] and return [elem["class"], elem["class"]]
         model.req_class_paths.each do |n|
           v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
           elem.at("./self::#{v1}") and return [n[:klass], n[:label]]

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -17,6 +17,7 @@ module IsoDoc
         i = Counter.new("@")
         clause_order_annex(xml).each do |a|
           xml.xpath(ns(a[:path])).each do |c|
+            unnumbered_section_name?(c) and next
             annex_names(c, i.increment(c).print)
             a[:multi] or break
           end
@@ -125,7 +126,7 @@ module IsoDoc
 
       def preface_name_anchors(clause, level, title)
         @anchors[clause["id"]] =
-          { label: nil, level: level,
+          { label: nil, level:,
             xref: title, title: nil,
             type: "clause", elem: @labels["clause"] }
       end
@@ -170,7 +171,7 @@ module IsoDoc
       def section_name_anchors(clause, num, level)
         @anchors[clause["id"]] =
           { label: num, xref: l10n("#{@labels['clause']} #{num}"),
-            title: clause_title(clause), level: level, type: "clause",
+            title: clause_title(clause), level:, type: "clause",
             elem: @labels["clause"] }
       end
 
@@ -188,9 +189,9 @@ module IsoDoc
         level == 1 && clause.name == "annex" and
           label = annex_name_lbl(clause, num)
         @anchors[clause["id"]] =
-          { label: label,
+          { label:,
             elem: @labels["annex"], type: "clause",
-            subtype: "annex", value: num.to_s, level: level,
+            subtype: "annex", value: num.to_s, level:,
             title: clause_title(clause),
             xref: "#{@labels['annex']} #{num}" }
       end

data/lib/isodoc/xref.rb

@@ -29,7 +29,7 @@ module IsoDoc
       @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
         .new({
-               default: "default", lang: lang, script: script,
+               default: "default", lang:, script:,
                labels: @i18n.get
              })
       @i18n

data/lib/isodoc/xslfo_convert.rb

@@ -39,13 +39,19 @@ module IsoDoc
       nil
     end
 
-    def pdf_options(_docxml)
+    def baseassetpath(filename)
+      !@baseassetpath && filename and
+        @baseassetpath = File.expand_path(Pathname.new(filename).parent.to_s)
+    end
+
+    def pdf_options(_docxml, filename)
+      baseassetpath(filename)
       ret = {}
       font_manifest = @options.dig(MN_OPTIONS_KEY, MN2PDF_FONT_MANIFEST) and
         ret[MN2PDF_FONT_MANIFEST] = font_manifest
       @aligncrosselements && !@aligncrosselements.empty? and
         ret["--param align-cross-elements="] =
-          @aligncrosselements.gsub(/,/, " ")
+          @aligncrosselements.tr(",", " ")
       @baseassetpath and
         ret["--param baseassetpath="] = @baseassetpath
       ret.merge(@pdf_cmd_options)
@@ -54,15 +60,14 @@ module IsoDoc
     # input_file: keep-alive tempfile
     def convert(input_fname, file = nil, debug = false,
                 output_fname = nil)
-      file = File.read(input_fname, encoding: "utf-8") if file.nil?
-      input_file, docxml, filename =
-        input_xml_path(input_fname, file, debug)
+      file ||= File.read(input_fname, encoding: "utf-8")
+      _, docxml, filename = input_xml_path(input_fname, file, debug)
+      xsl = pdf_stylesheet(docxml) or return
+      Pathname.new(xsl).absolute? or xsl = File.join(@libdir, xsl)
       @doctype = Nokogiri::XML(file).at(ns("//bibdata/ext/doctype"))&.text
       ::Metanorma::Output::XslfoPdf.new.convert(
-        filename,
-        output_fname || output_filename(input_fname),
-        File.join(@libdir, pdf_stylesheet(docxml)),
-        pdf_options(docxml),
+        filename, output_fname || output_filename(input_fname),
+        xsl, pdf_options(docxml, input_fname)
       )
     end
 

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

@@ -20,17 +20,17 @@ annex: ملحق
 appendix: تذييل
 continued: واصلت
 no_terms_boilerplate: |
-  <p>لم يتم سرد أي مصطلحات وتعريفات في هذا المستند.</p>
+  لم يتم سرد أي مصطلحات وتعريفات في هذا المستند.
 internal_terms_boilerplate: |
-  <p>لأغراض هذا المستند، تنطبق المصطلحات والتعريفات التالية.</p>
+  لأغراض هذا المستند، تنطبق المصطلحات والتعريفات التالية.
 norm_with_refs_pref:
   تتم الإشارة إلى المستندات التالية في النص بحيث يشكل بعض أو كل محتوياتها متطلبات هذا المستند. للحصول على مراجع مؤرخة، تطبق النسخة المشار إليها فقط. بالنسبة للمراجع غير المؤرخة ، تنطبق أحدث طبعة من الوثيقة المشار إليها (بما في ذلك أي تعديلات).
 norm_empty_pref:
   لا توجد مراجع معيارية في هذه الوثيقة.
 external_terms_boilerplate: |
-  <p> لأغراض هذا المستند ، تنطبق المصطلحات والتعريفات الواردة في%. </ p>
+   لأغراض هذا المستند ، تنطبق المصطلحات والتعريفات الواردة في%. 
 internal_external_terms_boilerplate: |
-  <p>لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.</p>
+  لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.
 no_information_available: "[لا توجد معلومات متاحة]"
 term_defined_in: "(%)"
 binary_and: "%1 و %2"

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

@@ -20,9 +20,9 @@ annex: Anhang
 appendix: Appendix
 continued: Fortsetzung
 no_terms_boilerplate: |
-          <p>In diesem Dokument sind keine Begriffe und Definitionen aufgeführt.</p>
+        In diesem Dokument sind keine Begriffe und Definitionen aufgeführt.
 internal_terms_boilerplate: |
-        <p>Für die Zwecke dieses Dokuments gelten die folgenden Begriffe und Definitionen</p>
+        Für die Zwecke dieses Dokuments gelten die folgenden Begriffe und Definitionen.
 norm_with_refs_pref:
   Auf die folgenden Dokumente wird im Text so verwiesen, dass ihr Inhalt ganz oder
   teilweise Anforderungen dieses Dokuments darstellt. Bei datierten Verweisen gilt
@@ -30,9 +30,9 @@ norm_with_refs_pref:
   referenzierten Dokuments (einschließlich eventueller Änderungen).
 norm_empty_pref: In diesem Dokument sind keine normativen Verweise enthalten.
 external_terms_boilerplate: |
-          <p>Für die Zwecke dieses Dokuments gelten die in % angegebenen Begriffe und Definitionen.</p>
+          Für die Zwecke dieses Dokuments gelten die in % angegebenen Begriffe und Definitionen.
 internal_external_terms_boilerplate: |
-          <p>Für die Zwecke dieses Dokuments gelten die in % und im Folgenden aufgeführten Begriffe und Definitionen.</p>
+          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"

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

@@ -21,10 +21,9 @@ annex: Annex
 appendix: Appendix
 continued: continued
 no_terms_boilerplate: |
-          <p>No terms and definitions are listed in this document.</p>
+      No terms and definitions are listed in this document.
 internal_terms_boilerplate: |
-        <p>For the purposes of this document, 
-            the following terms and definitions apply.</p>
+      For the purposes of this document, the following terms and definitions apply.
 norm_with_refs_pref: 
       The following documents are referred to in the text in such a way
       that some or all of their content constitutes requirements of this
@@ -32,13 +31,11 @@ norm_with_refs_pref:
       For undated references, the latest edition of the referenced
       document (including any amendments) applies.
 norm_empty_pref: 
-          There are no normative references in this document.
+      There are no normative references in this document.
 external_terms_boilerplate: |
-          <p>For the purposes of this document, 
-            the terms and definitions given in % apply.</p>
+      For the purposes of this document, the terms and definitions given in % apply.
 internal_external_terms_boilerplate: |
-          <p>For the purposes of this document, the terms and definitions 
-            given in % and the following apply.</p>
+      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"

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

@@ -20,9 +20,9 @@ annex: Anexo
 appendix: Apéndice
 continued: continuación
 no_terms_boilerplate: |
-          <p>En este documento no se enumeran términos ni definiciones.</p>
+      En este documento no se enumeran términos ni definiciones.
 internal_terms_boilerplate: |
-        <p>Para los propósitos de este documento, se aplican los siguientes términos y definiciones.</p>
+      Para los propósitos de este documento, se aplican los siguientes términos y definiciones.
 norm_with_refs_pref: 
       Los siguientes documentos se mencionan en el texto de tal manera que 
       parte o todo su contenido constituye requisitos de este documento.
@@ -32,9 +32,9 @@ norm_with_refs_pref:
 norm_empty_pref: 
           No hay referencias normativas en este documento.
 external_terms_boilerplate: |
-          <p>Para los propósitos de este documento, se aplican los términos y definiciones dados en %.</p>
+          Para los propósitos de este documento, se aplican los términos y definiciones dados en %.
 internal_external_terms_boilerplate: |
-          <p>Para los propósitos de este documento, se aplican los términos y definiciones dados en % y los siguientes.</p>
+          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"

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

@@ -21,17 +21,17 @@ annex: Annexe
 appendix: Appendice
 continued: continué
 no_terms_boilerplate: |
-          <p>Aucun terme n’est défini dans le présent document.</p>
+         Aucun terme n’est défini dans le présent document.
 internal_terms_boilerplate: |
-         <p>Pour les besoins du présent document, les termes et définitions suivants s’appliquent.</p>
+         Pour les besoins du présent document, les termes et définitions suivants s’appliquent.
 norm_with_refs_pref: 
      Les documents suivants cités dans le texte constituent, pour tout ou partie de leur contenu, des exigences du présent document. Pour les références datées, seule l’édition citée s’applique. Pour les références non datées, la dernière édition du document de référence s’applique (y compris les éventuels amendements).
 norm_empty_pref: 
           Le présent document ne contient aucune référence normative.
 external_terms_boilerplate: |
-          <p>Pour les besoins du présent document, les termes et définitions de % s’appliquent.</p>
+          Pour les besoins du présent document, les termes et définitions de % s’appliquent.
 internal_external_terms_boilerplate: |
-          <p>Pour les besoins du présent document, les termes et définitions de % ainsi que les suivants, s’appliquent.</p>
+          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"

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

@@ -6,32 +6,32 @@ symbols: 記号
 table_of_contents: 目次
 introduction: 序文
 foreword: まえがき
-abstract: Abstract
-acknowledgements: Acknowledgements
+abstract: はじめに
+acknowledgements: 謝辞
 termsdef: 用語及び定義
 termsdefsymbolsabbrev: 用語及び定義並びに記号及び略語
 termsdefsymbols: 用語及び定義並びに記号
 termsdefabbrev: 用語及び定義並びに略語
 normref: 引用規格
 bibliography: 参考文献
-preface: Preface
-section: Section
+preface: 序文
+section: セクション
 clause: 箇条
 annex: 附属書
 appendix: Appendix
 continued: 続き
 no_terms_boilerplate: |
-          <p>この規格には，定義する用語はない。</p>
+          この規格には，定義する用語はない。
 internal_terms_boilerplate: |
-        <p>この規格で用いる主な用語及び定義は，次による。</p>
+        この規格で用いる主な用語及び定義は，次による。
 norm_with_refs_pref: 
       次に掲げる引用規格は，この規格に引用されることによって，その一部又は全部がこの規格の要 求事項を構成している。これらの引用規格のうち，西暦年を付記してあるものは，記載の年の版を適 用し，その後の改正版(追補を含む。)は適用しない。西暦年の付記がない引用規格は，その最新版(追 補を含む。)を適用する。
 norm_empty_pref: 
           この規格には，引用規格はない。
 external_terms_boilerplate: |
-          <p>この規格で用いる主な用語及び定義は，% による。</p>
+          この規格で用いる主な用語及び定義は，% による。
 internal_external_terms_boilerplate: |
-          <p>この規格で用いる主な用語及び定義は，次によるほか，% による。</p>
+          この規格で用いる主な用語及び定義は，次によるほか，% による。
 no_information_available: "[情報はありません]"
 term_defined_in: "(%)"
 binary_and: "%1 and %2"
@@ -123,7 +123,7 @@ locality: {
                       subclause: 細分箇条,
                       part: 部,
                       paragraph: 段落,
-                      chapter: Chapter,
+                      chapter: 第章,
                       page: ページ,
                       table: 表,
                       annex: 附属書,
@@ -154,7 +154,7 @@ relatedterms:
   equivalent: equivalent
   compare: compare
   contrast: contrast
-  see: see
+  see: 参照
   seealso: see also
 inflection:
   Clause:

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

@@ -20,10 +20,9 @@ annex: Дополнение
 appendix: Приложение
 continued: продолжение
 no_terms_boilerplate: |
-          <p>Термины и определения не перечислены в этом документе.</p>
+        Термины и определения не перечислены в этом документе.
 internal_terms_boilerplate: |
-        <p>Для целей этого документа 
-            применяются следующие термины и определения.</p>
+        Для целей этого документа применяются следующие термины и определения.
 norm_with_refs_pref: 
       Следующие документы упоминаются в тексте таким образом, 
       что некоторая часть или все их содержание являются требованиями 
@@ -33,11 +32,9 @@ norm_with_refs_pref:
 norm_empty_pref: 
           Нет нормативных ссылок в этом документе.
 external_terms_boilerplate: |
-          <p>Для целей этого документа применяются 
-            термины и определения, данные в %.</p>
+          Для целей этого документа применяются термины и определения, данные в %.
 internal_external_terms_boilerplate: |
-          <p>Для целей этого документа применяются 
-            термины и определения, данные в % и следующие.</p>
+          Для целей этого документа применяются термины и определения, данные в % и следующие.
 no_information_available: "[ИНФОРМАЦИЯ ОТСУТСТВУЕТ]"
 term_defined_in: "(%)"
 binary_and: "%1 и %2"

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

@@ -21,9 +21,9 @@ annex: 附件
 appendix: 附录
 continued: 继续
 no_terms_boilerplate: |
-          <p>本文件不提供术语和定义。</p>
+          本文件不提供术语和定义。
 internal_terms_boilerplate: |
-          <p>下列术语和定义适用于本文件。</p>
+          下列术语和定义适用于本文件。
 norm_with_refs_pref: 
           下列文件对于本文件的应用是必不可少的。
           凡是注日期的引用文件，仅注日期的版本适用于本文件。
@@ -31,9 +31,9 @@ norm_with_refs_pref:
 norm_empty_pref: 
           本文件并没有规范性引用文件。
 external_terms_boilerplate: |
-          <p>% 界定的术语和定义适用于本文件。</p>
+          % 界定的术语和定义适用于本文件。
 internal_external_terms_boilerplate: |
-          <p>% 界定的以及下列术语和定义适用于本文件。</p>
+          % 界定的以及下列术语和定义适用于本文件。
 no_information_available: "[无资料]"
 term_defined_in: "（%）"
 binary_and: "%1和%2"

data/lib/nokogiri/xml/node.rb

@@ -0,0 +1,13 @@
+module Nokogiri
+  module XML
+    class Node
+      def add_first_child(content)
+        if children.empty?
+          add_child(content)
+        else
+          children.first.previous = content
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -460,6 +460,7 @@ files:
 - lib/metanorma/output/base.rb
 - lib/metanorma/output/utils.rb
 - lib/metanorma/output/xslfo.rb
+- lib/nokogiri/xml/node.rb
 - lib/relaton/render-isodoc/config.yml
 - lib/relaton/render-isodoc/general.rb
 homepage: https://github.com/metanorma/isodoc