metanorma-standoc 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed917e2185484c68d9c76b23b7bf977ee03da83204d3ceae22fd4fc893b8dae0
-  data.tar.gz: c1c7af6fd9cb9a958093cb698beb2523d16bee5cdc4b4a06140092690753f44b
+  metadata.gz: 6a5e5f1a3e1674d8e9cc0b3cdc0979195595b187e972e498616b30955cbc4512
+  data.tar.gz: 81b45e23e6ece67cd6a6d8d6bd747c439264faca7ee26daf58b6cbdc42dcd93d
 SHA512:
-  metadata.gz: 491207a21d304b30840b19398d547a1eb5e55037bd93c3c39397a9d31a725cde2de5e88348e984958639415f8ea38dcd6091fb5888825775934609e83c79cf53
-  data.tar.gz: aa771efa57e60c94ac9e8e65dc0fd00a6c9280a812ea1ecbc212cecb25547be7b492111a6fdcbfa0118ad855ca775772fbedfc1d83c92fd3d3fff68b89a8f950
+  metadata.gz: 33d2ba8ae3a9b5ed18bf30193c507bcc6da280054dcc5c6c22e0f87288e6d229fb2bbcc62175826918d2b25935f1b6fc84f7d68f64e925a438c1d20fe6845f77
+  data.tar.gz: acab296d523a22e518a64ef1d1109706bfe4e3b164366f237b09a42e804ac371bf3387cd40122ea1f9eb0e42f9fa86796140826fd0013b44417b9d792cc3751a

data/lib/metanorma/standoc/anchor.rb

@@ -48,14 +48,14 @@ module Metanorma
         { target: target, hidden: match[:hidden],
           type: match[:fn].nil? ? "inline" : "footnote",
           case: match[:case]&.sub(/%$/, ""),
-          style: match[:style]&.sub(/^style=/, "")&.sub(/%$/, "") || @xrefstyle,
+          style: match[:style] || @xrefstyle,
           droploc: match[:drop].nil? && match[:drop2].nil? ? nil : true,
           text: inline_anchor_xref_text(match, text) }
       end
 
       def inline_anchor_xref_match(text)
         /^(?:hidden%(?<hidden>[^,]+),?)?
-          (?<style>style=[^%]+%)?
+          (?:style=(?<style>[^%]+)%)?
           (?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
           (?<fn>fn:?\s*)?(?<text>.*)$/x.match text
       end
@@ -68,11 +68,7 @@ module Metanorma
       end
 
       def inline_anchor_link(node)
-        contents = node.text
-        contents = "" if node.target.gsub(%r{^mailto:}, "") == node.text
-        attributes = { target: node.target, alt: node.attr("title"),
-                       "update-type": node.attr("updatetype") ||
-                         node.attr("update-type") }
+        contents, attributes = inline_anchor_link_attrs(node)
         noko do |xml|
           xml.link **attr_code(attributes) do |l|
             l << contents
@@ -80,10 +76,18 @@ module Metanorma
         end.join
       end
 
+      def inline_anchor_link_attrs(node)
+        contents = node.text
+        contents = "" if node.target.gsub(%r{^mailto:}, "") == node.text
+        attributes = { target: node.target, alt: node.attr("title"),
+                       style: node.attr("style")&.sub(/%$/, ""),
+                       "update-type": node.attr("updatetype") ||
+                         node.attr("update-type") }
+        [contents, attributes]
+      end
+
       def inline_anchor_bibref(node)
-        eref_contents =
-          @c.decode(node.text || node.target || node.id)
-          &.sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
+        eref_contents = inline_anchor_bibref_contents(node)
         @refids << (node.target || node.id)
         noko do |xml|
           xml.ref **attr_code(id: node.target || node.id) do |r|
@@ -92,6 +96,11 @@ module Metanorma
         end.join
       end
 
+      def inline_anchor_bibref_contents(node)
+        @c.decode(node.text || node.target || node.id)
+          &.sub(/^\[?([^\[\]]+?)\]?$/, "[\\1]")
+      end
+
       def inline_callout(node)
         noko do |xml|
           xml.callout node.text

data/lib/metanorma/standoc/basicdoc.rng

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

data/lib/metanorma/standoc/blocks_notes.rb

@@ -22,13 +22,12 @@ module Metanorma
           attr_code(
             from: node.attr("from"),
             to: node.attr("to") || node.attr("from"),
+            type: node.attr("type") || nil,
           ),
         )
       end
 
       def sidebar(node)
-        return unless draft?
-
         noko do |xml|
           xml.review **sidebar_attrs(node) do |r|
             wrap_in_para(node, r)
@@ -42,7 +41,7 @@ module Metanorma
         attr_code(id_attr(node)
           .merge(reviewer: node.attr("reviewer") || node.attr("source") ||
                  "(Unknown)",
-                 date: date))
+                 date: date, type: "todo"))
       end
 
       def todo(node)
@@ -96,10 +95,7 @@ module Metanorma
       end
 
       def admonition(node)
-        return termnote(node) if in_terms? && node.attr("name") == "note"
-        return note(node) if node.attr("name") == "note"
-        return todo(node) if node.attr("name") == "todo"
-
+        ret = admonition_alternatives(node) and return ret
         noko do |xml|
           xml.admonition **admonition_attrs(node) do |a|
             node.title.nil? or a.name { |name| name << node.title }
@@ -107,6 +103,13 @@ module Metanorma
           end
         end.join("\n")
       end
+
+      def admonition_alternatives(node)
+        in_terms? && node.attr("name") == "note" and return termnote(node)
+        node.attr("name") == "note" and return note(node)
+        node.attr("name") == "todo" and return todo(node)
+        nil
+      end
     end
   end
 end

data/lib/metanorma/standoc/cleanup.rb

@@ -29,6 +29,7 @@ module Metanorma
         element_name_cleanup(xmldoc)
         passthrough_cleanup(xmldoc)
         unnumbered_blocks_cleanup(xmldoc)
+        termdocsource_cleanup(xmldoc) # feeds: metadata_cleanup
         metadata_cleanup(xmldoc) # feeds: boilerplate_cleanup
         sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup,
         # floatingtitle_cleanup

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -14,11 +14,12 @@ module Metanorma
       end
 
       def strip_initial_space(elem)
-        elem.children[0].text? or return
-        if /\S/.match?(elem.children[0].text)
-          elem.children[0].content = elem.children[0].text.lstrip
+        a = elem.children[0]
+        a.text? or return
+        if /\S/.match?(a.text)
+          a.content = a.text.lstrip
         else
-          elem.children[0].remove
+          a.remove
         end
       end
 
@@ -208,6 +209,10 @@ module Metanorma
       end
 
       def link_cleanup(xmldoc)
+        uri_cleanup(xmldoc)
+      end
+
+      def uri_cleanup(xmldoc)
         xmldoc.xpath("//link[@target]").each do |l|
           l["target"] = Addressable::URI.parse(l["target"]).to_s
         rescue Addressable::URI::InvalidURIError

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -119,7 +119,6 @@ module Metanorma
         termdomain1_cleanup(xmldoc)
         termnote_example_cleanup(xmldoc)
         term_children_cleanup(xmldoc)
-        termdocsource_cleanup(xmldoc)
       end
 
       def term_index_cleanup(xmldoc)

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.2.12 -->
+<!-- VERSION v1.3.0 -->
 <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">
@@ -146,6 +146,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style"/>
+        </optional>
         <oneOrMore>
           <ref name="PureTextElement"/>
         </oneOrMore>

data/lib/metanorma/standoc/section.rb

@@ -24,10 +24,9 @@ module Metanorma
       def sectiontype(node, level = true)
         ret = sectiontype1(node)
         ret1 = preface_main_filter(sectiontype_streamline(ret), node)
-        return ret1 if ret1 == "symbols and abbreviated terms"
-        return nil unless !level || node.level == 1
-        return nil if @seen_headers.include? ret
-
+        ret1 == "symbols and abbreviated terms" and return ret1
+        !level || node.level == 1 or return nil
+        @seen_headers.include? ret and return nil
         @seen_headers << ret unless ret1.nil?
         @seen_headers_canonical << ret1 unless ret1.nil?
         ret1
@@ -95,8 +94,8 @@ module Metanorma
                 "multilingual-rendering": node&.attr("multilingual-rendering"),
                 colophon: (if node.role == "colophon" ||
                           node.attr("style") == "colophon"
-                            true
-                          end),
+                             true
+                           end),
                 preface: (if node.role == "preface" ||
                           node.attr("style") == "preface"
                             true
@@ -152,13 +151,13 @@ module Metanorma
       end
 
       def set_obligation(attrs, node)
-        attrs[:obligation] = if node.attributes.has_key?("obligation")
-                               node.attr("obligation")
-                             elsif node.parent.attributes.has_key?("obligation")
-                               node.parent.attr("obligation")
-                             else
-                               "normative"
-                             end
+        attrs[:obligation] =
+          if node.attributes.has_key?("obligation")
+            node.attr("obligation")
+          elsif node.parent.attributes.has_key?("obligation")
+            node.parent.attr("obligation")
+          else "normative"
+          end
       end
 
       def preamble(node)
@@ -167,8 +166,7 @@ module Metanorma
             xml_abstract.title do |t|
               t << (node.blocks[0].title || @i18n.foreword)
             end
-            content = node.content
-            xml_abstract << content
+            xml_abstract << node.content
           end
         end.join("\n")
       end
@@ -241,9 +239,9 @@ module Metanorma
       end
 
       def floating_title_attrs(node)
-        attr_code(id_attr(node).merge(align: node.attr("align"),
-                                      depth: node.level,
-                                      type: "floating-title"))
+        attr_code(id_attr(node)
+          .merge(align: node.attr("align"), depth: node.level,
+                 type: "floating-title"))
       end
 
       def floating_title(node)

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -64,9 +64,10 @@ module Metanorma
           lookup = norm_ref_id_text(refterm.text.strip)
           p = @lookup[:sec2prim][lookup] and refterm.children = @c.encode(p)
           p || @lookup[:term][lookup] and
-            refterm.replace("<preferred><expression>" \
-                            "<name>#{refterm.children.to_xml}" \
-                            "</name></expression></preferred>")
+            refterm.replace(<<~XML,
+              <preferred><expression><name>#{refterm.children.to_xml}</name></expression></preferred>
+            XML
+                           )
         end
       end
 

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.0".freeze
+    VERSION = "2.8.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable