metanorma-ogc 2.0.7 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c203aacb7ff88cfd91d3572b59743f962d4df5d8c602dc056bc6e3b3daeb3cd
-  data.tar.gz: 5a0071efa21404e76b64a98ec6ff07b7b6a3f3252a03ef68e83144ebe69a62be
+  metadata.gz: 114f569b93b16cd055eda79bde9d167827b5af201bcab72cec2341a19f71e679
+  data.tar.gz: 75b4b390941bece71edeb25dd481fac0a39631b72abc2dbccbdc4bb54b102210
 SHA512:
-  metadata.gz: 07aeafd71ed996a103514871386fc9cef5660f4a296f115ffb9f3311f41d65af330498fd487109d505d623e207e04ba1d58d242798f09f8a0d0dd28844adfe0a
-  data.tar.gz: 00506d3ba16ca2b88bc497c02ee57e700236652d5ad146e6ec295f58d56f0eacef6362cef00b94f2c44e74f402e58448fc35e0238c609f9e56af962483cbfb88
+  metadata.gz: 70bba60758978f653c396c98be63012440e00ae7d82dbd721256d0bc12db6b0d4ae099469acfa24208e5bd067812ca207fe465e986a9e4f2c2202142c2fa3a25
+  data.tar.gz: 00267f9fc1fb975117feeceb9a2cb29c45ecf86cda368115138452369aa3f52ab36bcd851a9c4d9efaf1e37f1467c145551b4961f949f1e6d94369c808b5f837

data/lib/isodoc/ogc/biblio.rb

@@ -4,7 +4,7 @@ module IsoDoc
       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
-          standard_citation(ref, bib)
+          reference_format(bib, ref)
         end
       end
 
@@ -19,139 +19,6 @@ module IsoDoc
           reference_format(bib, r)
         end
       end
-
-      def reference_format(bib, ref)
-        if ftitle = bib.at(ns("./formattedref"))
-          ftitle&.children&.each { |n| parse(n, ref) }
-        else
-          # eventually will be full LNCS reference
-          standard_citation(ref, bib)
-        end
-      end
-
-      def multiplenames(names)
-        names.join(", ")
-      end
-
-      def multiplenames_and(names)
-        return "" if names.empty?
-        return names[0] if names.length == 1
-        return "#{names[0]} and #{names[1]}" if names.length == 2
-
-        names[0..-2].join(", ") + " and #{names[-1]}"
-      end
-
-      def nodes_to_span(node)
-        noko do |xml|
-          xml.span do |s|
-            node&.children&.each { |x| parse(x, s) }
-          end
-        end.join
-      end
-
-      def extract_publisher(bib)
-        abbrs = []
-        names = []
-        bib.xpath(ns("./contributor[role/@type = 'publisher']"\
-                     "[organization]"))&.each do |c1|
-          n = c1.at(ns("./organization/name")) or next
-          abbrs << (c1.at(ns("./organization/abbreviation")) || n)
-          names << nodes_to_span(n)
-        end
-        return [nil, nil] if names.empty?
-
-        [multiplenames_and(names), abbrs.map(&:text).join("/")]
-      end
-
-      def extract_author(bib)
-        c = bib.xpath(ns("./contributor[role/@type = 'author']"))
-        c = bib.xpath(ns("./contributor[role/@type = 'editor']")) if c.empty?
-        return nil if c.empty?
-
-        c.map do |c1|
-          c1&.at(ns("./organization/name"))&.text || extract_person_name(c1)
-        end.reject { |e| e.nil? || e.empty? }.join(", ")
-      end
-
-      def extract_person_name(bib)
-        p = bib.at(ns("./person/name")) or return
-        c = p.at(ns("./completename")) and return c.text
-        s = p&.at(ns("./surname"))&.text or return
-        i = p.xpath(ns("./initial")) and
-          front = i.map { |e| e.text.gsub(/[^[:upper:]]/, "") }.join
-        i.empty? and f = p.xpath(ns("./forename")) and
-          front = f.map { |e| e.text[0].upcase }.join
-        front ? "#{s} #{front}" : s
-      end
-
-      def date_render(date)
-        return nil if date.nil?
-
-        on = date&.at(ns("./on"))&.text
-        from = date&.at(ns("./from"))&.text
-        to = date&.at(ns("./to"))&.text
-        return on if on && !on.empty?
-        return "#{from}&ndash;#{to}" if from && !from.empty?
-
-        nil
-      end
-
-      def extract_year(bib)
-        d = bib.at(ns("./date[@type = 'published']")) ||
-          bib.at(ns("./date[@type = 'issued']")) ||
-          bib.at(ns("./date[@type = 'circulated']")) ||
-          bib.at(ns("./date"))
-        date_render(d)
-      end
-
-      def extract_city(bib)
-        bib.at(ns("./place"))
-      end
-
-      def extract_uri(bib)
-        bib.at(ns("./uri[@type = 'src']")) || bib.at(ns("./uri"))
-      end
-
-      # {author}: {document identifier}, {title}. {publisher}, {city} ({year})
-      def standard_citation(out, bib)
-        if ftitle = bib.at(ns("./formattedref"))
-          ftitle&.children&.each { |n| parse(n, out) }
-        else
-          pub, pub_abbrev = extract_publisher(bib)
-          author = extract_author(bib)
-          c = extract_city(bib)
-          y = extract_year(bib)
-          u = extract_uri(bib)
-          out << "#{author || pub_abbrev}: " if author || pub_abbrev
-          id = render_identifier(inline_bibitem_ref_code(bib))
-          out << id[:sdo] if id[:sdo]
-          out << " (Draft)" if ogc_draft_ref?(bib)
-          out << ", "
-          out.i do |i|
-            iso_title(bib)&.children&.each { |n| parse(n, i) }
-          end
-          out << ". "
-          out << pub if pub
-          out << ", " if pub && c
-          c&.children&.each { |n| parse(n, out) }
-          out << " " if (pub || c) && y
-          out << "(#{y}). " if y
-          u and out << "<a href='#{u.text}'>#{u.text}</a>"
-        end
-      end
-
-      def inline_bibitem_ref_code(bib)
-        id = bib.at(ns("./docidentifier[not(@type = 'DOI' "\
-                       "or @type = 'metanorma' or @type = 'ISSN' "\
-                       "or @type = 'ISBN' or @type = 'metanorma-ordinal')]"))
-        id ||= bib.at(ns("./docidentifier[not(@type = 'metanorma' or "\
-                         "@type = 'metanorma-ordinal')]"))
-        return [nil, id, nil, nil] if id
-
-        id = Nokogiri::XML::Node.new("docidentifier", bib.document)
-        id << "(NO ID)"
-        [nil, id, nil, nil]
-      end
     end
   end
 end

