metanorma-standoc 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da7d2f716300883df02cd6bcb01d5cfbb36390d6dfa355be0a41e55c9eeb10aa
-  data.tar.gz: 341e8403521c9bf5709593425e29317dd80c73f2c078afa2df481b9656c5b7d2
+  metadata.gz: 86e5f93e957beab663c8b30d6ea82cc211b158a6bf8b9f0e49a9843c21e910d2
+  data.tar.gz: 3b98332cd095ac90319145032f637b3fc1388ddc0f5ccbb6b1599d0b331cdd35
 SHA512:
-  metadata.gz: cfbbce08097ed466ff9e0253f1c07769acd6384fca6688394495e488a14cf20ca239e668c03c106e969cf60afbccd88f0e197052dad9a5a32962f5b816e558cc
-  data.tar.gz: 889e1eabbe45186cd1814c99fe0b6f97317beedcb26c676c4a637ec3242b25d3b9f4e353238cbf1bd2bde8a3d18416e6774a674051c210465f36e34b729cfa81
+  metadata.gz: 2e8aa9bd17082e4e9a06f26635282cb4eb3088ecf636c7144299b57d547cfb2ef2913f286bf67aa40557670b46abd0625d9545f9a8812b77cb597c2e00ef3af4
+  data.tar.gz: ec6148203ca15276fe22bcad392a30e1adb581791f6c4577f20fffaa401998f46384b0f374625dc34c40cc02f53695777eb974b1f678c942598d4efdafaf7885

data/lib/isodoc/html/htmlstyle.css

@@ -318,6 +318,13 @@ h6:hover > a.anchor,
   padding: 0;
 }
 
+svg {
+  width: 100%;
+  padding-bottom: 92%;
+  height: 1px;
+  overflow: visible;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/metanorma/standoc/basicdoc.rng

@@ -382,33 +382,7 @@ in a document (e.g. sourcecode annotations)</a:documentation>
     <a:documentation>Block intended to capture reviewer comments about some text in the document</a:documentation>
     <element name="review">
       <ref name="RequiredId"/>
-      <attribute name="reviewer">
-        <a:documentation>The party who has offered the comment</a:documentation>
-      </attribute>
-      <optional>
-        <attribute name="type">
-          <a:documentation>The type of reviewer comment</a:documentation>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="date">
-          <a:documentation>The date when the comment was made</a:documentation>
-          <data type="dateTime"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="from">
-          <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
-If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
-          <data type="IDREF"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="to">
-          <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
-          <data type="IDREF"/>
-        </attribute>
-      </optional>
+      <ref name="ReviewAttributes"/>
       <oneOrMore>
         <ref name="paragraph">
           <a:documentation>Reviewer comments content</a:documentation>
@@ -416,6 +390,35 @@ If not provided, the comment applies in the vicinity of the place it has been in
       </oneOrMore>
     </element>
   </define>
+  <define name="ReviewAttributes">
+    <attribute name="reviewer">
+      <a:documentation>The party who has offered the comment</a:documentation>
+    </attribute>
+    <optional>
+      <attribute name="type">
+        <a:documentation>The type of reviewer comment</a:documentation>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="date">
+        <a:documentation>The date when the comment was made</a:documentation>
+        <data type="dateTime"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="from">
+        <a:documentation>Identifier for the start of the text or point in the text to which the comment applies.
+If not provided, the comment applies in the vicinity of the place it has been inserted into the text</a:documentation>
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="to">
+        <a:documentation>Identifier for the end of the text to which the comment applies</a:documentation>
+        <data type="IDREF"/>
+      </attribute>
+    </optional>
+  </define>
   <define name="NumberingAttributes">
     <optional>
       <attribute name="unnumbered">
@@ -857,6 +860,7 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
   <define name="tr">
     <a:documentation>Sequence of cells to be displayed as a row in a table</a:documentation>
     <element name="tr">
+      <ref name="TrAttributes"/>
       <oneOrMore>
         <choice>
           <ref name="td">
@@ -869,6 +873,9 @@ in case the table cannot be rendered accessibly (HTML 5)</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="TrAttributes">
+    <empty/>
+  </define>
   <define name="tr-no-id">
     <a:documentation>Sequence of cells to be displayed as a row in a table: optional ID attributes recursively (for use in Relaton, metadata)</a:documentation>
     <element name="tr">

data/lib/metanorma/standoc/cleanup.rb

@@ -82,6 +82,7 @@ module Metanorma
         boilerplate_cleanup(xmldoc) # feeds: xref_cleanup for new <<>> introduced
         xref_cleanup(xmldoc)
         svgmap_cleanup(xmldoc) # feeds: img_cleanup
+        review_cleanup(xmldoc)
         toc_cleanup(xmldoc)
         smartquotes_cleanup(xmldoc)
         linebreak_cleanup(xmldoc)

data/lib/metanorma/standoc/cleanup_block.rb

@@ -219,7 +219,7 @@ module Metanorma
         doc.xpath("//ol[@explicit-type]").each do |x|
           x.delete("explicit-type")
           @log.add("Style", x,
-                   "Style override set for ordered list")
+                   "Style override set for ordered list", display: false)
         end
       end
 

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -145,10 +145,9 @@ module Metanorma
         elem.xpath(IDREF).each do |s|
           if (ret = Metanorma::Utils::to_ncname(s.value)) != (orig = s.value)
             s.value = ret
-            output = s.parent.dup
-            output.children.remove
             @log.add("Anchors", s.parent,
-                     "normalised identifier in #{output} from #{orig}")
+                     "normalised identifier to #{ret} from #{orig}",
+                     display: false)
           end
         end
       end
@@ -157,10 +156,9 @@ module Metanorma
         elem.xpath("//xref/@target").each do |s|
           if (ret = to_xreftarget(s.value)) != (orig = s.value)
             s.value = ret
-            output = s.parent.dup
-            output.children.remove
             @log.add("Anchors", s.parent,
-                     "normalised identifier in #{output} from #{orig}")
+                     "normalised identifier to #{ret} from #{orig}",
+                     display: false)
           end
         end
       end

data/lib/metanorma/standoc/cleanup_section.rb

@@ -192,7 +192,7 @@ module Metanorma
         xmldoc.at("//sections") or return
         ins = insert_before(xmldoc, "//sections")
         xmldoc.xpath("//sections//*[@beforeclauses = 'true']")
-          .reverse.each do |x|
+          .reverse_each do |x|
           x.delete("beforeclauses")
           ins.previous = x.remove
         end
@@ -201,7 +201,7 @@ module Metanorma
 
       # only move clausebefore notes at the very end of preface
       def endofpreface_clausebefore(xml, ins)
-        xml.xpath("//preface//*[@beforeclauses = 'true']").reverse.each do |x|
+        xml.xpath("//preface//*[@beforeclauses = 'true']").reverse_each do |x|
           textafter = xml.xpath("//preface//*") & x.xpath("./following::*")
           textafter.text.strip.empty? or break
           x.delete("beforeclauses")
@@ -217,29 +217,23 @@ module Metanorma
         ins
       end
 
-      def floatingtitle_cleanup(xmldoc)
-        pop_floating_title(xmldoc) # done again, after endofpreface_clausebefore
-        floating_title_preface2sections(xmldoc)
-      end
-
-      def pop_floating_title(xmldoc)
-        loop do
-          found = false
-          xmldoc.xpath("//floating-title").each do |t|
-            t.next_element.nil? or next
-            %w(sections annex preface).include? t.parent.name and next
-            t.parent.next = t
-            found = true
-          end
-          break unless found
+      def review_cleanup(xmldoc)
+        reviews = xmldoc.xpath("//review")
+        reviews.empty? and return
+        ctr = xmldoc.root.add_child("<review-container/>").first
+        reviews.each do |r|
+          review_set_location(r)
+          ctr << r
         end
       end
 
-      def floating_title_preface2sections(xmldoc)
-        t = xmldoc.at("//preface/floating-title") or return
-        s = xmldoc.at("//sections")
-        t.next_element or
-          s.children.first.previous = t.remove
+      def review_set_location(review)
+        unless review["from"]
+          id = "_#{UUIDTools::UUID.random_create}"
+          review.previous = "<bookmark id='#{id}'/>"
+          review["from"] = id
+        end
+        review["to"] ||= review["from"]
       end
     end
   end

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -156,6 +156,31 @@ module Metanorma
           end
         end
       end
+
+      def floatingtitle_cleanup(xmldoc)
+        pop_floating_title(xmldoc) # done again, after endofpreface_clausebefore
+        floating_title_preface2sections(xmldoc)
+      end
+
+      def pop_floating_title(xmldoc)
+        loop do
+          found = false
+          xmldoc.xpath("//floating-title").each do |t|
+            t.next_element.nil? or next
+            %w(sections annex preface).include? t.parent.name and next
+            t.parent.next = t
+            found = true
+          end
+          break unless found
+        end
+      end
+
+      def floating_title_preface2sections(xmldoc)
+        t = xmldoc.at("//preface/floating-title") or return
+        s = xmldoc.at("//sections")
+        t.next_element or
+          s.children.first.previous = t.remove
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup_table.rb

@@ -47,6 +47,8 @@ module Metanorma
         sources_table_cleanup(xmldoc)
         notes_table_cleanup(xmldoc)
         header_rows_cleanup(xmldoc)
+        tr_style_cleanup(xmldoc)
+        td_style_cleanup(xmldoc)
       end
 
       def sources_table_cleanup(xmldoc)
@@ -75,6 +77,26 @@ module Metanorma
           end
         end
       end
+
+      def tr_style_cleanup(xmldoc)
+        xmldoc.xpath("//tr[.//tr-style]").each do |tr|
+          ret = tr.xpath(".//tr-style").each_with_object([]) do |s, m|
+            m << s.text
+          end
+          tr["style"] = ret.join(";")
+        end
+        xmldoc.xpath(".//tr-style").each(&:remove)
+      end
+
+      def td_style_cleanup(xmldoc)
+        xmldoc.xpath("//td[.//td-style] | //th[.//td-style]").each do |tr|
+          ret = tr.xpath(".//td-style").each_with_object([]) do |s, m|
+            m << s.text
+          end
+          tr["style"] = ret.join(";")
+        end
+        xmldoc.xpath(".//td-style").each(&:remove)
+      end
     end
   end
 end

data/lib/metanorma/standoc/converter.rb

@@ -71,6 +71,8 @@ module Metanorma
         inline_macro Metanorma::Standoc::PassInlineMacro
         inline_macro Metanorma::Standoc::StdLinkInlineMacro
         inline_macro Metanorma::Standoc::NumberInlineMacro
+        inline_macro Metanorma::Standoc::TrStyleInlineMacro
+        inline_macro Metanorma::Standoc::TdStyleInlineMacro
         block Metanorma::Standoc::ToDoAdmonitionBlock
         block Metanorma::Standoc::EditorAdmonitionBlock
         treeprocessor Metanorma::Standoc::EditorInlineAdmonitionBlock

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v2.0.0 -->
+<!-- VERSION v2.0.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">
@@ -423,6 +423,21 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </choice>
     </define>
+    <define name="TdAttributes" combine="interleave">
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color supported</a:documentation>
+      </attribute>
+    </define>
+    <define name="ThAttributes" combine="interleave">
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color supported</a:documentation>
+      </attribute>
+    </define>
+    <define name="TrAttributes">
+      <attribute name="style">
+        <a:documentation>CSS style: only background-color supported</a:documentation>
+      </attribute>
+    </define>
     <define name="table-note">
       <element name="note">
         <ref name="OptionalId"/>
@@ -1272,6 +1287,11 @@ numbers</a:documentation>
           <a:documentation>Colophon or postface material</a:documentation>
         </ref>
       </optional>
+      <optional>
+        <ref name="review-container">
+          <a:documentation>Annotations to the document</a:documentation>
+        </ref>
+      </optional>
     </element>
   </define>
   <define name="misccontainer">
@@ -1282,6 +1302,13 @@ numbers</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="review-container">
+    <element name="review-container">
+      <oneOrMore>
+        <ref name="review"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="preface">
     <element name="preface">
       <oneOrMore>

data/lib/metanorma/standoc/macros_inline.rb

@@ -147,6 +147,30 @@ module Metanorma
       end
     end
 
+    class TrStyleInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :"tr-style"
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<tr-style>#{out}</tr-style>}
+      end
+    end
+
+    class TdStyleInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :"td-style"
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<td-style>#{out}</td-style>}
+      end
+    end
+
     class NumberInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       include ::Metanorma::Standoc::Utils
 

data/lib/metanorma/standoc/section.rb

@@ -52,7 +52,7 @@ module Metanorma
 
       PREFACE_CLAUSE_NAMES =
         %w(abstract foreword introduction metanorma-extension termdocsource
-           misc-container acknowledgements).freeze
+           misc-container metanorma-extension acknowledgements).freeze
 
       MAIN_CLAUSE_NAMES =
         ["normative references", "terms and definitions", "scope",

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "3.0.3".freeze
+    VERSION = "3.0.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -32,10 +32,10 @@ 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.5"
-  spec.add_dependency "isodoc", "~> 3.1.0"
+  spec.add_dependency "isodoc", "~> 3.1.4"
   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-glossarist", "~> 0.2.3"
   spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.0"
   spec.add_dependency "metanorma-utils", "~> 1.10.0"
   spec.add_dependency "ruby-jing"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: metanorma-plugin-lutaml
   requirement: !ruby/object:Gem::Requirement
@@ -434,7 +434,6 @@ files:
 - ".tex"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.devel
 - LICENSE
 - Makefile
 - README.adoc

data/Gemfile.devel

@@ -1 +0,0 @@
-gem "html2doc", git: "https://github.com/metanorma/html2doc", branch: "main"