isodoc 3.2.6 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43165a177a896526892723b216ed2cff72eee876ace1c099c52ea92ec549fff8
-  data.tar.gz: fc24432b8ccaeecbc0fad71bc64f5311c3307d0a1b336b32c3bc9399269ba031
+  metadata.gz: ac5bfd800fc89d9c1725ca6d96db1a708396bbc4ee89edcdef2c54d34ad51b2d
+  data.tar.gz: 26924ac140cd0ba29ca309086554a03baf0055d3f6415c03c95d1c68c56ff7a4
 SHA512:
-  metadata.gz: 58ddea5bae6b878309b915ba9e70837dbfdfd26d6d1b257f80a46345064770949b67dca7940aa9e1675a4089541e1c6d46961f01b8f42b1184ddbf7dcdeaf908
-  data.tar.gz: df2b697149cdbbc2c0e855047c7f7e2c5bced1ae89b1dc3d3d8b382e1b877ad195ea1251d5786e45eb769034f87e517a5ca613243637f4b1363a13c9f29a6ccf
+  metadata.gz: f0ff182791d2994fabd4f839a4a4fb9082447a7fdc73f2e4657229b81be656bf3dbb1a24b8f60c9a8e09e61bcab1b59ca35ba79584c0fde20e31cdac99f882a2
+  data.tar.gz: 62b50a7714b7e5cba905cbbd96d390b9b93d859cbb7248b5ff3f340750c2bae102178859cda6bfbd4e9288aeae376303a36c71cbc27de1c47cbd3587736268b1

data/isodoc.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
 
-  spec.add_dependency "relaton-render", "~> 0.9.0"
+  spec.add_dependency "relaton-render", "~> 0.10.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"

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/convert.rb

@@ -86,8 +86,9 @@ module IsoDoc
     end
 
     def bibrenderer(options = {})
-      ::Relaton::Render::IsoDoc::General.new(options.merge(language: @lang,
-                                                           i18nhash: @i18n.get))
+      ::Relaton::Render::IsoDoc::General
+        .new(options.merge(language: @lang, script: @script,
+                           i18nhash: @i18n.get))
     end
 
     def convert1_namespaces(html)

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/terms.rb

@@ -36,6 +36,12 @@ module IsoDoc
         end
       end
 
+      def related_parse(node, out)
+        out.div class: "RelatedTerms", style: "text-align:left;" do |p|
+          node.children.each { |c1| parse(c1, p) }
+        end
+      end
+
       def semx_term_parse(node, out); end
 
       def semx_related_parse(node, out); 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)
@@ -180,6 +180,7 @@ module IsoDoc
           when "termsource" then semx_termref_parse(node, out)
           when "fmt-termsource" then termref_parse(node, out)
           when "related" then semx_related_parse(node, out)
+          when "fmt-related" then related_parse(node, out)
           when "modification" then modification_parse(node, out)
           when "termnote" then termnote_parse(node, out)
           when "terms" then terms_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/init.rb

@@ -14,8 +14,9 @@ module IsoDoc
                                      i18nyaml: i18nyaml || @i18nyaml)
     end
 
-    def l10n(expr, lang = @lang, script = @script, locale = @locale)
-      @i18n.l10n(expr, lang, script, locale)
+    def l10n(expr, lang = @lang, script = @script, opt = {})
+      opt[:locale] ||= @locale
+      @i18n.l10n(expr, lang, script, opt)
     end
 
     def toc_init(docxml)
@@ -170,8 +171,8 @@ module IsoDoc
 
     def omit_docid_prefix(prefix)
       prefix.nil? || prefix.empty? and return true
-      %w(ISO IEC IEV ITU W3C BIPM csd metanorma repository metanorma-ordinal)
-        .include? prefix
+      %w(ISO IEC IEV ITU W3C BIPM csd metanorma repository metanorma-ordinal
+         title).include? prefix
     end
 
     def connectives_spans(text)

data/lib/isodoc/metadata.rb

@@ -9,8 +9,9 @@ module IsoDoc
       Common::ns(xpath)
     end
 
-    def l10n(expr, lang = @lang, script = @script, locale = @locale)
-      @i18n.l10n(expr, lang, script, locale)
+        def l10n(expr, lang = @lang, script = @script, opt = {})
+      opt[:locale] ||= @locale
+      @i18n.l10n(expr, lang, script, opt)
     end
 
     def connectives_strip(text)
