metanorma-ogc 2.2.7 → 2.3.1

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -103,7 +103,7 @@ module IsoDoc
       def annex1(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         t = elem.at(ns("./title")) and
-          t.children = "<strong>#{t.children.to_xml}</strong>"
+          t.children = "<strong>#{to_xml(t.children)}</strong>"
         prefix_name(elem, "<br/>", lbl, "title")
       end
 
@@ -123,11 +123,6 @@ module IsoDoc
         super
       end
 
-      def section(docxml)
-        super
-        references(docxml)
-      end
-
       def bibdata(docxml)
         docxml.xpath(ns("//bibdata/contributor[@type = 'author']")).each do |a|
           a.at(ns("./description"))&.text == "contributor" and
@@ -168,10 +163,10 @@ module IsoDoc
 
       def termsource1(elem)
         while elem&.next_element&.name == "termsource"
-          elem << "; #{elem.next_element.remove.children.to_xml}"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
         end
         elem.children = l10n("[<strong>#{@i18n.source}:</strong> " \
-                             "#{elem.children.to_xml.strip}]")
+                             "#{to_xml(elem.children).strip}]")
       end
 
       def bibliography_bibitem_number_skip(bibitem)
@@ -189,7 +184,7 @@ module IsoDoc
       def bibrender_relaton(xml, renderings)
         f = renderings[xml["id"]][:formattedref]
         f &&= "<formattedref>#{f}</formattedref>"
-        keep = "./docidentifier | ./uri | ./note | ./status"
+        keep = "./docidentifier | ./uri | ./note | ./status | ./biblio-tag"
         xml.children = "#{f}#{xml.xpath(ns(keep)).to_xml}"
       end
 
@@ -208,6 +203,18 @@ module IsoDoc
         display_order_xpath(docxml, "//indexsect", i)
       end
 
+      def norm_ref_entry_code(_ordinal, _idents, _ids, _standard, _datefn)
+        ""
+      end
+
+      # if ids is just a number, only use that ([1] Non-Standard)
+      # else, use both ordinal, as prefix, and ids
+      def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn)
+        standard and return "[#{ordinal}]<tab/>"
+        ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
+        prefix_bracketed_ref("#{ret}#{datefn}")
+      end
+
       include Init
     end
   end

data/lib/metanorma/ogc/basicdoc.rng

@@ -683,6 +683,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/ogc/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/ogc/boilerplate.xml

@@ -4,90 +4,24 @@
       <title>Copyright notice</title>
 
       <p align="center">Copyright
