metanorma-standoc 3.0.8 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6effed725121e1f1924a44b86be0de3ebd4bcf5cc1349b07c3933a1b8666ffdf
-  data.tar.gz: 3def10482963835400c5f5e9c7f1283ba26311a1bd82da6319633ab6186ea561
+  metadata.gz: db6d5e84280a719a76127b82021c52b54a140d3238f49ee7a5ac7c972d142e37
+  data.tar.gz: a0b7796f74365c18f35d05b27bffc7fbb369def03e1d29753ddeb7adbc9bef86
 SHA512:
-  metadata.gz: 39cd5c14eebf34d92214d6c76c9f8cd2aa72e4eed77d31998d629174096439dcab567326d565c7540e3ffe1aa7dfcd87c11f7f31148f6bc4a1895adad240dab6
-  data.tar.gz: f88823d2442c1ce9eadb24b34985cc5aba32a121531c01341a1da0483ce9273dc881a90f32ce22319018458028bffd0feb313584c11e39aa088badf298b3f4eb
+  metadata.gz: f6991e701daa845955fc12f72f602eab1947ff397ecad2e8514e3ec9a9b04fdfa68fa0e6d946b3a8d53ae6d1feb8fcb78ff81f5d71e17ffa580157cda891ccde
+  data.tar.gz: d9025688e127d12e7103537af3d8d6f50b8d1c6a67eff352a365a0ebcb67acb7d976bbfb391dd30980df56b193bf3a56c99d98db6f326e4ede057cc29b3bf935

data/lib/isodoc/html/htmlstyle.css

@@ -320,8 +320,6 @@ h6:hover > a.anchor,
 
 svg {
   width: 100%;
-  padding-bottom: 92%;
-  height: 1px;
   overflow: visible;
 }
 

data/lib/metanorma/standoc/anchor.rb

@@ -121,7 +121,7 @@ module Metanorma
         @fn_number ||= 0
         noko do |xml|
           @fn_number += 1
-          xml.fn reference: @fn_number do |fn|
+          xml.fn **attr_code(id_attr(nil).merge(reference: @fn_number)) do |fn|
             fn.p { |p| p << node.text }
           end
         end

data/lib/metanorma/standoc/blocks.rb

@@ -47,6 +47,13 @@ module Metanorma
         result
       end
 
