metanorma-generic 2.4.2 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01093350c674908eb5364ed8961536ff3dc4d129dd653ab321da120df792214
-  data.tar.gz: f350457717265bc34ef4df9d4e8626685cd5909fc6a3627fadc6d91834e0de9d
+  metadata.gz: 887490f8778fe098a195bdc2864f62a157779a0fff114b971e00729314ff0256
+  data.tar.gz: 43a57233fe44dca78b437cfc5b7b38208b25bb9f41ab0a70571c85baa8b6aa90
 SHA512:
-  metadata.gz: 8dd9a8044c3430195378e0fffee524d0008c562aba56b16ab9221a0cc0bef451c53ddb43acbebfe2c06fdb79a43e45b37e4c90b7a3f75cbaa76c17937adc10e2
-  data.tar.gz: 53cfa9e244fde4a48d41b5a769ebac4ce481b3a3454811d7606d854f8b3dd0bb1c8083c384b7d43b4fccfff3450c9b1957d0165cbf27d2ff755574471467592b
+  metadata.gz: f4c1a759d5b44ce75491e9aaa3a1608a815200cabb34c0ecc09e63d5a0f86f3429ff36e7b31b853ddddd7b8acb841abe378591dd03f6bc87eaffd7e2d7648d4d
+  data.tar.gz: a9e8da8406b04cb36db99d948dd2dd82c3bd69bdde02f1564b45248ed9fe5192cc16a8666c20112f9aded72f8b6edaa9ff3a129d7782b3e2da696864415031a1

data/lib/metanorma/generic/converter.rb

@@ -39,12 +39,17 @@ module Metanorma
 
       def doctype(node)
         d = super
-        configuration.doctypes or return d == "article" ? (configuration.default_doctype || "standard") : d
+        node.attr("doctype") == "article" and d = "article"
+        unless configuration.doctypes
+          d == "article" and return (configuration.default_doctype || "standard")
+          return d
+        end
         type = configuration.default_doctype ||
-          configuration.doctypes.keys.dig(0) || "standard"
-        unless configuration.doctypes.keys.include? d
-          @log.add("Document Attributes", nil,
-                   "#{d} is not a legal document type: reverting to '#{type}'")
+          configuration.doctypes.keys[0] || "standard"
+        if !configuration.doctypes.key?(d)
+          (node.attr("doctype") && node.attr("doctype") != "article") and # factory default
+            @log.add("Document Attributes", nil,
+                     "#{d} is not a legal document type: reverting to '#{type}'")
           d = type
         end
         d

data/lib/metanorma/generic/generic.rng

@@ -6,9 +6,10 @@
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for csand additions. And we do not want that.
   -->
+  <include href="biblio-standoc.rng"/>
   <include href="isodoc.rng">
     <start>
-      <ref name="generic"/>
+      <ref name="generic-standard"/>
     </start>
   </include>
   <define name="generic-standard">

data/lib/metanorma/generic/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.1 -->
+<!-- VERSION v1.2.2 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -211,6 +211,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -2136,6 +2139,7 @@
     <choice>
       <value>identical</value>
       <value>modified</value>
+      <value>adapted</value>
       <value>restyled</value>
       <value>context-added</value>
       <value>generalisation</value>

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.4.2".freeze
+    VERSION = "2.4.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities