mn-requirements 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0f29f7ad1df5f2127ec2c47f22d03e50bc6ec18e76459352ba6d873117d049
-  data.tar.gz: 60f5b1e8cd4463f0d2492731a502b33ea9b9d3930fa5fc09d99b2aa14285f153
+  metadata.gz: a12dad7f5d6cb715ade06167544dc2966581c8b9692b4d67de71664ddf401f23
+  data.tar.gz: 04cff2ddfd3116155014720376fbcf98c2d88bece77a12c748cd0726814d4c2e
 SHA512:
-  metadata.gz: 9028d71bdb94818359b7ebda35103973ce7906eae30aad1b881085fccdde2d78f6a07edb5fdc939c9234738751a48bda2a06bafba6809457808ba5fe563b189c
-  data.tar.gz: 83e2726e3edeb550d272860a8e477a50629bc298468555cb3fcf251b60b318a4e63a42b750d2812542bf8185007b0da0eb0ad49a926f4e0688c7c2a4b55efd5b
+  metadata.gz: dfc9ce13b9304cd254e0d2f941f04d48607041922aa0333417f57d61867495c4c486c2f2be459cbb46de52509a46e0f5b8f5460c6319310ee166864e2aac7797
+  data.tar.gz: f7a0989cc2212bc9186acf262a75bac6712bb9e7bdc7ae0d5c417446bce63f40dc7c8af9568b144a59a95914a0ff82f116af49586c75887697b079f7afa386a5

data/lib/metanorma/default/cleanup.rb

@@ -112,7 +112,7 @@ module Metanorma
       def unwrap_para(ddef)
         e = ddef.elements and e.size == 1 && e.first.name == "p" and
           ddef = e.first
-        ddef.children.to_xml
+        to_xml(ddef.children)
       end
 
       def reqt_dl_to_classif(ins, reqt, dlist)

data/lib/metanorma/default/isodoc.rb

@@ -6,13 +6,33 @@ module Metanorma
       end
 
       def recommendation_label(elem, type, xrefs)
-        number = xrefs.anchor(elem["id"], :label, false)
-        (number.nil? ? type : "#{type} #{number}")
+        label, title = recommendation_labels(elem)
+        type = "<span class='fmt-element-name'>#{type}</span>"
+        num = xrefs.anchor(elem["id"], :label, false)
+        num &&= "<semx element='autonum' source='#{elem['id']}'>#{num}</semx>"
+        ret = "#{type} #{num}".strip
+        label || title and
+          ret += recommendation_label_add(elem, label, title)
+        ret
+      end
+
+      def recommendation_label_add(elem, label, title)
+        r = recommendation_label_caption_delim
+        label and
+          r += "<semx element='identifier' source='#{elem['id']}'>#{label}</semx>"
+        label && title and r += ". "
+        title and
+          r += "<semx element='title' source='#{elem['id']}'>#{title}</semx>"
+        r
+      end
+
+      def recommendation_label_caption_delim
+        "<span class='fmt-caption-delim'>:<br/></span>"
       end
 
       def reqt_metadata_node?(node)
         %w(identifier title subject classification tag value
-           inherit name).include? node.name
+           inherit name fmt-name fmt-xref-label fmt-title).include? node.name
       end
 
       def requirement_render1(node)
@@ -25,35 +45,27 @@ module Metanorma
         out
       end
 
+      def recommendation_header(_node, out)
+        out
+      end
+
       def recommendation_base(node, klass)
         out = node.document.create_element(klass)
         node.attributes.each do |k, v|
           out[k] = v
         end
+        n = node.at(ns("./fmt-name")) and out << n
+        n = node.at(ns("./fmt-xref-label")) and out << n
         out
       end
 
       def recommendation_labels(node)
-        [node.at(ns("./identifier")), node.at(ns("./title")),
-         node.at(ns("./name"))]
+        [node.at(ns("./identifier")), node.at(ns("./title"))]
           .map do |n|
-          n&.children&.to_xml
+          to_xml(n&.children)
         end
       end
 
-      def recommendation_header(node, out)
-        label, title, name = recommendation_labels(node)
-        ret = name ? [name] : []
-        if label || title
-          ret << ":" unless ret.empty?
-          ret += ["<br/>", label]
-          ret << ". " if label && title
-          ret << title
-        end
-        out << "<name>#{l10n(ret.compact.join)}</name>"
-        out
-      end
-
       def recommendation_attributes1(node, out)
         oblig = node["obligation"] and
           out << l10n("#{@labels['default']['obligation']}: #{oblig}")
@@ -70,14 +82,14 @@ module Metanorma
       end
 
       def recommendation_attr_parse(node, label)
-        l10n("#{label}: #{node.children.to_xml}")
+        l10n("#{label}: #{to_xml(node.children)}")
       end
 
       def recommendation_attr_keyvalue(node, key, value)
         tag = node.at(ns("./#{key}")) or return nil
         value = node.at(ns("./#{value}")) or return nil
         l10n("#{Metanorma::Utils.strict_capitalize_first tag.text}: " \
-             "#{value.children.to_xml}")
+             "#{to_xml(value.children)}")
       end
 
       def recommendation_attributes(node, out)

data/lib/metanorma/default/utils.rb

@@ -22,6 +22,11 @@ module Metanorma
       def ns(xpath)
         Metanorma::Utils.ns(xpath)
       end
+
+      def to_xml(node)
+        node&.to_xml(encoding: "UTF-8", indent: 0,
+                   save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+      end
     end
   end
 end

data/lib/metanorma/modspec/cleanup.rb

@@ -127,7 +127,7 @@ module Metanorma
           next if %w(p ol ul dl table component description)
             .include?(c&.elements&.first&.name)
 
-          c.children = "<p>#{c.children.to_xml}</p>"
+          c.children = "<p>#{to_xml(c.children)}</p>"
         end
       end
 

data/lib/metanorma/modspec/isodoc.rb

@@ -34,7 +34,7 @@ module Metanorma
       end
 
       def recommendation_header(reqt, out)
-        n = recommendation_name(reqt, nil)
+        n = reqt.at(ns("./fmt-name"))
         x = if reqt.ancestors("requirement, recommendation, permission").empty?
               <<~THEAD
                 <thead><tr><th scope='colgroup' colspan='2'><p class='#{recommend_name_class(reqt)}'>#{n}</p></th></tr></thead>
@@ -47,10 +47,11 @@ module Metanorma
         out
       end
 
+=begin
       def recommendation_name(node, _out)
         ret = ""
-        name = node.at(ns("./name")) and ret += name.children.to_xml
-        title = node.at(ns("./title"))
+        name = node.at(ns("./fmt-name")) and ret += name.children.to_xml
+        title = node.at(ns("./fmt-title"))
         return ret unless title &&
           node.ancestors("requirement, recommendation, permission").empty?
 
@@ -58,6 +59,25 @@ module Metanorma
         ret += title.children.to_xml
         l10n(ret)
       end
+=end
+
+      def recommendation_label_add(elem, _label, title)
+        title or return ""
+        r = recommendation_label_caption_delim
+        title and
+          r += "<semx element='title' source='#{elem['id']}'>#{title}</semx>"
+        r
+      end
+
+      def recommendation_label_caption_delim
+        "<span class='fmt-caption-delim'>: </span>"
+      end
+
+      def recommendation_labels(node)
+        node.ancestors("requirement, recommendation, permission").empty? or
+          return [nil, nil]
+        super
+      end
 
       def recommendation_attributes(node, out)
         ins = out.add_child("<tbody></tbody>").first
@@ -72,7 +92,7 @@ module Metanorma
         label = node.at(ns("./identifier")) or return
         ret = <<~OUTPUT
           <tr><th>#{@labels['modspec']['identifier']}</th>
-          <td><tt><modspec-ident>#{label.children.to_xml}</modspec-ident></tt></td>
+          <td><tt><modspec-ident>#{to_xml(label.children)}</modspec-ident></tt></td>
         OUTPUT
         out.add_child(ret)
       end
@@ -120,7 +140,7 @@ module Metanorma
       def recommendation_attributes1_inherit(node, head)
         node.xpath(ns("./inherit")).each do |i|
           head << [@labels["modspec"]["dependency"],
-                   recommendation_id(i.children.to_xml)]
+                   recommendation_id(to_xml(i.children))]
         end
         head
       end
@@ -129,7 +149,7 @@ module Metanorma
         %w(indirect-dependency implements).each do |x|
           node.xpath(ns("./classification[tag][value]")).each do |c|
             c.at(ns("./tag")).text.casecmp(x).zero? or next
-            xref = recommendation_id(c.at(ns("./value")).children.to_xml) and
+            xref = recommendation_id(to_xml(c.at(ns("./value")).children)) and
               head << [@labels["modspec"][x.delete("-")], xref]
           end
         end
@@ -146,9 +166,9 @@ module Metanorma
 
         d = node.at(ns("./component[@class = 'step']"))
         d = d.replace("<ol class='steps'><li#{id_attr(d)}>" \
-                      "#{d.children.to_xml}</li></ol>").first
+                      "#{to_xml(d.children)}</li></ol>").first
         node.xpath(ns("./component[@class = 'step']")).each do |f|
-          f = f.replace("<li#{id_attr(f)}>#{f.children.to_xml}</li>").first
+          f = f.replace("<li#{id_attr(f)}>#{to_xml(f.children)}</li>").first
           d << f
         end
         node
@@ -203,7 +223,7 @@ module Metanorma
         recommend_class(node.parent) == "recommend" and
           lbl = "statement"
         out << "<tr><th>#{@labels['modspec'][lbl]}</th>" \
-               "<td>#{node.children.to_xml}</td></tr>"
+               "<td>#{to_xml(node.children)}</td></tr>"
         out
       end
 
@@ -220,8 +240,8 @@ module Metanorma
         node.xpath(ns("./dt")).each do |dt|
           dd = dt.next_element
           dd&.name == "dd" or next
-          out.add_child("<tr><th>#{dt.children.to_xml}</th>" \
-                        "<td>#{dd.children.to_xml}</td></tr>")
+          out.add_child("<tr><th>#{to_xml(dt.children)}</th>" \
+                        "<td>#{to_xml(dd.children)}</td></tr>")
         end
         out
       end

data/lib/metanorma/modspec/reqt_label.rb

@@ -27,10 +27,11 @@ module Metanorma
       def recommendation_label_xref(elem, label, xrefs, type)
         id = @reqtlabels[label]
         number = xrefs.anchor(id, :modspec, false)
-        number.nil? and return type
+        number.nil? and return "<span class='fmt-element-name'>#{type}</span>"
         elem.ancestors("requirement, recommendation, permission").empty? and
           return number
-        "<xref target='#{id}'>#{number}</xref>"
+        #"<xref target='#{id}'>#{number}</xref>"
+        number
       end
 
       def init_lookups(doc)
@@ -103,7 +104,8 @@ module Metanorma
 
       def recommendation_link_test(ident)
         test = @reqt_links_test[ident&.strip] or return nil
-        "<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
+        #"<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
+        test[:lbl]
       end
 
       # we have not implemented multiple levels of nesting of classes
@@ -155,12 +157,15 @@ module Metanorma
 
       def recommendation_link_class(ident)
         test = @reqt_links_class[ident&.strip] or return nil
-        "<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
+        #"<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
+        test[:lbl]
       end
 
       def recommendation_id(ident)
         test = @reqt_ids[ident&.strip] or return ident&.strip
-        "<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
+        #require "debug"; binding.b if test.include?("<xref")
+        #"<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
+        test[:lbl]
       end
 
       def recommendation_backlinks_test(node, id, ret)
@@ -185,7 +190,7 @@ module Metanorma
           .xpath(ns("//requirement//xref | //permission//xref | " \
                     "//recommendation//xref"))).each do |x|
           @reqt_id_base[x["target"]] or next # is a modspec requirement
-          x.children = x.children.to_xml.delete_prefix(@modspecidentifierbase)
+          x.children = to_xml(x.children).delete_prefix(@modspecidentifierbase)
         end
       end
 

data/lib/metanorma/modspec/table_cleanup.rb

@@ -46,7 +46,7 @@ module Metanorma
         hdr = th.text
         th.children = @i18n.inflect(hdr, number: "pl")
         td = th.next_element
-        res = [td.children.to_xml]
+        res = [to_xml(td.children)]
         res += gather_consec_table_rows(trow, hdr)
         td.children = res.join("<br/>")
       end
@@ -55,7 +55,7 @@ module Metanorma
         ret = []
         trow.xpath("./following-sibling::xmlns:tr").each do |r|
           r.at(ns("./th[text() = '#{hdr}']")) or break
-          ret << r.remove.at(ns("./td")).children.to_xml
+          ret << to_xml(r.remove.at(ns("./td")).children)
         end
         ret
       end
@@ -65,6 +65,8 @@ module Metanorma
           x = t.at(ns("./thead/tr")) or next
           x.at(ns("./th")).children =
             requirement_table_nested_cleanup_hdr(node)
+          f = x.at(ns("./td/fmt-name")) and
+            f.replace(f.children)
           t.parent.parent.replace(x)
         end
         table
@@ -78,7 +80,7 @@ module Metanorma
 
       def strip_id_base(elem, base)
         base.nil? and return elem.children
-        elem.children.to_xml.delete_prefix(base)
+        to_xml(elem.children).delete_prefix(base)
       end
 
       def truncate_id_base_in_reqt1(table, base)
@@ -94,8 +96,9 @@ module Metanorma
       # any xrefs not yet expanded out to rendering need to be expanded out,
       # so that the identifier instances they contain can be truncated
       def expand_xrefs_in_reqt(table)
-        table.xpath(ns(".//xref[not(@style)][normalize-space(text()) = '']"))
+        table.xpath(ns(".//xref[not(@style)][string-length() = 0]"))
           .each do |x|
+          @xrefs.anchor(x["target"], :modspec, false) or next # modspec xrefs only
           ref = @xrefs.anchor(x["target"], :xref, false) or next
           x << ref
         end

data/lib/metanorma/requirements/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   class Requirements
-    VERSION = "0.4.1".freeze
+    VERSION = "0.4.3".freeze
   end
 end

data/mn-requirements.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   # precise version is on relaton-render
   spec.add_dependency "isodoc-i18n", ">= 1.1.0"
   spec.add_dependency "metanorma-utils", ">= 0.10.0"
+  spec.add_dependency "relaton-render", ">= 0.9.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: relaton-render
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +264,7 @@ homepage: https://github.com/metanorma/mn-requirements
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -266,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Requirements processing and rendering according to different models
 test_files: []