metanorma-generic 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f01093350c674908eb5364ed8961536ff3dc4d129dd653ab321da120df792214
-  data.tar.gz: f350457717265bc34ef4df9d4e8626685cd5909fc6a3627fadc6d91834e0de9d
+  metadata.gz: c569a61e97030b3dc2beb2f09dc87c298eb9cdb9fbcc3937cb6ef5572b659ed4
+  data.tar.gz: add0ad9bc1dfdfeed20dee40e3aae93940be55d6838b87741dbcecce78aff687
 SHA512:
-  metadata.gz: 8dd9a8044c3430195378e0fffee524d0008c562aba56b16ab9221a0cc0bef451c53ddb43acbebfe2c06fdb79a43e45b37e4c90b7a3f75cbaa76c17937adc10e2
-  data.tar.gz: 53cfa9e244fde4a48d41b5a769ebac4ce481b3a3454811d7606d854f8b3dd0bb1c8083c384b7d43b4fccfff3450c9b1957d0165cbf27d2ff755574471467592b
+  metadata.gz: d53dd97d0e60a87fa34f8cac6cd7024df7b0990549477be0143d6b5e8337f52435ab1355946dd8bff8d1fb5f297180ed131f9f9aca07cecf4a9f9509b18a3e41
+  data.tar.gz: 17cb1656cbbc80cd52cc666cd6e9b3a813c83c5d619a49a02b4ec5587048bfd57f71cd113a043d98dffb3585f78ef7e430b30d6e6a4ba5e9e5d9dd4559b08f4c

data/lib/isodoc/generic/html/htmlstyle.scss

@@ -276,7 +276,7 @@ ul  li {
  list-style: none;
 }
 
-ul > li:before {
+ul > li::before {
   content: "\2014";
   display: inline-block; width: 1em;
   margin-left: -1.2em;
@@ -306,7 +306,7 @@ ol ul > li:first-child {
   list-style-type: none;
 }
 
-#toc li:before {
+#toc li::before {
   content: " ";
   display: none;
 }

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.3 -->
 <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">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -211,6 +213,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <ref name="CitationType"/>
       <oneOrMore>
         <ref name="PureTextElement"/>
@@ -833,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>
@@ -1009,6 +1034,7 @@
       <ref name="del"/>
       <ref name="span"/>
       <ref name="erefstack"/>
+      <ref name="date_inline"/>
     </choice>
   </define>
   <define name="add">
@@ -1050,6 +1076,23 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="date_inline">
+    <element name="date">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="format"/>
+      </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
+    </element>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>
@@ -2136,6 +2179,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.5.0".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.2"
+  spec.add_dependency "metanorma-standoc", "~> 2.5.0"
   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.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-08-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.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement