metanorma-ogc 0.1.3 → 0.1.4

data/lib/isodoc/ogc/biblio.rb

@@ -0,0 +1,106 @@
+module IsoDoc
+  module Ogc
+    module BaseConvert
+      def iso_bibitem_entry(list, b, ordinal, biblio)
+        return if implicit_reference(b)
+        list.p **attr_code(iso_bibitem_entry_attrs(b, biblio)) do |ref|
+          prefix_bracketed_ref(ref, ordinal) if biblio
+          standard_citation(ref, b)
+        end
+      end
+
+      def noniso_bibitem(list, b, ordinal, bibliography)
+        list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
+          if bibliography
+            id = docid_l10n(b.at(ns("./docidentifier")).text.gsub(/[\[\]]/, ""))
+            prefix = b&.at(ns("./docidentifier/@type"))&.text
+            ref_entry_code(r, ordinal, prefix, id) unless prefix
+          end
+          reference_format(b, r)
+        end
+      end
+
+      def reference_format(b, r)
+        if ftitle = b.at(ns("./formattedref"))
+          ftitle&.children&.each { |n| parse(n, r) }
+        else
+          # eventually will be full LNCS reference
+          standard_citation(r, b)
+        end
+      end
+
+      def multiplenames(names)
+        names.join(", ")
+      end
+
+      def multiplenames_and(names)
+        return "" if names.length == 0
+        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(n)
+        noko do |xml|
+          xml.span do |s|
+            n&.children&.each { |x| parse(x, s) }
+          end
+        end.join("")
+      end
+
+      def extract_publisher(b)
+        c = b.xpath(ns("./contributor[role/@type = 'publisher'][organization]"))
+        abbrs = []
+        names = []
+        c&.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?
+        return [multiplenames_and(names), (abbrs.map { |x| x.text }).join("/")]
+      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
+        return "#{from}&ndash;#{to}" if from
+        nil
+      end
+
+      def extract_year(b)
+        d = b.at(ns("./date[@type = 'published']")) ||
+          b.at(ns("./date[@type = 'issued']")) ||
+          b.at(ns("./date[@type = 'circulated']")) ||
+          b.at(ns("./date"))
+        date_render(d)
+      end
+
+      def extract_city(b)
+        b.at(ns("./place"))
+      end
+
+      # {author}: {document identifier}, {title}. {publisher}, {city} ({year})
+      def standard_citation(out, b)
+        pub, pub_abbrev = extract_publisher(b)
+        c = extract_city(b)
+        y = extract_year(b)
+        out << "#{pub_abbrev}: " if pub_abbrev
+        out << iso_bibitem_ref_code(b)
+        out << ", "
+        out.i do |i|
+          iso_title(b)&.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
+      end
+    end
+  end
+end

data/lib/isodoc/ogc/html/htmlstyle.scss

@@ -888,7 +888,7 @@ h2 p {
   font-weight: 100;
   padding-left: 1em;
   padding-right: 1em;
-  text-transform: uppercase;
+  /* text-transform: uppercase; */
 }
 
 .coverpage-title span {

data/lib/isodoc/ogc/reqt.rb

@@ -0,0 +1,81 @@
+require "isodoc"
+require_relative "metadata"
+require "fileutils"
+
+module IsoDoc
+  module Ogc
+    module BaseConvert
+      def recommend_table_attr(node)
+        attr_code(id: node["id"], class: "recommend",
+                  cellspacing: 0, cellpadding: 0,
+                  style: "border-collapse:collapse" )
+      end
+
+      REQ_TBL_ATTR =
+        { valign: "top", class: "example_label",
+          style: "width:100.0pt;padding:0 0 0 1em;margin-left:0pt" }.freeze
+
+      def recommendation_name(node, out, type)
+        out.p **{ class: "AdmonitionTitle" }  do |b|
+          lbl = anchor(node['id'], :label, false)
+          b << (lbl.nil? ? l10n("#{type}:") : l10n("#{type} #{lbl}:"))
+        end
+      end
+
+      def recommend_title(node, div)
+        label = node.at(ns("./label"))
+        title = node.at(ns("./title"))
+        label || title or return
+        div.p do |p|
+          p.b do |b|
+            label and label.children.each { |n| parse(n,b) }
+            b << "#{clausedelim} " if label && title
+            title and title.children.each { |n| parse(n,b) }
+          end
+        end
+      end
+
+      def recommendation_body(node, tr)
+        tr.td **{ valign: "top", class: "recommend" } do |td|
+          recommend_title(node, td)
+          node.children.each do |n|
+            parse(n, td) unless %(label title).include?(n.name)
+          end
+        end
+      end
+
+      def recommendation_parse(node, out)
+        out.table **recommend_table_attr(node) do |t|
+          t.tr do |tr|
+            tr.td **REQ_TBL_ATTR do |td|
+              recommendation_name(node, td, @recommendation_lbl)
+            end
+            recommendation_body(node, tr)
+          end
+        end
+      end
+
+      def requirement_parse(node, out)
+        out.table **recommend_table_attr(node) do |t|
+          t.tr do |tr|
+            tr.td **REQ_TBL_ATTR do |td|
+              recommendation_name(node, td, @requirement_lbl)
+            end
+            recommendation_body(node, tr)
+          end
+        end
+      end
+
+      def permission_parse(node, out)
+        out.table **recommend_table_attr(node) do |t|
+          t.tr do |tr|
+            tr.td **REQ_TBL_ATTR do |td|
+              recommendation_name(node, td, @permission_lbl)
+            end
+            recommendation_body(node, tr)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -272,6 +272,7 @@ files:
 - bin/rspec
 - bin/setup
 - lib/asciidoctor/ogc.rb
+- lib/asciidoctor/ogc/basicdoc.rng
 - lib/asciidoctor/ogc/biblio.rng
 - lib/asciidoctor/ogc/converter.rb
 - lib/asciidoctor/ogc/front.rb
@@ -282,6 +283,7 @@ files:
 - lib/asciidoctor/ogc/validate.rb
 - lib/isodoc/ogc.rb
 - lib/isodoc/ogc/base_convert.rb
+- lib/isodoc/ogc/biblio.rb
 - lib/isodoc/ogc/html/header.html
 - lib/isodoc/ogc/html/html_ogc_intro.html
 - lib/isodoc/ogc/html/html_ogc_titlepage.html
@@ -296,6 +298,7 @@ files:
 - lib/isodoc/ogc/i18n-en.yaml
 - lib/isodoc/ogc/metadata.rb
 - lib/isodoc/ogc/pdf_convert.rb
+- lib/isodoc/ogc/reqt.rb
 - lib/isodoc/ogc/word_convert.rb
 - lib/metanorma-ogc.rb
 - lib/metanorma/ogc.rb