metanorma-m3aawg 2.1.8 → 2.1.9

data/lib/isodoc/m3aawg/init.rb

@@ -6,8 +6,8 @@ require_relative "i18n"
 module IsoDoc
   module M3AAWG
     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)
@@ -15,10 +15,10 @@ 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
     end
   end
 end
-

data/lib/isodoc/m3aawg/m3aawg.policy.xsl

@@ -6422,6 +6422,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/m3aawg/m3aawg.report.xsl

@@ -6422,6 +6422,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/m3aawg/metadata.rb

@@ -3,11 +3,11 @@ require "isodoc"
 module IsoDoc
   module M3AAWG
     class Metadata < IsoDoc::Generic::Metadata
-       def configuration
+      def configuration
         Metanorma::M3AAWG.configuration
       end
 
-      def initialize(lang, script, labels)
+      def initialize(lang, script, locale, labels)
         super
         here = File.dirname(__FILE__)
         set(:logo_html,

data/lib/metanorma/m3aawg/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/m3aawg/processor.rb

@@ -3,12 +3,12 @@ require "metanorma/processor"
 module Metanorma
   module M3AAWG
     class Processor < Metanorma::Generic::Processor
-       def configuration
+      def configuration
         Metanorma::Ribose.configuration
       end
 
-      def initialize
-        @short = [:m3d, :m3aawg]
+      def initialize # rubocop:disable Lint/MissingSuper
+        @short = %i[m3d m3aawg]
         @input_format = :asciidoc
         @asciidoctor_backend = :m3aawg
       end
@@ -17,7 +17,7 @@ module Metanorma
         super.merge(
           html: "html",
           doc: "doc",
-          pdf: "pdf"
+          pdf: "pdf",
         )
       end
 
@@ -36,21 +36,24 @@ module Metanorma
         "Metanorma::M3AAWG #{Metanorma::M3AAWG::VERSION}"
       end
 
-      def output(isodoc_node, inname, outname, format, options={})
+      def output(isodoc_node, inname, outname, format, options = {})
         case format
         when :html
-          IsoDoc::M3AAWG::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::M3AAWG::HtmlConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :doc
-          IsoDoc::M3AAWG::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::M3AAWG::WordConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :pdf
-          IsoDoc::M3AAWG::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::M3AAWG::PdfConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         when :presentation
-          IsoDoc::M3AAWG::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
+          IsoDoc::M3AAWG::PresentationXMLConvert.new(options)
+            .convert(inname, isodoc_node, nil, outname)
         else
           super
         end
       end
-
     end
   end
 end

data/lib/metanorma/m3aawg/version.rb

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

data/lib/metanorma/m3aawg.rb

@@ -6,9 +6,6 @@ module Metanorma
   module M3AAWG
 
     class Configuration < Metanorma::Generic::Configuration
-      def initialize(*args)
-        super
-      end
     end
 
     class << self

data/{metanorma-m3d.gemspec → metanorma-m3aawg.gemspec}

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities", "~> 4.3.4"
   spec.add_dependency "thread_safe"
 
-  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-m3aawg
 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: htmlentities
@@ -44,14 +44,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
@@ -223,13 +223,16 @@ files:
 - lib/isodoc/m3aawg/html/header.html
 - lib/isodoc/m3aawg/html/html_m3d_intro.html
 - lib/isodoc/m3aawg/html/html_m3d_titlepage.html
+- lib/isodoc/m3aawg/html/htmlstyle.css
 - lib/isodoc/m3aawg/html/htmlstyle.scss
 - lib/isodoc/m3aawg/html/logo.jpg
 - lib/isodoc/m3aawg/html/m3-logo.png
+- lib/isodoc/m3aawg/html/m3d.css
 - lib/isodoc/m3aawg/html/m3d.scss
 - lib/isodoc/m3aawg/html/scripts.html
 - lib/isodoc/m3aawg/html/word_m3d_intro.html
 - lib/isodoc/m3aawg/html/word_m3d_titlepage.html
+- lib/isodoc/m3aawg/html/wordstyle.css
 - lib/isodoc/m3aawg/html/wordstyle.scss
 - lib/isodoc/m3aawg/html_convert.rb
 - lib/isodoc/m3aawg/i18n-en.yaml
@@ -253,7 +256,7 @@ files:
 - lib/metanorma/m3aawg/processor.rb
 - lib/metanorma/m3aawg/reqt.rng
 - lib/metanorma/m3aawg/version.rb
-- metanorma-m3d.gemspec
+- metanorma-m3aawg.gemspec
 - metanorma.yml
 homepage: https://github.com/metanorma/metanorma-m3aawg
 licenses: