metanorma-bipm 2.6.7 → 2.6.9

data/lib/isodoc/bipm/{doccontrol.rb → presentation_doccontrol.rb}

@@ -2,17 +2,18 @@ module IsoDoc
   module Bipm
     class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def doccontrol(doc)
-        return unless doc.at(ns("//bibdata/relation[@type = 'supersedes']"))
-
+        doc.at(ns("//bibdata/relation[@type = 'supersedes']")) or return
         clause = <<~DOCCONTROL
-          <doccontrol displayorder="999">
-          <fmt-title>Document Control</fmt-title>
-          <table unnumbered="true"><tbody>
-          <tr><th>Authors:</th><td/><td>#{list_authors(doc)}</td></tr>
+          <clause class="doccontrol" #{add_id_text}>
+          <fmt-title #{add_id_text}>Document Control</fmt-title>
+          <table #{add_id_text} unnumbered="true"><tbody>
+          <tr #{add_id_text}><th #{add_id_text}>Authors:</th><td #{add_id_text}/><td #{add_id_text}>#{list_authors(doc)}</td></tr>
           #{doccontrol_row1(doc)} #{doccontrol_row2(doc)} #{list_drafts(doc)}
-          </tbody></table></doccontrol>
+          </tbody></table></clause>
         DOCCONTROL
-        doc.root << clause
+        ins = doc.root.at(ns("./colophon")) ||
+          doc.root.add_child("<colophon/>").first
+        ins << clause
       end
 
       def doccontrol_row1(doc)
@@ -20,8 +21,8 @@ module IsoDoc
                                 1) == ["", ""] && list_cochairs(doc).empty?
 
         <<~ROW
-          <tr>#{list_draft(doc, 1)&.map { |x| "<td>#{x}</td>" }&.join}
-          <td>#{list_cochairs(doc)}</td></tr>
+          <tr #{add_id_text}>#{list_draft(doc, 1)&.map { |x| "<td #{add_id_text}>#{x}</td>" }&.join}
+          <td #{add_id_text}>#{list_cochairs(doc)}</td></tr>
         ROW
       end
 
@@ -30,8 +31,8 @@ module IsoDoc
           return ""
 
         <<~ROW
-          <tr>#{list_draft(docxml, 2)&.map { |x| "<td>#{x}</td>" }&.join}
-          <td>#{list_chairs(docxml)}</td></tr>
+          <tr #{add_id_text}>#{list_draft(docxml, 2)&.map { |x| "<td>#{x}</td>" }&.join}
+          <td #{add_id_text}>#{list_chairs(docxml)}</td></tr>
         ROW
       end
 
@@ -39,9 +40,9 @@ module IsoDoc
         ret = ""
         i = 3
         while list_draft(xml, i) != ["", ""]
-          ret += "<tr>#{list_draft(xml, i).map do |x|
-                          "<td>#{x}</td>"
-                        end.join} " \
+          ret += "<tr #{add_id_text}>#{list_draft(xml, i).map do |x|
+            "<td #{add_id_text}>#{x}</td>"
+          end.join} " \
                  "<td/></tr>"
           i += 1
         end
@@ -51,10 +52,9 @@ module IsoDoc
       def list_draft(xml, idx)
         d = xml.at(ns("//bibdata/relation[@type = 'supersedes'][#{idx}]" \
                       "/bibitem")) or return ["", ""]
-
-        draft = d&.at(ns("./version/draft"))&.text and draft = "Draft #{draft}"
-        edn = d&.at(ns("./edition"))&.text and edn = "Version #{edn}"
-        [[draft, edn].join(" "), d&.at(ns("./date"))&.text]
+        draft = d.at(ns("./version/draft"))&.text and draft = "Draft #{draft}"
+        edn = d.at(ns("./edition"))&.text and edn = "Version #{edn}"
+        [[draft, edn].join(" "), d.at(ns("./date"))&.text]
       end
 
       def list_authors(xml)

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -2,7 +2,7 @@ require "isodoc"
 require "metanorma-generic"
 require "metanorma-iso"
 require_relative "init"
-require_relative "doccontrol"
+require_relative "presentation_doccontrol"
 require_relative "../../relaton/render/general"
 require_relative "presentation_blocks"
 require_relative "presentation_biblio"
