metanorma-ogc 2.8.8 → 2.8.10

data/lib/metanorma/ogc/cleanup.rb

@@ -72,30 +72,6 @@ module Metanorma
         end
       end
 
-      # KILL
-      def section_names_terms_cleanupx(xml)
-        @i18n or return
-        replace_title(xml, "//definitions[@type = 'symbols']", @i18n.symbols)
-        replace_title(xml, "//definitions[@type = 'abbreviated_terms']",
-                      @i18n.abbrev)
-        replace_title(xml, "//definitions[not(@type)]", @i18n.symbolsabbrev)
-        replace_title(xml, "//sections//terms#{SYM_NO_ABBR} | " \
-                           "//sections//clause[.//terms]#{SYM_NO_ABBR}",
-                      @i18n.termsdefsymbols, true)
-        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}",
-                      @i18n.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//sections//terms#{NO_SYMABBR} | " \
-                           "//sections//clause[.//terms]#{NO_SYMABBR}",
-                      @i18n.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//sections//terms[not(.//definitions)] | " \
-                           "//sections//clause[.//terms][not(.//definitions)]",
-                      @i18n.termsdef, true)
-      end
-
       # as in standoc, but do not rename annex terms
        def section_names_terms1_cleanup(xml)
         auto_name_terms(xml) or return

data/lib/metanorma/ogc/front.rb

@@ -5,12 +5,6 @@ require "fileutils"
 module Metanorma
   module Ogc
     class Converter < Standoc::Converter
-      def safe_xml_string(node, key, value)
-        node.send key do |n|
-          n << value
-        end
-      end
-
       def org_author(node, xml)
         node.attr("submitting-organizations") or return
         csv_split(@c.decode(node.attr("submitting-organizations")),
@@ -18,7 +12,7 @@ module Metanorma
           xml.contributor do |c|
             c.role type: "author"
             c.organization do |a|
-              safe_xml_string(a, "name", org)
+              add_noko_elem(a, "name", org)
             end
           end
         end
@@ -40,7 +34,7 @@ module Metanorma
         type = node.attr("role#{suffix}")&.downcase || "editor"
         if type == "contributor"
           contrib.role type: "author" do |r|
-            safe_xml_string(r, "description", type)
+            add_noko_elem(r, "description", type)
           end
         else contrib.role type: type
         end
@@ -52,7 +46,7 @@ module Metanorma
           c.role type: "editor"
           c.person do |p|
             p.name do |n|
-              n.completename node.attr("editor")
+              add_noko_elem(n, "completename", node.attr("editor"))
             end
           end
         end
@@ -71,10 +65,10 @@ module Metanorma
 
       def personal_author_name(node, xml, suffix)
         if node.attr("fullname#{suffix}")
-          safe_xml_string(xml, "completename", node.attr("fullname#{suffix}"))
+          add_noko_elem(xml, "completename", node.attr("fullname#{suffix}"))
         else
-          safe_xml_string(xml, "forename", node.attr("givenname#{suffix}"))
-          safe_xml_string(xml, "surname", node.attr("surname#{suffix}"))
+          add_noko_elem(xml, "forename", node.attr("givenname#{suffix}"))
+          add_noko_elem(xml, "surname", node.attr("surname#{suffix}"))
         end
       end
 
@@ -108,12 +102,15 @@ module Metanorma
       end
 
       def metadata_id(node, xml)
-        e = externalid(node) and xml.docidentifier e, type: "ogc-external"
+        add_noko_elem(xml, "docidentifier", externalid(node),
+                      type: "ogc-external")
         node.attr("referenceurlid") and
-          xml.docidentifier externalurl(node), type: "ogc-external"
-        docnumber = node.attr("docnumber") || node.attr("docreference")
-        id = node.attr("docidentifier") || docnumber
-        xml.docidentifier id, type: "ogc-internal", primary: "true"
+          add_noko_elem(xml, "docidentifier", externalurl(node),
+                        type: "ogc-external")
+        id = node.attr("docidentifier") || node.attr("docnumber") ||
+          node.attr("docreference")
+        add_noko_elem(xml, "docidentifier", id, type: "ogc-internal",
+                                                primary: "true")
       end
 
       def externalurl(node)
@@ -126,8 +123,7 @@ module Metanorma
 
       def metadata_source(node, xml)
         super
-        node.attr("previous-uri") && xml.uri(node.attr("previous-uri"),
-                                             type: "previous")
+        add_noko_elem(xml, "uri", node.attr("previous-uri"), type: "previous")
       end
 
       def metadata_copyright(node, xml)
@@ -146,7 +142,7 @@ module Metanorma
       def ogc_date(node, xml, ogcname, metanormaname)
         if node.attr(ogcname)
           xml.date type: metanormaname do |d|
-            d.on node.attr(ogcname)
+            add_noko_elem(d, "on", node.attr(ogcname))
           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.3 -->
+<!-- VERSION v2.1.5 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -905,15 +905,32 @@ titlecase, or lowercase</a:documentation>
     </element>
   </define>
   <define name="image" combine="choice">
-    <element name="svg">
-      <a:documentation>Add svg mark up to image</a:documentation>
-      <oneOrMore>
-        <choice>
-          <text/>
-          <ref name="AnyElement"/>
-        </choice>
-      </oneOrMore>
-    </element>
+    <choice>
+      <element name="image">
+        <ref name="RequiredId"/>
+        <ref name="ImageAttributes"/>
+        <optional>
+          <element name="svg">
+            <a:documentation>Allow svg in image/svg, for consistency</a:documentation>
+            <oneOrMore>
+              <choice>
+                <text/>
+                <ref name="AnyElement"/>
+              </choice>
+            </oneOrMore>
+          </element>
+        </optional>
+      </element>
+      <element name="svg">
+        <a:documentation>Add svg mark up to image</a:documentation>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </choice>
   </define>
   <define name="ParagraphFnBody" combine="interleave">
     <ref name="BlockSource">

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.8.8".freeze
+    VERSION = "2.8.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.8.8
+  version: 2.8.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2025-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639