-        © {{ docyear }} Open Geospatial Consortium<br/>
-        To obtain additional rights of use, visit
-        <link target="http://www.ogc.org/legal/">http://www.ogc.org/legal/</link></p>
-    </clause>
-    <clause>
-      <title>Note</title>
-      <p align="left">Attention is drawn to the possibility that some of the elements of this document may be the subject of patent rights. The Open Geospatial Consortium shall not be held responsible for identifying any or all such patent rights.</p>
-
-      <p align="left">Recipients of this document are requested to submit, with their comments, notification of any relevant patent claims or other intellectual property rights of which they may be aware that might be infringed by any implementation of the standard set forth in this document, and to provide supporting documentation.</p>
-    </clause>
-  </copyright-statement>
-  <license-statement>
-    <clause>
-      <title>License Agreement</title>
-
-      <p>Permission is hereby granted by the Open Geospatial
-        Consortium, ("Licensor"), free of charge and subject to the terms set
-        forth below, to any person obtaining a copy of this Intellectual Property and
-        any associated documentation, to deal in the Intellectual Property without
-        restriction (except as set forth below), including without limitation the
-        rights to implement, use, copy, modify, merge, publish, distribute, and/or
-        sublicense copies of the Intellectual Property, and to permit persons to whom
-        the Intellectual Property is furnished to do so, provided that all copyright notices
-        on the intellectual property are retained intact and that each person to whom
-        the Intellectual Property is furnished agrees to the terms of this Agreement.</p>
-
-      <p>If you modify the Intellectual Property, all copies of
-        the modified Intellectual Property must include, in addition to the above
-        copyright notice, a notice that the Intellectual Property includes
-        modifications that have not been approved or adopted by LICENSOR.</p>
-
-      <p>THIS LICENSE IS A COPYRIGHT LICENSE ONLY, AND DOES NOT
-        CONVEY ANY RIGHTS UNDER ANY PATENTS THAT MAY BE IN FORCE ANYWHERE IN THE WORLD.
-        THE INTELLECTUAL PROPERTY IS PROVIDED "AS
-        IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-        LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-        AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE COPYRIGHT HOLDER OR HOLDERS
-        INCLUDED IN THIS NOTICE DO NOT WARRANT THAT THE FUNCTIONS CONTAINED IN THE
-        INTELLECTUAL PROPERTY WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE
-        INTELLECTUAL PROPERTY WILL BE UNINTERRUPTED OR ERROR FREE. ANY USE OF THE
-        INTELLECTUAL PROPERTY SHALL BE MADE ENTIRELY AT THE USER’S OWN RISK. IN NO
-        EVENT SHALL THE COPYRIGHT HOLDER OR ANY CONTRIBUTOR OF INTELLECTUAL PROPERTY
-        RIGHTS TO THE INTELLECTUAL PROPERTY BE LIABLE FOR ANY CLAIM, OR ANY DIRECT,
-        SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-        FROM ANY ALLEGED INFRINGEMENT OR ANY LOSS OF USE, DATA OR PROFITS, WHETHER IN
-        AN ACTION OF CONTRACT, NEGLIGENCE OR UNDER ANY OTHER LEGAL THEORY, ARISING OUT
-        OF OR IN CONNECTION WITH THE IMPLEMENTATION, USE, COMMERCIALIZATION OR
-        PERFORMANCE OF THIS INTELLECTUAL PROPERTY.</p>
-
-      <p>This license is effective until terminated. You may
-        terminate it at any time by destroying the Intellectual Property together with
-        all copies in any form. The license will also terminate if you fail to comply
-        with any term or condition of this Agreement. Except as provided in the
-        following sentence, no such termination of this license shall require the
-        termination of any third party end-user sublicense to the Intellectual Property
-        which is in force as of the date of notice of such termination. In addition,
-        should the Intellectual Property, or the operation of the Intellectual
-        Property, infringe, or in LICENSOR’s sole opinion be
-        likely to infringe, any patent, copyright, trademark or other right of a third
-        party, you agree that LICENSOR, in its sole discretion, may terminate this
-        license without any compensation or liability to you, your licensees or any
-        other party. You agree upon termination of any kind to destroy or cause to be
-        destroyed the Intellectual Property together with all copies in any form,
-        whether held by you or by any third party.</p>
-
-      <p>Except as contained in this notice, the name of
-        LICENSOR or of any other holder of a copyright in all or part of the Intellectual
-        Property shall not be used in advertising or otherwise to promote the sale, use
-        or other dealings in this Intellectual Property without prior written
-        authorization of LICENSOR or such copyright holder. LICENSOR is and shall at
-        all times be the sole entity that may authorize you or any third party to use
-        certification marks, trademarks or other special designations to indicate
-        compliance with any LICENSOR standards or specifications.
-        This Agreement is
-        governed by the laws of the Commonwealth of Massachusetts. The application to
-        this Agreement of the United Nations Convention on Contracts for the
-        International Sale of Goods is hereby expressly excluded. In the event any
-        provision of this Agreement shall be deemed unenforceable, void or invalid, such
-        provision shall be modified so as to make it valid and enforceable, and as so
-        modified the entire Agreement shall remain in full force and effect. No
-        decision, action or inaction by LICENSOR shall be construed to be a waiver of
-        any rights or remedies available to it.</p>
-
-      <p>None of the Intellectual Property or underlying information or technology may be downloaded or otherwise exported or reexported in violation of U.S. export laws and regulations. In addition, you are responsible for complying with any local laws in your jurisdiction which may impact your right to import, export or use the Intellectual Property, and you represent that you have complied with any regulations or registration procedures required by applicable law to make this license enforceable.</p>
+      © {{ docyear }} Open Geospatial Consortium<br/>
+      To obtain additional rights of use, visit
+      <link target="https://www.ogc.org/legal">https://www.ogc.org/legal</link>
+    </p>
+  </clause>
+  <clause>
+    <title>Note</title>
+    <p align="left">Attention is drawn to the possibility that some of the elements of this document may be the subject of patent rights. The Open Geospatial Consortium shall not be held responsible for identifying any or all such patent rights.</p>
+
+    <p align="left">Recipients of this document are requested to submit, with their comments, notification of any relevant patent claims or other intellectual property rights of which they may be aware that might be infringed by any implementation of the standard set forth in this document, and to provide supporting documentation.</p>
+  </clause>
+</copyright-statement>
+<license-statement>
+  <clause>
+    <title>License Agreement</title>
+
+    <p>Use of this document is subject to the license agreement at 
+    <link target="https://www.ogc.org/license">https://www.ogc.org/license</link></p>
     </clause>
   </license-statement>
 
@@ -97,62 +31,62 @@
     <clause>
       <title>Notice</title>
       <p>This document is an OGC Member approved international standard. This document is available on a royalty free, non-discriminatory basis. Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.
-      </p>
-    </clause>
-    {% else %}
-    <clause>
-      <title>Notice for Drafts</title>
-      <p>This document is not an OGC Standard. This document is distributed for review and comment. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
+    </p>
+  </clause>
+  {% else %}
+  <clause>
+    <title>Notice for Drafts</title>
+    <p>This document is not an OGC Standard. This document is distributed for review and comment. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
 
-      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
-    </clause>
-    {% endif %}
+    <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
+  </clause>
+  {% endif %}
 
 
-    {% elsif doctype == "Engineering Report" %}
-    <clause>
-      <title>Notice</title>
-      <p>This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
+  {% elsif doctype == "Engineering Report" %}
+  <clause>
+    <title>Notice</title>
+    <p>This document is not an OGC Standard. This document is an OGC Public Engineering Report created as a deliverable in an OGC Interoperability Initiative and is <em>not an official position</em> of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
 
-      <p>Further, any OGC Engineering Report should not be referenced as required or mandatory technology in procurements. However, the discussions in this document could very well lead to the definition of an OGC Standard.</p>
-    </clause>
+    <p>Further, any OGC Engineering Report should not be referenced as required or mandatory technology in procurements. However, the discussions in this document could very well lead to the definition of an OGC Standard.</p>
+  </clause>
 
 
-    {% elsif doctype == "Best Practice" %}
-    <clause>
-      <title>Notice</title>
-      <p>This document defines an OGC Best Practice on a particular technology or approach related to an OGC standard. This document is <em>not</em> an OGC Standard and may not be referred to as an OGC Standard. It is subject to change without notice. However, this document is an <em>official</em> position of the OGC membership on this particular technology topic.</p>
+  {% elsif doctype == "Best Practice" %}
+  <clause>
+    <title>Notice</title>
+    <p>This document defines an OGC Best Practice on a particular technology or approach related to an OGC standard. This document is <em>not</em> an OGC Standard and may not be referred to as an OGC Standard. It is subject to change without notice. However, this document is an <em>official</em> position of the OGC membership on this particular technology topic.</p>
 
-      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
-    </clause>
+    <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
+  </clause>
 
-    {% elsif doctype == "Release Notes" %}
-    <clause>
-      <title>Notice</title>
-      <p>This document is not an OGC standard. This document provides release notes for an OGC standard. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
+  {% elsif doctype == "Release Notes" %}
+  <clause>
+    <title>Notice</title>
+    <p>This document is not an OGC standard. This document provides release notes for an OGC standard. This document is subject to change without notice and may not be referred to as an OGC Standard.</p>
 
-      <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
+    <p>Recipients of this document are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</p>
 
-    </clause>
+  </clause>
 
-    {% else %}
-    <clause>
-      <title>Notice</title>
-      <p>This document is not an OGC Standard. This document is an OGC {{ doctype }} and is therefore not an official position of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
-      <p>Further, an OGC {{ doctype }} should not be referenced as required or mandatory technology in procurements.</p>
-    </clause>
-    {% endif %}
+  {% else %}
+  <clause>
+    <title>Notice</title>
+    <p>This document is not an OGC Standard. This document is an OGC {{ doctype }} and is therefore not an official position of the OGC membership. It is distributed for review and comment. It is subject to change without notice and may not be referred to as an OGC Standard.</p>
+    <p>Further, an OGC {{ doctype }} should not be referenced as required or mandatory technology in procurements.</p>
+  </clause>
+  {% endif %}
 
-  </legal-statement>
+</legal-statement>
 
 
 
 
-  <feedback-statement>
-    {% if doctype == "Standard" %}
-    <clause id="boilerplate-standard-feedback">
-      <p>Suggested additions, changes and comments on this document are welcome and encouraged. Such suggestions may be submitted using the online change request form on OGC web site: <link target="http://portal.opengeospatial.org/public_ogc/change_request.php">http://portal.opengeospatial.org/public_ogc/change_request.php</link></p>
-    </clause>
-    {% endif %}
-  </feedback-statement>
+<feedback-statement>
+  {% if doctype == "Standard" %}
+  <clause id="boilerplate-standard-feedback">
+    <p>Suggested additions, changes and comments on this document are welcome and encouraged. Such suggestions may be submitted using the online change request form on OGC web site: <link target="http://ogc.standardstracker.org/">http://ogc.standardstracker.org/</link></p>
+  </clause>
+  {% endif %}
+</feedback-statement>
 </boilerplate>

data/lib/metanorma/ogc/isodoc.rng

@@ -571,6 +571,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1238,6 +1243,11 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="bold">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="ital">
           <data type="boolean"/>
@@ -2653,6 +2663,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <text/>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.2.7".freeze
+    VERSION = "2.3.1".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.2.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.3.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.2.7
+  version: 2.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-21 00:00:00.000000000 Z
+date: 2022-12-19 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.2.4
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +224,6 @@ files:
 - README.adoc
 - lib/isodoc/ogc.rb
 - lib/isodoc/ogc/base_convert.rb
-- lib/isodoc/ogc/biblio.rb
 - lib/isodoc/ogc/html/_coverpage.css
 - lib/isodoc/ogc/html/_coverpage.scss
 - lib/isodoc/ogc/html/header.html
@@ -315,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Metanorma for the Open Geospatial Consortium.

data/lib/isodoc/ogc/biblio.rb

@@ -1,24 +0,0 @@
-module IsoDoc
-  module Ogc
-    module BaseConvert
-      def std_bibitem_entry(list, bib, ordinal, biblio)
-        list.p **attr_code(iso_bibitem_entry_attrs(bib, biblio)) do |ref|
-          prefix_bracketed_ref(ref, "[#{ordinal}]") if biblio
-          reference_format(bib, ref)
-        end
-      end
-
-      def nonstd_bibitem(list, bib, ordinal, bibliography)
-        list.p **attr_code(iso_bibitem_entry_attrs(bib, bibliography)) do |r|
-          id = bibitem_ref_code(bib)
-          identifier = render_identifier(id)
-          identifier[:sdo] = nil
-          if bibliography
-            ref_entry_code(r, ordinal, identifier, id)
-          end
-          reference_format(bib, r)
-        end
-      end
-    end
-  end
-end