@@ -39,7 +39,7 @@ module IsoDoc
       end
 
       def clause(docxml)
-        quotedtitles(docxml)
+        # quotedtitles(docxml)
         super
         @jcgm and
           docxml.xpath(ns("//preface/introduction[clause]")).each do |f|
@@ -54,16 +54,26 @@ module IsoDoc
       end
 
       def prefix_name(node, delims, number, elem)
-        if n = node.at(ns("./#{elem}[@type = 'quoted']"))
-          n1 = n.dup
-          n1.name = "fmt-#{elem}"
-          n.next = n1
-          prefix_name_postprocess(node, elem)
+        if elem == "title" &&
+            n = node.at(ns("./variant-#{elem}[@type = 'quoted']"))
+          quoted_title_render(node, elem, n)
         else
           super
         end
       end
 
+      def quoted_title_render(node, elem, variant_title)
+        add_id(variant_title)
+        variant_title.next =
+          fmt_caption("▀", elem, variant_title, {}, {})
+        if s = variant_title.next.at(ns("./semx[@element='title']"))
+          s["source"] = variant_title["id"]
+        end
+        # to prevent it rendering, as Semantic XML element
+        variant_title.name = "title"
+        prefix_name_postprocess(node, elem)
+      end
+
       def conversions(docxml)
         doccontrol docxml
         super
@@ -133,10 +143,11 @@ module IsoDoc
         node.next = "]"
       end
 
+      # KILL
       def quotedtitles(docxml)
         docxml.xpath(ns("//variant-title[@type = 'quoted']")).each do |t|
           t.name = "title"
-          t.children.first.previous = "<blacksquare/>"
+          t.children.first.previous = "&#x2580;"
         end
       end
 
@@ -146,7 +157,8 @@ module IsoDoc
 
       def index1(docxml, indexsect, index)
         index.keys.sort.each do |k|
-          c = indexsect.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
+          c = indexsect
+            .add_child "<clause #{add_id_text}><title #{add_id_text}>#{k}</title><ul></ul></clause>"
           words = index[k].keys.each_with_object({}) do |w, v|
             v[sortable(w).downcase] = w
           end

data/lib/metanorma/bipm/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.5 -->
+<!-- VERSION v2.0.6 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -801,6 +801,12 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
   </define>
   <define name="OptionalId" combine="interleave">
     <optional>
@@ -808,6 +814,12 @@ titlecase, or lowercase</a:documentation>
         <a:documentation> User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
   </define>
   <define name="ObligationType">
     <a:documentation>The force of a clause in a standard document: whether it has normative or informative effect</a:documentation>
@@ -954,6 +966,7 @@ titlecase, or lowercase</a:documentation>
 is used in particular to capture mutually agreed definitions of codepoints in Unicode Private Use Area</a:documentation>
         </attribute>
       </optional>
+      <ref name="OptionalId"/>
       <oneOrMore>
         <ref name="TextElement">
           <a:documentation>Textual content of span</a:documentation>

data/lib/metanorma/bipm/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Bipm
-    VERSION = "2.6.7".freeze
+    VERSION = "2.6.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-bipm
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-12 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -257,7 +257,6 @@ files:
 - lib/isodoc/bipm/bipm.guide.xsl
 - lib/isodoc/bipm/bipm.mise-en-pratique.xsl
 - lib/isodoc/bipm/bipm.rapport.xsl
-- lib/isodoc/bipm/doccontrol.rb
 - lib/isodoc/bipm/html/html_bipm_intro.html
 - lib/isodoc/bipm/html/html_bipm_titlepage.html
 - lib/isodoc/bipm/html/htmlstyle.css
@@ -286,6 +285,7 @@ files:
 - lib/isodoc/bipm/pdf_convert.rb
 - lib/isodoc/bipm/presentation_biblio.rb
 - lib/isodoc/bipm/presentation_blocks.rb
+- lib/isodoc/bipm/presentation_doccontrol.rb
 - lib/isodoc/bipm/presentation_footnotes.rb
 - lib/isodoc/bipm/presentation_xml_convert.rb
 - lib/isodoc/bipm/xref.rb