metanorma-iho 0.6.8 → 0.6.9

data/lib/isodoc/iho/iho.specification.xsl

@@ -6556,6 +6556,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/iho/iho.standard.xsl

@@ -6556,6 +6556,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/iho/init.rb

@@ -5,8 +5,8 @@ require_relative "xref"
 module IsoDoc
   module IHO
     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)
       end
 
       def xref_init(lang, script, _klass, labels, options)
@@ -14,9 +14,10 @@ module IsoDoc
         @xrefs = Xref.new(lang, script, html, labels, options)
       end
 
-      def i18n_init(lang, script, i18nyaml = nil)
+      def i18n_init(lang, script, locale, i18nyaml = nil)
         @i18n = I18n.new(
-          lang, script, i18nyaml: i18nyaml ||
+          lang, script, locale: locale,
+                        i18nyaml: i18nyaml ||
           Metanorma::IHO.configuration.i18nyaml || @i18nyaml
         )
       end

data/lib/metanorma/iho/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/iho/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module IHO
-    VERSION = "0.6.8".freeze
+    VERSION = "0.6.9".freeze
   end
 end

data/lib/relaton/render/config.yml

@@ -1,6 +1,5 @@
 template:
-  # skip standardidentifier, it is inserted in front of formattedref within metanorma
-  standard: "{{ standardidentifier | first }} edition_{{ edition }} : {{ title }},  {{ creatornames }} ,_{{role}} ({{ uri }}) ." 
+  standard: "{{ authoritative_identifier | first }} edition_{{ edition }} : {{ title }}, {{ creatornames }}, {{role}}, {{ publisher }} ({{ uri }}) ." 
   misc: standard
 nametemplate:
   one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }} {{initials[0]}}{% endif %}"

data/lib/relaton/render/fields.rb

@@ -12,7 +12,7 @@ module Relaton
 
         def misc_fields_format(hash)
           super
-          hash[:standardidentifier].map! do |x|
+          hash[:authoritative_identifier].map! do |x|
             x.sub(/^IHO /, "")
           end
           hash

data/lib/relaton/render/parse.rb

@@ -2,19 +2,6 @@ module Relaton
   module Render
     module IHO
       class Parse < ::Relaton::Render::Parse
-        def standardidentifier(doc)
-          out = doc.docidentifier.each_with_object([]) do |id, ret|
-            ret << id.id unless standardidentifier_exclude1.include? id.type
-          end
-          return out unless out.empty?
-
-          super
-        end
-
-        def standardidentifier_exclude1
-          %w(metanorma metanorma-ordinal DOI ISSN ISBN rfc-anchor)
-        end
-
         def uri(doc)
           uri = nil
           %w(src).each do |t|

data/metanorma-iho.gemspec

@@ -26,7 +26,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-iho
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.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,7 +191,9 @@ files:
 - lib/isodoc/iho/html/header.html
 - lib/isodoc/iho/html/html_iho_intro.html
 - lib/isodoc/iho/html/html_iho_titlepage.html
+- lib/isodoc/iho/html/htmlstyle.css
 - lib/isodoc/iho/html/htmlstyle.scss
+- lib/isodoc/iho/html/iho.css
 - lib/isodoc/iho/html/iho.scss
 - lib/isodoc/iho/html/image001.png
 - lib/isodoc/iho/html/image002.png
@@ -201,6 +203,7 @@ files:
 - lib/isodoc/iho/html/scripts.html
 - lib/isodoc/iho/html/word_iho_intro.html
 - lib/isodoc/iho/html/word_iho_titlepage.html
+- lib/isodoc/iho/html/wordstyle.css
 - lib/isodoc/iho/html/wordstyle.scss
 - lib/isodoc/iho/html_convert.rb
 - lib/isodoc/iho/i18n-en.yaml