@@ -84,11 +85,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
@@ -120,7 +116,7 @@ module IsoDoc
       draftinfo = " (#{@labels['draft_label']} #{draft}"
       draftinfo += ", #{revdate}" if revdate
       draftinfo += ")"
-      l10n(draftinfo, @lang, @script, @locale)
+      l10n(draftinfo, @lang, @script)
     end
 
     def version(isoxml, _out)

data/lib/isodoc/presentation_function/block.rb

@@ -87,7 +87,8 @@ module IsoDoc
 
     def admonition_label(elem, num)
       lbl = if elem["type"] == "box" then @i18n.box
-            else @i18n.admonition[elem["type"]]&.upcase end
+            else @i18n.admonition[elem["type"]]&.upcase
+            end
       labelled_autonum(lbl, elem["id"], num)
     end
 
@@ -184,17 +185,29 @@ module IsoDoc
       source1(elem, :figure)
     end
 
+    def source_join_delim(_elem)
+      "; "
+    end
+
     def source1(elem, ancestor)
-      n = elem
-      while n = n&.next_element
-        case n.name
+      source_elems = source1_gather(elem)
+      source_elems.each do |e|
+        elem << "#{source_join_delim(elem)}#{to_xml(e.remove.children).strip}"
+      end
+      source1_label(elem, to_xml(elem.children).strip, ancestor)
+    end
+
+    def source1_gather(elem)
+      source_elems = []
+      while elem = elem&.next_element
+        case elem.name
         when "source"
         when "fmt-source"
-          elem << "; #{to_xml(n.remove.children)}"
+          source_elems << elem
         else break
         end
       end
-      source1_label(elem, to_xml(elem.children).strip, ancestor)
+      source_elems
     end
 
     def source1_label(elem, sources, _ancestor)

data/lib/isodoc/presentation_function/concepts.rb

@@ -104,153 +104,5 @@ module IsoDoc
       ref.previous = prev
       ref.next = foll
     end
