metanorma-ogc 2.7.8 → 2.7.10

data/lib/isodoc/ogc/presentation_sections.rb

@@ -20,8 +20,15 @@ module IsoDoc
         insert_preface_sections(doc)
       end
 
+      def section(docxml)
+        dochistory_insert(docxml)
+        @xrefs.parse docxml
+        super
+      end
+
       def insert_preface_sections(doc)
-        preface_insert(doc.at(ns("//preface//clause[@type = 'submitters' or @type = 'contributors']")),
+        preface_insert(doc.at(ns("//preface//clause[@type = 'submitters' or " \
+                                 "@type = 'contributors']")),
                        submit_orgs_append_pt(doc), doc)
         insert_submitting_orgs(doc)
         preface_insert(doc.at(ns("//preface/clause[@type = 'security']")),
@@ -29,6 +36,84 @@ module IsoDoc
         insert_keywords(doc)
       end
 
+      def dochistory_insert(docxml)
+        updates = docxml.xpath(ns(UPDATE_RELATIONS))
+        updates.empty? and return
+        fwd = annex_insert_point(docxml)
+        generate_dochistory(updates, fwd)
+      end
+
+      def annex_insert_point(docxml)
+        docxml.at(ns("//annex[last()]")) || docxml.at(ns("//sections"))
+      end
+
+      def generate_dochistory(updates, pref)
+        ret = updates.map { |u| generate_dochistory_row(u) }.flatten.join("\n")
+        pref.next = <<~XML
+          <annex #{add_id_text} obligation='informative'>
+          <title #{add_id_text}>#{@i18n.dochistory}</title>
+          <table unnumbered="true" #{add_id_text}><thead>
+          <tr #{add_id_text}><th #{add_id_text}>Date</th><th #{add_id_text}>Release</th><th #{add_id_text}>Author</th>
+            <th #{add_id_text}>Paragraph Modified</th><th #{add_id_text}>Description</th></tr>
+          </thead><tbody>#{ret}</tbody></table></annex>
+        XML
+      end
+
+      def generate_dochistory_row(item)
+        e = item.at(ns("./edition")) || item.at(ns("./version/draft"))
+        date = dochistory_date(item)
+        c = dochistory_contributors(item)
+        l = dochistory_location(item)
+        desc = dochistory_description(item)
+        <<~XML
+          <tr #{add_id_text}><td #{add_id_text}>#{date}</td><td #{add_id_text}>#{e&.text}</td><td #{add_id_text}>#{c}</td>
+            <td #{add_id_text}>#{l}</td><td #{add_id_text}>#{desc}</td></tr>
+        XML
+      end
+
+      def dochistory_date(item)
+        d = item.at(ns("./date[@type = 'updated']")) ||
+          item.at(ns("./date[@type = 'published']")) ||
+          item.at(ns("./date[@type = 'issued']")) or return ""
+        d.text.strip
+      end
+
+      def dochistory_contributors(item)
+        item.xpath(ns("./contributor")).map do |c|
+          dochistory_contributor(c)
+        end.join(", ")
+      end
+
+      def dochistory_contributor(contrib)
+        ret = contrib.at("./organization/subdivision") ||
+          contrib.at("./organization/name") ||
+          contrib.at("./person/name/abbreviation") ||
+          contrib.at("./person/name/completename")
+        ret and return ret.text
+        format_personalname(contrib)
+      end
+
+      def format_personalname(contrib)
+        Relaton::Render::Ogc::General
+          .new(template: { book: "{{ creatornames }}" })
+          .render("<bibitem type='book'>#{contrib.to_xml}</bibitem>",
+                  embedded: true)
+      end
+
+      def dochistory_description(item)
+        d = item.at(ns("./amend/description")) or return ""
+        d.children.to_xml
+      end
+
+      def dochistory_location(item)
+        t = item.at(ns("./amend/location")) or return "All"
+        xpath = "./amend/location/locality | ./amend/location/localityStack"
+        r = eref_localities(item.xpath(ns(xpath)), nil, t)
+        r.sub!(/^, /, "")
+        r == @i18n.wholeoftext and r = "All"
+        r
+      end
+
       def preface_init_insert_pt(docxml)
         docxml.at(ns("//preface")) ||
           docxml.at(ns("//sections"))

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -26,91 +26,12 @@ module IsoDoc
             a["type"] = "contributor"
         end
         super
-        dochistory_insert(docxml)
       end
 
       UPDATE_RELATIONS = <<~XPATH.freeze
         //bibdata/relation[@type = 'updatedBy' or @type = 'merges' or @type = 'splits' or @type = 'hasDraft']/bibitem
       XPATH
 
-      def dochistory_insert(docxml)
-        updates = docxml.xpath(ns(UPDATE_RELATIONS))
-        updates.empty? and return
-        fwd = annex_insert_point(docxml)
-        generate_dochistory(updates, fwd)
-      end
-
-      def annex_insert_point(docxml)
-        docxml.at(ns("//annex[last()]")) || docxml.at(ns("//sections"))
-      end
-
-      def generate_dochistory(updates, pref)
-        ret = updates.map { |u| generate_dochistory_row(u) }.flatten.join("\n")
-        pref.next = <<~XML
-          <annex #{add_id_text} obligation='informative'>
-          <title #{add_id_text}>#{@i18n.dochistory}</title>
-          <table unnumbered="true" #{add_id_text}><thead>
-          <tr #{add_id_text}><th #{add_id_text}>Date</th><th #{add_id_text}>Release</th><th #{add_id_text}>Author</th>
-            <th #{add_id_text}>Paragraph Modified</th><th #{add_id_text}>Description</th></tr>
-          </thead><tbody>#{ret}</tbody></table></annex>
-        XML
-      end
-
-      def generate_dochistory_row(item)
-        e = item.at(ns("./edition")) || item.at(ns("./version/draft"))
-        date = dochistory_date(item)
-        c = dochistory_contributors(item)
-        l = dochistory_location(item)
-        desc = dochistory_description(item)
-        <<~XML
-          <tr #{add_id_text}><td #{add_id_text}>#{date}</td><td #{add_id_text}>#{e&.text}</td><td #{add_id_text}>#{c}</td>
-            <td #{add_id_text}>#{l}</td><td #{add_id_text}>#{desc}</td></tr>
-        XML
-      end
-
-      def dochistory_date(item)
-        d = item.at(ns("./date[@type = 'updated']")) ||
-          item.at(ns("./date[@type = 'published']")) ||
-          item.at(ns("./date[@type = 'issued']")) or return ""
-        d.text.strip
-      end
-
-      def dochistory_contributors(item)
-        item.xpath(ns("./contributor")).map do |c|
-          dochistory_contributor(c)
-        end.join(", ")
-      end
-
-      def dochistory_contributor(contrib)
-        ret = contrib.at("./organization/subdivision") ||
-          contrib.at("./organization/name") ||
-          contrib.at("./person/name/abbreviation") ||
-          contrib.at("./person/name/completename")
-        ret and return ret.text
-        format_personalname(contrib)
-      end
-
-      def format_personalname(contrib)
-        Relaton::Render::Ogc::General
-          .new(template: { book: "{{ creatornames }}" })
-          .render("<bibitem type='book'>#{contrib.to_xml}</bibitem>",
-                  embedded: true)
-      end
-
-      def dochistory_description(item)
-        d = item.at(ns("./amend/description")) or return ""
-        d.children.to_xml
-      end
-
-      def dochistory_location(item)
-        t = item.at(ns("./amend/location")) or return "All"
-        xpath = "./amend/location/locality | ./amend/location/localityStack"
-        r = eref_localities(item.xpath(ns(xpath)), nil, t)
-        r.sub!(/^, /, "")
-        r == @i18n.wholeoftext and r = "All"
-        r
-      end
-
       def bibdata_i18n(bib)
         doctype = bib&.at(ns("./ext/doctype"))
         rename_stage(bib&.at(ns("./status/stage")), doctype, bib)

data/lib/metanorma/ogc/converter.rb

@@ -28,11 +28,6 @@ module Metanorma
         File.join(@libdir, "boilerplate.adoc")
       end
 
-      def makexml(node)
-        @draft = node.attributes.has_key?("draft")
-        super
-      end
-
       def doctype(node)
         d = super
         d1 = ::IsoDoc::Ogc::DOCTYPE_ABBR.invert[d] and d = d1

data/lib/metanorma/ogc/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.7 -->
+<!-- VERSION v2.0.8 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -72,6 +72,46 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
         </oneOrMore>
       </element>
     </define>
+    <define name="review">
+      <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
+the type attribute defaults to `review` for reviews</a:documentation>
+      <element name="annotation">
+        <ref name="RequiredId"/>
+        <ref name="ReviewAttributes"/>
+        <oneOrMore>
+          <ref name="paragraph">
+            <a:documentation>Reviewer comments content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </element>
+    </define>
+    <define name="ruby_pronunciation">
+      <a:documentation>Ruby annotation giving pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-pronunciation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="ruby_annotation">
+      <a:documentation>Ruby annotation giving information other than pronunciation of text: change tag from BasicDoc for disambiguation</a:documentation>
+      <element name="ruby-annotation">
+        <attribute name="value">
+          <a:documentation>Ruby annotation value</a:documentation>
+        </attribute>
+        <ref name="LocalizedStringAttributes"/>
+      </element>
+    </define>
+    <define name="annotation">
+      <a:documentation>Source code annotation, corresponding to a callout</a:documentation>
+      <element name="callout-annotation">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="paragraph"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="section-title">
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
@@ -540,7 +580,7 @@ normative or informative references, some split references into sections organiz
       <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
-          <a:documentation>CSS style: only background-color supported</a:documentation>
+          <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
         </attribute>
       </optional>
     </define>
@@ -620,7 +660,7 @@ This is done if the footnote reference is already presented in some other form,
     <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
-        <a:documentation>CSS style: only background-color supported</a:documentation>
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
       </attribute>
     </optional>
   </define>
@@ -700,6 +740,11 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>Width of the table block in rendering</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color, color, border supported</a:documentation>
+      </attribute>
+    </optional>
     <ref name="BlockAttributes"/>
   </define>
   <define name="FigureAttributes" combine="interleave">
@@ -1417,7 +1462,7 @@ numbers</a:documentation>
       </optional>
       <ref name="DocumentBody"/>
       <optional>
-        <ref name="review-container">
+        <ref name="annotation-container">
           <a:documentation>Annotations to the document</a:documentation>
         </ref>
       </optional>
@@ -1461,8 +1506,8 @@ numbers</a:documentation>
       </oneOrMore>
     </element>
   </define>
-  <define name="review-container">
-    <element name="review-container">
+  <define name="annotation-container">
+    <element name="annotation-container">
       <oneOrMore>
         <ref name="review"/>
       </oneOrMore>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.7.8".freeze
+    VERSION = "2.7.10".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "metanorma-standoc", "~> 3.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.1.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -39,7 +39,6 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-06-09 00:00:00.000000000 Z
+date: 2025-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement