metanorma-m3aawg 2.1.5 → 2.1.8

data/lib/metanorma/m3aawg/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/lib/metanorma/m3aawg/isodoc.rng

@@ -1285,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/m3aawg/reqt.rng

@@ -108,7 +108,7 @@
     </element>
   </define>
   <define name="label">
-    <element name="label">
+    <element name="identifier">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/m3aawg/version.rb

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

data/lib/metanorma-m3aawg.rb

@@ -5,8 +5,9 @@ require_relative "isodoc/m3aawg/word_convert"
 require_relative "isodoc/m3aawg/pdf_convert"
 require_relative "isodoc/m3aawg/presentation_xml_convert"
 require_relative "metanorma/m3aawg/version"
+require "metanorma"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   require_relative "metanorma/m3aawg"
   Metanorma::Registry.instance.register(Metanorma::M3AAWG::Processor)
 end

data/metanorma-m3d.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.1.1"
+  spec.add_dependency "metanorma-generic", "~> 2.2.0"
 
   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.5
+  version: 2.1.8
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -222,16 +223,13 @@ 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
@@ -261,7 +259,7 @@ homepage: https://github.com/metanorma/metanorma-m3aawg
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -276,8 +274,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: metanorma-m3d lets you write M3AAWG Documents in AsciiDoc.
 test_files: []