-
-    def related(docxml)
-      docxml.xpath(ns("//fmt-related/semx")).each { |f| related1(f) }
-    end
-
-    def related1(node)
-      p, ref, orig = related1_prep(node)
-      label = @i18n.relatedterms[orig["type"]].upcase
-      ret = "<strong>**RELATED TERM NOT FOUND**</strong>"
-      p && ref and ret = "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})"
-      node.children = (l10n("<p><strong>#{label}:</strong> #{ret}</p>"))
-    end
-
-    def related1_prep(node)
-      p = node.at(ns("./fmt-preferred"))&.children
-      ref = node.at(ns("./xref | ./eref | ./termref"))
-      orig = semx_orig(node)
-      [p, ref, orig]
-    end
-
-    def related_designation1(desgn)
-      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
-      d1 = semx_fmt_dup(desgn)
-      %w(preferred admitted deprecates).each do |w|
-        d = d1.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
-      end
-      out << d1
-    end
-
-    def designation(docxml)
-      docxml.xpath(ns("//related")).each { |p| related_designation1(p) }
-      docxml.xpath(ns("//preferred | //admitted | //deprecates"))
-        .each { |p| designation1(p) }
-      docxml.xpath(ns("//fmt-preferred | //fmt-admitted | //fmt-deprecates"))
-        .each { |t| merge_second_preferred(t) }
-      docxml.xpath(ns("//fmt-deprecates")).each { |d| deprecates(d) }
-      docxml.xpath(ns("//fmt-admitted")).each { |d| admits(d) }
-    end
-
-    def deprecates(elem)
-      elem.xpath(ns(".//semx[@element = 'deprecates']")).each do |t|
-        t.previous = @i18n.l10n("#{@i18n.deprecated}: ")
-      end
-    end
-
-    def admits(elem); end
-
-    def merge_second_preferred(term)
-      pref = nil
-      out = term.xpath(ns("./semx")).each_with_index
-        .with_object([]) do |(p, i), m|
-        if (i.zero? && (pref = p)) || merge_preferred_eligible?(pref, p)
-          m << p
-        else p.wrap("<p></p>")
-        end
-      end
-      pref&.replace(merge_second_preferred1(out, term))
-    end
-
-    def merge_second_preferred1(desgns, term)
-      desgns[1..].each(&:remove)
-      ret = l10n(desgns.map { |x| to_xml(x) }.join("; "))
-      term.ancestors("fmt-related").empty? and ret = "<p>#{ret}</p>"
-      ret
-    end
-
-    def merge_preferred_eligible?(first, second)
-      orig_first, orig_second, firstex, secondex =
-        merge_preferred_eligible_prep(first, second)
-      orig_first["geographic-area"] == orig_second["geographic-area"] &&
-        firstex["language"] == secondex["language"] &&
-        !orig_first.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
-        !orig_second.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
-        orig_first.name == "preferred" && orig_second.name == "preferred"
-    end
-
-    def merge_preferred_eligible_prep(first, second)
-      orig_first = semx_orig(first)
-      orig_second = semx_orig(second)
-      firstex = orig_first.at(ns("./expression")) || {}
-      secondex = orig_second.at(ns("./expression")) || {}
-      [orig_first, orig_second, firstex, secondex]
-    end
-
-    def designation1(desgn)
-      desgn.parent.name == "related" and return
-      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
-      d1 = semx_fmt_dup(desgn)
-      s = d1.at(ns("./source"))
-      modification_dup_align(desgn.at(ns("./source")), s)
-      name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
-                         "./graphical-symbol")) or return
-      designation_annotate(d1, name, desgn)
-      out << d1
-      s and out << s.wrap("<fmt-termsource></fmt-termsource>").parent
-    end
-
-    def designation_annotate(desgn, name, orig)
-      designation_boldface(desgn)
-      designation_field(desgn, name, orig)
-      designation_grammar(desgn, name)
-      designation_localization(desgn, name, orig)
-      designation_pronunciation(desgn, name)
-      designation_bookmarks(desgn, name)
-      desgn.children = name.children
-    end
-
-    def designation_boldface(desgn)
-      desgn["element"] == "preferred" or return
-      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
-      name.children = "<strong>#{name.children}</strong>"
-    end
-
-    def designation_field(_desgn, name, orig)
-      f = orig.xpath(ns("./field-of-application | ./usage-info"))
-        &.map { |u| to_xml(semx_fmt_dup(u)) }&.join(", ")
-      f&.empty? and return nil
-      name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>"
-    end
-
-    def designation_grammar(desgn, name)
-      g = desgn.at(ns("./expression/grammar")) or return
-      ret = g.xpath(ns("./gender | ./number")).each_with_object([]) do |x, m|
-        m << @i18n.grammar_abbrevs[x.text]
-      end
-      %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
-        .each do |x|
-        g.at(ns("./#{x}[text() = 'true']")) and ret << @i18n.grammar_abbrevs[x]
-      end
-      name << ", #{ret.join(', ')}"
-    end
-
-    def designation_localization(desgn, name, orig_desgn)
-      loc = [desgn.at(ns("./expression/@language"))&.text,
-             desgn.at(ns("./expression/@script"))&.text,
-             orig_desgn.at("./@geographic-area")&.text].compact
-      loc.empty? and return
-      name << ", #{loc.join(' ')}"
-    end
-
-    def designation_pronunciation(desgn, name)
-      f = desgn.at(ns("./expression/pronunciation")) or return
-      name << ", /#{to_xml(f.children)}/"
-    end
-
-    def designation_bookmarks(desgn, name)
-      desgn.xpath(ns(".//bookmark")).each { |b| name << b.remove }
-    end
   end
 end

data/lib/isodoc/presentation_function/designations.rb

@@ -0,0 +1,158 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def related(docxml)
+      docxml.xpath(ns("//fmt-related/semx")).each { |f| related1(f) }
+    end
+
+    # Only render related if rendered and hyperlinked
+    def related1(node)
+      p, ref, orig = related1_prep(node)
+      label = @i18n.relatedterms[orig["type"]].upcase
+      ret = if p && ref
+              if p.text == ref.text
+                "<em>#{Common::to_xml(ref)}</em>"
+              else
+                "<em>#{to_xml(p)}</em> (#{Common::to_xml(ref)})"
+              end
+            else "<strong>**RELATED TERM NOT FOUND**</strong>"
+            end
+      node.children = (l10n("<p><strong>#{label}:</strong> #{ret}</p>"))
+    end
+
+    def related1_prep(node)
+      p = node.at(ns("./fmt-preferred"))&.children
+      ref = node.at(ns("./xref | ./eref | ./termref"))
+      orig = semx_orig(node)
+      [p, ref, orig]
+    end
+
+    def related_designation1(desgn)
+      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
+      d1 = semx_fmt_dup(desgn)
+      %w(preferred admitted deprecates).each do |w|
+        d = d1.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
+      end
+      out << d1
+    end
+
+    def designation(docxml)
+      docxml.xpath(ns("//related")).each { |p| related_designation1(p) }
+      docxml.xpath(ns("//preferred | //admitted | //deprecates"))
+        .each { |p| designation1(p) }
+      docxml.xpath(ns("//fmt-preferred | //fmt-admitted | //fmt-deprecates"))
+        .each { |t| merge_second_preferred(t) }
+      docxml.xpath(ns("//fmt-deprecates")).each { |d| deprecates(d) }
+      docxml.xpath(ns("//fmt-admitted")).each { |d| admits(d) }
+    end
+
+    def deprecates(elem)
+      elem.xpath(ns(".//semx[@element = 'deprecates']")).each do |t|
+        t.previous = @i18n.l10n("#{@i18n.deprecated}: ")
+      end
+    end
+
+    def admits(elem); end
+
+    def merge_second_preferred(term)
+      pref = nil
+      out = term.xpath(ns("./semx")).each_with_index
+        .with_object([]) do |(p, i), m|
+        if (i.zero? && (pref = p)) || merge_preferred_eligible?(pref, p)
+          m << p
+        else p.wrap("<p></p>")
+        end
+      end
+      pref&.replace(merge_second_preferred1(out, term))
+    end
+
+    def merge_second_preferred1(desgns, term)
+      desgns[1..].each(&:remove)
+      ret = l10n(desgns.map { |x| to_xml(x) }.join("; "))
+      term.ancestors("fmt-related").empty? and ret = "<p>#{ret}</p>"
+      ret
+    end
+
+    def merge_preferred_eligible?(first, second)
+      orig_first, orig_second, firstex, secondex =
+        merge_preferred_eligible_prep(first, second)
+      orig_first["geographic-area"] == orig_second["geographic-area"] &&
+        firstex["language"] == secondex["language"] &&
+        !orig_first.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
+        !orig_second.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
+        orig_first.name == "preferred" && orig_second.name == "preferred"
+    end
+
+    def merge_preferred_eligible_prep(first, second)
+      orig_first = semx_orig(first)
+      orig_second = semx_orig(second)
+      firstex = orig_first.at(ns("./expression")) || {}
+      secondex = orig_second.at(ns("./expression")) || {}
+      [orig_first, orig_second, firstex, secondex]
+    end
+
+    def designation1(desgn)
+      desgn.parent.name == "related" and return
+      out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
+      d1 = semx_fmt_dup(desgn)
+      s = d1.at(ns("./source"))
+      modification_dup_align(desgn.at(ns("./source")), s)
+      name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
+                         "./graphical-symbol")) or return
+      designation_annotate(d1, name, desgn)
+      out << d1
+      s and out << s.wrap("<fmt-termsource></fmt-termsource>").parent
+    end
+
+    def designation_annotate(desgn, name, orig)
+      designation_boldface(desgn)
+      designation_field(desgn, name, orig)
+      designation_grammar(desgn, name)
+      designation_localization(desgn, name, orig)
+      designation_pronunciation(desgn, name)
+      designation_bookmarks(desgn, name)
+      desgn.children = name.children
+    end
+
+    def designation_boldface(desgn)
+      desgn["element"] == "preferred" or return
+      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
+      name.children = "<strong>#{name.children}</strong>"
+    end
+
+    def designation_field(_desgn, name, orig)
+      f = orig.xpath(ns("./field-of-application | ./usage-info"))
+        &.map { |u| to_xml(semx_fmt_dup(u)) }&.join(", ")
+      f&.empty? and return nil
+      name << "<span class='fmt-designation-field'>, &#x3c;#{f}&#x3e;</span>"
+    end
+
+    def designation_grammar(desgn, name)
+      g = desgn.at(ns("./expression/grammar")) or return
+      ret = g.xpath(ns("./gender | ./number")).each_with_object([]) do |x, m|
+        m << @i18n.grammar_abbrevs[x.text]
+      end
+      %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
+        .each do |x|
+        g.at(ns("./#{x}[text() = 'true']")) and ret << @i18n.grammar_abbrevs[x]
+      end
+      name << ", #{ret.join(', ')}"
+    end
+
+    def designation_localization(desgn, name, orig_desgn)
+      loc = [desgn.at(ns("./expression/@language"))&.text,
+             desgn.at(ns("./expression/@script"))&.text,
+             orig_desgn.at("./@geographic-area")&.text].compact
+      loc.empty? and return
+      name << ", #{loc.join(' ')}"
+    end
+
+    def designation_pronunciation(desgn, name)
+      f = desgn.at(ns("./expression/pronunciation")) or return
+      name << ", /#{to_xml(f.children)}/"
+    end
+
+    def designation_bookmarks(desgn, name)
+      desgn.xpath(ns(".//bookmark")).each { |b| name << b.remove }
+    end
+  end
+end

data/lib/isodoc/presentation_function/docid.rb

@@ -31,11 +31,13 @@ module IsoDoc
       id, id1, id2, id3 = bibitem_ref_code_prep(bib)
       id || id1 || id2 || id3 and return [id, id1, id2, id3]
       bib["suppress_identifier"] == "true" and return [nil, nil, nil, nil]
-      [nil, no_identifier(bib), nil, nil]
+      # [nil, no_identifier(bib), nil, nil]
+      [nil, nil, nil, nil]
     end
 
     def bibitem_ref_code_prep(bib)
-      id = bib.at(ns("./docidentifier[@type = 'metanorma']"))
+      id = bib.at(ns("./docidentifier[@type = 'metanorma']")) ||
+        bib.at(ns("./docidentifier[@type = 'title']"))
       id1 = pref_ref_code(bib)
       id2 = bib.at(ns("./docidentifier[#{SKIP_DOCID}]"))
       id3 = bib.at(ns("./docidentifier[@type = 'metanorma-ordinal']"))

data/lib/isodoc/presentation_function/erefs.rb

@@ -15,6 +15,7 @@ module IsoDoc
     end
 
     def citeas_cleanup(ref)
+      ref.nil? and return nil
       if ref.include?("<")
         xml = Nokogiri::XML("<root>#{ref}</root>")
         xml.xpath("//semx").each { |x| x.replace(x.children) }
@@ -39,18 +40,17 @@ module IsoDoc
     def eref_localities(refs, target, node)
       if can_conflate_eref_rendering?(refs)
         l10n(", #{eref_localities_conflated(refs, target, node)}"
-          .gsub(/\s+/, " "))
+          .gsub(/\s+/, " "), @lang, @script, { prev: target })
       else
         ret = resolve_eref_connectives(eref_locality_stacks(refs, target, node))
-        l10n(ret.join.gsub(/\s+/, " "))
+        l10n(ret.join.gsub(/\s+/, " "), @lang, @script, { prev: target })
       end
     end
 
     def eref_localities_conflated(refs, target, node)
       droploc = node["droploc"]
       node["droploc"] = true
-      ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
-                                                          node))
+      ret = resolve_eref_connectives(eref_locality_stacks(refs, target, node))
       node.delete("droploc") unless droploc
       eref_localities1({ target:, number: "pl",
                          type: refs.first.at(ns("./locality/@type")).text,
@@ -216,7 +216,7 @@ module IsoDoc
     def eref2link1(node, href)
       url = href[:link]
       att = href[:type] == :attachment ? "attachment='true'" : ""
-      repl = "<fmt-link #{att} target='#{url}'>#{node.children}</link>"
+      repl = "<fmt-link #{att} target='#{url}'>#{to_xml(node.children)}</link>"
       node["type"] == "footnote" and repl = "<sup>#{repl}</sup>"
       node.replace(repl)
     end

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
@@ -116,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

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)
@@ -184,6 +184,7 @@ module IsoDoc
       ret += datefn
       ret.empty? and return ret
       idents[:sdo] and ret += ","
+      ret.sub(",", "").strip.empty? and return ""
       "#{ret} "
     end
 
@@ -192,7 +193,7 @@ module IsoDoc
     def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
       # standard and id = nil
       ret = ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]"
-      if ids[:sdo]
+      if ids[:sdo] && !ids[:sdo].empty?
         ret = prefix_bracketed_ref(ret)
         ret += "#{ids[:sdo]}#{datefn}, "
       else

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

@@ -37,13 +37,14 @@ module IsoDoc
       docxml.xpath(ns("//termnote")).each { |f| termnote1(f) }
     end
 
-    def termnote_delim(_elem)
-      l10n(": ")
+    def termnote_delim(_elem, lbl)
+      l10n(": ", { prev: lbl })
     end
 
     def termnote1(elem)
       lbl = termnote_label(elem)
-      prefix_name(elem, { label: termnote_delim(elem) }, lower2cap(lbl), "name")
+      prefix_name(elem, { label: termnote_delim(elem, lbl) },
+                  lower2cap(lbl), "name")
     end
 
     def termnote_label(elem)
@@ -96,10 +97,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)
@@ -151,10 +153,15 @@ module IsoDoc
       while elem&.next_element&.name == "source"
         ret << semx_fmt_dup(elem.next_element.remove)
       end
-      s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
+      s = ret.map { |x| to_xml(x) }.map(&:strip)
+        .join(termsource_join_delim(elem))
       termsource_label(elem, s)
     end
 
+    def termsource_join_delim(_elem)
+      "; "
+    end
+
     def termsource_label(elem, sources)
       elem.replace(l10n("[#{@i18n.source}: #{sources}]"))
     end
@@ -162,7 +169,8 @@ module IsoDoc
     def termsource_modification(elem)
       elem.xpath(".//text()[normalize-space() = '']").each(&:remove)
       origin = elem.at(ns("./origin"))
-      s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
+      s = termsource_status(elem["status"]) and
+        origin.next = l10n(", #{s}", @lang, @script, { prev: origin.text })
       mod = elem.at(ns("./modification")) or return
       termsource_add_modification_text(mod)
     end

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/presentation_xml_convert.rb

@@ -2,6 +2,7 @@ require_relative "presentation_function/block"
 require_relative "presentation_function/list"
 require_relative "presentation_function/reqt"
 require_relative "presentation_function/concepts"
+require_relative "presentation_function/designations"
 require_relative "presentation_function/terms"
 require_relative "presentation_function/xrefs"
 require_relative "presentation_function/erefs"

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.2.6".freeze
+  VERSION = "3.3.0".freeze
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -147,7 +147,6 @@ refer_list)
             list_item_value(li, c, depth,
                             { list_anchor:, prev_label:,
                               refer_list: depth == 1 ? refer_list : nil })
-          #li["id"] ||= "_#{UUIDTools::UUID.random_create}"
           @anchors[li["id"]] =
             { label: bare_label, bare_xref: "#{label})", type: "listitem",
               xref: %[#{label}#{delim_wrap(list_item_delim)}], refer_list:,

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],

data/lib/isodoc/xref.rb

@@ -90,8 +90,9 @@ module IsoDoc
       Common::ns(xpath)
     end
 
-    def l10n(text, lang = @lang, script = @script, locale = @locale)
-      @i18n.l10n(text, lang, script, locale)
+    def l10n(expr, lang = @lang, script = @script, opt = {})
+      opt[:locale] ||= @locale
+      @i18n.l10n(expr, lang, script, opt)
     end
 
     include ::IsoDoc::XrefGen::Util

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

@@ -96,7 +96,6 @@ no_identifier: (識別子なし)
 all_parts: 規格群
 edition_ordinal: "第{{ var1 }}版"
 edition: 版
-version: version
 toc_figures: List of figures
 toc_tables: List of tables
 toc_recommendations: List of recommendations

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-02 00:00:00.000000000 Z
+date: 2025-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -440,6 +440,7 @@ files:
 - lib/isodoc/presentation_function/block.rb
 - lib/isodoc/presentation_function/cleanup.rb
 - lib/isodoc/presentation_function/concepts.rb
+- lib/isodoc/presentation_function/designations.rb
 - lib/isodoc/presentation_function/docid.rb
 - lib/isodoc/presentation_function/erefs.rb
 - lib/isodoc/presentation_function/footnotes.rb