metanorma-generic 2.1.3 → 2.2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1ea2cd4613f684350bfa37ff726720ff2e84805ccd32cfde1678fb090834964
-  data.tar.gz: a37875b2848be73265687de24eaa5ae00b755ae4e353fd36fa0dae88a0e0c29e
+  metadata.gz: 659bc5b25f106f07e3aa23d3dcb17609ec43f50c7263a1643f6fdd34ff4e166f
+  data.tar.gz: 63d42dc39e025bd8d2acdae2e7e9aaa79b85bebc3399913a96cf14c08c208123
 SHA512:
-  metadata.gz: 1a92438595ed2a5cab6a73ccfb3bda7231c8a36597d7136f24b625a0d01502129a7fcda21ea77671bbef1eb190aa7c74b57cec977b1d935e8bdad31ba4d1b5bb
-  data.tar.gz: b953cd5e9ff920b0222245901d790d9f50ff2b891c175fb7fc9c3b465f379747e9ac88deeac7737b1263734e8e70fa0f2510172bbff71aa3dab9992513a2bd5c
+  metadata.gz: 3ed6e8c02f244e135b3bc169cdef61d420c1e71e82dde98752ec07741d20798c24af59928ee9085708fdd806b1c4d62a408faf9a58761de2a4d209cbf03c865d
+  data.tar.gz: b253e605a626694a82b1b9ad7aa87ce26c2c9d486eb888f96c4e648c2cc7d4f16781158134097ce80ce3765adb79c347e2eed035e317c3b434c526dd33937c22

data/.github/workflows/rake.yml

@@ -10,6 +10,6 @@ on:
 
 jobs:
   notify:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/mn-processor-rake.yml@main
+    uses: metanorma/ci/.github/workflows/mn-processor-rake.yml@main
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+

data/lib/isodoc/generic/html/html_generic_titlepage.html

@@ -75,7 +75,7 @@
 <div class="info-section">
 <div class="copyright">
   <p class="year">
-  &copy; {{ docyear }} {{ publisher }}
+  &#xa9; {{ docyear }} {{ publisher }}
   </p>
 
   <p class="message">

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

@@ -65,7 +65,7 @@ module Metanorma
         elsif configuration&.bibliography_titles&.map(&:downcase)&.include? ret
           "bibliography"
         else
-          ret
+          super
         end
       end
 

data/lib/metanorma/generic/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -116,6 +127,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="suppress_identifier">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <ref name="BibliographicItem"/>
       </element>
     </define>
@@ -1269,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>
@@ -2488,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

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

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.1.3".freeze
+    VERSION = "2.2.1.1".freeze
   end
 end

data/lib/metanorma-generic.rb

@@ -2,7 +2,8 @@ require "metanorma/generic"
 require "asciidoctor"
 require "metanorma/generic/converter"
 require "isodoc/generic"
+require "metanorma"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   Metanorma::Registry.instance.register(Metanorma::Generic::Processor)
 end

data/metanorma-generic.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.1.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.2.2"
   spec.add_dependency "ruby-jing"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -255,7 +256,7 @@ homepage: https://github.com/metanorma/metanorma-generic
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -270,8 +271,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 template gem for customisation.
 test_files: []