+      def block_title(node, out)
+        node.title.nil? and return
+        out.name **attr_code(id_attr(nil)) do |name|
+          name << node.title
+        end
+      end
+
       def form_attrs(node)
         attr_code(id_attr(node)
           .merge(class: node.attr("class"),
@@ -68,7 +75,7 @@ module Metanorma
       def literal(node)
         noko do |xml|
           xml.figure **literal_attrs(node) do |f|
-            figure_title(node, f)
+            block_title(node, f)
             pre_attrs = id_attr(node).tap { |h| h.delete(:anchor) }
               .merge(alt: node.attr("alt"))
             f.pre node.lines.join("\n"), **attr_code(pre_attrs)
@@ -128,7 +135,7 @@ module Metanorma
         node.blocks.each { |b| b.remove_sub(:replacements) }
         noko do |xml|
           xml.figure **example_attrs(node).merge(class: "pseudocode") do |ex|
-            figure_title(node, ex)
+            block_title(node, ex)
             wrap_in_para(node, ex)
           end
         end
@@ -141,7 +148,7 @@ module Metanorma
       def example_proper(node)
         noko do |xml|
           xml.example **example_attrs(node) do |ex|
-            node.title.nil? or ex.name { |name| name << node.title }
+            block_title(node, xml)
             wrap_in_para(node, ex)
           end
         end
@@ -203,7 +210,7 @@ module Metanorma
       def listing(node)
         fragment = ::Nokogiri::XML::Builder.new do |xml|
           xml.sourcecode **listing_attrs(node) do |s|
-            figure_title(node, s)
+            block_title(node, s)
             s.body do |b|
               b << node.content
             end
@@ -232,7 +239,7 @@ module Metanorma
 
       # need to validate Metanorma XML before it passes to textcleanup,
       # where passthrough wrapper and escaped tags are removed:
-      # <passthrough format="metanorma>&lt;tag&gt</passthrough> => <tag>
+      # <passthrough formats="metanorma>&lt;tag&gt</passthrough> => <tag>
       # Do not treat not well-formed XML as invalid,
       # as it may be fragment, e.g. unterminated start of element markup
       def passthrough_validate(node, content, encoded_content)

data/lib/metanorma/standoc/blocks_image.rb

@@ -10,7 +10,7 @@ module Metanorma
           xml.svgmap **attr_code(svgmap_attrs(node).merge(
                                    src: node.attr("src"), alt: node.attr("alt"),
                                  )) do |ex|
-            figure_title(node, ex)
+            block_title(node, ex)
             ex << node.content
           end
         end
@@ -19,17 +19,12 @@ module Metanorma
       def figure_example(node)
         noko do |xml|
           xml.figure **figure_attrs(node) do |ex|
-            node.title.nil? or ex.name { |name| name << node.title }
+            block_title(node, ex)
             wrap_in_para(node, ex)
           end
         end
       end
 
-      def figure_title(node, out)
-        node.title.nil? and return
-        out.name { |name| name << node.title }
-      end
-
       def figure_attrs(node)
         attr_code(id_unnum_attrs(node).merge(keep_attrs(node))
           .merge(class: node.attr("class"),
@@ -39,7 +34,7 @@ module Metanorma
       def image(node)
         noko do |xml|
           xml.figure **figure_attrs(node) do |f|
-            figure_title(node, f)
+            block_title(node, f)
             f.image **(image_attributes(node).tap { |h| h.delete(:anchor) })
           end
         end

data/lib/metanorma/standoc/blocks_notes.rb

@@ -96,7 +96,7 @@ module Metanorma
         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 }
+            block_title(node, a)
             wrap_in_para(node, a)
           end
         end

data/lib/metanorma/standoc/cleanup.rb

@@ -29,10 +29,12 @@ module Metanorma
       def cleanup(xmldoc)
         @doctype = xmldoc.at("//bibdata/ext/doctype")&.text
         element_name_cleanup(xmldoc)
-        passthrough_cleanup(xmldoc)
+        source_include_cleanup(xmldoc) # feeds: misccontainer_cleanup
+        passthrough_cleanup(xmldoc) # feeds: smartquotes_cleanup
         unnumbered_blocks_cleanup(xmldoc)
         termdocsource_cleanup(xmldoc) # feeds: metadata_cleanup
         metadata_cleanup(xmldoc) # feeds: boilerplate_cleanup
+        misccontainer_cleanup(xmldoc)
         sections_cleanup(xmldoc) # feeds: obligations_cleanup, toc_cleanup,
         # floatingtitle_cleanup
         obligations_cleanup(xmldoc)
@@ -89,10 +91,12 @@ module Metanorma
         linebreak_cleanup(xmldoc)
         variant_cleanup(xmldoc)
         para_cleanup(xmldoc)
+        source_id_cleanup(xmldoc)
         empty_element_cleanup(xmldoc)
         img_cleanup(xmldoc)
         anchor_cleanup(xmldoc)
         link_cleanup(xmldoc)
+        passthrough_metanorma_cleanup(xmldoc)
         xmldoc
       end
 

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -52,7 +52,7 @@ module Metanorma
         i = i.add_child("<references hidden='true' normative='false'/>").first
         refs.each do |x|
           i << <<~BIB
-            <bibitem anchor="#{x}" id="_#{UUIDTools::UUID.random_create}" type="internal">
+            <bibitem anchor="#{x}" #{add_id_text} type="internal">
             <docidentifier type="repository">#{x.sub(/^#{prefix}_/, "#{prefix}/")}</docidentifier>
             </bibitem>
           BIB

data/lib/metanorma/standoc/cleanup_bibitem.rb

@@ -174,7 +174,7 @@ module Metanorma
         @datauriattachment and
           f = File.join(@attachmentsdir, File.basename(path))
         Pathname.new(File.expand_path(f))
-          .relative_path_from(Pathname.new(File.expand_path(@localdir))).to_s
+          .relative_path_from(Pathname.new(File.expand_path(@output_dir))).to_s
       end
 
       def datauri_attachment(path, doc)
@@ -182,7 +182,7 @@ module Metanorma
         m = add_misc_container(doc)
         f = attachment_location(path)
         e = (m << "<attachment name='#{f}'/>").last_element_child
-        Vectory::Utils::datauri(path, @localdir).scan(/.{1,60}/)
+        Vectory::Utils::datauri(path, @output_dir).scan(/.{1,60}/)
           .each { |dd| e << "#{dd}\n" }
         f
       end
@@ -196,6 +196,7 @@ module Metanorma
       end
 
       def init_attachments
+        @datauriattachment or return
         @attachmentsdir and return
         @attachmentsfld = "_#{@filename}_attachments"
         @attachmentsdir = File.join(@output_dir, @attachmentsfld)

data/lib/metanorma/standoc/cleanup_footnotes.rb

@@ -94,6 +94,7 @@ module Metanorma
       def footnote_block_cleanup(xmldoc)
         ids = xmldoc.xpath("//footnoteblock").each_with_object([]) do |f, m|
           f.name = "fn"
+          add_id(f)
           m << f.text
           if id = xmldoc.at("//*[@anchor = '#{f.text}']")
             f.children = id.dup.children

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -137,7 +137,6 @@ module Metanorma
 
       def contenthash_id_cleanup(doc)
         @contenthash_ids = contenthash_id_make(doc)
-        #contenthash_id_update_idrefs(doc, @contenthash_ids)
       end
 
       def contenthash_id_make(doc)
@@ -150,14 +149,6 @@ module Metanorma
         end
       end
 
-      def contenthash_id_update_idrefs(doc, ids)
-        Metanorma::Utils::anchor_attributes.each do |a|
-          doc.xpath("//#{a[0]}").each do |x|
-            ids[x[a[1]]] and x[a[1]] = ids[x[a[1]]]
-          end
-        end
-      end
-
       def contenthash(elem)
         Digest::MD5.hexdigest("#{elem.path}////#{elem.text}")
           .sub(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, "_\\1-\\2-\\3-\\4-\\5")
@@ -168,14 +159,17 @@ module Metanorma
           p.name = "passthrough"
           p.children = select_odd_chars(p.children.to_xml)
         end
-        doc.xpath("//passthrough[@format = 'metanorma']").each do |p|
-          p.replace(p.children)
-        end
         doc.xpath("//identifier").each do |p|
           p.children = select_odd_chars(p.children.to_xml)
         end
       end
 
+      def passthrough_metanorma_cleanup(doc)
+        doc.xpath("//passthrough[@formats = 'metanorma']").each do |p|
+          p.replace(p.children)
+        end
+      end
+
       def link_cleanup(xmldoc)
         uri_cleanup(xmldoc)
       end
@@ -193,6 +187,13 @@ module Metanorma
         CGI.escape(comp).gsub("+", "%20")
       end
 
+      def source_id_cleanup(xmldoc)
+        xmldoc.xpath("//span[normalize-space(.)=''][@source]").each do |s|
+          s.parent["source"] = s["source"]
+          s.remove
+        end
+      end
+
       private
 
       # skip ZWNJ inserted to prevent regexes operating in asciidoctor

data/lib/metanorma/standoc/cleanup_section.rb

@@ -124,7 +124,6 @@ module Metanorma
       end
 
       def sections_cleanup(xml)
-        misccontainer_cleanup(xml)
         sections_order_cleanup(xml)
         sections_level_cleanup(xml)
         sections_names_cleanup(xml)
@@ -133,9 +132,32 @@ module Metanorma
       end
 
       def misccontainer_cleanup(xml)
-        m = xml.at("//misc-container-clause") or return
+        m = xml.xpath("//metanorma-extension-clause")
+        m.empty? and return
         ins = add_misc_container(xml)
-        ins << m.remove.children
+        m.each do |m1|
+          ins << m1.remove.children
+        end
+      end
+
+      def source_include_cleanup(xml)
+        xml.xpath("//source-include").each do |s|
+          f = File.join(@localdir, s["path"])
+          s.remove
+          r = source_sanitise(File.read(f))
+          xml.root << <<~XML
+            <metanorma-extension-clause>
+            <clause>
+            <title #{add_id_text}>#{s['path']}</title>
+            <source>#{r} </source>
+            </clause>
+            </metanorma-extension-clause>
+          XML
+        end
+      end
+
+      def source_sanitise(code)
+        code
       end
 
       def single_clause_annex(xml)

data/lib/metanorma/standoc/cleanup_section_names.rb

@@ -9,7 +9,9 @@ module Metanorma
             node.children.first.previous = "<title/>"
           end
         end
-        node.at("./title")
+        ret = node.at("./title")
+        add_id(ret)
+        ret
       end
 
       def replace_title(doc, xpath, text, first = false)
@@ -149,7 +151,6 @@ module Metanorma
         path = section_containers.map { |x| "./ancestor::#{x}" }.join(" | ")
         xml.xpath("//p[@variant_title]").each do |p|
           p.name = "variant-title"
-          p.delete("id")
           p.delete("variant_title")
           p.xpath("(#{path})[last()]").each do |sect|
             (ins = sect.at("./title") and ins.next = p) or

data/lib/metanorma/standoc/cleanup_terms.rb

@@ -34,6 +34,7 @@ module Metanorma
         xmldoc.xpath("//term[not(definition)]").each do |d|
           first_child = d.at(TERMDEF_BLOCKS) || next
           t = Nokogiri::XML::Element.new("definition", xmldoc)
+          add_id(t)
           first_child.replace(t)
           t << first_child.remove
           d.xpath(TERMDEF_BLOCKS).each do |n|
@@ -45,10 +46,13 @@ module Metanorma
       def split_termdefinitions(xmldoc)
         xmldoc.xpath("//definition").each do |d|
           if d.at("./p | ./ol | ./dl | ./ul")
-            d.children = "<verbal-definition>#{d.children}</verbal-definition>"
+            d.children = <<~XML.strip
+              <verbal-definition #{add_id_text}>#{d.children}</verbal-definition>
+            XML
           else
-            d.children = "<non-verbal-representation>" \
-                         "#{d.children}</non-verbal-representation>"
+            d.children = <<~XML.strip
+              <non-verbal-representation #{add_id_text}>#{d.children}</non-verbal-representation>
+            XML
           end
         end
       end
@@ -124,9 +128,16 @@ module Metanorma
         termdefinition_cleanup(xmldoc)
         termdomain1_cleanup(xmldoc)
         termnote_example_cleanup(xmldoc)
+        term_id_attr_cleanup(xmldoc)
         term_children_cleanup(xmldoc)
       end
 
+      def term_id_attr_cleanup(xmldoc)
+        xmldoc.xpath("//usage-info[@id]").each do |u|
+          u.delete("id")
+        end
+      end
+
       def term_index_cleanup(xmldoc)
         @index_terms or return
         xmldoc.xpath("//preferred").each do |p|

data/lib/metanorma/standoc/cleanup_text.rb

@@ -32,19 +32,21 @@ module Metanorma
           e[:skip] and next
           lines = lines_strip_textspan(e, block[i + 1])
           out = Metanorma::Utils.line_sanitise(lines)
-          # e[:last] or out.pop
+          e[:last] or out.pop
+          /\s$/.match?(e[:text][-1]) or out[-1].rstrip!
           e[:elem].replace(out.join)
         end
       end
 
-      def lines_strip_textspan(span, _nextspan)
+      def lines_strip_textspan(span, nextspan)
         lines = span[:text].lines[0..-2].map(&:rstrip) <<
           span[:text].lines[-1]&.sub(/\n$/, "")
         # no final line rstrip: can be space linking to next line
-        # span[:last] or lines << nextspan[:text].lines.first # next token context
+        span[:last] or lines << nextspan[:text].lines.first # next token context
         lines
       end
 
+      # TODO: we are not counting empty xref, eref here
       def gather_text_for_linebreak_cleanup(block)
         x = block.xpath(".//text()").map do |e|
           { elem: e, text: e.text, stem: ancestor_include?(e, %w(stem)),

data/lib/metanorma/standoc/converter.rb

@@ -35,11 +35,12 @@ module Metanorma
         block_macro Metanorma::Plugin::Lutaml::LutamlKlassTableBlockMacro
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
+        preprocessor Metanorma::Standoc::PassProtectPreprocessor
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Metanorma::Standoc::Datamodel::DiagramPreprocessor
-        preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
-        preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
-        preprocessor Metanorma::Plugin::Datastruct::Data2TextPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::Json2TextPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::Yaml2TextPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::Data2TextPreprocessor
         preprocessor Metanorma::Plugin::Glossarist::DatasetPreprocessor
         preprocessor Metanorma::Standoc::NamedEscapePreprocessor
         inline_macro Metanorma::Standoc::PreferredTermInlineMacro
@@ -69,11 +70,14 @@ module Metanorma
         inline_macro Metanorma::Standoc::FormSelectMacro
         inline_macro Metanorma::Standoc::FormOptionMacro
         inline_macro Metanorma::Standoc::ToCInlineMacro
-        inline_macro Metanorma::Standoc::PassInlineMacro
+        inline_macro Metanorma::Standoc::PassFormatInlineMacro
         inline_macro Metanorma::Standoc::StdLinkInlineMacro
         inline_macro Metanorma::Standoc::NumberInlineMacro
         inline_macro Metanorma::Standoc::TrStyleInlineMacro
         inline_macro Metanorma::Standoc::TdStyleInlineMacro
+        inline_macro Metanorma::Standoc::AnchorInlineMacro
+        inline_macro Metanorma::Standoc::SourceIdInlineMacro
+        inline_macro Metanorma::Standoc::SourceIncludeInlineMacro
         block Metanorma::Standoc::ToDoAdmonitionBlock
         block Metanorma::Standoc::EditorAdmonitionBlock
         treeprocessor Metanorma::Standoc::EditorInlineAdmonitionBlock
@@ -103,15 +107,20 @@ module Metanorma
       $xreftext = {}
 
       def initialize(backend, opts)
+        doc = opts&.dig(:document)
+        doc&.delete_attribute("sectids") # no autoassign sect ids from title
         super
         basebackend "html"
         outfilesuffix ".xml"
         @libdir = File.dirname(self.class::_file || __FILE__)
         @c = HTMLEntities.new
-        unless opts && @log = opts[:document]&.options&.dig(:log)
-          @log = Metanorma::Utils::Log.new
-          @local_log = true
-        end
+        local_log(doc)
+      end
+
+      def local_log(doc)
+        @log = doc&.options&.dig(:log) and return
+        @log = Metanorma::Utils::Log.new
+        @local_log = true
       end
 
       class << self

data/lib/metanorma/standoc/init.rb

@@ -105,14 +105,20 @@ module Metanorma
         @output_dir = outputdir node
       end
 
+      def i18nyaml_path(node)
+        if i18nyaml = node.attr("i18nyaml")
+          (Pathname.new i18nyaml).absolute? or
+            i18nyaml = File.join(@localdir, i18nyaml)
+        end
+        i18nyaml
+      end
+
       def init_i18n(node)
         @lang = node.attr("language") || "en"
         @script = node.attr("script") ||
           Metanorma::Utils.default_script(node.attr("language"))
         @locale = node.attr("locale")
-        i18nyaml = node.attr("i18nyaml")
-        i18nyaml &&= File.join(@localdir, i18nyaml)
-        @isodoc = isodoc(@lang, @script, @locale, i18nyaml)
+        @isodoc = isodoc(@lang, @script, @locale, i18nyaml_path(node))
         @i18n = @isodoc.i18n
       end
 

data/lib/metanorma/standoc/inline.rb

@@ -13,6 +13,11 @@ module Metanorma
         end
       end
 
+      def pass(node)
+        require "debug"; binding.b
+        "<passthrough-inline formats='metanorma'>#{node.content}</passthrough-inline>"
+      end
+
       def page_break(node)
         attrs = {}
         node.option?("landscape") and attrs[:orientation] = "landscape"

data/lib/metanorma/standoc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-<!-- VERSION v2.0.5 -->
+<!-- VERSION v2.0.7 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -76,6 +76,7 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
         <a:documentation>Title proper for a clause</a:documentation>
+        <ref name="RequiredId"/>
         <zeroOrMore>
           <ref name="TextElement"/>
         </zeroOrMore>
@@ -83,10 +84,19 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <zeroOrMore>
         <element name="variant-title">
           <a:documentation>Alternate title for a clause</a:documentation>
+          <ref name="RequiredId"/>
           <ref name="TypedTitleString"/>
         </element>
       </zeroOrMore>
     </define>
+    <define name="tname">
+      <element name="name">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="NestedTextElement"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="UlBody">
       <optional>
         <ref name="tname">
@@ -475,6 +485,7 @@ normative or informative references, some split references into sections organiz
     <!-- exclude figures? -->
     <define name="dd">
       <element name="dd">
+        <ref name="OptionalId"/>
         <zeroOrMore>
           <!-- exclude figures? -->
           <ref name="BasicBlock"/>
@@ -526,6 +537,7 @@ normative or informative references, some split references into sections organiz
       </choice>
     </define>
     <define name="TrAttributes">
+      <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
           <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -595,6 +607,7 @@ gives an explicit page orientation</a:documentation>
   </include>
   <!-- end overrides -->
   <define name="FnAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="hiddenref">
         <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
@@ -604,6 +617,7 @@ This is done if the footnote reference is already presented in some other form,
     </optional>
   </define>
   <define name="TdAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
         <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -801,6 +815,12 @@ titlecase, or lowercase</a:documentation>
         <a:documentation>User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
   </define>
   <define name="OptionalId" combine="interleave">
     <optional>
@@ -808,6 +828,12 @@ titlecase, or lowercase</a:documentation>
         <a:documentation> User-supplied anchor of element; replaced by content-based id, with all references to the anchor updated accordingly</a:documentation>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="source">
+        <a:documentation>Sourcing of the current element in an external data model</a:documentation>
+        <ref name="IdRefType"/>
+      </attribute>
+    </optional>
   </define>
   <define name="ObligationType">
     <a:documentation>The force of a clause in a standard document: whether it has normative or informative effect</a:documentation>
@@ -954,6 +980,7 @@ titlecase, or lowercase</a:documentation>
 is used in particular to capture mutually agreed definitions of codepoints in Unicode Private Use Area</a:documentation>
         </attribute>
       </optional>
+      <ref name="OptionalId"/>
       <oneOrMore>
         <ref name="TextElement">
           <a:documentation>Textual content of span</a:documentation>
@@ -1808,7 +1835,7 @@ used in document amendments</a:documentation>
     </element>
   </define>
   <define name="TermAttributes">
-    <ref name="OptionalId"/>
+    <ref name="RequiredId"/>
     <ref name="LocalizedStringAttributes"/>
     <ref name="BlockAttributes"/>
   </define>
@@ -2151,6 +2178,7 @@ used in document amendments</a:documentation>
   <define name="termdefinition">
     <a:documentation>The definition of a term applied in the current document</a:documentation>
     <element name="definition">
+      <ref name="RequiredId"/>
       <optional>
         <attribute name="type">
           <a:documentation>Type of definition, used to differentiate it from other definitions of the same term if present</a:documentation>
@@ -2172,6 +2200,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="verbaldefinition">
     <element name="verbal-definition">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
@@ -2192,6 +2221,7 @@ used in document amendments</a:documentation>
   <define name="nonverbalrep">
     <a:documentation>Non-verbal representation of the term</a:documentation>
     <element name="non-verbal-representation">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the non-verbal representation of the term</a:documentation>

data/lib/metanorma/standoc/lists.rb

@@ -85,7 +85,7 @@ module Metanorma
           xml_dl.dd
           return
         end
-        xml_dl.dd do |xml_dd|
+        xml_dl.dd **dl_attrs(ddefn) do |xml_dd|
           xml_dd.p { |t| t << ddefn.text } if ddefn.text?
           xml_dd << ddefn.content if ddefn.blocks?
         end
@@ -122,7 +122,7 @@ module Metanorma
       end
 
       def list_caption(node, out)
-        a = node.title and out.name { |n| n << a }
+        block_title(node, out)
       end
     end
   end