metanorma-standoc 2.8.7 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c85d5bbd7c078ea07217f9d0e4eac15edec02f1123a2d631774a7d95e194b5ea
-  data.tar.gz: 69c26ff7e359967646790c05e81ec9addc1641bd05bf9d1e9bd2e58f330ba24a
+  metadata.gz: 3d7a510054b98ebc499b0e59b1a21685ee1dae2a038f2e1ac0cd5f4c8d29d9c8
+  data.tar.gz: a748a7834be53490e998f21e4236a1b41d24b13d40522e86ad29ebdf241f80c5
 SHA512:
-  metadata.gz: 616aac498897af730a4bd1198011b7bfb310782ca3d1ee940638f753a39c5ee8ef9b0d9d344199d089fef554c757b52dcc1bfafe9dee22b031cf22616bbd358a
-  data.tar.gz: 88b94f216dc5db91750d334f0555edcf7cef65f8b2c6b011ea6684317dd25817ee216ea9cf935a13f5299710042b996f6f46ea5a784e95d5e2b43760507009b4
+  metadata.gz: e23a71d8ce405a29267831a0d0c8fc85c023122265d41b6623c70b3fcb01d33df01f3cfde2afbafdcd79599eebb77a287cc5e680e5dbb1ffa1cbe7c5bd5bd9e4
+  data.tar.gz: 421a8574228773ad16ae79d2f33eed300516d7985692c77d15abdfac0569710f40d6827945ec720d604ec4bfb69567304b0ee79465a01699bcca77cf691e899f

data/lib/isodoc/html/htmlstyle.css

@@ -177,6 +177,50 @@ table.rouge-line-table pre {
   overflow-x: visible;
   font-size: 100%; }
 
+a.header {
+  color: inherit;
+  text-decoration: none; }
+
+a.header:hover {
+  color: #a53221; }
+
+a.header:visited {
+  color: inherit;
+  text-decoration: none; }
+
+a.anchor {
+  position: absolute;
+  z-index: 1001;
+  width: 1.5ex;
+  margin-left: -1.5ex;
+  display: block;
+  text-decoration: none !important;
+  visibility: hidden;
+  text-align: center;
+  font-weight: 400; }
+
+a.anchor::before {
+  content: "\00A7";
+  font-size: .85em;
+  display: block;
+  padding-top: .1em; }
+
+h1 > a.anchor:hover,
+h2 > a.anchor:hover,
+h3 > a.anchor:hover,
+h4 > a.anchor:hover,
+h5 > a.anchor:hover,
+h6 > a.anchor:hover,
+.inline-header > a.anchor:hover,
+h1:hover > a.anchor,
+h2:hover > a.anchor,
+h3:hover > a.anchor,
+h4:hover > a.anchor,
+h5:hover > a.anchor,
+h6:hover > a.anchor,
+.inline-header:hover > a.anchor {
+  visibility: visible; }
+
 #brochure-band {
   background-color: #0AC442; }
 

data/lib/metanorma/standoc/biblio.rng

@@ -95,7 +95,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString1">
+  <define name="LocalizedStringAttrs">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -106,6 +106,10 @@
     <optional>
       <attribute name="script"/>
     </optional>
+  </define>
+  <define name="LocalizedString1">
+    <!-- multiple languages and scripts possible: comma delimit them if so -->
+    <ref name="LocalizedStringAttrs"/>
     <text/>
   </define>
   <define name="LocalizedString">
@@ -142,16 +146,8 @@
     <ref name="LocalizedStringOrXsAny"/>
   </define>
   <define name="LocalizedStringOrXsAny1">
-    <optional>
-      <!-- multiple languages and scripts possible: comma delimit them if so -->
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="locale"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
+    <!-- multiple languages and scripts possible: comma delimit them if so -->
+    <ref name="LocalizedStringAttrs"/>
     <oneOrMore>
       <choice>
         <text/>
@@ -208,6 +204,7 @@
   </define>
   <define name="roledescription">
     <element name="description">
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -335,6 +332,7 @@
   </define>
   <define name="affiliationdescription">
     <element name="description">
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -948,6 +946,7 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <ref name="LocalizedStringAttrs"/>
     <zeroOrMore>
       <ref name="TextElement"/>
     </zeroOrMore>
@@ -1041,15 +1040,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="locale"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1277,6 +1268,7 @@
       <optional>
         <attribute name="type"/>
       </optional>
+      <ref name="LocalizedStringAttrs"/>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -1284,9 +1276,15 @@
   </define>
   <define name="bibabstract">
     <element name="abstract">
-      <oneOrMore>
-        <ref name="TextElement"/>
-      </oneOrMore>
+      <ref name="LocalizedStringAttrs"/>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlock"/>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement"/>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="copyright">
@@ -1391,6 +1389,7 @@
       </attribute>
       <optional>
         <element name="description">
+          <ref name="LocalizedStringAttrs"/>
           <oneOrMore>
             <ref name="TextElement"/>
           </oneOrMore>

data/lib/metanorma/standoc/cleanup_image.rb

@@ -10,17 +10,12 @@ module Metanorma
         Vectory::SvgMapping.new(xmldoc, @localdir).call
       end
 
-      def guid?(str)
-        /^_[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i
-          .match(str)
-      end
-
       def svgmap_moveattrs(xmldoc)
         xmldoc.xpath("//svgmap").each do |s|
           f = s.at(".//figure") or next
           (t = s.at("./name")) && !f.at("./name") and
             f.children.first.previous = t.remove
-          if s["id"] && guid?(f["id"])
+          if s["id"] && Metanorma::Utils::guid_anchor?(f["id"])
             f["id"] = s["id"]
             s.delete("id")
           end

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -165,11 +165,6 @@ module Metanorma
         end
       end
 
-      def guid?(str)
-        /^_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/
-          .match?(str)
-      end
-
       def contenthash_id_cleanup(doc)
         ids = contenthash_id_make(doc)
         contenthash_id_update_refs(doc, ids)
@@ -177,7 +172,7 @@ module Metanorma
 
       def contenthash_id_make(doc)
         doc.xpath("//*[@id]").each_with_object({}) do |x, m|
-          next unless guid?(x["id"])
+          next unless Metanorma::Utils::guid_anchor?(x["id"])
 
           m[x["id"]] = contenthash(x)
           x["id"] = m[x["id"]]

data/lib/metanorma/standoc/cleanup_section.rb

@@ -1,6 +1,3 @@
-require "date"
-require "htmlentities"
-require "json"
 require_relative "cleanup_section_names"
 
 module Metanorma
@@ -51,8 +48,9 @@ module Metanorma
 
       def clean_abstract(dupabstract)
         dupabstract.traverse { |n| n.remove_attribute("id") }
-        dupabstract.remove_attribute("language")
-        dupabstract.remove_attribute("script")
+        %w(language script unnumbered).each do |w|
+          dupabstract.remove_attribute(w)
+        end
         dupabstract.at("./title")&.remove
         dupabstract
       end
@@ -100,9 +98,9 @@ module Metanorma
           y.name == "annex" || !y.ancestors("annex").empty? and next
           y.wrap("<annex/>")
           y.parent["id"] = "_#{UUIDTools::UUID.random_create}"
-          y.parent["obligation"] = y["obligation"]
-          y.parent["language"] = y["language"]
-          y.parent["script"] = y["script"]
+          %w(obligation language script).each do |w|
+            y.parent[w] = y[w]
+          end
         end
       end
 
@@ -195,7 +193,8 @@ module Metanorma
       def sections_clausebefore_cleanup(xmldoc)
         xmldoc.at("//sections") or return
         ins = insert_before(xmldoc, "//sections")
-        xmldoc.xpath("//sections//*[@beforeclauses = 'true']").reverse.each do |x|
+        xmldoc.xpath("//sections//*[@beforeclauses = 'true']")
+          .reverse.each do |x|
           x.delete("beforeclauses")
           ins.previous = x.remove
         end
@@ -204,9 +203,10 @@ module Metanorma
 
       # only move clausebefore notes at the very end of preface
       def endofpreface_clausebefore(xmldoc, ins)
-        xmldoc.xpath("//preface//*[@beforeclauses = 'true']").reverse.each do |x|
-          textafternote = xmldoc.xpath("//preface//*") & x.xpath("./following::*")
-          textafternote.text.strip.empty? or break
+        xmldoc.xpath("//preface//*[@beforeclauses = 'true']").reverse
+          .each do |x|
+          textafter = xmldoc.xpath("//preface//*") & x.xpath("./following::*")
+          textafter.text.strip.empty? or break
           x.delete("beforeclauses")
           ins.previous = x.remove
         end

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.3.0 -->
+<!-- VERSION v1.3.1 -->
 <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">
@@ -1346,38 +1346,41 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="Section-Attributes">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
+    <optional>
+      <attribute name="inline-header">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
+    <optional>
+      <attribute name="branch-number"/>
+    </optional>
+    <optional>
+      <attribute name="obligation">
+        <choice>
+          <value>normative</value>
+          <value>informative</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="reference-clause">
     <element name="clause">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="branch-number"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
+      <ref name="Section-Attributes"/>
       <optional>
         <ref name="section-title"/>
       </optional>
@@ -1566,36 +1569,7 @@
     </element>
   </define>
   <define name="Content-Section">
-    <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
-      <attribute name="inline-header">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="branch-number"/>
-    </optional>
+    <ref name="Section-Attributes"/>
     <optional>
       <attribute name="type"/>
     </optional>
@@ -1617,39 +1591,10 @@
     </element>
   </define>
   <define name="Clause-Section">
-    <optional>
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
-    <optional>
-      <attribute name="inline-header">
-        <data type="boolean"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-    </optional>
+    <ref name="Section-Attributes"/>
     <optional>
       <attribute name="type"/>
     </optional>
-    <optional>
-      <attribute name="number"/>
-    </optional>
-    <optional>
-      <attribute name="branch-number"/>
-    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1730,34 +1675,10 @@
   </define>
   <define name="terms">
     <element name="terms">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
+      <ref name="Section-Attributes"/>
       <optional>
         <attribute name="type"/>
       </optional>
-      <optional>
-        <attribute name="number"/>
-      </optional>
-      <optional>
-        <attribute name="branch-number"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
       <optional>
         <ref name="section-title"/>
       </optional>

data/lib/metanorma/standoc/section.rb

@@ -83,6 +83,7 @@ module Metanorma
       def section_attributes(node)
         ret =
           { id: Metanorma::Utils::anchor_or_uuid(node),
+            unnumbered: node.option?("unnumbered") ? "true" : nil,
             annex: role_style(node, "appendix") && node.level == 1 ? true : nil,
             colophon: role_style(node, "colophon") ? true : nil,
             preface: role_style(node, "preface") ? true : nil }

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.7".freeze
+    VERSION = "2.8.9".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -32,11 +32,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.10.0"
+  spec.add_dependency "isodoc", "~> 2.10.2"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"
-  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.5.0"
+  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.6.0"
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-08 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.10.2
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -573,7 +573,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: metanorma-standoc realises standards following the Metanorma standoc model