metanorma-generic 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bf92a793e5141d7d7b715f71375bfc2b0de7cab4bc35738485ada265f9f4857
-  data.tar.gz: a8fc280993417feb35132d8dbf80f4fe7730a32eec3ff8a04a3343d8998b3837
+  metadata.gz: d6ca4a738a95870e27c98de6d0fbe097d09680ea4d0cb937bfbf2bcbb132f1d9
+  data.tar.gz: a7f17f995cea68405d7fdfe2cd8d88a2e47d439361085f2840cb4ae3ecba43c2
 SHA512:
-  metadata.gz: e1805ec8eaf913758af97730b60689de59dfa9859818be48e3f856b87419d4f20741de99586e944151f92a56674a64709738fb87dea0c420d35202da2422920d
-  data.tar.gz: 575184663fb71706e02584764f68762ba94c7c5970877007df786344c8d928e328701bef8a89bdeb3c33158b8b85d47e38cda2b543f614ecbd889cd585ad550f
+  metadata.gz: 9e922e3c785d8c13798070a8f05e6047dd65e94b3ff6c27f6f2b94b01e6c1dfd7a706cd346248c14f77011e337fcb33b49da8745076d48faf25fa5a1c2347944
+  data.tar.gz: 9841a5dd0d679c4a4c3de1f94fbf4a78cdee6e895edb5ec034ef9cbc6b868bb4bac4a39f0f1a0052bc53fda30df2236834b2445fbff6bf243eed9dba392f522b

data/lib/metanorma/generic/isodoc.rng

@@ -382,6 +382,9 @@
         <optional>
           <ref name="dl"/>
         </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
       </element>
     </define>
     <define name="figure">
@@ -404,9 +407,6 @@
           <attribute name="class"/>
         </optional>
         <ref name="BlockAttributes"/>
-        <optional>
-          <ref name="source"/>
-        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -431,6 +431,20 @@
         <zeroOrMore>
           <ref name="note"/>
         </zeroOrMore>
+        <optional>
+          <ref name="source"/>
+        </optional>
+      </element>
+    </define>
+    <define name="source">
+      <element name="source">
+        <attribute name="status">
+          <ref name="SourceStatusType"/>
+        </attribute>
+        <ref name="origin"/>
+        <optional>
+          <ref name="modification"/>
+        </optional>
       </element>
     </define>
     <define name="sourcecode">
@@ -2099,10 +2113,7 @@
   <define name="termsource">
     <element name="termsource">
       <attribute name="status">
-        <choice>
-          <value>identical</value>
-          <value>modified</value>
-        </choice>
+        <ref name="SourceStatusType"/>
       </attribute>
       <attribute name="type">
         <choice>
@@ -2116,6 +2127,17 @@
       </optional>
     </element>
   </define>
+  <define name="SourceStatusType">
+    <choice>
+      <value>identical</value>
+      <value>modified</value>
+      <value>restyled</value>
+      <value>context-added</value>
+      <value>generalisation</value>
+      <value>specialisation</value>
+      <value>unspecified</value>
+    </choice>
+  </define>
   <define name="origin">
     <element name="origin">
       <choice>

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.4.0".freeze
+    VERSION = "2.4.1".freeze
   end
 end

data/metanorma-generic.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 2.4.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.4.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.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement