metanorma-ogc 2.4.1 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6f6cbb5bc0bc2323c2ca580974c1b8088c17cd1b8e54ce952ad349990518d1
-  data.tar.gz: c33fb7fe87342becdb7d44ecd64422d5b911230622f0f571b1318d802b89ead2
+  metadata.gz: fb73a22a896fe1504ae9b753559974f1661b9efcf681d0bf5b33ebaff7367c04
+  data.tar.gz: 1ed9c11c1d4cd3178e4a83d4f2859c88f1585f2d6e3bfdc4f029bc8f75d7db52
 SHA512:
-  metadata.gz: 2c8ce9e3fd6cdf2a2f8f349c5991bde3d6809d73cba6b515a20f99dde628d041012602697bad104f21b9578622e18b5acfe6d7b172ae80b08546396f5fdfb527
-  data.tar.gz: 70e85764d9f88e93075742ca70b5d2c4bfed91b12c5ccf201421f1760235f684732f70f73073e7795dca982f9ec39ef7e14bc8648afb8e9ed6bd7e411e06aa6a
+  metadata.gz: 6e5bdca3ba426991aec0174b59a3828257f682d97a370805964dd6a94063be863f61854ff5e47ea1053d8c6cde67b1ca761f1edb42a7039a731b9b7f900ec1d7
+  data.tar.gz: 8b90fd7e42d112c8cbfbf1ed2ce3285fbb771dd1401e92331f7c6790d2c3998e5f7ca0395e1961b246ea09d854b970b15cfca4e12cc23e33fa522a733e388229

data/lib/isodoc/ogc/html_convert.rb

@@ -69,9 +69,9 @@ module IsoDoc
 
       def html_head
         ret = super
-        k = @meta.get[:keywords].join(", ")
+        k = @meta.get[:keywords].join(", ").gsub("'", "'")
         k.empty? or ret += "<meta name='keywords' content='#{k}'/>"
-        k = @meta.get[:abstract]
+        k = @meta.get[:abstract]&.gsub("'", "&#x27;")
         (k.nil? || k.empty?) or
           ret += "<meta name='description' content='#{k}'/>"
         ret

data/lib/isodoc/ogc/pdf_convert.rb

@@ -11,14 +11,13 @@ module IsoDoc
         super
       end
 
-      def pdf_stylesheet(docxml)
-        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+      def pdf_stylesheet(_docxml)
         %w(abstract-specification-topic best-practice draft-standard
            change-request-supporting-document community-practice
            community-standard discussion-paper engineering-report policy
            reference-model release-notes standard user-guide test-suite
-           white-paper).include? doctype or doctype = "other"
-        "ogc.#{doctype}.xsl"
+           white-paper).include? @doctype or @doctype = "other"
+        "ogc.#{@doctype}.xsl"
       end
     end
   end

data/lib/isodoc/ogc/word_convert.rb

@@ -40,13 +40,12 @@ module IsoDoc
       end
 
       def convert1(docxml, filename, dir)
-        if docxml&.at(ns("//bibdata/ext/doctype"))&.text == "white-paper"
+        if @doctype == "white-paper"
           @wordstylesheet_name = html_doc_path("wordstyle_wp.scss")
           @standardstylesheet_name = html_doc_path("ogc_wp.scss")
           @wordcoverpage = html_doc_path("word_ogc_titlepage_wp.html")
           @wordintropage = html_doc_path("word_ogc_intro_wp.html")
           @header = html_doc_path("header_wp.html")
-          @doctype = "white-paper"
           options[:bodyfont] = '"Arial",sans-serif'
           options[:headerfont] = '"Lato",sans-serif'
           options[:normalfontsize] = "11.0pt"

data/lib/isodoc/ogc/xref.rb

@@ -12,7 +12,7 @@ module IsoDoc
              "//sections/definitions | " \
              "//sections/clause[descendant::definitions][not(descendant::terms)]",
              @klass.middle_clause(docxml)]
-        ret + if docxml.at(ns("//bibdata/ext/doctype"))&.text == "engineering-report"
+        ret + if @doctype == "engineering-report"
                 [{ path: a.join(" | "), multi: true }]
               else
                 [{ path: a[0] }, { path: a[1] }, { path: a[2], multi: true }]

data/lib/metanorma/ogc/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/lib/metanorma/ogc/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/metanorma/ogc/cleanup.rb

@@ -34,16 +34,32 @@ module Metanorma
       def insert_security(xml, sect)
         description = "document"
         description = "standard" if %w(standard community-standard)
-          .include?(sect.at("//bibdata/ext/doctype")&.text)
+          .include?(@doctype)
+        @doctype == "engineering-report" and return remove_security(xml)
         preface = sect.at("//preface") ||
           sect.add_previous_sibling("<preface/>").first
         sect = xml.at("//clause[@type = 'security']")&.remove ||
-          "<clause type='security' #{add_id}>" \
-          "<title>Security considerations</title>" \
-          "<p>#{@i18n.security_empty.sub(/%/, description)}</p></clause>"
+          create_security_clause(xml)
         preface.add_child sect
       end
 
+      def remove_security(xml)
+        a = xml.at("//clause[@type = 'security']") and
+          a.delete("type")
+      end
+
+      def create_security_clause(xml)
+        doctype = xml.at("//bibdata/ext/doctype")&.text
+        description = "document"
+        description = "standard" if %w(standard community-standard)
+          .include?(doctype)
+        <<~CLAUSE
+          <clause type='security' #{add_id}>
+            <title>Security considerations</title>
+            <p>#{@i18n.security_empty.sub('%', description)}</p></clause>
+        CLAUSE
+      end
+
       def insert_submitters(xml, sect)
         if xml.at("//submitters")
           preface = sect.at("//preface") ||
@@ -62,9 +78,11 @@ module Metanorma
         super
         a = xmldoc.at("//bibdata/status/stage")
         a.text == "published" and a.children = "approved"
-        doctype = xmldoc.at("//bibdata/ext/doctype")
-        doctype.text == "technical-paper" and
+        if @doctype == "technical-paper"
+          doctype = xmldoc.at("//bibdata/ext/doctype")
           doctype.children = "white-paper"
+          @doctype = "white-paper"
+        end
       end
 
       def section_names_terms_cleanup(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.4 -->
+<!-- VERSION v1.2.5 -->
 <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">
@@ -485,6 +485,8 @@
           <choice>
             <text/>
             <ref name="callout"/>
+            <ref name="xref"/>
+            <ref name="eref"/>
           </choice>
         </oneOrMore>
         <zeroOrMore>
@@ -865,6 +867,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -880,6 +883,7 @@
             <ref name="PureTextElement"/>
             <ref name="stem"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -894,6 +898,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
             <ref name="eref"/>
             <ref name="erefstack"/>
             <ref name="xref"/>
@@ -908,6 +913,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -918,6 +924,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -928,6 +935,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -938,6 +946,7 @@
           <choice>
             <ref name="PureTextElement"/>
             <ref name="index"/>
+            <ref name="index-xref"/>
           </choice>
         </zeroOrMore>
       </element>
@@ -1047,6 +1056,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1060,6 +1071,8 @@
         <ref name="keyword"/>
         <ref name="xref"/>
         <ref name="hyperlink"/>
+        <ref name="index"/>
+        <ref name="index-xref"/>
       </choice>
     </element>
   </define>
@@ -1126,6 +1139,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>
@@ -1136,6 +1151,8 @@
             <choice>
               <ref name="PureTextElement"/>
               <ref name="stem"/>
+              <ref name="index"/>
+              <ref name="index-xref"/>
             </choice>
           </zeroOrMore>
         </element>

data/lib/metanorma/ogc/validate.rb

@@ -2,7 +2,6 @@ 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"))

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.4.1".freeze
+    VERSION = "2.4.3".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.5.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.6.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.1
+  version: 2.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-25 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.5.4
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement