metanorma-standoc 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2989c386041bf221f5c9627ff57765b18b1bd1990891eec48add7dfd3b14ef8e
-  data.tar.gz: 4eea2a64da042dcb8bc14d12a74d630a006ae8f7ac79654f95eec64426525427
+  metadata.gz: 824b1e03a0d0ad3473df22d417991f5e7a1dbf551143d0a810c3b0d66a126f4e
+  data.tar.gz: 67a0fe247f7c6bf8339bcd8e0188a2b301b44fd865d8c171bd39508ca42f6246
 SHA512:
-  metadata.gz: 7e928dc4b5ab62caf6a69a7b17d52f7ac95a67cdec4b957e8b61c3f0bff40840416d7e664d963ade8e6ea82f4d85154f76495ad21acbf8eb102f95da60cc6dd3
-  data.tar.gz: 7968ee76f47e1faf852b218652594a815cc36bcf24d2b66389fe032e47f54981c476e1dee212b45485e07003e388a4c327ec61729fa1ad9737f7c716e56af0cb
+  metadata.gz: e1a583f8f45b49cc1645bda7eea76e45750eadec72abc248db93e980fde9d96525e6c2fa80de2092ca0db4b58b5e58159621059ceab9a4a383ecc4a67a4a8202
+  data.tar.gz: 7dfff1109a7d3fb6905840170fe738c94301c3521c65786702a5f6055756885acb20f0cf013ead5d1004bfe6e9b558bb9e679f4d45ee73e9d1cef8cbfb8d9219

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.1.7)
+    metanorma-standoc (1.1.8)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       html2doc (~> 0.8.0)
@@ -61,7 +61,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (0.3.8)
+    hashdiff (0.3.9)
     html2doc (0.8.10)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
@@ -75,7 +75,7 @@ GEM
     iecbib (0.2.2)
       addressable
       iso-bib-item (~> 0.4.2)
-    ietfbib (0.4.5)
+    ietfbib (0.4.6)
       iso-bib-item (~> 0.4.2)
     iev (0.2.2)
       nokogiri
@@ -88,7 +88,7 @@ GEM
       algoliasearch
       iecbib (~> 0.2.1)
       iso-bib-item (~> 0.4.2)
-    isodoc (0.9.21)
+    isodoc (0.9.22)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -117,7 +117,7 @@ GEM
     mime-types-data (3.2019.0331)
     mini_portile2 (2.3.0)
     nenv (0.3.0)
-    nistbib (0.1.1)
+    nistbib (0.1.2)
       iso-bib-item (~> 0.4.2)
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
@@ -153,7 +153,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)

data/lib/asciidoctor/standoc/biblio.rng

@@ -810,6 +810,9 @@
   </define>
   <define name="biblionote">
     <element name="note">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <ref name="FormattedString"/>
     </element>
   </define>

data/lib/asciidoctor/standoc/cleanup_block.rb

@@ -10,12 +10,13 @@ module Asciidoctor
   module Standoc
     module Cleanup
       def para_cleanup(xmldoc)
-        xmldoc.xpath("//p[not(@id)]").each do |x|
-          x["id"] = Utils::anchor_or_uuid
-        end
-        xmldoc.xpath("//note[not(@id)][not(ancestor::bibitem)]"\
-                     "[not(ancestor::table)]").each do |x|
-          x["id"] = Utils::anchor_or_uuid
+        inject_id(xmldoc, "//p | //ol | //ul")
+        inject_id(xmldoc, "//note[not(ancestor::bibitem)][not(ancestor::table)]")
+      end
+
+      def inject_id(xmldoc, path)
+        xmldoc.xpath(path).each do |x|
+          x["id"] ||= Utils::anchor_or_uuid
         end
       end
 

data/lib/asciidoctor/standoc/front.rb

@@ -81,16 +81,12 @@ module Asciidoctor
             node.attr("affiliation#{suffix}") and p.affiliation do |a|
               a.organization do |o|
                 o.name node.attr("affiliation#{suffix}")
-                node.attr("address#{suffix}") and o.contact do |c|
-                  c.address do |ad|
-                    ad.formattedAddress node.attr("address#{suffix}")
-                  end
+                node.attr("address#{suffix}") and o.address do |ad|
+                  ad.formattedAddress node.attr("address#{suffix}")
                 end
               end
             end
-            node.attr("email#{suffix}") and p.contact do |c|
-              c.email node.attr("email#{suffix}")
-            end
+            node.attr("email#{suffix}") and p.email node.attr("email#{suffix}")
             node.attr("contributor-uri#{suffix}") and p.uri node.attr("contributor-uri#{suffix}")
           end
         end
@@ -180,6 +176,32 @@ module Asciidoctor
         xml.script (node.attr("script") || "Latn")
       end
 
+      def relaton_relations
+        %w(part-of)
+      end
+
+      def metadata_relations(node, xml)
+        relaton_relations.each do |t|
+          metadata_getrelation(node, xml, t)
+        end
+      end
+
+      def relation_normalise(type)
+        type.sub(/-by$/, "By").sub(/-of$/, "Of")
+      end
+
+      def metadata_getrelation(node, xml, type)
+        docs = node.attr(type) || return
+        docs.split(/,/).each do |d|
+          xml.relation **{ type: relation_normalise(type) } do |r|
+            fetch_ref(r, d, nil, {}) or r.bibitem do |b|
+              b.title "--"
+              b.docidentifier d
+            end
+          end
+        end
+      end
+
       def metadata(node, xml)
         title node, xml
         metadata_source(node, xml)
@@ -188,14 +210,19 @@ module Asciidoctor
         metadata_author(node, xml)
         metadata_publisher(node, xml)
         metadata_version(node, xml)
+        metadata_note(node, xml)
         metadata_language(node, xml)
         metadata_script(node, xml)
         metadata_status(node, xml)
         metadata_copyright(node, xml)
+        metadata_relations(node, xml)
         metadata_committee(node, xml)
         metadata_ics(node, xml)
       end
 
+      def metadata_note(node, xml)
+      end
+
       def asciidoc_sub(x)
         return nil if x.nil?
         return "" if x.empty?

data/lib/asciidoctor/standoc/isodoc.rng

@@ -735,6 +735,20 @@
       <ref name="bookmark"/>
     </choice>
   </define>
+  <define name="PureTextElement">
+    <choice>
+      <text/>
+      <ref name="em"/>
+      <ref name="strong"/>
+      <ref name="sub"/>
+      <ref name="sup"/>
+      <ref name="tt"/>
+      <ref name="keyword"/>
+      <ref name="strike"/>
+      <ref name="smallcap"/>
+      <ref name="br"/>
+    </choice>
+  </define>
   <define name="source">
     <element name="source">
       <ref name="TypedUri"/>
@@ -742,42 +756,58 @@
   </define>
   <define name="em">
     <element name="em">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="strong">
     <element name="strong">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="tt">
     <element name="tt">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="keyword">
     <element name="keyword">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sub">
     <element name="sub">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="sup">
     <element name="sup">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="strike">
     <element name="strike">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="smallcap">
     <element name="smallcap">
-      <text/>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
     </element>
   </define>
   <define name="br">

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.1.7".freeze
+    VERSION = "1.1.8".freeze
   end
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -95,6 +95,7 @@ RSpec.describe Asciidoctor::Standoc do
       :address_2: 6A Rubble Way, Bedrock
       :email_2: barney@rockhead.example.com
       :publisher: Hanna Barbera, Cartoon Network
+      :part-of: ABC
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
 <standard-document xmlns="http://riboseinc.com/isoxml">
@@ -138,11 +139,6 @@ RSpec.describe Asciidoctor::Standoc do
 <date type="Jack">
   <on>1010-01-01</on>
 </date>
-<edition>2</edition>
-<version>
-  <revision-date>2000-01-01</revision-date>
-  <draft>3.4</draft>
-</version>
 <contributor>
   <role type="author"/>
   <organization>
@@ -164,11 +160,9 @@ RSpec.describe Asciidoctor::Standoc do
      <affiliation>
    <organization>
      <name>Slate Rock and Gravel Company</name>
-     <contact>
   <address>
     <formattedAddress>6 Rubble Way, Bedrock</formattedAddress>
   </address>
-</contact>
    </organization>
    </affiliation>
    <uri>http://slate.example.com</uri>
@@ -185,16 +179,12 @@ RSpec.describe Asciidoctor::Standoc do
 <affiliation>
   <organization>
     <name>Rockhead and Quarry Cave Construction Company</name>
-    <contact>
   <address>
     <formattedAddress>6A Rubble Way, Bedrock</formattedAddress>
   </address>
-</contact>
   </organization>
 </affiliation>
- <contact>
    <email>barney@rockhead.example.com</email>
- </contact>
   </person>
 </contributor>
 <contributor>
@@ -209,6 +199,11 @@ RSpec.describe Asciidoctor::Standoc do
     <name>Cartoon Network</name>
   </organization>
 </contributor>
+<edition>2</edition>
+<version>
+  <revision-date>2000-01-01</revision-date>
+  <draft>3.4</draft>
+</version>
   <language>en</language>
   <script>Latn</script>
   <status format="plain">published</status>
@@ -228,6 +223,12 @@ RSpec.describe Asciidoctor::Standoc do
      </organization>
    </owner>
   </copyright>
+  <relation type="partOf">
+  <bibitem>
+  <title>--</title>
+  <docidentifier>ABC</docidentifier>
+  </bibitem>
+</relation>
   <editorialgroup>
     <technical-committee number="1" type="A">TC</technical-committee>
     <technical-committee number="11" type="A1">TC1</technical-committee>

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -401,7 +401,7 @@ RSpec.describe Asciidoctor::Standoc do
     <docidentifier type="IETF">RFC 8341</docidentifier>
     <docidentifier type="DOI">10.17487/RFC8341</docidentifier>
     <date type="published">
-      <on>2018</on>
+      <on>2018-03</on>
     </date>
     <contributor>
       <role type="author"/>
@@ -432,6 +432,7 @@ RSpec.describe Asciidoctor::Standoc do
       </person>
     </contributor>
     <language>en</language>
+    <script>Latn</script>
     <series type="main">
       <title format="plain" language="en" script="Latn">STD</title>
       <number>91</number>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor