metanorma-ogc 2.3.8 → 2.3.9

data/lib/metanorma/ogc/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.1 -->
 <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">
@@ -1349,15 +1350,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </define>
   <define name="standard-document">
     <element name="standard-document">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>

data/lib/metanorma/ogc/ogc.rng

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="https://www.metanorma.org/ns/ogc" xmlns="http://relaxng.org/ns/structure/1.0">
+<grammar ns='https://www.metanorma.org/ns/ogc' xmlns="http://relaxng.org/ns/structure/1.0">
   <!--
+    VERSION v1.2.1
     Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for csand additions. And we do not want that.
@@ -45,13 +46,7 @@
   </define>
   <define name="ogc-standard">
     <element name="ogc-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
+      <ref name="Root-Attributes"/>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/metanorma/ogc/validate.rb

@@ -2,6 +2,7 @@ module Metanorma
   module Ogc
     class Converter < Standoc::Converter
       def validate(doc)
+        @doctype = doc.at("//bibdata/ext/doctype")&.text
         content_validate(doc)
         schema_validate(formattedstr_strip(doc.dup),
                         File.join(File.dirname(__FILE__), "ogc.rng"))
@@ -22,12 +23,13 @@ module Metanorma
       end
 
       def stage_validate(xmldoc)
+        @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
           @log.add("Document Attributes", nil,
                    "#{stage} is not a recognised status")
-        stage_type_validate(stage, xmldoc&.at("//bibdata/ext/doctype")&.text)
+        stage_type_validate(stage, @doctype)
       end
 
       def stage_type_validate(stage, doctype)
@@ -47,23 +49,21 @@ module Metanorma
 
       def version_validate(xmldoc)
         version = xmldoc.at("//bibdata/edition")&.text
-        doctype = xmldoc.at("//bibdata/ext/doctype")&.text
-        if %w(engineering-report discussion-paper).include? doctype
+        if %w(engineering-report discussion-paper).include? @doctype
           version.nil? or @log.add("Document Attributes", nil,
-                                   "Version not permitted for #{doctype}")
+                                   "Version not permitted for #{@doctype}")
         else
           version.nil? and @log.add("Document Attributes", nil,
-                                    "Version required for #{doctype}")
+                                    "Version required for #{@doctype}")
         end
       end
 
       def execsummary_validate(xmldoc)
-        doctype = xmldoc.at("//bibdata/ext/doctype")&.text
         sect = xmldoc.at("//clause[@type = 'executivesummary']")
-        doctype == "engineering-report" && sect.nil? and
+        @doctype == "engineering-report" && sect.nil? and
           @log.add("Style", nil,
                    "Executive Summary required for Engineering Reports!")
-        doctype != "engineering-report" && !sect.nil? and
+        @doctype != "engineering-report" && !sect.nil? and
           @log.add("Style", nil,
                    "Executive Summary only allowed for Engineering Reports!")
       end
@@ -109,9 +109,7 @@ module Metanorma
       end
 
       def sections_sequence_validate(root)
-        return unless STANDARDTYPE.include?(
-          root.at("//bibdata/ext/doctype")&.text,
-        )
+        return unless STANDARDTYPE.include?(@doctype)
 
         names = root.xpath("//sections/* | //bibliography/*")
         names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val])
@@ -132,6 +130,7 @@ module Metanorma
       end
 
       def preface_sequence_validate(root)
+        @doctype == "engineering-report" and return
         root.at("//preface/abstract") or @log.add("Style", nil,
                                                   "Abstract is missing!")
         root.at("//bibdata/keyword | //bibdata/ext/keyword") or
@@ -144,6 +143,14 @@ module Metanorma
         root.at("//submitters") or @log.add("Style", nil,
                                             "Submitters is missing!")
       end
+
+      def norm_ref_validate(doc)
+        @doctype == "engineering-report" or return super
+        doc.xpath("//references[@normative = 'true']").each do |b|
+          @log.add("Bibliography", b,
+                   "Engineering report should not contain normative references")
+        end
+      end
     end
   end
 end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.3.8".freeze
+    VERSION = "2.3.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.3.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639