metanorma-ogc 2.6.5 → 2.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f8abe4584052c8638ff63af0cf4f601329a1833105aa4847d70c8746c285ca
-  data.tar.gz: e9287cf4b36ddf56eb74b927e677ec483f96a934bd891014d1bdada95eb07823
+  metadata.gz: f4ab48de717eb69643066a331b7b70b6fc5c4c0cf361e1800ea1fc8aa61cbd74
+  data.tar.gz: 5433c82cabbf8262d41602a84013391bf82083c3dddc216b1a0ce04b735950f3
 SHA512:
-  metadata.gz: a8e30d2b9bdc650ae6c3c953221ea480761bbc06eb8bc3a09ff8b5b65799896893ca8a4d5d928f240b877990a32f61c4d3cea183bbad3928244eea05d682bc0e
-  data.tar.gz: 3966ff5a7adbb26710a33606cf97cc622db0d2154a50e07453c5d5b05c2228022408435a63660dd51c54157ba4a8a6e3fee43267c2489217a781f3e2a042f053
+  metadata.gz: a4e0e711b1e6636bf0724a93f1ba818ed4d52d4208dd8e2624c8991ed5bd6c279965a931ca051dbc192a29211551aaf99de9fe54fd69070e3c448ff900e25fed
+  data.tar.gz: 2aa9c78676a0ad5b2057249c7648b8e025ae8a9d491acc336492485d514a10a9b1333c785249df129ddc309c9f44f72fd6ee184a1668f8170abec480d3596a9a

data/lib/isodoc/ogc/base_convert.rb

@@ -36,8 +36,9 @@ module IsoDoc
         h2 = term.at("./preceding-sibling::*[@class = 'TermNum'][1]")
         term["class"] = h2["class"]
         term["id"] = h2["id"]
-        term.children.first.previous = " "
-        term.children.first.previous = h2.remove.children
+        # TODO to PresentationXML
+        term.add_first_child " "
+        term.add_first_child h2.remove.children
       end
 
       def term_cleanup_merge_admitted(term)
@@ -50,7 +51,7 @@ module IsoDoc
       end
 
       def example_parse(node, out)
-        name = node.at(ns("./name"))
+        name = node.at(ns("./fmt-name"))
         example_name_parse(node, out, name) # if name
         super
       end

data/lib/isodoc/ogc/html_convert.rb

@@ -143,11 +143,10 @@ module IsoDoc
       def figure_parse1(node, out)
         out.div **figure_attrs(node) do |div|
           node.children.each do |n|
-            figure_key(out) if n.name == "dl"
-            parse(n, div) unless n.name == "name"
+            parse(n, div) unless n.name == "fmt-name"
           end
         end
-        figure_name_parse(node, out, node.at(ns("./name")))
+        figure_name_parse(node, out, node.at(ns("./fmt-name")))
       end
 
       def html_cleanup(html)
@@ -170,7 +169,7 @@ module IsoDoc
                             encoding: "UTF-8")
         "#{a[0]}#{scripts}#{a[1]}"
       end
-        
+
       # to pass on to imported _coverpage.scss
       def scss_fontheader(is_html_css)
         super + <<~SCSS

data/lib/isodoc/ogc/init.rb

@@ -32,15 +32,6 @@ module IsoDoc
       def submittingorgs_path
         "//bibdata/contributor[role/@type = 'author']/organization/name"
       end
-
-      def ogc_draft_ref?(ref)
-        return unless ref.at(ns("./docidentifier[@type = 'OGC']"))
-
-        status = ref.at(ns("./status/stage"))&.text or return
-        return if %w(approved published deprecated retired).include? status
-
-        true
-      end
     end
   end
 end

data/lib/isodoc/ogc/metadata.rb

@@ -81,7 +81,7 @@ module IsoDoc
           m << n.text
         end
         c.empty? and c = ["Open Geospatial Consortium"]
-        set(:copyright_holder, @i18n.boolean_conj(c, "and"))
+        set(:copyright_holder, connectives_strip(@i18n.boolean_conj(c, "and")))
       end
 
       def docid(isoxml, _out)