metanorma-ogc 2.8.2 → 2.8.4

data/lib/metanorma/ogc/cleanup.rb

@@ -78,11 +78,11 @@ module Metanorma
         replace_title(xml, "//definitions[@type = 'abbreviated_terms']",
                       @i18n.abbrev)
         replace_title(xml, "//definitions[not(@type)]", @i18n.symbolsabbrev)
-        replace_title(xml, "//sections//terms#{SYMnoABBR} | " \
-                           "//sections//clause[.//terms]#{SYMnoABBR}",
+        replace_title(xml, "//sections//terms#{SYM_NO_ABBR} | " \
+                           "//sections//clause[.//terms]#{SYM_NO_ABBR}",
                       @i18n.termsdefsymbols, true)
-        replace_title(xml, "//sections//terms#{ABBRnoSYM} | " \
-                           "//sections//clause[.//terms]#{ABBRnoSYM}",
+        replace_title(xml, "//sections//terms#{ABBR_NO_SYM} | " \
+                           "//sections//clause[.//terms]#{ABBR_NO_SYM}",
                       @i18n.termsdefabbrev, true)
         replace_title(xml, "//sections//terms#{SYMABBR} | " \
                            "//sections//clause[.//terms]#{SYMABBR}",

data/lib/metanorma/ogc/front.rb

@@ -5,19 +5,13 @@ require "fileutils"
 module Metanorma
   module Ogc
     class Converter < Standoc::Converter
-      def metadata_author(node, xml)
-        corporate_author(node, xml)
-        personal_author(node, xml)
-        committee_contributors(node, xml, default_publisher, {})
-      end
-
       def safe_xml_string(node, key, value)
         node.send key do |n|
           n << value
         end
       end
 
-      def corporate_author(node, xml)
+      def org_author(node, xml)
         node.attr("submitting-organizations") or return
         csv_split(@c.decode(node.attr("submitting-organizations")),
                   ";")&.each do |org|
@@ -92,7 +86,7 @@ module Metanorma
         { "Open Geospatial Consortium" => "OGC" }
       end
 
-      def metadata_committee_types(node)
+      def metadata_committee_types(_node)
         %w(committee subcommittee workgroup)
       end
 
@@ -190,9 +184,8 @@ module Metanorma
 
       def title(node, xml)
         super
-        at = { format: "text/plain", type: "abbrev" }
-        a = node.attr("abbrev") and
-          xml.title a, **attr_code(at)
+        content = node.attr("abbrev") and
+          add_title_xml(xml, content, @lang, "abbrev")
       end
     end
   end

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.1.1 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -123,6 +123,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlBody">
       <optional>
@@ -140,6 +144,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlAttributes">
       <a:documentation>NOTE: `start` attribute is not included by default, because of problems it raises with DOC output</a:documentation>
@@ -188,6 +196,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="dt">
       <element name="dt">
@@ -443,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -592,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -841,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">
@@ -871,6 +890,12 @@ titlecase, or lowercase</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="ParagraphFnBody" combine="interleave">
+    <ref name="BlockSource">
+      <a:documentation>Bibliographic source for the information in the paragraph
+parargaph sources are currently only rendered in metanorma-plateau</a:documentation>
+    </ref>
+  </define>
   <define name="BasicBlock" combine="choice">
     <ref name="columnbreak"/>
   </define>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.8.2".freeze
+    VERSION = "2.8.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-18 00:00:00.000000000 Z
+date: 2025-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639