data/lib/isodoc/ogc/html/html_ogc_titlepage.html

@@ -98,6 +98,8 @@
   <div class="coverpage-warning">
     <div id="boilerplate-legal-destination"/>
  </div>
+         <div class="coverpage-warning" id="coverpage-note-destination"/>
+
 
 <div class="docstage-box">
   <table>

data/lib/isodoc/ogc/html/word_ogc_titlepage.html

@@ -50,7 +50,10 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>
 
 <div class="warning">
       <div id="boilerplate-legal-destination"/>
+        <div  id="boilerplate-license-destination"/>
       </div>
+              <div class="coverpage-warning" id="coverpage-note-destination"/>
+
 
 <div style='mso-element:frame;mso-element-frame-hspace:7.1pt;mso-element-frame-vspace:
 7.1pt;mso-element-wrap:auto;mso-element-anchor-vertical:page;mso-element-anchor-horizontal:

data/lib/isodoc/ogc/html/word_ogc_titlepage_wp.html

@@ -65,8 +65,11 @@ style='mso-no-proof:yes;font-size:10.0pt'>Category: {{ doctype }}</span></p>
 <div id="boilerplate-copyright-destination"/>
         <div class="warning">
       <div id="boilerplate-legal-destination"/>
+        <div  id="boilerplate-license-destination"/>
       </div>
 </div>
+                <div class="coverpage-warning" id="coverpage-note-destination"/>
+
 
 <v:shape id="Picture_x0020_4" o:spid="_x0000_s1026" type="#_x0000_t75"
  alt="A close up of a sign&#10;&#10;Description automatically generated"

data/lib/isodoc/ogc/init.rb

@@ -10,13 +10,13 @@ module IsoDoc
         @meta = Metadata.new(lang, script, labels)
       end
 
-      def xref_init(lang, script, klass, labels, options)
+      def xref_init(lang, script, _klass, labels, options)
         html = HtmlConvert.new(language: lang, script: script)
         @xrefs = Xref.new(lang, script, html, labels, options)
       end
 
       def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml || @i18nyaml)
+        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
       end
 
       def fileloc(loc)
@@ -28,14 +28,13 @@ module IsoDoc
       end
 
       def ogc_draft_ref?(ref)
-        return unless ref.at(
-          ns("./contributor[role/@type = 'publisher']/organization"\
-             "[name = 'Open Geospatial Consortium']"))
+        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
-