metanorma-standoc 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25f4c5a4250a14fb1499512d51f25cf8ea7b1cc6dc7da44560dc442342a54773
-  data.tar.gz: 10dd5ba69da52963c0e9310834212fc5e74743f660a4cf533efdd721037f5f5d
+  metadata.gz: 6a5cc91caf1f8d674aeff3b46209557d7be11087bf59728df07a73b26cec880a
+  data.tar.gz: 7b674d7c013a3e5aee09394c085ee40dbbed6e241ffb14a14b363ca5956636f5
 SHA512:
-  metadata.gz: dbc30f8112130ea49edcfabf97fedc1d3934f41a09163369fb74ba754eb5d11e861e040df17b15e2f865b7f5bb43d8513a76f859bc192eb2f30f23e4dea67232
-  data.tar.gz: 2ce49c90d894757b2964c4922b702bfb54c24f5e8d53a530a399692f6003042d8c9d44f5ebbc57110d6c56bc3d18fc17650e2511c8b102e38dce2a0d7b85fd41
+  metadata.gz: dab0eafeeb100111eecdd7ae0eeb3a23dd1b60acdbf1fc884a7fba6084db22bc816c8255c230a16eb4ab0fc68555378586106145545672a5b39d444e8a3f97c8
+  data.tar.gz: 1f6ffc49435ffebec0441fafbf4a6eb629216270d0d8fd38d68ad15a5d99e4e3162f3d685229827e0eb1df2a2c6d43aaf475795cbcdb143b772d5589787248ff

data/lib/asciidoctor/standoc/blocks.rb

@@ -1,5 +1,5 @@
 require "htmlentities"
-require "uri"
+require "uri" if /^2\./.match?(RUBY_VERSION)
 require_relative "./blocks_notes"
 
 module Asciidoctor

data/lib/asciidoctor/standoc/cleanup.rb

@@ -76,7 +76,7 @@ module Asciidoctor
            street city state country postcode identifier referenceFrom surname
            referenceTo docidentifier docnumber prefix initial addition forename
            title draft secretariat title-main title-intro title-part
-           verbaldefinition nonverbalrepresentation}.freeze
+           verbal-definition non-verbal-representation}.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

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -15,15 +15,18 @@ module Asciidoctor
         )
       end
 
-      def term_defs_boilerplate(div, source, term, preface, isodoc)
+      def term_defs_boilerplate(div, source, term, _preface, isodoc)
         a = @i18n.term_def_boilerplate and div.next = a
         source.each do |s|
           @anchors[s["bibitemid"]] or
             @log.add("Crossreferences", nil,
                      "term source #{s['bibitemid']} not referenced")
         end
-        a = source.empty? && term.nil? ?  @i18n.no_terms_boilerplate :
-          term_defs_boilerplate_cont(source, term, isodoc)
+        a = if source.empty? && term.nil?
+              @i18n.no_terms_boilerplate
+            else
+              term_defs_boilerplate_cont(source, term, isodoc)
+            end
         a and div.next = a
       end
 
@@ -51,10 +54,11 @@ module Asciidoctor
       end
 
       TERM_CLAUSE = "//sections/terms | "\
-        "//sections/clause[descendant::terms]".freeze
+                    "//sections/clause[descendant::terms]".freeze
 
       NORM_REF = "//bibliography/references[@normative = 'true'] | "\
-        "//bibliography/clause[.//references[@normative = 'true']]".freeze
+                 "//bibliography/clause[.//references[@normative = 'true']]"
+        .freeze
 
       def boilerplate_isodoc(xmldoc)
         x = xmldoc.dup
@@ -118,8 +122,11 @@ module Asciidoctor
 
       def boilerplate(xml, conv)
         file = boilerplate_file(xml)
-        file = File.join(@localdir, @boilerplateauthority) if @boilerplateauthority
-        !file.nil? and File.exists?(file) or return
+        if @boilerplateauthority
+          file = File.join(@localdir,
+                           @boilerplateauthority)
+        end
+        (!file.nil? and File.exists?(file)) or return
         conv.populate_template(File.read(file, encoding: "UTF-8"), nil)
       end
 
@@ -166,28 +173,29 @@ module Asciidoctor
         end
       end
 
-      def indirect_eref_to_xref(e, id)
-        loc = e&.at("./localityStack[locality[@type = 'anchor']]")&.remove&.text ||
-          e&.at("./locality[@type = 'anchor']")&.remove&.text || id
-        e.name = "xref"
-        e.delete("bibitemid")
-        e.delete("citeas")
-        e["target"] = loc
-        unless e.document.at("//*[@id = '#{loc}']")
-          e.children = %(** Missing target #{loc})
-          e["target"] = id
+      def indirect_eref_to_xref(eref, ident)
+        loc = eref&.at("./localityStack[locality[@type = 'anchor']]")
+          &.remove&.text ||
+          eref&.at("./locality[@type = 'anchor']")&.remove&.text || ident
+        eref.name = "xref"
+        eref.delete("bibitemid")
+        eref.delete("citeas")
+        eref["target"] = loc
+        unless eref.document.at("//*[@id = '#{loc}']")
+          eref.children = %(** Missing target #{loc})
+          eref["target"] = ident
         end
       end
 
       def resolve_local_indirect_erefs(xmldoc, refs, prefix)
         refs.each_with_object([]) do |r, m|
           id = r.sub(/^#{prefix}_/, "")
-          if n = xmldoc.at("//*[@id = '#{id}']") and n.at("./ancestor-or-self::*[@type = '#{prefix}']")
+          if n = xmldoc.at("//*[@id = '#{id}']") and
+              n.at("./ancestor-or-self::*[@type = '#{prefix}']")
             xmldoc.xpath("//eref[@bibitemid = '#{r}']").each do |e|
               indirect_eref_to_xref(e, id)
             end
-          else
-            m << r
+          else m << r
           end
         end
       end

data/lib/asciidoctor/standoc/cleanup_ref_dl.rb

@@ -17,45 +17,53 @@ module Asciidoctor
 
       def validate_ref_dl(bib, c)
         id = bib["id"]
-        id ||= c["id"] unless /^_/.match(c["id"]) # do not accept implicit id
+        id ||= c["id"] unless /^_/.match?(c["id"]) # do not accept implicit id
         unless id
-          @log.add("Anchors", c, "The following reference is missing an anchor:\n" + c.to_xml)
+          @log.add("Anchors", c,
+                   "The following reference is missing an anchor:\n" + c.to_xml)
           return
         end
         @refids << id
-        bib["title"] or @log.add("Bibliography", c, "Reference #{id} is missing a title")
-        bib["docid"] or @log.add("Bibliography", c, "Reference #{id} is missing a document identifier (docid)")
+        bib["title"] or
+          @log.add("Bibliography", c, "Reference #{id} is missing a title")
+        bib["docid"] or
+          @log.add("Bibliography", c,
+                   "Reference #{id} is missing a document identifier (docid)")
       end
 
       def extract_from_p(tag, bib, key)
         return unless bib[tag]
+
         "<#{key}>#{bib[tag].at('p').children}</#{key}>"
       end
 
       # if the content is a single paragraph, replace it with its children
       # single links replaced with uri
-      def p_unwrap(p)
-        elems = p.elements
+      def p_unwrap(para)
+        elems = para.elements
         if elems.size == 1 && elems[0].name == "p"
           link_unwrap(elems[0]).children.to_xml.strip
         else
-          p.to_xml.strip
+          para.to_xml.strip
         end
       end
 
-      def link_unwrap(p)
-        elems = p.elements
+      def link_unwrap(para)
+        elems = para.elements
         if elems.size == 1 && elems[0].name == "link"
-          p.at("./link").replace(elems[0]["target"].strip)
+          para.at("./link").replace(elems[0]["target"].strip)
         end
-        p
+        para
       end
 
       def dd_bib_extract(dtd)
         return nil if dtd.children.empty?
+
         dtd.at("./dl") and return dl_bib_extract(dtd)
         elems = dtd.remove.elements
-        return p_unwrap(dtd) unless elems.size == 1 && %w(ol ul).include?(elems[0].name)
+        return p_unwrap(dtd) unless elems.size == 1 &&
+          %w(ol ul).include?(elems[0].name)
+
         ret = []
         elems[0].xpath("./li").each do |li|
           ret << p_unwrap(li)
@@ -64,7 +72,7 @@ module Asciidoctor
       end
 
       def add_to_hash(bib, key, val)
-        Metanorma::Utils::set_nested_value(bib, key.split(/\./), val)
+        Metanorma::Utils::set_nested_value(bib, key.split("."), val)
       end
 
       # definition list, with at most one level of unordered lists
@@ -73,14 +81,16 @@ module Asciidoctor
         bib = {}
         key = ""
         dl.xpath("./dt | ./dd").each do |dtd|
-          dtd.name == "dt" and key = dtd.text.sub(/:+$/, "") or add_to_hash(bib, key, dd_bib_extract(dtd))
+          (dtd.name == "dt" and key = dtd.text.sub(/:+$/, "")) or
+            add_to_hash(bib, key, dd_bib_extract(dtd))
         end
         c.xpath("./clause").each do |c1|
           key = c1&.at("./title")&.text&.downcase&.strip
           next unless %w(contributor relation series).include? key
+
           add_to_hash(bib, key, dl_bib_extract(c1, true))
         end
-        if !nested and c.at("./title")
+        if !nested && c.at("./title")
           title = c.at("./title").remove.children.to_xml
           bib["title"] = [bib["title"]] if bib["title"].is_a? Hash
           bib["title"] = [bib["title"]] if bib["title"].is_a? String

data/lib/asciidoctor/standoc/cleanup_section_names.rb

@@ -21,7 +21,7 @@ module Asciidoctor
           title = get_or_make_title(node)
           fn = title.xpath("./fn")
           fn.each(&:remove)
-          title.content = text
+          title.children = text
           fn.each { |n| title << n }
         end
       end
@@ -82,7 +82,7 @@ module Asciidoctor
           p.delete("id")
           p.delete("variant_title")
           p.xpath("(#{path})[last()]").each do |sect|
-            ins = sect.at("./title") and ins.next = p or
+            (ins = sect.at("./title") and ins.next = p) or
               sect.children.first.previous = p
           end
         end

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -6,14 +6,16 @@ module Asciidoctor
     module Cleanup
       def termdomain_cleanup(xmldoc)
         xmldoc.xpath("//p/domain").each do |a|
-          prev = a.parent.previous
+          parent = a.parent
+          prev = parent.previous
           prev.next = a.remove
+          parent.text.strip.empty? and parent.remove
         end
       end
 
       def termdomain1_cleanup(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          d = t.xpath("./domain | ./subject | ./usageinfo").last or next
+          d = t.xpath("./domain | ./subject").last or next
           defn = d.at("../definition") and defn.previous = d.remove
         end
       end
@@ -21,6 +23,7 @@ module Asciidoctor
       def termdefinition_cleanup(xmldoc)
         generate_termdefinitions(xmldoc)
         split_termdefinitions(xmldoc)
+        alternate_termdefinitions(xmldoc)
       end
 
       TERMDEF_BLOCKS =
@@ -40,27 +43,28 @@ module Asciidoctor
 
       def split_termdefinitions(xmldoc)
         xmldoc.xpath("//definition").each do |d|
-          n = d.children.first
-            .add_previous_sibling("<nonverbalrepresentation/>").first
-          v = d.children.first.add_previous_sibling("<verbaldefinition/>").first
-          nonverb = false
-          d.elements.each do |e|
-            nonverb = split_termdefinitions1(e, n, v, nonverb)
+          if d.at("./p | ./ol | ./dl | ./ul")
+            d.children = "<verbal-definition>#{d.children}</verbal-definition>"
+          else
+            d.children = "<non-verbal-representation>"\
+                         "#{d.children}</non-verbal-representation>"
           end
         end
       end
 
-      def split_termdefinitions1(elem, nonverbal, verbal, nonverb)
-        case elem.name
-        when "nonverbalrepresentation", "verbaldefinition" then return nonverb
-        when "figure", "table", "formula"
-          nonverbal << elem.remove
-          nonverb = true
-        when "termsource"
-          (nonverb ? nonverbal : verbal) << elem.remove
-        else verbal << elem.remove
+      def alternate_termdefinitions(xmldoc)
+        xmldoc.xpath("//term").each do |t|
+          t.xpath("./definition").each do |d|
+            d1 = d.next_element or next
+            if (v = d.at("./verbal-definition")) &&
+                !d.at("./non-verbal-representation") &&
+                !d1.at("./verbal-definition") &&
+                nv = d1.at("./non-verbal-representation")
+              v.next = nv.remove
+              d1.remove
+            end
+          end
         end
-        nonverb
       end
 
       def termdocsource_cleanup(xmldoc)
@@ -101,8 +105,8 @@ module Asciidoctor
         term_termsource_to_designation(xmldoc)
         term_designation_reorder(xmldoc)
         termdef_from_termbase(xmldoc)
-        termdef_stem_cleanup(xmldoc)
         termdomain_cleanup(xmldoc)
+        termdef_stem_cleanup(xmldoc)
         termdefinition_cleanup(xmldoc)
         termdomain1_cleanup(xmldoc)
         termnote_example_cleanup(xmldoc)

data/lib/asciidoctor/standoc/cleanup_terms_designations.rb

@@ -3,16 +3,27 @@ module Asciidoctor
     module Cleanup
       def termdef_stem_cleanup(xmldoc)
         xmldoc.xpath("//term/p/stem").each do |a|
-          if a.parent.elements.size == 1 # para contains just a stem expression
+          if initial_formula(a.parent)
             parent = a.parent
             parent.replace("<admitted>#{term_expr(a.to_xml)}</admitted>")
           end
         end
+        xmldoc.xpath("//term/formula").each do |a|
+          if initial_formula(a)
+            a.replace("<admitted>#{term_expr(a.children.to_xml)}</admitted>")
+          end
+        end
         xmldoc.xpath("//term//expression/name[stem]").each do |n|
           n.parent.name = "letter-symbol"
         end
       end
 
+      def initial_formula(elem)
+        elem.elements.size == 1 && # para contains just stem expression
+          !elem.at("./preceding-sibling::p | ./preceding-sibling::dl | "\
+                   "./preceding-sibling::ol | ./preceding-sibling::ul")
+      end
+
       # release termdef tags from surrounding paras
       def termdef_unnest_cleanup(xmldoc)
         desgn = "//p/admitted | //p/deprecates | //p/preferred | //p//related"
@@ -40,13 +51,18 @@ module Asciidoctor
           prev.at("./preceding-sibling::preferred").nil?
 
         ins = term_element_insert_point(prev)
-        %w(domain subject usageinfo).each do |a|
+        %w(domain subject).each do |a|
           ins = dl_to_elems(ins, prev.parent, dlist, a)
         end
       end
 
       def term_dl_to_designation_metadata(prev, dlist)
-        %w(absent geographicArea).each { |a| dl_to_attrs(related2pref(prev), dlist, a) }
+        %w(absent geographic-area).each do |a|
+          dl_to_attrs(related2pref(prev), dlist, a)
+        end
+        %w(field-of-application usage-info).reverse.each do |a|
+          dl_to_elems(prev.at("./expression"), prev, dlist, a)
+        end
       end
 
       def term_element_insert_point(prev)
@@ -62,7 +78,7 @@ module Asciidoctor
         %w(language script type isInternational).each do |a|
           dl_to_attrs(prev, dlist, a)
         end
-        %w(abbreviationType pronunciation).reverse.each do |a|
+        %w(abbreviation-type pronunciation).reverse.each do |a|
           dl_to_elems(prev.at("./expression/name"), prev, dlist, a)
         end
         g = dlist.at("./dt[text()='grammar']/following::dd//dl") and
@@ -73,20 +89,21 @@ module Asciidoctor
       def term_dl_to_expression_grammar(prev, dlist)
         prev.at(".//expression") or return
         prev.at(".//expression") << "<grammar><sentinel/></grammar>"
-        %w(gender isPreposition isParticiple isAdjective isAdverb isNoun
-           grammarValue).reverse.each do |a|
+        %w(gender number isPreposition isParticiple isAdjective isAdverb isNoun
+           grammar-value).reverse.each do |a|
           dl_to_elems(prev.at(".//expression/grammar/*"), prev.elements.last,
                       dlist, a)
         end
-        term_dl_to_designation_gender(prev)
+        term_dl_to_designation_category(prev, "gender")
+        term_dl_to_designation_category(prev, "number")
+        prev.at(".//expression/grammar/sentinel").remove
       end
 
-      def term_dl_to_designation_gender(prev)
-        gender = prev.at(".//expression/grammar/gender")
-        /,/.match?(gender&.text) and
-          gender.replace(gender.text.split(/,\s*/)
-            .map { |x| "<gender>#{x}</gender>" }.join)
-        prev.at(".//expression/grammar/sentinel").remove
+      def term_dl_to_designation_category(prev, category)
+        cat = prev.at(".//expression/grammar/#{category}")
+        /,/.match?(cat&.text) and
+          cat.replace(cat.text.split(/,\s*/)
+            .map { |x| "<#{category}>#{x}</#{category}>" }.join)
       end
 
       def term_to_letter_symbol(prev, dlist)
@@ -134,7 +151,7 @@ module Asciidoctor
       def term_termsource_to_designation(xmldoc)
         xmldoc.xpath("//term/termsource").each do |t|
           p = t.previous_element
-          while %w(domain subject usageinfo).include? p&.name
+          while %w(domain subject).include? p&.name
             p = p.previous_element
           end
           %w(preferred admitted deprecates related).include?(p&.name) or

data/lib/asciidoctor/standoc/datamodel/attributes_table_preprocessor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'erb'
+require "erb"
 
 module Asciidoctor
   module Standoc
@@ -9,7 +9,7 @@ module Asciidoctor
         BLOCK_START_REGEXP = /\{(.+?)\.\*,(.+),(.+)\}/
         BLOCK_END_REGEXP = /\A\{[A-Z]+\}\z/
         MARCO_REGEXP = /\[datamodel_attributes_table,([^,]+),?(.+)?\]/
-        TEMPLATES_PATH = File.expand_path('../views/datamodel', __dir__).freeze
+        TEMPLATES_PATH = File.expand_path("../views/datamodel", __dir__).freeze
         # search document for block `datamodel_attributes_table`
         #  read include derectives that goes after that in block and transform
         #  into yaml2text blocks
@@ -39,16 +39,16 @@ module Asciidoctor
         def model_representation(model_path)
           template = File.read(File.join(
                                  TEMPLATES_PATH,
-                                 'model_representation.adoc.erb'
-          ))
-          file_name = File.basename(model_path).gsub(/\.ya?ml/, '')
+                                 "model_representation.adoc.erb",
+                               ))
+          file_name = File.basename(model_path).gsub(/\.ya?ml/, "")
           ERB
             .new(template)
             .result(binding)
         end
 
         def yaml_relative_path(file_path, document)
-          directory = File.dirname(document.attributes['docfile'] || '.')
+          directory = File.dirname(document.attributes["docfile"] || ".")
           document.path_resolver.system_path(file_path, directory)
         end
       end

data/lib/asciidoctor/standoc/inline.rb

@@ -15,14 +15,10 @@ module Asciidoctor
 
       def inline_anchor(node)
         case node.type
-        when :ref
-          inline_anchor_ref node
-        when :xref
-          inline_anchor_xref node
-        when :link
-          inline_anchor_link node
-        when :bibref
-          inline_anchor_bibref node
+        when :ref then inline_anchor_ref node
+        when :xref then inline_anchor_xref node
+        when :link then inline_anchor_link node
+        when :bibref then inline_anchor_bibref node
         end
       end
 
@@ -50,7 +46,12 @@ module Asciidoctor
         m.nil? and return { target: t, type: "inline", text: node.text }
         droploc = m[:drop].nil? && m[:drop2].nil? ? nil : true
         f = m[:fn].nil? ? "inline" : "footnote"
-        c = %i[case fn drop drop2].any? { |x| !m[x].nil? } ? m[:text] : node.text
+        c = if %i[case fn drop drop2].any? do |x|
+                 !m[x].nil?
+               end
+              m[:text]
+            else node.text
+            end
         { target: t, type: f, case: m[:case]&.sub(/%$/, ""), droploc: droploc,
           text: c }
       end
@@ -58,8 +59,9 @@ module Asciidoctor
       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"),
-                       "updatetype": node.attr("updatetype") }
+        attributes = { target: node.target, alt: node.attr("title"),
+                       "update-type": node.attr("updatetype") ||
+                         node.attr("update-type") }
         noko do |xml|
           xml.link **attr_code(attributes) do |l|
             l << contents

data/lib/asciidoctor/standoc/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1814,9 +1814,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1877,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1946,7 +1963,7 @@
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1973,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar-info">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2000,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2036,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2049,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2070,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,13 +2083,16 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
         </choice>
       </oneOrMore>
       <zeroOrMore>
@@ -2076,7 +2101,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>