metanorma-un 0.9.8 → 0.9.9

data/lib/isodoc/un/init.rb

@@ -6,8 +6,8 @@ require_relative "i18n"
 module IsoDoc
   module UN
     module Init
-      def metadata_init(lang, script, labels)
-        @meta = Metadata.new(lang, script, labels)
+      def metadata_init(lang, script, locale, labels)
+        @meta = Metadata.new(lang, script, locale, labels)
         @meta.set(:toc, @toc)
       end
 
@@ -16,8 +16,9 @@ module IsoDoc
         @xrefs = Xref.new(lang, script, html, labels, 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
 
       def fileloc(loc)

data/lib/isodoc/un/metadata.rb

@@ -4,9 +4,8 @@ require "iso-639"
 
 module IsoDoc
   module UN
-
     class Metadata < IsoDoc::Metadata
-      def initialize(lang, script, labels)
+      def initialize(lang, script, locale, labels)
         super
         here = File.dirname(__FILE__)
         set(:logo, File.expand_path(File.join(here, "html", "logo.jpg")))
@@ -27,8 +26,8 @@ module IsoDoc
       def extract_languages(nodeset)
         lgs = []
         nodeset.each do |l|
-          l && ISO_639&.find(l.text)&.english_name &&
-            lgs << ISO_639.find(l.text).english_name 
+          l && ISO_639.find(l.text)&.english_name and
+            lgs << ISO_639.find(l.text).english_name
         end
         lgs.map { |l| l == "Spanish; Castilian" ? "Spanish" : l }
       end
@@ -36,7 +35,7 @@ module IsoDoc
       def author(isoxml, _out)
         tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text) if tc
-        set(:distribution, isoxml&.at(ns("//bibdata/ext/distribution"))&.text)
+        set(:distribution, isoxml.at(ns("//bibdata/ext/distribution"))&.text)
         lgs = extract_languages(isoxml.xpath(ns("//bibdata/language")))
         lgs.sort == %w(English French Arabic Chinese Russian Spanish).sort and
           lgs = []
@@ -56,23 +55,23 @@ module IsoDoc
       end
 
       def session(isoxml, _out)
-        set(:session_number, isoxml&.at(ns("//bibdata/ext/session/number"))&.
-            text&.to_i&.localize&.
-            to_rbnf_s("SpelloutRules", "spellout-ordinal")&.capitalize)
-        set(:session_date, isoxml&.at(ns("//bibdata/ext/session/date"))&.text)
+        set(:session_number, isoxml.at(ns("//bibdata/ext/session/number"))
+            &.text&.to_i&.localize
+            &.to_rbnf_s("SpelloutRules", "spellout-ordinal")&.capitalize)
+        set(:session_date, isoxml.at(ns("//bibdata/ext/session/date"))&.text)
         set(:session_collaborator,
-            isoxml&.at(ns("//bibdata/ext/session/collaborator"))&.text)
-        sid = isoxml&.at(ns("//bibdata/ext/session/id"))&.text
+            isoxml.at(ns("//bibdata/ext/session/collaborator"))&.text)
+        sid = isoxml.at(ns("//bibdata/ext/session/id"))&.text
         set(:session_id, sid)
         set(:session_id_head, sid&.sub(%r{/.*$}, ""))
         set(:session_id_tail, sid&.sub(%r{^[^/]+}, ""))
-        set(:item_footnote, 
-            isoxml&.at(ns("//bibdata/ext/session/item-footnote"))&.text)
-        set(:session_itemnumber, 
+        set(:item_footnote,
+            isoxml.at(ns("//bibdata/ext/session/item-footnote"))&.text)
+        set(:session_itemnumber,
             multival(isoxml, "//bibdata/ext/session/item-number"))
-        set(:session_itemname, 
+        set(:session_itemname,
             multival(isoxml, "//bibdata/ext/session/item-name"))
-        set(:session_subitemname, 
+        set(:session_subitemname,
             multival(isoxml, "//bibdata/ext/session/subitem-name"))
       end
 
@@ -80,8 +79,8 @@ module IsoDoc
         dn = isoxml.at(ns("//bibdata/docidentifier"))&.text
         set(:docnumber, dn)
         type = isoxml&.at(ns("//bibdata/ext/doctype"))&.text
-        set(:formatted_docnumber, type == "recommendation" ?
-            "UN/CEFACT Recommendation #{dn}" : dn)
+        set(:formatted_docnumber,
+            type == "recommendation" ? "UN/CEFACT Recommendation #{dn}" : dn)
       end
 
       def stage_abbr(status)

data/lib/isodoc/un/un.plenary-attachment.xsl

@@ -6542,6 +6542,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>

data/lib/isodoc/un/un.plenary.xsl

@@ -6542,6 +6542,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>

data/lib/isodoc/un/un.recommendation.xsl

@@ -6622,6 +6622,18 @@
 		</xsl:copy>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sub']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'sup']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="contents_item">
 		<xsl:copy-of select="."/>
 	</xsl:template>

data/lib/isodoc/un/xref.rb

@@ -25,6 +25,15 @@ module IsoDoc
         end
       end
 
+      def asset_anchor_names(doc)
+        super
+        @parse_settings.empty? or return
+        sequential_asset_names(
+          doc.xpath(ns("//preface/abstract | //foreword | //introduction | "\
+                       "//preface/clause | //acknowledgements")),
+        )
+      end
+
       def clause_names(docxml, _sect_num)
         q = "//clause[parent::sections]"
         @paranumber = 0

data/lib/metanorma/un/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/un/converter.rb

@@ -51,7 +51,7 @@ module Metanorma
       def metadata_id(node, xml)
         dn = node.attr("docnumber")
         if docstatus = node.attr("status")
-          abbr = IsoDoc::UN::Metadata.new("en", "Latn", @i18n)
+          abbr = IsoDoc::UN::Metadata.new("en", "Latn", "", @i18n)
             .stage_abbr(docstatus)
           dn = "#{dn}(#{abbr})" unless abbr.empty?
         end
@@ -67,13 +67,13 @@ module Metanorma
         xml.session do |session|
           session.number node.attr("session") if node.attr("session")
           session.date node.attr("session-date") if node.attr("session-date")
-          node&.attr("item-number")&.split(/, */)&.each do |i|
+          node.attr("item-number")&.split(/, */)&.each do |i|
             session.item_number i
           end
-          node&.attr("item-name")&.split(/, */)&.each do |i|
+          node.attr("item-name")&.split(/, */)&.each do |i|
             session.item_name i
           end
-          node&.attr("subitem-name")&.split(/, */)&.each do |i|
+          node.attr("subitem-name")&.split(/, */)&.each do |i|
             session.subitem_name i
           end
           node.attr("collaborator") and

data/lib/metanorma/un/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module UN
-    VERSION = "0.9.8".freeze
+    VERSION = "0.9.9".freeze
   end
 end

data/{metanorma-unece.gemspec → metanorma-un.gemspec}

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roman-numerals"
   spec.add_dependency "twitter_cldr"
 
-  spec.add_dependency "metanorma-standoc", "~> 2.2.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.4"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-un
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.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: iso-639
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -235,13 +235,16 @@ files:
 - lib/isodoc/un/html/html_unece_intro.html
 - lib/isodoc/un/html/html_unece_plenary_titlepage.html
 - lib/isodoc/un/html/html_unece_titlepage.html
+- lib/isodoc/un/html/htmlstyle.css
 - lib/isodoc/un/html/htmlstyle.scss
 - lib/isodoc/un/html/logo.jpg
 - lib/isodoc/un/html/scripts.html
+- lib/isodoc/un/html/unece.css
 - lib/isodoc/un/html/unece.scss
 - lib/isodoc/un/html/word_unece_intro.html
 - lib/isodoc/un/html/word_unece_plenary_titlepage.html
 - lib/isodoc/un/html/word_unece_titlepage.html
+- lib/isodoc/un/html/wordstyle.css
 - lib/isodoc/un/html/wordstyle.scss
 - lib/isodoc/un/html_convert.rb
 - lib/isodoc/un/i18n-en.yaml
@@ -269,7 +272,7 @@ files:
 - lib/metanorma/un/un.rng
 - lib/metanorma/un/validate.rb
 - lib/metanorma/un/version.rb
-- metanorma-unece.gemspec
+- metanorma-un.gemspec
 homepage: https://github.com/metanorma/metanorma-un
 licenses:
 - BSD-2-Clause