metanorma-ieee 0.1.1 → 0.1.3

data/lib/isodoc/ieee/init.rb

@@ -12,7 +12,7 @@ module IsoDoc
 
       def xref_init(lang, script, _klass, i18n, options)
         html = HtmlConvert.new(language: lang, script: script)
-        options = options.merge(hierarchical_assets: @hierarchical_assets)
+        options = options.merge(hierarchicalassets: @hierarchical_assets)
         @xrefs = Xref.new(lang, script, html, i18n, options)
       end
 

data/lib/isodoc/ieee/presentation_ref.rb

@@ -1,3 +1,5 @@
+require_relative "../../relaton/render/general"
+
 module IsoDoc
   module IEEE
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert

data/lib/isodoc/ieee/presentation_terms.rb

@@ -1,5 +1,3 @@
-require_relative "../../relaton/render/general"
-
 module IsoDoc
   module IEEE
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
@@ -28,9 +26,7 @@ module IsoDoc
         if coll.all? do |c|
              c.elements.size == 1 && c.elements.first.name == "p"
            end
-          ret = coll.map do |c|
-            c.elements.first.children.to_xml
-          end
+          ret = coll.map { |c| c.elements.first.children.to_xml }
           return "<p>#{ret.join}</p>"
         end
         coll.map { |c| c.children.to_xml }.join
@@ -42,7 +38,7 @@ module IsoDoc
 
           p = v.xpath(ns("./p"))
           v.children =
-            "<p>#{p.map(&:children).map(&:to_xml).join("\n")}</p>"\
+            "<p>#{p.map(&:children).map(&:to_xml).join("\n")}</p>" \
             "#{v.xpath(ns('./termsource')).to_xml}"
         end
         super
@@ -61,9 +57,9 @@ module IsoDoc
         prev = 0
         coll[1..-1].each_with_index do |r, i|
           if coll[prev]["type"] != r["type"]
-            prev = i
-            next
+            prev = i and next
           end
+
           coll[prev].at(ns("./preferred")) << "; #{r.at(ns('./preferred'))
               .children.to_xml}"
           r.remove
@@ -71,17 +67,20 @@ module IsoDoc
       end
 
       def sort_terms_key(term)
-        d = term.at(ns("./preferred/expression/name | "\
-                       "./preferred/letter-symbol/name | "\
-                       "./preferred/graphical-symbol/figure/name | "\
-                       "./preferred/graphical-symbol/figure/@id | "\
+        d = term.at(ns("./preferred/expression/name | " \
+                       "./preferred/letter-symbol/name | " \
+                       "./preferred/graphical-symbol/figure/name | " \
+                       "./preferred/graphical-symbol/figure/@id | " \
                        "./preferred"))
         f = term.at(ns("./field-of-application")) || term.at(ns("./domain"))
         HTMLEntities.new.decode("#{sort_terms_key1(d)} :: #{sort_terms_key1(f)}")
       end
 
       def sort_terms_key1(elem)
-        elem&.text&.strip&.downcase || "zzzz"
+        elem.nil? and return "zzzz"
+        dup = elem.dup
+        dup.xpath(ns(".//asciimath | .//latexmath")).each(&:remove)
+        dup.text&.strip&.downcase || "zzzz"
       end
 
       def term_related_reorder(coll)
@@ -173,7 +172,7 @@ module IsoDoc
       def collapse_term_related(rels)
         ret = rels.map do |r|
           p = r.at(ns("./preferred"))
-          "<em>#{@i18n.relatedterms[r['type']]}:</em> "\
+          "<em>#{@i18n.relatedterms[r['type']]}:</em> " \
             "#{p&.children&.to_xml || '**RELATED TERM NOT FOUND**'}"
         end.join(". ")
         ret += "." unless ret.empty?
@@ -186,8 +185,7 @@ module IsoDoc
         opt[:source] and src = "(#{opt[:source].remove.children.to_xml.strip})"
         <<~TERM
           <p>#{opt[:pref]&.children&.to_xml || '**TERM NOT FOUND**'}: #{defn}
-          #{collapse_term_related(opt[:rels])}
-          #{src}</p>
+          #{collapse_term_related(opt[:rels])} #{src}</p>
         TERM
       end
 
@@ -229,7 +227,7 @@ module IsoDoc
       def merge_second_preferred(term)
         pref =
           term.at(ns("./preferred[not(abbreviation-type)]/expression/name"))
-        x = term.xpath(ns("./preferred[expression/name][abbreviation-type] | "\
+        x = term.xpath(ns("./preferred[expression/name][abbreviation-type] | " \
                           "./admitted[expression/name][abbreviation-type]"))
         (pref && !x.empty?) or return
         tail = x.map do |p|

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -7,7 +7,7 @@ module IsoDoc
   module IEEE
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
       def initialize(options)
-        @hierarchical_assets = options[:hierarchical_assets]
+        @hierarchical_assets = options[:hierarchicalassets]
         super
       end
 

data/lib/isodoc/ieee/word_cleanup.rb

@@ -107,6 +107,14 @@ module IsoDoc
         FigureTitle: "IEEEStdsRegularFigureCaption",
       }.freeze
 
+      def table_toc_class
+        %w(IEEEStdsRegularTableCaption TableTitle tabletitle)
+      end
+
+      def figure_toc_class
+        %w(IEEEStdsRegularFigureCaption FigureTitle figuretitle)
+      end
+
       def style_cleanup(docxml)
         note_style_cleanup(docxml)
         docxml.xpath("//div[@class = 'formula']/p").each do |p|

data/lib/isodoc/ieee/xref.rb

@@ -8,7 +8,7 @@ module IsoDoc
     class Xref < ::IsoDoc::Xref
       def initialize(lang, script, klass, labels, options)
         super
-        @hierarchical_assets = options[:hierarchical_assets]
+        @hierarchical_assets = options[:hierarchicalassets]
       end
 
       def initial_anchor_names(doc)
@@ -29,7 +29,7 @@ module IsoDoc
           n = Counter.new
           n = section_names(doc.at(ns("//clause[@type = 'overview']")), n, 1)
           n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-          n = section_names(doc.at(ns("//sections/terms | "\
+          n = section_names(doc.at(ns("//sections/terms | " \
                                       "//sections/clause[descendant::terms]")), n, 1)
           n = section_names(doc.at(ns("//sections/definitions")), n, 1)
           clause_names(doc, n)
@@ -37,14 +37,14 @@ module IsoDoc
       end
 
       def middle_sections
-        " #{@klass.norm_ref_xpath} | "\
-          "//sections/terms | //preface/clause | "\
+        " #{@klass.norm_ref_xpath} | " \
+          "//sections/terms | //preface/clause | " \
           "//sections/definitions | //clause[parent::sections]"
       end
 
       def middle_section_asset_names(doc)
         middle_sections =
-          "#{@klass.norm_ref_xpath} | //sections/terms | "\
+          "#{@klass.norm_ref_xpath} | //sections/terms | " \
           "//sections/definitions | //clause[parent::sections]"
         if @hierarchical_assets
           doc.xpath(ns(middle_sections)).each do |c|
@@ -57,9 +57,7 @@ module IsoDoc
 
       def sequential_formula_names(clause)
         c = Counter.new
-        clause.xpath(ns(".//formula")).reject do |n|
-          blank?(n["id"])
-        end.each do |t|
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             c.increment(t).print, nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -71,14 +69,12 @@ module IsoDoc
       def termnote_anchor_names(docxml)
         docxml.xpath(ns("//*[termnote]")).each do |t|
           c = Counter.new
-          sequence = UUIDTools::UUID.random_create.to_s
           notes = t.xpath(ns("./termnote"))
-          notes.reject { |n| blank?(n["id"]) }.each do |n|
+          notes.noblank.each do |n|
             @anchors[n["id"]] =
               anchor_struct("#{@labels['termnote']} #{increment_label(notes, n, c)}",
-                            n,
-                            @labels["note_xref"], "termnote", false)
-                .merge(sequence: sequence)
+                            n, @labels["note_xref"], "termnote", false)
+                .merge(sequence: UUIDTools::UUID.random_create.to_s)
           end
         end
       end

data/lib/metanorma/ieee/biblio.rng

@@ -188,6 +188,11 @@
           <value>adapter</value>
           <value>translator</value>
           <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
         </choice>
       </attribute>
       <zeroOrMore>

data/lib/metanorma/ieee/boilerplate.xml

@@ -115,10 +115,10 @@
         an IEEE standard is welcome to join the relevant IEEE working group. You can
         indicate interest in a working group using the Interests tab in the Manage
         Profile &#x26; Interests area of the <link target="https://development.standards.ieee.org/myproject-web/public/view.html#landing">IEEE
-          SA myProject system</link>.<fn><p>Available at: <link target="https://development.standards.ieee.org/myproject-web/public/view.html#landing"/>.</p></fn>
+          SA myProject system</link>.<fn reference="_boilerplate_1"><p>Available at: <link target="https://development.standards.ieee.org/myproject-web/public/view.html#landing"/>.</p></fn>
           An IEEE Account is needed to access the application.</p>
 
-        <p>Comments on standards should be submitted using the <link target="https://standards.ieee.org/content/ieee-standards/en/about/contact/index.html">Contact Us</link> form.<fn><p>Available at: <link target="https://standards.ieee.org/content/ieee-standards/en/about/contact/index.html"/>.</p></fn></p>
+        <p>Comments on standards should be submitted using the <link target="https://standards.ieee.org/content/ieee-standards/en/about/contact/index.html">Contact Us</link> form.<fn reference="_boilerplate_2"><p>Available at: <link target="https://standards.ieee.org/content/ieee-standards/en/about/contact/index.html"/>.</p></fn></p>
       </clause>
 
       <clause><title>Laws and regulations</title>
@@ -187,7 +187,7 @@
         order to determine whether a given document is the current edition and whether
         it has been amended through the issuance of amendments, corrigenda, or errata,
         visit <link target="https://ieeexplore.ieee.org/browse/standards/collection/ieee/">IEEE
-          Xplore</link> or <link target="https://standards.ieee.org/content/ieee-standards/en/about/contact/index.html">contact IEEE</link>.<fn><p>Available at <link target="https://ieeexplore.ieee.org/browse/standards/collection/ieee"/>.</p></fn>
+          Xplore</link> or <link target="https://standards.ieee.org/content/ieee-standards/en/about/contact/index.html">contact IEEE</link>.<fn reference="_boilerplate_3"><p>Available at <link target="https://ieeexplore.ieee.org/browse/standards/collection/ieee"/>.</p></fn>
           For more information about the IEEE SA or IEEE’s standards development process,
           visit the IEEE SA Website.</p>
       </clause>
@@ -195,12 +195,12 @@
       <clause>
         <title>Errata</title>
 
-        <p>Errata, if any, for all IEEE standards can be accessed on the <link target="https://standards.ieee.org/standard/index.html">IEEE SA Website</link>.<fn><p>Available at: <link target="https://standards.ieee.org/standard/index.html"/>.</p></fn> Search for standard number and year of approval to access the web page of the published standard. Errata links are located under the Additional Resources Details section. Errata are also available in <link target="https://ieeexplore.ieee.org/browse/standards/collection/ieee/">IEEE Xplore</link>. Users are encouraged to periodically check for errata.</p>
+        <p>Errata, if any, for all IEEE standards can be accessed on the <link target="https://standards.ieee.org/standard/index.html">IEEE SA Website</link>.<fn reference="_boilerplate_4"><p>Available at: <link target="https://standards.ieee.org/standard/index.html"/>.</p></fn> Search for standard number and year of approval to access the web page of the published standard. Errata links are located under the Additional Resources Details section. Errata are also available in <link target="https://ieeexplore.ieee.org/browse/standards/collection/ieee/">IEEE Xplore</link>. Users are encouraged to periodically check for errata.</p>
       </clause>
 
       <clause><title>Patents</title>
 
-        <p>IEEE Standards are developed in compliance with the <link target="https://standards.ieee.org/about/sasb/patcom/materials.html">IEEE SA Patent Policy</link>.<fn><p>Available at: <link target="https://standards.ieee.org/about/sasb/patcom/materials.html"/>.</p></fn></p>
+        <p>IEEE Standards are developed in compliance with the <link target="https://standards.ieee.org/about/sasb/patcom/materials.html">IEEE SA Patent Policy</link>.<fn reference="_boilerplate_5"><p>Available at: <link target="https://standards.ieee.org/about/sasb/patcom/materials.html"/>.</p></fn></p>
         <p>Attention is called to
         the possibility that implementation of this standard may require use of subject
         matter covered by patent rights. By publication of this standard, no position
@@ -247,17 +247,17 @@
         <p>At the time this draft {{ doctype }} was completed, the {{ working_group }} Working Group had the following membership:</p>
         <membership>
           <ul>
-            <li><dl><dt>name</dt><dd>&#x3c;Chair Name&#x3e;</dd><dt>role</dt><dd>Chair</dd></dl></li>
-            <li><dl><dt>name</dt><dd>&#x3c;Vice-chair Name&#x3e;</dd><dt>role</dt><dd>Vice Chair</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant1</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant2</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant3</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant4</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant5</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant6</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant7</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant8</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Participant9</dd><dt>role</dt><dd>Member</dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>&#x3c;Chair Name&#x3e;</p></dd><dt>role</dt><dd><p>Chair</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>&#x3c;Vice-chair Name&#x3e;</p></dd><dt>role</dt><dd><p>Vice Chair</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant1</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant2</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant3</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant4</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant5</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant6</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant7</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant8</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Participant9</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
           </ul>
         </membership>
       </clause>
@@ -265,15 +265,15 @@
         <p>The following members of the {{ balloting_group_type }} {{ balloting_group }} Standards Association balloting group voted on this {{ doctype }}. Balloters may have voted for approval, disapproval, or abstention.</p>
         <membership>
         <ul>
-            <li><dl><dt>name</dt><dd>Balloter1</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Balloter2</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Balloter3</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Balloter4</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Balloter5</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Balloter6</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Balloter7</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Balloter8</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>Balloter9</dd><dt>role</dt><dd>Member</dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter1</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter2</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter3</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter4</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter5</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter6</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter7</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter8</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>Balloter9</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
         </ul>
       </membership>
       </clause>
@@ -281,19 +281,19 @@
         <p>When the IEEE SA Standards Board approved this {{ doctype }} on {{ issueddate }}, it had the following membership:</p>
         <membership>
           <ul>
-            <li><dl><dt>name</dt><dd>&#x3c;Name&#x3e;</dd><dt>role</dt><dd>Chair</dd></dl></li>
-            <li><dl><dt>name</dt><dd>&#x3c;Name&#x3e;</dd><dt>role</dt><dd>Vice Chair</dd></dl></li>
-            <li><dl><dt>name</dt><dd>&#x3c;Name&#x3e;</dd><dt>role</dt><dd>Past Chair</dd></dl></li>
-            <li><dl><dt>name</dt><dd>&#x3c;Name&#x3e;</dd><dt>role</dt><dd>Secretary</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember1</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember2</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember3</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember4</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember5</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember6</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember7</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember8</dd><dt>role</dt><dd>Member</dd></dl></li>
-            <li><dl><dt>name</dt><dd>SBMember9</dd><dt>role</dt><dd>Member</dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>&#x3c;Name&#x3e;</p></dd><dt>role</dt><dd><p>Chair</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>&#x3c;Name&#x3e;</p></dd><dt>role</dt><dd><p>Vice Chair</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>&#x3c;Name&#x3e;</p></dd><dt>role</dt><dd><p>Past Chair</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>&#x3c;Name&#x3e;</p></dd><dt>role</dt><dd><p>Secretary</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember1</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember2</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember3</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember4</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember5</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember6</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember7</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember8</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
+            <li><dl><dt>name</dt><dd><p>SBMember9</p></dd><dt>role</dt><dd><p>Member</p></dd></dl></li>
         </ul>
         </membership>
         <p type="emeritus_sign">*Member Emeritus</p>
@@ -337,7 +337,7 @@
   {% else %}
   <clause id="boilerplate_word_usage">
     <title>Word usage</title>
-    <p>The word <em>shall</em> indicates mandatory requirements strictly to be followed in order to conform to the standard and from which no deviation is permitted (<em>shall</em> equals <em>is required to</em>).<fn><p>The use of the word <em>must</em> is deprecated and cannot be used when stating mandatory requirements; <em>must</em> is used only to describe unavoidable situations.</p></fn><fn><p>The use of <em>will</em> is deprecated and cannot be used when stating mandatory requirements; <em>will</em> is only used in statements of fact.</p></fn></p>
+    <p>The word <em>shall</em> indicates mandatory requirements strictly to be followed in order to conform to the standard and from which no deviation is permitted (<em>shall</em> equals <em>is required to</em>).<fn reference="_boilerplate_6"><p>The use of the word <em>must</em> is deprecated and cannot be used when stating mandatory requirements; <em>must</em> is used only to describe unavoidable situations.</p></fn><fn reference="_boilerplate_7"><p>The use of <em>will</em> is deprecated and cannot be used when stating mandatory requirements; <em>will</em> is only used in statements of fact.</p></fn></p>
     <p>The word <em>should</em> indicates that among several possibilities one is recommended as particularly suitable, without mentioning or excluding others; or that a certain course of action is preferred but not necessarily required (<em>should</em> equals <em>is recommended that</em>).</p>
     <p>The word <em>may</em> is used to indicate a course of action permissible within the limits of the standard (<em>may</em> equals <em>is permitted to</em>).</p>
     <p>The word <em>can</em> is used for statements of possibility and capability, whether material, physical, or causal (<em>can</em> equals <em>is able to</em>).</p>

data/lib/metanorma/ieee/cleanup.rb

@@ -89,7 +89,8 @@ module Metanorma
                       "//annex//note[not(@type = 'boilerplate')]") or
           return
         ins = n.at("./p[last()]")
-        ins << "<fn><p>#{@i18n.note_inform_fn}</p></fn>"
+        ins << "<fn reference='_boilerplate_cleanup1'>" \
+               "<p>#{@i18n.note_inform_fn}</p></fn>"
       end
 
       def table_footnote_renumber1(fnote, idx, seen)
@@ -169,6 +170,7 @@ module Metanorma
           ul.xpath("./li").each { |li| populate_participants2(li) }
           ul.xpath(".//p[normalize-space() = '']").each(&:remove)
         end
+        clause.at("./title")&.remove
         clause.children.to_xml
       end
 
@@ -183,14 +185,16 @@ module Metanorma
       end
 
       def populate_participants2(list)
-        if dl = list.at("./dl")
+        curr = list
+        p = curr.at("./p") and curr = p
+        if dl = curr.at("./dl")
           ret = extract_participants(dl)
           dl.children = ret.keys.map do |k|
-            "<dt>#{k}</dt><dd>#{ret[k]}</dd>"
+            "<dt>#{k}</dt><dd><p>#{ret[k]}</p></dd>"
           end.join
         else
-          list.children = "<dl><dt>name</dt><dd>#{list.children.to_xml}</dd>" \
-                          "<dt>role</dt><dd>member</dd></dl>"
+          list.children = "<dl><dt>name</dt><dd><p>#{curr.children.to_xml}" \
+                          "</p></dd><dt>role</dt><dd><p>member</p></dd></dl>"
         end
       end
 

data/lib/metanorma/ieee/converter.rb

@@ -62,13 +62,13 @@ module Metanorma
       end
 
       def html_extract_attributes(node)
-        super.merge(hierarchical_assets:
+        super.merge(hierarchicalassets:
                     node.attr("hierarchical-object-numbering"),
                     ieeedtd: node.attr("ieee-dtd"))
       end
 
       def doc_extract_attributes(node)
-        super.merge(hierarchical_assets:
+        super.merge(hierarchicalassets:
                     node.attr("hierarchical-object-numbering"),
                     ulstyle: "l11", olstyle: "l16")
       end

data/lib/metanorma/ieee/ieee.rng

@@ -10,6 +10,22 @@
     <start>
       <ref name="ieee-standard"/>
     </start>
+    <define name="sections">
+      <element name="sections">
+        <optional>
+          <ref name="note"/>
+        </optional>
+        <oneOrMore>
+          <choice>
+            <ref name="clause"/>
+            <ref name="terms"/>
+            <ref name="term-clause"/>
+            <ref name="definitions"/>
+            <ref name="floating-title"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
   </include>
   <define name="ieee-standard">
     <element name="ieee-standard">

data/lib/metanorma/ieee/isodoc.rng

@@ -177,11 +177,7 @@
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
@@ -1031,6 +1027,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1045,6 +1042,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1058,6 +1056,7 @@
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1153,7 +1152,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="BibliographicItem"/>
+      <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
   <define name="image" combine="choice">
@@ -1195,6 +1194,7 @@
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
@@ -1202,6 +1202,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1214,6 +1215,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1278,6 +1280,7 @@
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -1970,6 +1973,7 @@
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -2525,6 +2529,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
@@ -2572,6 +2577,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
@@ -2620,6 +2626,15 @@
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
@@ -2628,16 +2643,35 @@
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
     </element>
   </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/ieee/term_lookup_cleanup.rb

@@ -3,8 +3,9 @@ module Metanorma
     class TermLookupCleanup < Metanorma::Standoc::TermLookupCleanup
       def remove_missing_ref_term(node, _target)
         node.at("../xrefrender")&.remove
-        node.replace("<preferred><expression><name>#{node.children.to_xml}"\
-                     "</name></expression></preferred>")
+        #node.replace("<preferred><expression><name>#{node.children.to_xml}"\
+        #             "</name></expression></preferred>")
+        node.replace("<refterm>#{node.children.to_xml}</refterm>")
       end
     end
   end

data/lib/metanorma/ieee/validate.rb

@@ -131,7 +131,7 @@ module Metanorma
         klass = IsoDoc::IEEE::HtmlConvert.new(language: @lang, script: @script)
         xrefs = IsoDoc::IEEE::Xref
           .new(@lang, @script, klass, IsoDoc::IEEE::I18n.new(@lang, @script),
-               { hierarchical_assets: @hierarchical_assets })
+               { hierarchicalassets: @hierarchical_assets })
         xrefs.parse(Nokogiri::XML(xmldoc.to_xml))
         xrefs
       end