metanorma-standoc 1.0.14 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 644ddfc0c5ac5fae5afc94f5dbdfaae98e652bff498bc93babb5cba3852c0141
-  data.tar.gz: cb00da517ce5f359f348d57fee37cffc8b2148250ae6c4557ef192c1b779b865
+  metadata.gz: ade6c1c0ec2ee0ab99b2442458300ff20d4ff4f54852d27555c12102325bde55
+  data.tar.gz: 8438c7af3cdb3950dfef74a6834a5110dd6fdb64b8919b491f1e0c3899ced318
 SHA512:
-  metadata.gz: 44cbc66e4d6e477aef83073e733c783461e0041b3ea4c80db24d491407716e7557814a1bf3e3acc8398d82dd778c43b2c8ff796c289ea95fb4163e98bcbdcc8d
-  data.tar.gz: dcc8047577538f25d37a6a81a73e2d78ef3fd53925489500dc72d26682fcf7bd790c419b2a1158944ff40a1ffd6792a0e39fa14c739ed4c045db536850d95404
+  metadata.gz: 5d4932ccc12e249099226f62fccfd08e116d362c1b0b045e758325db52fa0f2425ffa8b197d106cd4fcb4d7b28ba8a1fcacaacba5cc69be2391e74ced1b3ecac
+  data.tar.gz: 8eda800af76b44522d194711cc5272387b8e1c996713db8c54ff1a0dbbad86b229b9cd1feb3139c45cbbfec326d92503eb51fea857c007958588aaf36cc67e2c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    metanorma-standoc (1.0.14)
+    metanorma-standoc (1.1.0)
       asciidoctor (~> 1.5.7)
       concurrent-ruby
       iev (~> 0.2.0)

data/README.adoc

@@ -1,7 +1,7 @@
 = Metanorma-standoc
 
 image:https://img.shields.io/gem/v/metanorma-standoc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-standoc"]
-image:https://img.shields.io/travis/riboseinc/metanorma-standoc/master.svg["Build Status", link="https://travis-ci.org/riboseinc/metanorma-standoc"]
+image:https://img.shields.io/travis/riboseinc/metanorma-standoc/master.svg["Build Status", link="https://travis-ci.com/riboseinc/metanorma-standoc"]
 image:https://codeclimate.com/github/riboseinc/metanorma-standoc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/riboseinc/metanorma-standoc"]
 
 WARNING: This gem is still under development.
@@ -586,6 +586,21 @@ the document was issued
 
 `:technical-committee:`:: The name of the relevant technical committee
 
+`:fullname{_i}:`:: The full name of a person who is a contributor to the document.
+A second person is indicated by using a numeric suffix: `:fullname:`, `:fullname_2:`, `fullname_3:`, &c.
+(This and the other personal name attributes are not displayed in all standards.)
+
+`:surname{_i}:`:: The surname of a person who is a contributor to the document.
+`:givenname{_i}:`:: The given name(s) of a person who is a contributor to the document.
+`:initials{_i}:`:: The initials(s) of a person who is a contributor to the document.
+`:role{_i}:`:: The role of a a person who is a contributor to the document. By default,
+they are coded as an `editor`; they can also be represented as an `author`.
+`:affiliation{_i}:`:: The organisational affiliation of a person who is a contributor to the document.
+`:address{_i}:`:: The organisational address of a person who is a contributor to the document.
+`:contributor-uri{_i}:`:: The URI of a person who is a contributor to the document.
+`:email{_i}:`:: The email of a person who is a contributor to the document.
+
+
 `:draft:`:: The document draft (used in addition to document stage, for multiple iterations: expected format _X.Y_)
 
 `:issued-date:`::

data/lib/asciidoctor/standoc/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/standoc/blocks.rb

@@ -127,7 +127,7 @@ module Asciidoctor
       def datauri(uri)
         types = MIME::Types.type_for(@localdir + uri)
         type = types ? types.first.to_s : 'text/plain; charset="utf-8"'
-        bin = File.read(@localdir + uri, encoding: "utf-8")
+        bin = File.open(@localdir + uri, 'rb') {|io| io.read}
         data = Base64.strict_encode64(bin)
         "data:#{type};base64,#{data}"
       end

data/lib/asciidoctor/standoc/front.rb

@@ -44,13 +44,56 @@ module Asciidoctor
       end
 
       def metadata_author(node, xml)
-        publishers = node.attr("publisher") || return
+        publishers = node.attr("publisher") || ""
         publishers.split(/,[ ]?/).each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization { |a| organization(a, p) }
           end
         end
+        personal_author(node, xml)
+      end
+
+      def personal_author(node, xml)
+        if node.attr("fullname") || node.attr("surname")
+          personal_author1(node, xml, "")
+        end
+        i = 2
+        while node.attr("fullname_#{i}") || node.attr("surname_#{i}")
+          personal_author1(node, xml, "_#{i}")
+          i += 1
+        end
+      end
+
+      def personal_author1(node, xml, suffix)
+        xml.contributor do |c|
+          c.role **{ type: node.attr("role#{suffix}")&.downcase || "author" }
+          c.person do |p|
+            p.name do |n|
+              if node.attr("fullname#{suffix}")
+                n.completename node.attr("fullname#{suffix}")
+              else
+                n.forename node.attr("givenname#{suffix}")
+                n.initial node.attr("initials#{suffix}")
+                n.surname node.attr("surname#{suffix}")
+              end
+            end
+            node.attr("affiliation#{suffix}") and p.affiliation do |a|
+              a.org 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
+                end
+              end
+            end
+            node.attr("email#{suffix}") and p.contact do |c|
+              c.email node.attr("email#{suffix}")
+            end
+            node.attr("contributor-uri#{suffix}") and p.uri node.attr("contributor-uri#{suffix}")
+          end
+        end
       end
 
       def metadata_publisher(node, xml)

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.14".freeze
+    VERSION = "1.1.0".freeze
   end
 end

data/spec/asciidoctor-standoc/base_spec.rb

@@ -82,6 +82,19 @@ RSpec.describe Asciidoctor::Standoc do
       :language: en
       :title: Main Title -- Title
       :library-ics: 1,2,3
+      :fullname: Fred Flintstone
+      :role: author
+      :affiliation: Slate Rock and Gravel Company
+      :address: 6 Rubble Way, Bedrock
+      :contributor-uri: http://slate.example.com
+      :surname_2: Rubble
+      :givenname_2: Barney
+      :initials_2: B. X.
+      :role_2: editor
+      :affiliation_2: Rockhead and Quarry Cave Construction Company
+      :address_2: 6A Rubble Way, Bedrock
+      :email_2: barney@rockhead.example.com
+      :publisher: Hanna Barbera, Cartoon Network
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
 <standard-document xmlns="http://riboseinc.com/isoxml">
@@ -130,11 +143,90 @@ RSpec.describe Asciidoctor::Standoc do
   <revision-date>2000-01-01</revision-date>
   <draft>3.4</draft>
 </version>
+<contributor>
+  <role type="author"/>
+  <organization>
+    <name>Hanna Barbera</name>
+  </organization>
+</contributor>
+<contributor>
+  <role type="author"/>
+  <organization>
+    <name>Cartoon Network</name>
+  </organization>
+</contributor>
+<contributor>
+  <role type="author"/>
+  <person>
+    <name>
+      <completename>Fred Flintstone</completename>
+    </name>
+     <affiliation>
+   <org>
+     <name>Slate Rock and Gravel Company</name>
+     <contact>
+  <address>
+    <formattedAddress>6 Rubble Way, Bedrock</formattedAddress>
+  </address>
+</contact>
+   </org>
+   </affiliation>
+   <uri>http://slate.example.com</uri>
+  </person>
+</contributor>
+<contributor>
+  <role type="editor"/>
+  <person>
+    <name>
+      <forename>Barney</forename>
+      <initial>B. X.</initial>
+      <surname>Rubble</surname>
+    </name>
+<affiliation>
+  <org>
+    <name>Rockhead and Quarry Cave Construction Company</name>
+    <contact>
+  <address>
+    <formattedAddress>6A Rubble Way, Bedrock</formattedAddress>
+  </address>
+</contact>
+  </org>
+</affiliation>
+ <contact>
+   <email>barney@rockhead.example.com</email>
+ </contact>
+  </person>
+</contributor>
+<contributor>
+  <role type="publisher"/>
+  <organization>
+    <name>Hanna Barbera</name>
+  </organization>
+</contributor>
+<contributor>
+  <role type="publisher"/>
+  <organization>
+    <name>Cartoon Network</name>
+  </organization>
+</contributor>
   <language>en</language>
   <script>Latn</script>
   <status format="plain">published</status>
   <copyright>
     <from>2001</from>
+       <owner>
+     <organization>
+       <name>Hanna Barbera</name>
+     </organization>
+   </owner>
+ </copyright>
+ <copyright>
+   <from>2001</from>
+   <owner>
+     <organization>
+       <name>Cartoon Network</name>
+     </organization>
+   </owner>
   </copyright>
   <editorialgroup>
     <technical-committee number="1" type="A">TC</technical-committee>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -339,7 +339,6 @@ files:
 - lib/asciidoctor/standoc/utils.rb
 - lib/asciidoctor/standoc/validate.rb
 - lib/asciidoctor/standoc/validate_section.rb
-- lib/hacks/sterile.rb
 - lib/metanorma-standoc.rb
 - lib/metanorma/standoc.rb
 - lib/metanorma/standoc/processor.rb

data/lib/hacks/sterile.rb

@@ -1,54 +0,0 @@
-# encoding: UTF-8
-
-module Sterile
-  # @private
-  class Data
-    def self.smart_format_rules
-      [
-        ["'tain't", "’tain’t"],
-        ["'twere", "’twere"],
-        ["'twas", "’twas"],
-        ["'tis", "’tis"],
-        ["'twill", "’twill"],
-        ["'til", "’til"],
-        ["'bout", "’bout"],
-        ["'nuff", "’nuff"],
-        ["'round", "’round"],
-        ["'cause", "’cause"],
-        ["'cos", "’cos"],
-        ["i'm", "i’m"],
-        ['--"', "—“"],
-        ["--'", "—‘"],
-        ["--", "—"],
-        ["...", "…"],
-        ["(tm)", "™"],
-        ["(TM)", "™"],
-        ["(c)", "©"],
-        ["(r)", "®"],
-        ["(R)", "®"],
-        [/\'(\d\d)(?!’|\')([\p{P}\p{Z}])/, "’\\1\\2"],
-        # [/<p>"/, "<p>\\1″"],
-        [/s\'([^a-zA-Z0-9])/, "s’\\1"],
-        [/"([:;])/, "”\\1"],
-        [/\'s$/, "’s"],
-        [/\'(\d\d(?:’|\')?s)/, "’\\1"],
-        [/(\s|\A|"|\(|\[)\'/, "\\1‘"],
-        # [/(\d+)"/, "\\1″"],
-        # [/(\d+)\'/, "\\1′"],
-        [/(\S)\'([^\'\s])/, "\\1’\\2"],
-        [/(\s|\A|\(|\[)"(?!\s)/, "\\1“\\2"],
-        [/"(\s|\S|\Z)/, "”\\1"],
-        [/\'([\s.]|\Z)/, "’\\1"],
-        [/(\d+)x(\d+)/, "\\1×\\2"],
-        [/([a-z])'(t|d|s|ll|re|ve)(\b)/i, "\\1’\\2\\3"],
-      ]
-    end
-  end
-
-  class << self
-    private
-     def smart_format_rules
-       Data.smart_format_rules
-     end
-  end
-end