metanorma-ogc 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54d51e2b4b90d16bbdf9501ec56ec6cd9662ae28cb2ceb8033fef7c83db0cbf3
-  data.tar.gz: 8256897c8b5d73c2a6b3463f4febb3830b5d5126dade22cde283a78c0e3f8192
+  metadata.gz: cf5663cc79d98ff38a32717c48b8b0ab1a0bddb9b37c19dad11cc1ffabe4c705
+  data.tar.gz: e89c3705f344428e79691d2803a144f9c1f4555f46fae166e60727482f3c77f4
 SHA512:
-  metadata.gz: 6a83357c1d2fba623924e2839e168968bfb213cbec0cb6304a17a466295adfd9b7b69ecdab54c21b735549ff91d582f27471021fdb3679fc9b0210dfc7d853d1
-  data.tar.gz: 12fbc914136ee27e66387c03c0afb7e861af434bc2455de29a1f3acd0e27437c7b9d945916b85bb7887a156aa58c75ad95fe743906154f20f4ef31be9ec92dbd
+  metadata.gz: fee53d546401cf6daa7ded839c091bb6938761dd6cddb643cf99e8e42f0bb966e2df6e16c7589e41ffe7ff92d3c554f272c372cac7b55b7b05cbff039297a748
+  data.tar.gz: 86a37701755ce86fa6bb69f82d27a608797eb902f9ed17dc853b00ebafd3149afe7becfbf88004114d00c1d63b64764d815ccc13706f4e9482f699cbb093a583

data/lib/asciidoctor/ogc/reqt.rng

@@ -87,7 +87,7 @@
     </element>
   </define>
   <define name="reqinherit">
-    <element name="subject">
+    <element name="inherit">
       <text/>
     </element>
   </define>

data/lib/isodoc/ogc/biblio.rb

@@ -1,20 +1,18 @@
 module IsoDoc
   module Ogc
     module BaseConvert
-      def iso_bibitem_entry(list, b, ordinal, biblio)
-        return if implicit_reference(b)
+      def std_bibitem_entry(list, b, ordinal, biblio)
         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)
+      def nonstd_bibitem(list, b, ordinal, bibliography)
         list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
+          id = bibitem_ref_code(b)
           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
+            ref_entry_code(r, ordinal, id)
           end
           reference_format(b, r)
         end
@@ -85,11 +83,14 @@ module IsoDoc
 
       # {author}: {document identifier}, {title}. {publisher}, {city} ({year})
       def standard_citation(out, b)
+        if ftitle = b.at(ns("./formattedref"))
+          ftitle&.children&.each { |n| parse(n, out) }
+        else
         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 << bibitem_ref_code(b)
         out << ", "
         out.i do |i|
           iso_title(b)&.children&.each { |n| parse(n, i) }
@@ -100,6 +101,7 @@ module IsoDoc
         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_convert.rb

@@ -64,10 +64,6 @@ module IsoDoc
         end
       end
 
-      def html_toc(docxml)
-        docxml
-      end
-
       def make_body3(body, docxml)
         body.div **{ class: "main-section" } do |div3|
           @prefacenum = 0

data/lib/isodoc/ogc/reqt.rb

@@ -7,13 +7,12 @@ module IsoDoc
     module BaseConvert
       def recommend_table_attr(node)
         attr_code(id: node["id"], class: "recommend",
-                  cellspacing: 0, cellpadding: 0,
-                  style: "border-collapse:collapse" )
+                  style: "border-collapse:collapse;border-spacing:0;" )
       end
 
       REQ_TBL_ATTR =
-        { valign: "top", class: "example_label",
-          style: "width:100.0pt;padding:0 0 0 1em;margin-left:0pt" }.freeze
+        { class: "example_label",
+          style: "width:100.0pt;padding:0 0 0 1em;margin-left:0pt;vertical-align:top;" }.freeze
 
       def recommendation_name(node, out, type)
         out.p **{ class: "AdmonitionTitle" }  do |b|
@@ -36,7 +35,7 @@ module IsoDoc
       end
 
       def recommendation_body(node, tr)
-        tr.td **{ valign: "top", class: "recommend" } do |td|
+        tr.td **{ style: "vertical-align:top;", class: "recommend" } do |td|
           recommend_title(node, td)
           node.children.each do |n|
             parse(n, td) unless %(label title).include?(n.name)

data/lib/metanorma/ogc/version.rb

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

data/metanorma-ogc.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 1.5.7"
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "metanorma-standoc", "~> 1.2.0"
-  spec.add_dependency "isodoc", "~> 0.10.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.3.0"
+  spec.add_dependency "isodoc", "~> 1.0.0"
   spec.add_dependency "iso-639"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-04 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement