metanorma-ogc 2.4.3 → 2.4.7

data/lib/metanorma/ogc/cleanup.rb

@@ -86,25 +86,26 @@ module Metanorma
       end
 
       def section_names_terms_cleanup(xml)
-        replace_title(xml, "//definitions[@type = 'symbols']", @i18n&.symbols)
+        @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)
+                      @i18n.abbrev)
+        replace_title(xml, "//definitions[not(@type)]", @i18n.symbolsabbrev)
         replace_title(xml, "//sections//terms#{SYMnoABBR} | " \
                            "//sections//clause[.//terms]#{SYMnoABBR}",
-                      @i18n&.termsdefsymbols, true)
+                      @i18n.termsdefsymbols, true)
         replace_title(xml, "//sections//terms#{ABBRnoSYM} | " \
                            "//sections//clause[.//terms]#{ABBRnoSYM}",
-                      @i18n&.termsdefabbrev, true)
+                      @i18n.termsdefabbrev, true)
         replace_title(xml, "//sections//terms#{SYMABBR} | " \
                            "//sections//clause[.//terms]#{SYMABBR}",
-                      @i18n&.termsdefsymbolsabbrev, true)
+                      @i18n.termsdefsymbolsabbrev, true)
         replace_title(xml, "//sections//terms#{NO_SYMABBR} | " \
                            "//sections//clause[.//terms]#{NO_SYMABBR}",
-                      @i18n&.termsdefsymbolsabbrev, true)
+                      @i18n.termsdefsymbolsabbrev, true)
         replace_title(xml, "//sections//terms[not(.//definitions)] | " \
                            "//sections//clause[.//terms][not(.//definitions)]",
-                      @i18n&.termsdef, true)
+                      @i18n.termsdef, true)
       end
 
       def termdef_cleanup(xmldoc)
@@ -115,8 +116,7 @@ module Metanorma
       # skip annex/terms/terms, which is empty node
       def termdef_subclause_cleanup(xmldoc)
         xmldoc.xpath("//annex//clause[terms]").each do |t|
-          next unless t.xpath("./clause | ./terms | ./definitions").size == 1
-
+          t.xpath("./clause | ./terms | ./definitions").size == 1 or next
           t.children.each { |n| n.parent = t.parent }
           t.remove
         end
@@ -224,6 +224,26 @@ module Metanorma
           partid: partid&.to_i || 0,
           type: id ? id["type"] : nil }
       end
+
+       # Numbers sort *before* letters; we leave out using thorn to force that sort order.
+      # case insensitive
+       def symbol_key(sym)
+        @c.decode(asciimath_key(sym).text)
+          .gsub(/[\[\]{}<>()]/, "").gsub(/\s/m, "")
+          .gsub(/[[:punct:]]|[_^]/, ":\\0").gsub("`", "")
+      end
+
+       def symbols_cleanup(docxml)
+        docxml.xpath("//definitions/dl").each do |dl|
+          dl_out = extract_symbols_list(dl)
+          dl_out.sort! do |a, b|
+            a[:key].downcase <=> b[:key].downcase || a[:key] <=> b[:key] ||
+              a[:dt] <=> b[:dt]
+          end
+          dl.children = dl_out.map { |d| d[:dt].to_s + d[:dd].to_s }.join("\n")
+        end
+        docxml
+      end
     end
   end
 end

data/lib/metanorma/ogc/converter.rb

@@ -154,7 +154,9 @@ module Metanorma
       end
 
       def presentation_xml_converter(node)
-        IsoDoc::Ogc::PresentationXMLConvert.new(html_extract_attributes(node))
+        IsoDoc::Ogc::PresentationXMLConvert
+          .new(html_extract_attributes(node)
+          .merge(output_formats: ::Metanorma::Ogc::Processor.new.output_formats))
       end
 
       def html_converter(node)
@@ -170,6 +172,17 @@ module Metanorma
       def doc_converter(node)
         IsoDoc::Ogc::WordConvert.new(doc_extract_attributes(node))
       end
+
+      # preempt subdoctype warning
+      def adoc2xml(text, flavour)
+        Nokogiri::XML(text).root and return text
+        c = Asciidoctor
+          .convert("= X\nA\n:semantic-metadata-headless: true\n" \
+                   ":novalid:\n:docsubtype: implementation\n" \
+                   ":doctype: standard\n\n#{text}\n",
+                   backend: flavour, header_footer: true)
+        Nokogiri::XML(c).at("//xmlns:sections")
+      end
     end
   end
 end

data/lib/metanorma/ogc/front.rb

@@ -11,8 +11,7 @@ module Metanorma
       end
 
       def corporate_author(node, xml)
-        return unless node.attr("submitting-organizations")
-
+        node.attr("submitting-organizations") or return
         csv_split(HTMLEntities.new
           .decode(node.attr("submitting-organizations")), ";")&.each do |org|
           xml.contributor do |c|
@@ -49,8 +48,7 @@ module Metanorma
       end
 
       def ogc_editor(node, xml)
-        return unless node.attr("editor")
-
+        node.attr("editor") or return
         xml.contributor do |c|
           c.role type: "editor"
           c.person do |p|
@@ -78,12 +76,15 @@ module Metanorma
       end
 
       def default_publisher
-        "Open Geospatial Consortium"
+        "OGC"
       end
 
-      def metadata_committee(node, xml)
-        return unless node.attr("committee")
+       def org_abbrev
+         { "Open Geospatial Consortium" => "OGC" }
+      end
 
+      def metadata_committee(node, xml)
+        node.attr("committee") or return
         xml.editorialgroup do |a|
           metadata_committee1(node, a)
         end
@@ -102,12 +103,10 @@ module Metanorma
       end
 
       def externalid(node)
-        return node.attr("external-id") if node.attr("external-id")
-
+        i = node.attr("external-id") and return i
         d = doctype(node)
         a = node.attr("abbrev")
-        return unless d && a
-
+        d && a or return
         url = "http://www.opengis.net/doc/#{IsoDoc::Ogc::DOCTYPE_ABBR[d]}/#{a}"
         v = (node.attr("edition") || node.attr("version")) and url += "/#{v}"
         url
@@ -181,12 +180,12 @@ module Metanorma
           unless %w{general encoding extension profile
                     profile-with-extension}.include? s
             @log.add("Document Attributes", nil,
-                     "'#{s}' is not a permitted subtype of Standard: " \
-                     "reverting to 'implementation'")
+                     "'#{s}' is not a permitted subtype of best-practice: " \
+                     "reverting to 'general'")
             s = "general"
           end
         end
-        s and xml.subdoctype s
+        s && !s.empty? and xml.subdoctype s
       end
 
       def title(node, xml)

data/lib/metanorma/ogc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.5 -->
+<!-- VERSION v1.2.9 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1013,6 +1013,14 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="BasicBlock" combine="choice">
+    <ref name="columnbreak"/>
+  </define>
+  <define name="columnbreak">
+    <element name="columnbreak">
+      <empty/>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -1046,6 +1054,17 @@
       <ref name="date_inline"/>
     </choice>
   </define>
+  <define name="PureTextElement" combine="choice">
+    <ref name="passthrough_inline"/>
+  </define>
+  <define name="passthrough_inline">
+    <element name="passthrough">
+      <optional>
+        <attribute name="formats"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
   <define name="add">
     <element name="add">
       <choice>
@@ -1084,6 +1103,9 @@
       <optional>
         <attribute name="style"/>
       </optional>
+      <optional>
+        <attribute name="custom-charset"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1386,6 +1408,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1609,6 +1634,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1660,6 +1688,9 @@
     <optional>
       <attribute name="number"/>
     </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1757,6 +1788,9 @@
       <optional>
         <attribute name="number"/>
       </optional>
+      <optional>
+        <attribute name="branch-number"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1924,6 +1958,16 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="type">
+          <choice>
+            <value>letter</value>
+            <value>symbol</value>
+            <value>formula</value>
+            <value>equation</value>
+          </choice>
+        </attribute>
+      </optional>
       <element name="name">
         <oneOrMore>
           <choice>

data/lib/metanorma/ogc/processor.rb

@@ -40,6 +40,7 @@ module Metanorma
       end
 
       def output(isodoc_node, inname, outname, format, options={})
+        options_preprocess(options)
         case format
         when :html then IsoDoc::Ogc::HtmlConvert.new(options)
           .convert(inname, isodoc_node, nil, outname)

data/lib/metanorma/ogc/validate.rb

@@ -25,7 +25,7 @@ module Metanorma
         @doctype == "engineering-report" and return
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(draft swg-draft oab-review public-rfc tc-vote work-item-draft
-           approved deprecated retired rescinded).include? stage or
+           approved deprecated retired rescinded legacy).include? stage or
           @log.add("Document Attributes", nil,
                    "#{stage} is not a recognised status")
         stage_type_validate(stage, @doctype)
@@ -40,7 +40,7 @@ module Metanorma
               when "best-practice", "community-practice"
                 %w(draft swg-draft work-item-draft).include?(stage)
               else %w(swg-draft oab-review public-rfc tc-vote
-                      work-item-draft deprecated rescinded).include?(stage)
+                      work-item-draft deprecated rescinded legacy).include?(stage)
               end
         err and @log.add("Document Attributes", nil,
                          "#{stage} is not an allowed status for #{doctype}")

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.4.3".freeze
+    VERSION = "2.4.7".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "metanorma-standoc", "~> 2.6.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.7.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement