metanorma-cc 2.1.8 → 2.1.9

data/lib/isodoc/cc/init.rb

@@ -6,8 +6,8 @@ require_relative "i18n"
 module IsoDoc
   module CC
     module Init
-      def metadata_init(lang, script, i18n)
-        @meta = Metadata.new(lang, script, i18n)
+      def metadata_init(lang, script, locale, i18n)
+        @meta = Metadata.new(lang, script, locale, i18n)
       end
 
       def xref_init(lang, script, _klass, i18n, options)
@@ -15,10 +15,10 @@ module IsoDoc
         @xrefs = Xref.new(lang, script, html, i18n, options)
       end
 
-      def i18n_init(lang, script, i18nyaml = nil)
-        @i18n = I18n.new(lang, script, i18nyaml: i18nyaml || @i18nyaml)
+      def i18n_init(lang, script, locale, i18nyaml = nil)
+        @i18n = I18n.new(lang, script, locale: locale,
+                                       i18nyaml: i18nyaml || @i18nyaml)
       end
     end
   end
 end
-

data/lib/isodoc/cc/metadata.rb

@@ -8,7 +8,7 @@ module IsoDoc
         Metanorma::CC.configuration
       end
 
-      def initialize(lang, script, labels)
+      def initialize(lang, script, locale, labels)
         super
         set(:tc, "XXXX")
       end
@@ -29,16 +29,18 @@ module IsoDoc
       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|
+        set(:roles_authors_affiliations, roles_authors_affiliations(isoxml))
+        super
+      end
+
+      def roles_authors_affiliations(isoxml)
+        isoxml.xpath(ns("//bibdata/contributor/role/@type"))
+          .inject([]) { |m, t| m << t.value }
+          .uniq.sort.each_with_object({}) do |r, m|
           names = isoxml.xpath(ns("//bibdata/contributor[role/@type = '#{r}']"\
-                                    "/person"))
-          persons[r] = extract_person_names_affiliations(names) unless names.empty?
+                                  "/person"))
+          names.empty? or m[r] = extract_person_names_affiliations(names)
         end
-        set(:roles_authors_affiliations, persons)
-        super
       end
     end
   end

data/lib/metanorma/cc/biblio.rng

@@ -73,8 +73,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +99,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +145,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -650,6 +662,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -741,6 +756,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +872,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +909,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +958,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.1.8".freeze
+    VERSION = "2.1.9".freeze
   end
 end

data/metanorma-cc.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.2.0"
+  spec.add_dependency "metanorma-generic", "~> 2.2.2"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -191,17 +191,21 @@ files:
 - bin/setup
 - lib/isodoc/cc/base_convert.rb
 - lib/isodoc/cc/cc.standard.xsl
+- lib/isodoc/cc/html/_coverpage.css
 - lib/isodoc/cc/html/_coverpage.scss
+- lib/isodoc/cc/html/cc.css
 - lib/isodoc/cc/html/cc.scss
 - lib/isodoc/cc/html/dots-w@2x.png
 - lib/isodoc/cc/html/dots@2x.png
 - lib/isodoc/cc/html/header.html
 - lib/isodoc/cc/html/html_cc_intro.html
 - lib/isodoc/cc/html/html_cc_titlepage.html
+- lib/isodoc/cc/html/htmlstyle.css
 - lib/isodoc/cc/html/htmlstyle.scss
 - lib/isodoc/cc/html/scripts.html
 - lib/isodoc/cc/html/word_cc_intro.html
 - lib/isodoc/cc/html/word_cc_titlepage.html
+- lib/isodoc/cc/html/wordstyle.css
 - lib/isodoc/cc/html/wordstyle.scss
 - lib/isodoc/cc/html_convert.rb
 - lib/isodoc/cc/i18n-en.yaml