metanorma-ogc 1.4.5 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cb1583cace9a2d58cc458ee480be7385034abb7666d511bcbe1a228908258fe
-  data.tar.gz: 882469c7bf396171ad9cd81599d0f9f49c9b591a040968da758fb0d2d7fd600e
+  metadata.gz: '031379ecf57a52c5e03554fcd26e612d80b12c662e5c02653e334726baa9a763'
+  data.tar.gz: 4308644ba756016b6a58d9d8f135fb03a54d3f88b85dd21e1b1c670e225d080d
 SHA512:
-  metadata.gz: 114c8e43be8dfb2c3d4f088645111f93014b258881f1df9de256a3850e6853f2342acc3bfb8784e48f74e9524f2a3d94c33e0d8a1fc7d7939f76d9c32b4ec1e8
-  data.tar.gz: d070f02e1965aeb0c29d61a2010a90af3be5bd7614c31362d01befa59d212b26eb3b65479be5252caf5ab256511a4a66f2d3ed1b1f21b6db19d62aab2e239e87
+  metadata.gz: bfde0fdf6dea362dabefafd7451d12cae304298ab60617fa33fe1d013ada9dda8636741892f5ef51d7120f5ddeb80775cae198b7f92eddc6cc490ed9d8b480b8
+  data.tar.gz: d7f3fb149f6d529cf5e21c59e55e7bae77d74d5fb2d36457df75b41789029603443071249133cdea8222f21d2be30bea423eedb8f00ed05129532164bc879eaf

data/lib/asciidoctor/ogc/cleanup.rb

@@ -138,10 +138,15 @@ module Asciidoctor
         end
       end
 
+      def termdef_cleanup(xmldoc)
+        super
+        termdef_subclause_cleanup(xmldoc)
+      end
+
       # skip annex/terms/terms, which is empty node
       def termdef_subclause_cleanup(xmldoc)
-        xmldoc.xpath("//annex//terms[terms]").each do |t|
-          next if t.parent.name == "terms"
+        xmldoc.xpath("//annex//clause[terms]").each do |t|
+          next unless t.xpath("./clause | ./terms | ./definitions").size == 1
 
           t.children.each { |n| n.parent = t.parent }
           t.remove

data/lib/asciidoctor/ogc/isodoc.rng

@@ -1885,6 +1885,7 @@
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
+      <ref name="graphical_symbol_designation"/>
     </choice>
     <zeroOrMore>
       <ref name="termsource"/>
@@ -1907,6 +1908,16 @@
       </element>
     </element>
   </define>
+  <define name="graphical_symbol_designation">
+    <element name="graphical-symbol">
+      <optional>
+        <attribute name="isInternational">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <ref name="figure"/>
+    </element>
+  </define>
   <define name="expression_designation">
     <element name="expression">
       <optional>
@@ -1930,12 +1941,9 @@
         </attribute>
       </optional>
       <element name="name">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
+        <zeroOrMore>
+          <ref name="PureTextElement"/>
+        </zeroOrMore>
       </element>
       <optional>
         <element name="abbreviationType">
@@ -2042,9 +2050,31 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <choice>
+        <ref name="verbaldefinition"/>
+        <ref name="nonverbalrep"/>
+        <group>
+          <ref name="verbaldefinition"/>
+          <ref name="nonverbalrep"/>
+        </group>
+      </choice>
+    </element>
+  </define>
+  <define name="verbaldefinition">
+    <element name="verbaldefinition">
+      <oneOrMore>
+        <ref name="paragraph"/>
+      </oneOrMore>
+      <zeroOrMore>
+        <ref name="termsource"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="nonverbalrep">
+    <element name="nonverbalrepresentation">
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="table"/>
           <ref name="figure"/>
           <ref name="formula"/>
         </choice>

data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.best-practice.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.community-practice.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.community-standard.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.discussion-paper.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.engineering-report.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.other.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.policy.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.reference-model.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.release-notes.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.standard.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.test-suite.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.user-guide.xsl

@@ -5660,6 +5660,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/isodoc/ogc/ogc.white-paper.xsl

@@ -4977,6 +4977,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
+			
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "1.4.5".freeze
+    VERSION = "1.5.0".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -25,8 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "isodoc", "~> 1.7.0"
-  spec.add_dependency "metanorma-standoc", "~> 1.10.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.11.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   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: 1.4.5
+  version: 1.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -24,34 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement