metanorma-standoc 1.10.7 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90fb9b89f2c7070b763519843f307f4d3ecebb8ee462d7017afb886a397de8a8
-  data.tar.gz: b6f2e8253577f05a76e833d3a1e5d9f64fd47a7de48d8ec6703056b04965096a
+  metadata.gz: 25f4c5a4250a14fb1499512d51f25cf8ea7b1cc6dc7da44560dc442342a54773
+  data.tar.gz: 10dd5ba69da52963c0e9310834212fc5e74743f660a4cf533efdd721037f5f5d
 SHA512:
-  metadata.gz: 17eb330f74f079b78db600f8030c15e497b6e0b1251157b9499cf532974280e6d4bb61ebe7d4c52cc443ca4d407371b575f6425783aa384e4c977733de528c5e
-  data.tar.gz: f3063d8116e77c1e00cf6f9ba12668e5bfbb581d41e02e9d4c4fee2dc21884754f8102a718d7318d3b0619abaf1715528162e9aebcb97895a7ab85bbeb6fccd4
+  metadata.gz: dbc30f8112130ea49edcfabf97fedc1d3934f41a09163369fb74ba754eb5d11e861e040df17b15e2f865b7f5bb43d8513a76f859bc192eb2f30f23e4dea67232
+  data.tar.gz: 2ce49c90d894757b2964c4922b702bfb54c24f5e8d53a530a399692f6003042d8c9d44f5ebbc57110d6c56bc3d18fc17650e2511c8b102e38dce2a0d7b85fd41

data/README.adoc

@@ -10,26 +10,24 @@ Gem for serialising the https://github.com/metanorma/metanorma-model-standoc[Met
 
 == Functionality
 
-This gem processes Metanorma documents following a template for generating standards documents, according
-to a range of standards classes. This gem provides underlying generic functionality; behaviour specific
-to each standards class is refined in the gem specific to that standards class (e.g. https://github.com/metanorma/metanorma-iso).
-The following outputs are generated.
-
-* Metanorma XML representation of the document, intended as a document model for 
-Standards. The Metanorma XML representation is processed in turn, to generate one or more of 
-the following outputs as end deliverables, depending on each standards class gem:
-* Microsoft Word output (`.doc`)
-* HTML output (`.html`)
-* PDF (`.pdf`)
+This gem processes Metanorma AsciiDoc input into the Metanorma document model.
+This gem provides underlying generic functionality; behaviour specific
+to each standards class is refined in the gem specific to that standards class
+(e.g. https://github.com/metanorma/metanorma-iso[Metanorma ISO]).
+
+The following outputs are generated:
+
+* Metanorma semantic XML
+* Metanorma presentation XML
+
+These Metanorma XML representations are processed downstream by the `isodoc` gem
+to generate other end deliverables, depending on each standards class.
 
 The following input formats are supported:
 
-* http://asciidoctor.org/[Asciidoctor]
+* Metanorma AsciiDoc
 
-This README provides an overview of the functionality of the gem; see also
-https://github.com/metanorma/metanorma-iso/blob/master/docs/guidance.adoc[Guidance for authoring].
-https://github.com/metanorma/metanorma-iso/blob/master/docs/quickstart.adoc[Quickstart guide]
-gives a summary overview.
+See the https://www.metanorma.org[Metanorma website] for more information.
 
 NOTE: http://asciimath.org[AsciiMathML] is used for mathematical formatting.
 The gem uses the https://github.com/asciidoctor/asciimath[Ruby AsciiMath parser],
@@ -39,21 +37,19 @@ expressions.
 
 === Installation
 
-If you are using a Mac, the https://github.com/metanorma/metanorma-macos-setup
-repository has instructions on setting up your machine to run Metanorma
-scripts such as this one. You need only run the following in a Terminal console:
+See the https://www.metanorma.org[Metanorma website] for instructions.
+
+In the terminal:
 
 [source,console]
 ----
-$ bash <(curl -s https://raw.githubusercontent.com/metanorma/metanorma-macos-setup/master/metanorma-setup)
 $ gem install metanorma-standoc
 $ gem install metanorma-cli 
 ----
 
-The metanorma-cli gem is the command-line interface for the Metanorma tool suite
+`metanorma-cli` is the command-line interface for the Metanorma suite
 (incorporating the `metanorma` executable seen above).
 
 == Documentation
 
-See http://metanorma.com[]
-
+See the https://www.metanorma.org[Metanorma website] for details.

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'isodoc/gem_tasks'
+require "isodoc/gem_tasks"
 
 IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)

data/lib/asciidoctor/standoc/base.rb

@@ -14,6 +14,7 @@ module Asciidoctor
     module Base
       XML_ROOT_TAG = "standard-document".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
+      FONTS_MANIFEST = "fonts-manifest".freeze
 
       def xml_root_tag
         self.class::XML_ROOT_TAG
@@ -38,7 +39,7 @@ module Asciidoctor
           scripts: node.attr("scripts"),
           scripts_override: node.attr("scripts-override"),
           scripts_pdf: node.attr("scripts-pdf"),
-          datauriimage: node.attr("data-uri-image"),
+          datauriimage: node.attr("data-uri-image") != "false",
           htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
           doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
           break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
@@ -46,6 +47,7 @@ module Asciidoctor
           bare: node.attr("bare"),
           sectionsplit: node.attr("sectionsplit"),
           baseassetpath: node.attr("base-asset-path"),
+          aligncrosselements: node.attr("align-cross-elements"),
         }
       end
 
@@ -81,11 +83,12 @@ module Asciidoctor
           suppressasciimathdup: node.attr("suppress-asciimath-dup"),
           bare: node.attr("bare"),
           baseassetpath: node.attr("base-asset-path"),
+          aligncrosselements: node.attr("align-cross-elements"),
         }
 
-        if font_manifest_file = node.attr("mn2pdf-font-manifest-file")
+        if fonts_manifest = node.attr(FONTS_MANIFEST)
           attrs[IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS] = {
-            IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => font_manifest_file,
+            IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => fonts_manifest,
           }
         end
 
@@ -125,7 +128,7 @@ module Asciidoctor
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"
         @bibdb = nil
         @seen_headers = []
-        @datauriimage = node.attr("data-uri-image")
+        @datauriimage = node.attr("data-uri-image") != "false"
         @boilerplateauthority = node.attr("boilerplate-authority")
         @sourcecode_markup_start = node.attr("sourcecode-markup-start") || "{{{"
         @sourcecode_markup_end = node.attr("sourcecode-markup-end") || "}}}"

data/lib/asciidoctor/standoc/basicdoc.rng

@@ -624,6 +624,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +637,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +647,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +833,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +848,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +864,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/lib/asciidoctor/standoc/blocks.rb

@@ -6,14 +6,17 @@ module Asciidoctor
   module Standoc
     module Blocks
       def id_attr(node = nil)
-        { id: Metanorma::Utils::anchor_or_uuid(node) }
+        { id: Metanorma::Utils::anchor_or_uuid(node),
+          tag: node&.attr("tag"),
+          "multilingual-rendering": node&.attr("multilingual-rendering") }
       end
 
       def id_unnum_attrs(node)
-        attr_code(id: Metanorma::Utils::anchor_or_uuid(node),
-                  unnumbered: node.option?("unnumbered") ? "true" : nil,
-                  number: node.attr("number"),
-                  subsequence: node.attr("subsequence"))
+        attr_code(id_attr(node).merge(
+                    unnumbered: node.option?("unnumbered") ? "true" : nil,
+                    number: node.attr("number"),
+                    subsequence: node.attr("subsequence"),
+                  ))
       end
 
       def formula_attrs(node)
@@ -43,10 +46,9 @@ module Asciidoctor
 
       def form(node)
         noko do |xml|
-          xml.form **attr_code(
-            id: Metanorma::Utils::anchor_or_uuid, class: node.attr("class"),
-            name: node.attr("name"), action: node.attr("action")
-          ) do |f|
+          xml.form **attr_code(id_attr(node)
+            .merge(class: node.attr("class"),
+                   name: node.attr("name"), action: node.attr("action"))) do |f|
             f << node.content
           end
         end
@@ -78,7 +80,7 @@ module Asciidoctor
 
       def term_example(node)
         noko do |xml|
-          xml.termexample **id_attr(node) do |ex|
+          xml.termexample **attr_code(id_attr(node)) do |ex|
             wrap_in_para(node, ex)
           end
         end.join("\n")
@@ -100,10 +102,11 @@ module Asciidoctor
       end
 
       def svgmap_attrs(node)
-        attr_code({ id: node.id,
-                    unnumbered: node.option?("unnumbered") ? "true" : nil,
-                    number: node.attr("number"),
-                    subsequence: node.attr("subsequence") }
+        attr_code(id_attr(node)
+          .merge(id: node.id,
+                 unnumbered: node.option?("unnumbered") ? "true" : nil,
+                 number: node.attr("number"),
+                 subsequence: node.attr("subsequence"))
         .merge(keep_attrs(node)))
       end
 
@@ -162,11 +165,10 @@ module Asciidoctor
       end
 
       def para_attrs(node)
-        attr_code(keep_attrs(node)
+        attr_code(id_attr(node).merge(keep_attrs(node)
           .merge(align: node.attr("align"),
                  variant_title: node.role == "variant-title" ? true : nil,
-                 type: node.attr("type"),
-                 id: Metanorma::Utils::anchor_or_uuid(node)))
+                 type: node.attr("type"))))
       end
 
       def paragraph(node)
@@ -180,9 +182,8 @@ module Asciidoctor
       end
 
       def quote_attrs(node)
-        attr_code(keep_attrs(node)
-          .merge(align: node.attr("align"),
-                 id: Metanorma::Utils::anchor_or_uuid(node)))
+        attr_code(id_attr(node).merge(keep_attrs(node))
+          .merge(align: node.attr("align")))
       end
 
       def quote_attribution(node, out)
@@ -206,12 +207,11 @@ module Asciidoctor
       end
 
       def listing_attrs(node)
-        attr_code(keep_attrs(node)
+        attr_code(id_attr(node).merge(keep_attrs(node)
                   .merge(lang: node.attr("language"),
-                         id: Metanorma::Utils::anchor_or_uuid(node),
                          unnumbered: node.option?("unnumbered") ? "true" : nil,
                          number: node.attr("number"),
-                         filename: node.attr("filename")))
+                         filename: node.attr("filename"))))
       end
 
       # NOTE: html escaping is performed by Nokogiri

data/lib/asciidoctor/standoc/blocks_notes.rb

@@ -2,24 +2,21 @@ module Asciidoctor
   module Standoc
     module Blocks
       def termnote_attrs(node)
-        attr_code(
-          id_attr(node).merge(
+        attr_code(id_attr(node).merge(keep_attrs(node)
+          .merge(
             unnumbered: node.attr("unnumbered"),
             number: node.attr("number"),
             subsequence: node.attr("subsequence"),
-            "keep-with-next": node.attr("keep-with-next"),
-            "keep-lines-together": node.attr("keep-with-next"),
-            "keep-separate": node.attr("keep-separate")
-          )
-        )
+            "keep-separate": node.attr("keep-separate"),
+          )))
       end
 
       def note_attrs(node)
         attr_code(
           termnote_attrs(node).merge(
             type: node.attr("type"),
-            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil
-          )
+            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil,
+          ),
         )
       end
 
@@ -27,8 +24,8 @@ module Asciidoctor
         todo_attrs(node).merge(
           attr_code(
             from: node.attr("from"),
-            to: node.attr("to") || node.attr("from")
-          )
+            to: node.attr("to") || node.attr("from"),
+          ),
         )
       end
 
@@ -45,11 +42,10 @@ module Asciidoctor
       def todo_attrs(node)
         date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
         date += "T00:00:00Z" unless /T/.match? date
-        attr_code(
-          id: ::Metanorma::Utils::anchor_or_uuid(node),
-          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
-          date: date
-        )
+        attr_code(id_attr(node)
+          .merge(reviewer: node.attr("reviewer") || node.attr("source") ||
+                 "(Unknown)",
+                 date: date))
       end
 
       def todo(node)
@@ -81,12 +77,11 @@ module Asciidoctor
         a = node.attr("type") and ["danger", "safety precautions"].each do |t|
           name = t if a.casecmp(t).zero?
         end
-        attr_code(
-          keep_attrs(node).merge(
-            id: Metanorma::Utils::anchor_or_uuid(node), type: name,
-            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil
-          )
-        )
+        attr_code(keep_attrs(node).merge(id_attr(node)
+          .merge(
+            type: name,
+            beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil,
+          )))
       end
 
       def admonition(node)

data/lib/asciidoctor/standoc/cleanup.rb

@@ -9,6 +9,7 @@ require_relative "./cleanup_ref_dl"
 require_relative "./cleanup_boilerplate"
 require_relative "./cleanup_section"
 require_relative "./cleanup_terms"
+require_relative "./cleanup_symbols"
 require_relative "./cleanup_xref"
 require_relative "./cleanup_inline"
 require_relative "./cleanup_amend"
@@ -41,6 +42,7 @@ module Asciidoctor
         symbols_cleanup(xmldoc)
         xref_cleanup(xmldoc)
         concept_cleanup(xmldoc)
+        related_cleanup(xmldoc)
         origin_cleanup(xmldoc)
         bookmark_cleanup(xmldoc)
         termdef_cleanup(xmldoc)
@@ -73,7 +75,8 @@ module Asciidoctor
         %w{status language script version author name callout phone email
            street city state country postcode identifier referenceFrom surname
            referenceTo docidentifier docnumber prefix initial addition forename
-           title draft secretariat title-main title-intro title-part}.freeze
+           title draft secretariat title-main title-intro title-part
+           verbaldefinition nonverbalrepresentation}.freeze
 
       # it seems Nokogiri::XML is treating the content of <script> as cdata,
       # because of its use in HTML. Bad nokogiri. Undoing that, since we use
@@ -83,7 +86,9 @@ module Asciidoctor
       end
 
       def empty_element_cleanup(xmldoc)
-        xmldoc.xpath("//" + TEXT_ELEMS.join(" | //")).each do |x|
+        xmldoc.xpath("//#{TEXT_ELEMS.join(' | //')}").each do |x|
+          next if x.name == "name" && x.parent.name == "expression"
+
           x.remove if x.children.empty?
         end
       end
@@ -108,19 +113,23 @@ module Asciidoctor
             n.name != "variant" && (!n.text? || !n.text.gsub(/\s/, "").empty?)
           end
 
-          c.xpath("./variant").each do |n|
-            if n.at_xpath("preceding-sibling::node()"\
-                          "[not(self::text()[not(normalize-space())])][1]"\
-                          "[self::variantwrap]")
-              n.previous_element << n
-            else
-              n.replace("<variantwrap/>").first << n
-            end
-          end
+          variant_cleanup1(c)
         end
         xmldoc.xpath("//variantwrap").each { |n| n.name = "variant" }
       end
 
+      def variant_cleanup1(elem)
+        elem.xpath("./variant").each do |n|
+          if n.at_xpath("preceding-sibling::node()"\
+                        "[not(self::text()[not(normalize-space())])][1]"\
+                        "[self::variantwrap]")
+            n.previous_element << n
+          else
+            n.replace("<variantwrap/>").first << n
+          end
+        end
+      end
+
       def variant_space_cleanup(xmldoc)
         xmldoc.xpath("//*[variant]").each do |c|
           if c&.next&.text? && c&.next&.next&.name == "variant"

data/lib/asciidoctor/standoc/cleanup_image.rb

@@ -15,9 +15,8 @@ module Asciidoctor
       def svgmap_moveattrs(xmldoc)
         xmldoc.xpath("//svgmap").each do |s|
           f = s.at(".//figure") or next
-          if (t = s.at("./name")) && !f.at("./name")
+          (t = s.at("./name")) && !f.at("./name") and
             f.children.first.previous = t.remove
-          end
           if s["id"] && guid?(f["id"])
             f["id"] = s["id"]
             s.delete("id")
@@ -26,13 +25,13 @@ module Asciidoctor
         end
       end
 
-      def svgmap_moveattrs1(s, f)
+      def svgmap_moveattrs1(svgmap, figure)
         %w(unnumbered number subsequence keep-with-next
-           keep-lines-together).each do |a|
-          next if f[a] || !s[a]
+           keep-lines-together tag multilingual-rendering).each do |a|
+          next if figure[a] || !svgmap[a]
 
-          f[a] = s[a]
-          s.delete(a)
+          figure[a] = svgmap[a]
+          svgmap.delete(a)
         end
       end
 

data/lib/asciidoctor/standoc/cleanup_inline.rb

@@ -1,4 +1,5 @@
 require "metanorma-utils"
+require "digest"
 
 module Asciidoctor
   module Standoc
@@ -59,13 +60,26 @@ module Asciidoctor
         xmldoc.xpath("//concept[not(termxref)]").each do |x|
           term = x.at("./refterm")
           term&.remove if term&.text&.empty?
-          x.children.remove if x&.children&.text&.strip&.empty?
-          key_extract_locality(x)
-          if /:/.match?(x["key"]) then concept_termbase_cleanup(x)
-          elsif refid? x["key"] then concept_eref_cleanup(x)
-          else concept_xref_cleanup(x)
-          end
-          x.delete("key")
+          concept_cleanup1(x)
+        end
+      end
+
+      def concept_cleanup1(elem)
+        elem.children.remove if elem&.children&.text&.strip&.empty?
+        key_extract_locality(elem)
+        if /:/.match?(elem["key"]) then concept_termbase_cleanup(elem)
+        elsif refid? elem["key"] then concept_eref_cleanup(elem)
+        else concept_xref_cleanup(elem)
+        end
+        elem.delete("key")
+      end
+
+      def related_cleanup(xmldoc)
+        xmldoc.xpath("//related[not(termxref)]").each do |x|
+          term = x.at("./refterm")
+          term.replace("<preferred>#{term_expr(term.children.to_xml)}"\
+                       "</preferred>")
+          concept_cleanup1(x)
         end
       end
 
@@ -112,6 +126,7 @@ module Asciidoctor
       def anchor_cleanup(elem)
         anchor_cleanup1(elem)
         xreftarget_cleanup(elem)
+        contenthash_id_cleanup(elem)
       end
 
       def anchor_cleanup1(elem)
@@ -137,6 +152,29 @@ module Asciidoctor
           end
         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 = doc.xpath("//*[@id]").each_with_object({}) do |x, m|
+          next unless guid?(x["id"])
+
+          m[x["id"]] = contenthash(x)
+          x["id"] = m[x["id"]]
+        end
+        [%w(review from), %(review to), %(callout target), %(eref bibitemid),
+         %(citation bibitemid), %(xref target), %(xref to)].each do |a|
+          doc.xpath("//#{a[0]}").each { |x| ids[a[1]] and x[a[1]] = ids[a[1]] }
+        end
+      end
+
+      def contenthash(elem)
+        Digest::MD5.hexdigest("#{elem.path}////#{elem.text}")
+          .sub(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "_\\1-\\2-\\3-\\4-\\5")
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/cleanup_maths.rb

@@ -69,13 +69,12 @@ module Asciidoctor
         return false if char.length > 1
 
         if /\p{Greek}/.match?(char)
-          /\p{Lower}/.match(char) && !mathml_mi_italics[:lowergreek] ||
-            /\p{Upper}/.match(char) && !mathml_mi_italics[:uppergreek]
+          (/\p{Lower}/.match(char) && !mathml_mi_italics[:lowergreek]) ||
+            (/\p{Upper}/.match(char) && !mathml_mi_italics[:uppergreek])
         elsif /\p{Latin}/.match?(char)
-          /\p{Lower}/.match(char) && !mathml_mi_italics[:lowerroman] ||
-            /\p{Upper}/.match(char) && !mathml_mi_italics[:upperroman]
-        else
-          false
+          (/\p{Lower}/.match(char) && !mathml_mi_italics[:lowerroman]) ||
+            (/\p{Upper}/.match(char) && !mathml_mi_italics[:upperroman])
+        else false
         end
       end
 

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -84,6 +84,11 @@ module Asciidoctor
         biblio_reorder(xmldoc)
         biblio_nested(xmldoc)
         biblio_renumber(xmldoc)
+        biblio_no_ext(xmldoc)
+      end
+
+      def biblio_no_ext(xmldoc)
+        xmldoc.xpath("//bibitem/ext").each(&:remove)
       end
 
       def biblio_nested(xmldoc)

data/lib/asciidoctor/standoc/cleanup_reqt.rb

@@ -86,33 +86,14 @@ module Asciidoctor
           ins = reqt.children.first
         end
         %w(obligation model type).each do |a|
-          reqt_dl_to_attrs(reqt, dlist, a)
+          dl_to_attrs(reqt, dlist, a)
         end
         requirement_metadata1_tags.each do |a|
-          ins = reqt_dl_to_elems(ins, reqt, dlist, a)
+          ins = dl_to_elems(ins, reqt, dlist, a)
         end
         reqt_dl_to_classif(ins, reqt, dlist)
       end
 
-      def reqt_dl_to_attrs(reqt, dlist, name)
-        e = dlist.at("./dt[text()='#{name}']") or return
-        val = e.at("./following::dd/p") || e.at("./following::dd") or return
-        reqt[name] = val.text
-      end
-
-      def reqt_dl_to_elems(ins, reqt, dlist, name)
-        if a = reqt.at("./#{name}[last()]")
-          ins = a
-        end
-        dlist.xpath("./dt[text()='#{name}']").each do |e|
-          val = e.at("./following::dd/p") || e.at("./following::dd")
-          val.name = name
-          ins.next = val
-          ins = ins.next
-        end
-        ins
-      end
-
       def reqt_dl_to_classif(ins, reqt, dlist)
         if a = reqt.at("./classification[last()]") then ins = a end
         dlist.xpath("./dt[text()='classification']").each do |e|