metanorma-generic 2.2.5 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbce166fafcaf89a0035517529d34b5c5e4d8788cbcdf49d2c1f504732caf42f
-  data.tar.gz: 832bb3bfdb95e608d0c7b0e64f1b536803ec278a5bd9aded93a4b7eb0ae0aeec
+  metadata.gz: c4f4ab3c878c5e271d13ea0b54fb8b767d43727cb1c6d5d2001713fcee1a6060
+  data.tar.gz: 73f97affc1f31b62ea13d7b07d27af03992edb4345cad6fa450ce63819beedfd
 SHA512:
-  metadata.gz: 5412b613208a44150f8555ef094d8514effe93870fcf8554c5ed4187f984094437dae20390fbeb86b07252897944aa6184c196b71d4abe4f951795c5c3e70c97
-  data.tar.gz: 32b9857423366b31fb11a3052f3f0ba5a9765f6d81487498ba87df30068be81810cf322aeb4bc6dd15326e912ebcf799f05281620c558277bb1f33ac45634ba7
+  metadata.gz: 5a3da7cb82b0a039eb7826652cf8d398b4d2cfbf74af64c9fca2daea1ade6d1aebfb8c403004fde734b3050b049c246fb1bfb8100680f85598d18c0abe2c7f2a
+  data.tar.gz: 59a1922fea21ca1d1167b1648beecdba198e210fca8232389201af9c4e8a16d75f00ccb4015a2492c08e3d4ce34138e8a108d18306cc0006295424d8e3b4e772

data/.gitignore

@@ -3,7 +3,6 @@
 .rubocop-https--*
 
 /.rspec_status
-/Gemfile.devel
 /Gemfile.lock
 /coverage/
 /test.doc

data/lib/isodoc/generic/base_convert.rb

@@ -14,7 +14,7 @@ module IsoDoc
           h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
           d["id"] = h2["id"]
           d.children.first.previous =
-            "<strong>#{h2.remove.children.to_xml}</strong>&#xa0;"
+            "<strong>#{to_xml(h2.remove.children)}</strong>&#xa0;"
         end
         docxml
       end

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

@@ -82,6 +82,12 @@ div.figure {
   @include figureBlock();
 }
 
+table div.figure {
+  padding: 0;
+  margin: 0;
+}
+
+
 /*
     Document types + stages
 */

data/lib/isodoc/generic/presentation_xml_convert.rb

@@ -8,7 +8,7 @@ module IsoDoc
       def annex1(elem)
         lbl = @xrefs.anchor(elem["id"], :label)
         if t = elem.at(ns("./title"))
-          t.children = "<strong>#{t.children.to_xml}</strong>"
+          t.children = "<strong>#{to_xml(t.children)}</strong>"
         end
         prefix_name(elem, "<br/>", lbl, "title")
       end

data/lib/metanorma/generic/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">
@@ -683,6 +682,9 @@
   </define>
   <define name="underline">
     <element name="underline">
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <zeroOrMore>
         <ref name="PureTextElement"/>
       </zeroOrMore>

data/lib/metanorma/generic/biblio-standoc.rng

@@ -47,7 +47,7 @@
     </element>
   </define>
   <define name="DocumentType">
-    <value>document</value>
+    <text/>
   </define>
   <define name="docsubtype">
     <element name="subdoctype">

data/lib/metanorma/generic/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/metanorma/generic/converter.rb

@@ -32,6 +32,7 @@ module Metanorma
         template = configuration.docid_template ||
           "{{ organization_name_short }} {{ docnumeric }}"
         docid = xmldoc.at("//bibdata/docidentifier")
+        docid&.text&.empty? or return
         id = boilerplate_isodoc(xmldoc).populate_template(template, nil)
         (id.empty? and docid.remove) or docid.children = id
       end

data/lib/metanorma/generic/front.rb

@@ -9,7 +9,7 @@ module Metanorma
         if !configuration.organization_name_long.empty? &&
             !configuration.organization_name_short.empty? &&
             configuration.organization_name_long !=
-            configuration.organization_name_short
+                configuration.organization_name_short
           { configuration.organization_name_long =>
             configuration.organization_name_short }
         else
@@ -23,13 +23,14 @@ module Metanorma
 
       def metadata_committee(node, xml)
         return unless node.attr("committee")
+
         xml.editorialgroup do |a|
           a.committee node.attr("committee"),
-            **attr_code(type: node.attr("committee-type"))
+                      **attr_code(type: node.attr("committee-type"))
           i = 2
-          while node.attr("committee_#{i}") do
+          while node.attr("committee_#{i}")
             a.committee node.attr("committee_#{i}"),
-              **attr_code(type: node.attr("committee-type_#{i}"))
+                        **attr_code(type: node.attr("committee-type_#{i}"))
             i += 1
           end
         end
@@ -38,16 +39,16 @@ module Metanorma
       def metadata_status(node, xml)
         xml.status do |s|
           s.stage ( node.attr("status") || node.attr("docstage") ||
-                   configuration.default_stage || "published" )
+                   configuration.default_stage || "published")
           x = node.attr("substage") and s.substage x
           x = node.attr("iteration") and s.iteration x
         end
       end
 
       def metadata_id(node, xml)
-        xml.docidentifier **{ type:
-                              configuration.organization_name_short } do |i|
-          i << "DUMMY"
+        xml.docidentifier type:
+                              configuration.organization_name_short do |i|
+          i << (node.attr("docidentifier") || "")
         end
         xml.docnumber { |i| i << node.attr("docnumber") }
       end
@@ -72,8 +73,9 @@ module Metanorma
 
       def metadata_ext_hash(node, ext, hash)
         hash.each do |k, v|
-          next if EXT_STRUCT.include?(k) || !v&.is_a?(Hash) && !node.attr(k)
-          if v&.is_a?(Hash) && v["_list"]
+          next if EXT_STRUCT.include?(k) || (!v.is_a?(Hash) && !node.attr(k))
+
+          if v.is_a?(Hash) && v["_list"]
             csv_split(node.attr(k), ",").each do |val|
               metadata_ext_hash1(k, val, ext, v, node)
             end
@@ -84,21 +86,25 @@ module Metanorma
       end
 
       def metadata_ext_hash1(key, value, ext, hash, node)
-        return if hash&.is_a?(Hash) && hash["_attribute"]
-        is_hash = hash&.is_a?(Hash) &&
-            !hash.keys.reject { |n| EXT_STRUCT.include?(n) }.empty?
+        return if hash.is_a?(Hash) && hash["_attribute"]
+
+        is_hash = hash.is_a?(Hash) &&
+          !hash.keys.reject { |n| EXT_STRUCT.include?(n) }.empty?
         return if !is_hash && (value.nil? || value.empty?)
-        name = hash&.is_a?(Hash) ? (hash["_output"] || key) : key
+
+        name = hash.is_a?(Hash) ? (hash["_output"] || key) : key
         ext.send name, **attr_code(metadata_ext_attrs(hash, node)) do |e|
-            is_hash ? metadata_ext_hash(node, e, hash) : (e << value)
+          is_hash ? metadata_ext_hash(node, e, hash) : (e << value)
         end
       end
 
       def metadata_ext_attrs(hash, node)
         return {} unless hash.is_a?(Hash)
+
         ret = {}
         hash.each do |k, v|
           next unless v.is_a?(Hash) && v["_attribute"]
+
           ret[(v["_output"] || k).to_sym] = node.attr(k)
         end
         ret

data/lib/metanorma/generic/isodoc.rng

@@ -66,6 +66,7 @@
         <value>caution</value>
         <value>statement</value>
         <value>editorial</value>
+        <value>box</value>
       </choice>
     </define>
     <define name="index">
@@ -571,6 +572,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1238,6 +1244,11 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="bold">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="ital">
           <data type="boolean"/>
@@ -1567,10 +1578,13 @@
       <zeroOrMore>
         <ref name="indexsect"/>
       </zeroOrMore>
+      <optional>
+        <ref name="colophon"/>
+      </optional>
     </element>
   </define>
   <define name="misccontainer">
-    <element name="misc-container">
+    <element name="metanorma-extension">
       <oneOrMore>
         <ref name="AnyElement"/>
       </oneOrMore>
@@ -1589,6 +1603,13 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="colophon">
+    <element name="colophon">
+      <oneOrMore>
+        <ref name="content"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="foreword">
     <element name="foreword">
       <ref name="Content-Section"/>
@@ -2653,6 +2674,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
+      <text/>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.2.5".freeze
+    VERSION = "2.3.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.2.4"
+  spec.add_dependency "metanorma-standoc", "~> 2.3.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.2.5
+  version: 2.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.4
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Metanorma template gem for customisation.