metanorma-csd 1.0.14 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b883ec7d0c6e32c1c969d25ea2d87fb40d2d0a93975bdefc96cb544429b1da31
-  data.tar.gz: 55a9eda449de34ad2d9c3d80da4bac8209aa1fc61bc68b1224bec9d084d0ba25
+  metadata.gz: dbbb463a01b6b5605c7a2c0212c89a9c9c6b33ec239fcad02663b1c2c81d8229
+  data.tar.gz: a52ef2d35a02d64ee85d1a1d9e86aa05190d957df1900f8b9dbdfdd665ea9bb3
 SHA512:
-  metadata.gz: 645a63ce30ba0fc053b8588e2a9413bdcdaff8cf6b5d76b93830475040216dce13feceb70aca79b6b5255a67ac39de574b3cc9650aa7f379c02f7ec6986f9196
-  data.tar.gz: 9abf53c1a1efdaa285a0ef8f2b01d32e96e0dd370ae826292b13f042c5b27b598abcce15874732a50baae03e62bf4ab87b9f2aaf085f2dc544f03a45ce01f253
+  metadata.gz: 0ca840d3b57ea14bab06a98dce7ab8e7beaa2530e023b5115336ffd4444564a2b643b065c26e2afcdb7c61dff6d5d43f7a622948652792a7ecfbbd62d26430b7
+  data.tar.gz: 58501c062ed63d65773bdc3bd76c0e9e3cfe6fef3357c6fc9f85ff49b75f64d61f1bb62ec9c38918264a52a2f110edb89719e3f4e5fd3f0661a36bbce090b107

data/README.adoc

@@ -171,6 +171,7 @@ other committees are added as `_3`, `_4`...
 The attribute `:draft:`, if present, includes review notes in the XML output;
 these are otherwise suppressed.
 
+////
 === Attributs specific to CSD
 
 `:fullname{_i}:`:: The full name of a person who is a contributor to the document.
@@ -180,16 +181,16 @@ A second person is indicated by using a numeric suffix: `:fullname:`, `:fullname
 `:givenname{_i}:`:: The given name(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`.
+////
 
-
-== Asciidoctor features specific to CSAND
+////
+== Asciidoctor features specific to CSD
 
 The https://github.com/riboseinc/metanorma-standoc[metanorma-standoc]
 gem documents the customisations of Asciidoctor markup common to all metanorma gems.
 The following markup is specific to this gem:
 
-* `+[keyword]#...#+`: encodes keywords, such as "MUST", "MUST NOT". (Encoded as
-`<span class="keyword">...</span>`.
+////
 
 == Data Models
 

data/lib/asciidoctor/csd/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/csd/front.rb

@@ -17,33 +17,6 @@ module Asciidoctor
         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.surname node.attr("surname#{suffix}")
-              end
-            end
-          end
-        end
-      end
-
       def metadata_publisher(node, xml)
         xml.contributor do |c|
           c.role **{ type: "publisher" }

data/lib/asciidoctor/csd/isodoc.rng

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

data/lib/isodoc/csd/html/csd.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,11 @@ 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/csd/html/html_csd_titlepage.html

@@ -36,7 +36,7 @@
   </div>
 
 {% capture tags %}
-{% for tag in contributors %}
+{% for tag in roles_authors_affiliations %}
   {{ tag[0] }}
 {% endfor %}
 {% endcapture %}
@@ -46,10 +46,12 @@
   {% for tag in sortedtags %}
   <div class="coverpage-contributors">
     <div class="group {{ tag }}">
-    {% for person in contributors[tag] %}
-    <span class="person {{ tag }}">{{ person }}<span class="role">{{ tag | capitalize }}</span></span>
-    {% endfor %}
-    </div>
+{% for affiliation in roles_authors_affiliations[tag] %}
+    {% for author in affiliation[1] %}
+    <span class="person {{ tag }}">{{ author }}<span class="role">{{ tag | capitalize }}</span></span>
+{% endfor %}
+<div class="affiliation">{{affiliation[0]}}</div>
+{% endfor %}
   </div>
   {% endfor %}
 

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

@@ -620,11 +620,23 @@ td.example {
     margin: 2em 0 1em 0;
 }
 
+.example {
+    background-color: #e1eef1;
+    padding: 0.5em;
+    margin: 2em 0 1em 0;
+    text-align: left;
+    padding-left: 2em;
+}
+
+.example p {
+    margin: 0;
+}
+
 .example .example-title {
     font-weight: 700;
     text-transform: uppercase;
-    text-align: center;
     margin-top:0;
+    margin-left:-1.5em;
 }
 
 /*

data/lib/isodoc/csd/html/word_csd_titlepage.html

@@ -10,21 +10,19 @@ style='mso-no-proof:yes'>{{ tc | join: "/" }}</span></p>
 style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:24.0pt'>{{ doctitle }}</span>
 </b><br/><span lang="EN-GB" style='font-size:16.0pt'>{{ docsubtitle }}</span></p>
 
-  {% capture tags %}
-  {% for tag in contributors %}
-    {{ tag[0] }}
-  {% endfor %}
+{% capture tags %}
+{% for tag in roles_authors_affiliations %}
+  {{ tag[0] }}
+{% endfor %}
 {% endcapture %}
+
 {% assign sortedtags = tags | split:' ' | sort %}
 
   {% for tag in sortedtags %}
   <p class="MsoNormal" align="center" style='text-align:center'>
-    {% if contributors[tag].size > 1 %}
-    {{ tag | capitalize }}s:
-    {% else %}
-    {{ tag | capitalize }}:
-    {% endif %}
-    {{ contributors[tag] | join: ", " }}
+{% for affiliation in roles_authors_affiliations[tag] %}
+<span class="person {{ tag }}">{{ affiliation[1] | join: "," }}{% if affiliation[0].size > 0 %}, {{affiliation[0]}}{% endif %}: <span class="role">{{ tag | capitalize }}</span></span>
+{% endfor %}
   </p>
   {% endfor %}
 

data/lib/isodoc/csd/metadata.rb

@@ -25,7 +25,7 @@ module IsoDoc
       def author(isoxml, _out)
         tc = isoxml.at(ns("//bibdata/editorialgroup/technical-committee"))
         set(:tc, tc.text) if tc
-        set(:contributors, personal_authors(isoxml))
+        personal_authors(isoxml)
       end
 
       def personal_authors(isoxml)
@@ -34,24 +34,11 @@ module IsoDoc
           inject([]) { |m, t| m << t.value }
         roles.uniq.sort.each do |r|
           names = isoxml.xpath(ns("//bibdata/contributor[role/@type = '#{r}']"\
-                                    "/person/name"))
-          persons[r] = extract_person_names(names) unless names.empty?
+                                    "/person"))
+          persons[r] = extract_person_names_affiliations(names) unless names.empty?
         end
-        persons
-      end
-
-      def extract_person_names(authors)
-        ret = []
-        authors.each do |a|
-          if a.at(ns("./completename"))
-            ret << a.at(ns("./completename")).text
-          else
-            fn = a.xpath(ns("./forename")).inject([]) { |m, f| m << f.text }
-            surname = a&.at(ns("./surname"))&.text
-            ret << fn.join(" ") + " " + surname
-          end
-        end
-        ret
+        set(:roles_authors_affiliations, persons)
+        super
       end
 
       def docid(isoxml, _out)

data/lib/metanorma/csd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csd
-    VERSION = "1.0.14"
+    VERSION = "1.1.0"
   end
 end

data/metanorma-csd.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "metanorma-standoc", "~> 1.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.1.0"
   spec.add_dependency "isodoc", "~> 0.9.6"
 
   spec.add_development_dependency "bundler", "~> 2.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csd
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement