metanorma-csd 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11d60940512345545644ab6c55d0f71310ca12257b86ab7c9d1ca550d92bd414
-  data.tar.gz: 8808b89e1b47ac413aad8ceacc91929d32cad01dafeaddf179f69a846db0039b
+  metadata.gz: 07a1c4c2346d23b888d601689d2bf5dbb4d5e9360f7244f04f3a0acc54dfe2ba
+  data.tar.gz: 810674351bc67f23e2634fa7b292967d30494dcad39d460429d6e9647bea2a7e
 SHA512:
-  metadata.gz: 833eb87552db7ffe68cf48e96e7e6b2469c874efc091e1e311b009ee0cc7afeb988e640b377aef15cb0a4218dc2359eb45366ef8abcde26ac819aa940fbc3ee0
-  data.tar.gz: 941ac1ba05c88f284445263acb33b7eb6f499ad6916b7cd35388742d835989a2cffc61a5d0babaf4d42163e02d3542b199cdd12d97fe7c6d420bf0a9294cd207
+  metadata.gz: fd36d9482a4b31b8ef69d2649c1587b3d557d4f937462229bb33760f677f6dbbc1a72d3bcc41417a6b7121f00f6e2547cf1ddea5f2d2fdab674972d308105e41
+  data.tar.gz: dbf8ec8f9fceacbb37d6034d582810815fc76f8545d71c9174e4f4bb5b9a0c2b7d9d4b0d5c6ac9edc4f99dde654616414b8a77bd5c637ec177a87db0f8202ccd

data/lib/isodoc/csd/html/html_csd_titlepage.html

@@ -37,16 +37,24 @@
     <span>TC {{ tc }}</span>
   </div>
 
-  {% if editors.size > 0 %}
-  <div class="coverpage-tc-name">
-    <span>Editors: {{ editors | join: ", " }}</span>
-  </div>
-  {% endif %}
-  {% if authors.size > 0 %}
-  <div class="coverpage-tc-name">
-    <span>Authors: {{ authors | join: ", " }}</span>
-  </div>
-  {% endif %}
+  {% capture tags %}
+  {% for tag in contributors %}
+    {{ tag[0] }}
+  {% endfor %}
+{% endcapture %}
+{% assign sortedtags = tags | split:' ' | sort %}
+
+  {% for tag in sortedtags %}
+  <div class="coverpage-tc-name"><span>
+    {% if contributors[tag].size > 1 %}
+    {{ tag | capitalize }}s: 
+    {% else %}
+    {{ tag | capitalize }}:
+    {% endif %}
+    {{ contributors[tag] | join: ", " }}
+    </span></div>
+  {% endfor %}
+
   </div>
 
   <div class="title-section1">

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

@@ -76,6 +76,12 @@ time, mark, audio, video {
 
 code, pre, tt, kbd, samp {
   font-family: $monospacefont;
+  font-variant-ligatures: none;
+}
+
+code *, pre *, tt *, kbd *, samp * {
+  font-family: $monospacefont !important;
+  font-variant-ligatures: none;
 }
 
 h1, h2, h3, h4, h5, h6, .h2Annex {
@@ -561,6 +567,7 @@ p.Biblio, p.NormRef {
 
 .figure, .Sourcecode {
     font-family: $monospacefont;
+    font-variant-ligatures: none;
     background-color: #f7f7f7;
     font-size: 0.8em;
     line-height: 1.6em;
@@ -698,6 +705,7 @@ a.footnote-number {
 
 .contact-info p, .contact-info a {
     font-family: $monospacefont;
+    font-variant-ligatures: none;
     font-weight: 400;
 }
 
@@ -882,6 +890,7 @@ To top button
 
 #myBtn {
     font-family: $monospacefont;
+    font-variant-ligatures: none;
     display: none;
     position: fixed;
     bottom: 20px;

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

@@ -10,16 +10,23 @@ 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>
 
-  {% if editors %}
+  {% capture tags %}
+  {% for tag in contributors %}
+    {{ tag[0] }}
+  {% endfor %}
+{% endcapture %}
+{% assign sortedtags = tags | split:' ' | sort %}
+
+  {% for tag in sortedtags %}
   <p class="MsoNormal" align="center" style='text-align:center'>
-    <span>Editors: {{ editors | join: ", " }}</span>
+    {% if contributors[tag].size > 1 %}
+    {{ tag | capitalize }}s:
+    {% else %}
+    {{ tag | capitalize }}:
+    {% endif %}
+    {{ contributors[tag] | join: ", " }}
   </p>
-  {% endif %}
-  {% if authors %}
-  <p class="MsoNormal" align="center" style='text-align:center'>
-    <span>Authors: {{ authors | join: ", " }}</span>
-  </p>
-  {% endif %}
+  {% endfor %}
 
 <p class="MsoNormal" style='margin-top:100.0pt'><span lang="EN-GB"><o:p>&nbsp;</o:p></span></p>
 

data/lib/isodoc/csd/metadata.rb

@@ -10,6 +10,7 @@ module IsoDoc
       def initialize(lang, script, labels)
         super
         set(:status, "XXX")
+        set(:tc, "XXXX")
       end
 
       def title(isoxml, _out)
@@ -22,13 +23,21 @@ module IsoDoc
       end
 
       def author(isoxml, _out)
-        set(:tc, "XXXX")
         tc = isoxml.at(ns("//bibdata/editorialgroup/technical-committee"))
         set(:tc, tc.text) if tc
-        authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person/name"))
-        set(:authors, extract_person_names(authors))
-        editors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'editor']/person/name"))
-        set(:editors, extract_person_names(editors))
+        set(:contributors, personal_authors(isoxml))
+      end
+
+      def personal_authors(isoxml)
+        persons = {}
+        roles = isoxml.xpath(ns("//bibdata/contributor/role/@type")).
+          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?
+        end
+        persons
       end
 
       def extract_person_names(authors)
@@ -37,9 +46,7 @@ module IsoDoc
           if a.at(ns("./completename"))
             ret << a.at(ns("./completename")).text
           else
-            fn = []
-            forenames = a.xpath(ns("./forename"))
-            forenames.each { |f| fn << f.text }
+            fn = a.xpath(ns("./forename")).inject([]) { |m, f| m << f.text }
             surname = a&.at(ns("./surname"))&.text
             ret << fn.join(" ") + " " + surname
           end

data/lib/metanorma/csd/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csd
-    VERSION = "1.0.12"
+    VERSION = "1.0.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csd
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc