metanorma-ogc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df4233a66b15a6f5ceca9a09de9f48db9891afef5fe4d51902dc52698284047c
-  data.tar.gz: b8804f096f9f06f796c1fb8477169b45196b480ea39417bf05d4a917a08d26cd
+  metadata.gz: 51962d5ce3484e09e78005d6c5dd1cb09e26494022f6b613817e6b443b2894c8
+  data.tar.gz: eb789d6e500b4d7fbd79553bc2e903dbf87699af5e86c8be579a2834dd440a21
 SHA512:
-  metadata.gz: 9a23095afe742af5b55067c9258051aa0ed6109ec074424393c06306d5898d04086bf616b78b4d427e3f4fd1f7807b6964d36e173f6eeea6e5b5c179fddd387a
-  data.tar.gz: db4541efc339686cad756f529048efc9eba7f074941d88652dd45e4419c9d85560938c0da8170716d4af6f2e3680e40bd3f06dd0d3697506b6e76f5fd423c263
+  metadata.gz: fc0f027c30f0b8c1e5df245db5f682b00f1c5778b9f85673dde2804f2843727a08efcceb64aa5544b2aec91d8689b5250896c17b9c5b643c39602c4669e8086f
+  data.tar.gz: 39f6aafd21c67b0a82a347dbf92bdd4978f517217d2e607f72082f02f8d3941cb8e69788bbc43d7a9a86fdf39d365f7fc6a2f0db7817063c9b8199a002fcbf22

data/README.adoc

@@ -1,7 +1,7 @@
 = metanorma-ogc: Metanorma processor for the Open Geospatial Consortium document class
 
 image:https://img.shields.io/gem/v/metanorma-ogc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-ogc"]
-image:https://img.shields.io/travis/riboseinc/metanorma-ogc/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-ogc"]
+image:https://img.shields.io/travis/riboseinc/metanorma-ogc/master.svg["Build Status", link="https://travis-ci.com/riboseinc/metanorma-ogc"]
 image:https://codeclimate.com/github/riboseinc/metanorma-ogc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-ogc"]
 
 WARNING: This gem is still under development.

data/lib/asciidoctor/ogc/biblio.rng

@@ -286,18 +286,23 @@
   </define>
   <define name="address">
     <element name="address">
-      <oneOrMore>
+      <choice>
         <!-- iso191606 TODO -->
-        <ref name="street"/>
-      </oneOrMore>
-      <ref name="city"/>
-      <optional>
-        <ref name="state"/>
-      </optional>
-      <ref name="country"/>
-      <optional>
-        <ref name="postcode"/>
-      </optional>
+        <group>
+          <oneOrMore>
+            <ref name="street"/>
+          </oneOrMore>
+          <ref name="city"/>
+          <optional>
+            <ref name="state"/>
+          </optional>
+          <ref name="country"/>
+          <optional>
+            <ref name="postcode"/>
+          </optional>
+        </group>
+        <ref name="formattedAddress"/>
+      </choice>
     </element>
   </define>
   <define name="street">
@@ -325,6 +330,11 @@
       <text/>
     </element>
   </define>
+  <define name="formattedAddress">
+    <element name="formattedAddress">
+      <text/>
+    </element>
+  </define>
   <define name="person-identifier">
     <element name="identifier">
       <attribute name="type">

data/lib/asciidoctor/ogc/front.rb

@@ -117,7 +117,7 @@ module Asciidoctor
 
       def metadata_source(node, xml)
         super
-        node.attr("previous-uri") && xml.source(node.attr("previous-uri"), type: "previous")
+        node.attr("previous-uri") && xml.uri(node.attr("previous-uri"), type: "previous")
       end
 
       def metadata_copyright(node, xml)

data/lib/asciidoctor/ogc/isodoc.rng

@@ -911,6 +911,9 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
     </element>
   </define>
   <define name="stem">

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

@@ -593,13 +593,14 @@ p.Biblio, p.NormRef {
     background-color: #e1eef1;
     padding: 1.2em;
     margin: 2em 0 1em 0;
+    padding-left: 2em;
 }
 
 .example .example-title {
     font-weight: 700;
     text-transform: uppercase;
-    text-align: center;
     margin-top:0;
+    margin-left:-1.5em;
 }
 
 .recommend {

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

@@ -607,13 +607,17 @@ div.coverpage_warning
         aside {
           font-size:10.0pt;
 }
-div.example {
-  margin-left:70.9pt;
-  text-indent:-70.9pt;
+
+.example-title {
+font-weight: bold;
+margin-left: -36.0pt;
 }
-p.example, li.example, div.example, td.example
-        {       margin:0in;
-        margin-bottom:.0001pt;
+
+p.example, li.example, div.example, td.example {
+    margin-top: 0cm;
+  margin-right: 36.0pt;
+  margin-bottom: 0cm;
+  margin-left: 36.0pt;
         mso-pagination:none;
         font-size:10.0pt;
         font-family:$bodyfont;}
@@ -622,6 +626,10 @@ td.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
 
+td.example p.MsoListParagraph {
+  font-size: 10.0pt;
+}
+
 span.note_label, span.example_label, td.example_label, td.note_label
 {
 font-size: 10.0pt;

data/lib/isodoc/ogc/metadata.rb

@@ -22,28 +22,12 @@ module IsoDoc
       def author(isoxml, _out)
         tc = isoxml.at(ns("//bibdata/editorialgroup/committee"))
         set(:tc, tc.text) if tc
-        authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person/name"))
+        authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
         set(:authors, extract_person_names(authors))
-        editors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'editor']/person/name"))
+        editors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'editor']/person"))
         set(:editors, extract_person_names(editors))
       end
 
-      def extract_person_names(authors)
-        ret = []
-        authors.each do |a|
-          if a.at(ns("./completename"))
-            ret << a.at(ns("./completename")).text
-          else
-            fn = []
-            forenames = a.xpath(ns("./forename"))
-            forenames.each { |f| fn << f.text }
-            surname = a&.at(ns("./surname"))&.text
-            ret << fn.join(" ") + " " + surname
-          end
-        end
-        ret
-      end
-
       def docid(isoxml, _out)
         set(:docnumber, isoxml&.at(ns("//bibdata/docidentifier[@type = 'ogc-internal']"))&.text)
         set(:externalid, isoxml&.at(ns("//bibdata/docidentifier[@type = 'ogc-external']"))&.text)
@@ -95,7 +79,7 @@ module IsoDoc
 
       def url(xml, _out)
         super
-        a = xml.at(ns("//bibdata/source[@type = 'previous']")) and set(:previousuri, a.text)
+        a = xml.at(ns("//bibdata/uri[@type = 'previous']")) and set(:previousuri, a.text)
       end
     end
   end

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ 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.0.8"
+  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
   spec.add_dependency "isodoc", "~> 0.9.0"
   spec.add_dependency "iso-639"
 
@@ -41,5 +41,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "metanorma", "~> 0.3.0"
-  spec.add_development_dependency "metanorma-cli", "~> 1.0.3"
+  spec.add_development_dependency "metanorma-cli", "~> 1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.2
 description: 'Metanorma for the Open Geospatial Consortium.
 
 '