metanorma-ieee 1.5.1 → 1.5.3

data/lib/isodoc/ieee/metadata.rb

@@ -6,7 +6,7 @@ module IsoDoc
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, i18n, fonts_options = {})
         super
-        @metadata[:issueddate] = "&lt;Date Approved&gt;"
+        @metadata[:ieee_sasb_approveddate] = "&lt;Date Approved&gt;"
         logos
       end
 
@@ -64,28 +64,30 @@ module IsoDoc
       end
 
       def society(xml)
-        society = xml.at(ns("//bibdata/ext/editorialgroup/" \
-                            "society"))&.text || "&lt;Society&gt;"
+        society = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
+        "organization/subdivision[@type='Society']/name"))&.text ||
+          "&lt;Society&gt;"
         set(:society, society)
       end
 
       def tc(xml)
-        tc = xml.at(ns("//bibdata/ext/editorialgroup/" \
-                       "committee"))&.text || "&lt;Committee Name&gt;"
+        tc = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
+          "organization/subdivision[@type='Committee']/name"))&.text ||
+          "&lt;Committee Name&gt;"
         set(:technical_committee, tc)
       end
 
       def wg(xml)
-        wg = xml.at(ns("//bibdata/ext/editorialgroup/" \
-                       "working-group")) or return nil
+        wg = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
+         "organization/subdivision[@type='Working group']/name")) or return nil
         set(:working_group, wg.text)
       end
 
       def bg(xml)
-        bg = xml.at(ns("//bibdata/ext/editorialgroup/" \
-                       "balloting-group")) or return nil
+        bg = xml.at(ns("//bibdata/contributor[role/@type = 'authorizer']/" \
+         "organization/subdivision[@type='Balloting group']/name")) or return nil
         set(:balloting_group, bg.text)
-        set(:balloting_group_type, bg["type"])
+        set(:balloting_group_type, bg.parent["subtype"])
       end
 
       def otherid(isoxml, _out)

data/lib/isodoc/ieee/presentation_ref.rb

@@ -117,10 +117,12 @@ module IsoDoc
       end
 
       def availability_note(bib)
-        note = bib.at(ns("./note[@type = 'Availability']")) or return ""
-        id = UUIDTools::UUID.random_create.to_s
-        @new_ids[id] = nil
-        "<fn id='#{id}' reference='#{id}'><p>#{note.content}</p></fn>"
+        notes = bib.xpath(ns("./note[@type = 'Availability']"))
+        notes.map do |note|
+          id = UUIDTools::UUID.random_create.to_s
+          @new_ids[id] = nil
+          "<fn id='#{id}' reference='#{id}'><p>#{note.content}</p></fn>"
+        end.join
       end
 
       def omit_docid_prefix(prefix)
@@ -130,10 +132,11 @@ module IsoDoc
 
       def bracket_if_num(num)
         num.nil? and return nil
-        num = num.text.sub(/^\[/, "").sub(/\]$/, "")
-        return "[#{num}]" if /^B?\d+$/.match?(num)
-
-        num
+        ret = num.dup
+        ret.xpath(ns(".//fn")).each(&:remove)
+        ret = ret.text.strip.sub(/^\[/, "").sub(/\]$/, "")
+        /^B?\d+$/.match?(ret) and return "[#{ret}]"
+        ret
       end
     end
   end

data/lib/isodoc/ieee/presentation_terms.rb

@@ -31,6 +31,13 @@ module IsoDoc
         end
       end
 
+      def wrap_nodeset_in_parens(xpath)
+        unless xpath.empty?
+          xpath[0].previous = " ("
+          xpath[-1].next = ")"
+        end
+      end
+
       def unwrap_definition1(d)
         %w(verbal-definition non-verbal-representation).each do |e|
           v = d.at(ns("./#{e}")) or next
@@ -41,11 +48,7 @@ module IsoDoc
             v.children =
               "#{p.map(&:children).map { |x| to_xml(x) }.join("\n")}#{s}"
           else
-            s = v.xpath(ns("./source"))
-            unless s.empty?
-              s[0].previous = " ("
-              s[-1].next = ")"
-            end
+            wrap_nodeset_in_parens(v.xpath(ns("./source")))
           end
           v.replace(v.children)
         end
@@ -77,6 +80,7 @@ module IsoDoc
           def: term.at(ns("./fmt-definition")),
           rels: term.at(ns("./fmt-related"))&.remove,
           source: term.at(ns("./fmt-termsource"))&.remove,
+          fns: term.xpath(ns("./fn")).map(&:remove),
         )
         term.at(ns("./fmt-admitted"))&.remove
         ins = term.at(ns("./fmt-definition")) and
@@ -96,8 +100,7 @@ module IsoDoc
       def collapse_term_related1(rels)
         rels.xpath(ns("./p")).each do |p|
           orig = p.at(ns(".//semx[@element = 'related']"))
-          reln = "<em>#{@i18n.relatedterms[orig['type']]}:</em> "
-          p.add_first_child reln
+          p.add_first_child "<em>#{@i18n.relatedterms[orig['type']]}:</em> "
           p.xpath(ns(".//semx[@element = 'related']")).each do |r|
             r.at(ns("./fmt-preferred")) or
               r.add_first_child "**RELATED TERM NOT FOUND**"
@@ -107,9 +110,8 @@ module IsoDoc
 
       def collapse_term_template(opt)
         defn, multiblock = collapse_unwrap_definition(opt[:def])
-        opt[:source] and src = "(#{to_xml(opt[:source].remove.children).strip})"
         t = collapse_term_pref(opt)
-        tail = "#{collapse_term_related(opt[:rels])} #{src}"
+        tail = collapse_term_template_tail(opt)
         if multiblock
           tail = tail.strip.empty? ? "" : "<p>#{tail}</p>"
           "<p>#{t}:</p> #{defn}#{tail}"
@@ -117,14 +119,16 @@ module IsoDoc
         end
       end
 
+      def collapse_term_template_tail(opt)
+        opt[:source] and src = "(#{to_xml(opt[:source].children).strip})"
+        opt[:fns].empty? or fn = opt[:fns].map(&:to_xml).join
+        "#{collapse_term_related(opt[:rels])} #{src}#{fn}"
+      end
+
       def collapse_term_pref(opt)
         p = opt[:pref]
         p.text.strip.empty? and return "**TERM NOT FOUND**"
-        s = p.xpath(ns(".//semx[@element = 'source']"))
-        unless s.empty?
-          s[0].previous = " ("
-          s[-1].next = ")"
-        end
+        wrap_nodeset_in_parens(p.xpath(ns(".//semx[@element = 'source']")))
         p.xpath(ns(".//fmt-termsource")).each { |x| x.replace(x.children) }
         to_xml(p.children).strip
       end

data/lib/isodoc/ieee/presentation_xml_convert.rb

@@ -228,6 +228,16 @@ module IsoDoc
         n.children.wrap("<em></em>")
       end
 
+      # before processing, move license termnotes to fn at end of term,
+      # so they aren't numbered as termnotes
+      def conversions(docxml)
+        docxml.xpath(ns("//termnote[@type='license']")).each do |n|
+          n.name = "fn"
+          n.parent << n
+        end
+        super
+      end
+
       include Init
     end
   end

data/lib/isodoc/ieee/word_authority.rb

@@ -114,7 +114,7 @@ module IsoDoc
           "<div class='WordSection'>#{para}#{d}</div>"
         end.join(SECTIONBREAK)
         div.document.at("//div[@class = 'WordSectionIntro']")
-          .previous_element.previous = SECTIONBREAK + out
+          .previous_element.previous = SECTIONBREAK + out + SECTIONBREAK
       end
 
       def feedback_table(docxml)

data/lib/isodoc/ieee/word_convert.rb

@@ -203,16 +203,16 @@ module IsoDoc
         end
       end
 
-      # "Figure 1—" remove each of these: strip elements in caption associated
+      # "Figure 1" remove each of these: strip elements in caption associated
       # with autonumbering -- # but not in footnotes. The autonumber captions
-      # are provided by Word styles instead
+      # are provided by Word styles instead.
+      # Retain the em-dash delimiting caption
       def strip_caption_semx(name)
         name.xpath(".//xmlns:semx[@element = 'autonum']/"\
                    "preceding-sibling::*[normalize-space() = '']").each do |s|
                      s.ancestors("fn").empty? and s.remove
                    end
         name.xpath(ns(".//span[@class = 'fmt-element-name']  | "\
-                      ".//span[@class = 'fmt-caption-delim'] | "\
                       ".//semx[@element = 'autonum']")).each do |s|
                         s.ancestors("fn").empty? and s.remove
                       end

data/lib/metanorma/ieee/basicdoc.rng

@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
       <ref name="pure_strike"/>
       <ref name="pure_smallcap"/>
       <ref name="br"/>
+      <ref name="stem"/>
     </choice>
   </define>
   <define name="NestedTextElement">
     <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
     <choice>
       <ref name="PureTextElement"/>
-      <ref name="stem"/>
       <ref name="eref"/>
       <ref name="xref"/>
       <ref name="hyperlink"/>

data/lib/metanorma/ieee/biblio-standoc.rng

@@ -76,12 +76,6 @@ from other documents in the same doctype</a:documentation>
     <ref name="flavor">
       <a:documentation>Flavour of Metanorma used to process this document</a:documentation>
     </ref>
-    <optional>
-      <ref name="editorialgroup">
-        <a:documentation>Groups associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-      </ref>
-    </optional>
     <zeroOrMore>
       <ref name="ics">
         <a:documentation>Classification of the document contents taken from the International Classification of Standards</a:documentation>
@@ -130,49 +124,6 @@ a standards definition organization</a:documentation>
 However we prefer not to hardcode it, given ongoing extension.</a:documentation>
     <text/>
   </define>
-  <define name="editorialgroup">
-    <a:documentation>A group associated with the production of the standards document, typically within
-a standards definition organization</a:documentation>
-    <element name="editorialgroup">
-      <oneOrMore>
-        <ref name="technical-committee">
-          <a:documentation>A technical committee associated with the production of the standards document</a:documentation>
-        </ref>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="technical-committee">
-    <a:documentation>Technical committee associated with the production of a standards document</a:documentation>
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="IsoWorkgroup">
-    <optional>
-      <attribute name="number">
-        <a:documentation>Numeric identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="type">
-        <a:documentation>Type of the technical committee, used in identifying the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="identifier">
-        <a:documentation>Non-numeric, complete identifier of the technical committee</a:documentation>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="prefix">
-        <a:documentation>Disambiguating prefix added to number to form the identifier of the technical committee,
-typically indicating its type</a:documentation>
-      </attribute>
-    </optional>
-    <text>
-      <a:documentation>Name of the technical committee</a:documentation>
-    </text>
-  </define>
   <define name="ics">
     <a:documentation>Classification taken from the International Classification of Standards. 
 ICS is defined by ISO here -- https://www.iso.org/publication/PUB100033.html</a:documentation>

data/lib/metanorma/ieee/biblio.rng

@@ -242,6 +242,8 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
     </choice>
   </define>
   <define name="roledescription">
+    <a:documentation>A more detailed description of the role of the contributor
+Some descriptions are reserved words; in particular, the editorial committee of a standard has the role description "committee"</a:documentation>
     <element name="description">
       <ref name="LocalizedMarkedUpString"/>
     </element>
@@ -443,7 +445,10 @@ real names (if the person is named with a pseudonym or user name); previous lega
     </oneOrMore>
     <zeroOrMore>
       <ref name="subdivision">
-        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item</a:documentation>
+        <a:documentation>The subdivision of the organization directly involved with the production of the bibliographic item.
+Multiple subdivisions can be specified for an organization, with no implication of hierarchical
+relation between them
+Editorial and advisory groups are represented as consecutive subdivisions of the SDO</a:documentation>
       </ref>
     </zeroOrMore>
     <optional>
@@ -485,6 +490,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
           <a:documentation>The type of subdivision</a:documentation>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="subtype">
+          <a:documentation>The subtype of subdivision; e.g. different types of technical committee</a:documentation>
+        </attribute>
+      </optional>
       <ref name="OrganizationType">
         <a:documentation>The subdivision, modelled recursively as an organization</a:documentation>
       </ref>

data/lib/metanorma/ieee/boilerplate.adoc

@@ -275,7 +275,7 @@ role::: Member
 [[boilerplate-participants-sb]]
 ==== {blank}
 
-When the IEEE SA Standards Board approved this {{ doctype }} on {{ issueddate }}, it had the following membership:
+When the IEEE SA Standards Board approved this {{ doctype }} on {{ ieee_sasb_approveddate }}, it had the following membership:
 
 ++++
 <membership>

data/lib/metanorma/ieee/cleanup_boilerplate.rb

@@ -55,12 +55,22 @@ module Metanorma
         PARTICIPANT_BOILERPLATE_LOCATIONS.each do |k, v|
           populate_participants(xml, k.to_s, v)
         end
-        p = xml.at(".//p[@type = 'emeritus_sign']")
-        ul = xml.at("//clause[@anchor = 'boilerplate-participants-sb']//ul")
-        p && ul and ul.next = p
+        emeritus_sign(xml)
         xml.at("//sections//clause[@type = 'participants']")&.remove
       end
 
+      def emeritus_sign(xml)
+        p = xml.at(".//p[@type = 'emeritus_sign']") or return
+        ul = xml.at("//clause[@anchor = 'boilerplate-participants-sb']//ul") or
+          return
+        has_asterisk = ul.xpath(".//p")&.any? do |li|
+          li.text.strip.end_with?("*")
+        end
+        if has_asterisk then ul.next = p
+        else p.remove
+        end
+      end
+
       def populate_participants(xml, target, subtitle)
         t = xml.at("//clause[@anchor = '#{target}']/membership") or return
         s = xml.xpath("//clause[@type = 'participants']/clause").detect do |x|
@@ -98,9 +108,10 @@ module Metanorma
           dl.children = ret.keys.map do |k|
             "<dt>#{k}</dt><dd #{add_id_text}><p>#{ret[k]}</p></dd>"
           end.join
-        else list.children =
-         "<dl><dt>name</dt><dd #{add_id_text}><p>#{curr.children.to_xml}" \
-         "</p></dd><dt>role</dt><dd #{add_id_text}><p>member</p></dd></dl>"
+        else list.children = <<~XML
+          <dl><dt>name</dt><dd #{add_id_text}><p>#{curr.children.to_xml}
+          </p></dd><dt>role</dt><dd #{add_id_text}><p>member</p></dd></dl>
+        XML
         end
       end
 

data/lib/metanorma/ieee/cleanup_ref.rb

@@ -239,12 +239,20 @@ module Metanorma
 
       def insert_availability_note(bib, msg)
         bib or return
-        note = %(<note type="Availability"><p>#{msg}</p></note>)
+        Array(msg).each do |msg1|
+          note = %(<note type="Availability"><p>#{msg1}</p></note>)
+          if b = insert_availability_note_ins(bib)
+            b.next = note
+          end
+        end
+      end
+
+      def insert_availability_note_ins(bib)
         if b = bib.at("./language | ./script | ./abstract | ./status")
-          b.previous = note
-        else b = bib.at("./contributor") || bib.at("./date") ||
+          b.previous
+        else bib.at("./contributor") || bib.at("./date") ||
           bib.at("./docnumber") || bib.at("./docidentifier") ||
-          bib.at("./title") and b.next = note
+          bib.at("./title")
         end
       end
     end

data/lib/metanorma/ieee/front.rb

@@ -4,16 +4,6 @@ require "pubid-ieee"
 module Metanorma
   module Ieee
     class Converter < Standoc::Converter
-      def metadata_committee(node, xml)
-        metadata_committee_prep(node) or return
-        xml.editorialgroup do |a|
-          committee_component("society", node, a)
-          committee_component("balloting-group", node, a)
-          committee_component("working-group", node, a)
-          committee_component("committee", node, a)
-        end
-      end
-
       def metadata_committee_prep(node)
         node.attr("doctype") == "whitepaper" &&
           node.attr("docsubtype") == "industry-connection-report" and
@@ -26,6 +16,41 @@ module Metanorma
         true
       end
 
+      def metadata_committee_types(_node)
+        %w(society balloting-group working-group committee)
+      end
+
+      def committee_contributors(node, xml, agency, opt)
+        metadata_committee_prep(node) or return
+        super
+      end
+
+      def org_attrs_add_committees(node, ret, opts, opts_orig)
+        opts_orig[:groups]&.each_with_index do |g, i|
+          i.zero? and next
+          opts = committee_contrib_org_prep(node, g, nil, opts_orig)
+          ret << org_attrs_parse_core(node, opts).map do |x|
+            x.merge(subdivtype: opts[:subdivtype])
+          end
+        end
+        contributors_committees_nest1(ret)
+      end
+
+      def contributors_committees_nest1(committees)
+        committees.empty? and return committees
+        committees = committees.map(&:reverse).reverse.flatten
+        committees.each_with_index do |m, i|
+          i.zero? and next
+          m[:subdiv] = committees[i - 1]
+        end
+        committees[-1].nil? and return []
+        [committees[-1]]
+      end
+
+      def committee_contrib_org_prep(node, type, agency, _opts)
+        super.merge(role: "authorizer")
+      end
+
       def metadata_other_id(node, xml)
         a = node.attr("isbn-pdf") and
           xml.docidentifier a, type: "ISBN", scope: "PDF"
@@ -121,7 +146,7 @@ module Metanorma
       end
 
       def datetypes
-        super + %w{feedback-ended}
+        super + %w{feedback-ended ieee-sasb-approved}
       end
 
       def metadata_subdoctype(node, xml)

data/lib/metanorma/ieee/ieee-footnotes.yaml

@@ -1,28 +1,27 @@
 ---
-ieee: |
-  IEEE publications are available from The Institute of Electrical and
-  Electronics Engineers (http://standards.ieee.org/).
+ieee:
+  - The IEEE standards or products referred to in this clause are trademarks owned by The Institute of Electrical and Electronics Engineers, Incorporated.
+  - IEEE publications are available from The Institute of Electrical and
+    Electronics Engineers (http://standards.ieee.org/).
 
 iec: |
   IEC publications are available from the International Electrotechnical
-  Commission (http://www.iec.ch/). IEC publications are also available in
-  the United States from the American National Standards Institute
-  (http://www.ansi.org/).
+  Commission (https://www.iec.ch) and the American National Standards Institute
+  (https://www.ansi.org/).
 
 cispr: |
   CISPR documents are available from the International Electrotechnical
-  Commission (http://www.iec.ch/). CISPR documents are also available in
-  the United States from the American National Standards Institute
-  (http://www.ansi.org)
+  Commission (https://www.iec.ch/) and the American National Standards Institute
+  (https://www.ansi.org/).
 
 ietf: |
-  IETF documents (e.g., RFCs) are available from the Internet Engineering Task Force (http://www.ietf.org/).
+  IETF documents (e.g., RFCs) are available from the Internet Engineering Task
+  Force (http://www.ietf.org/).
 
 iso: |
-  ISO publications are available from the ISO Central Secretariat
-  (http://www.iso.org/). ISO publications are also available in the United
-  States from the American National Standards Institute
-  (http://www.ansi.org/).
+  ISO publications are available from the International Organization for
+  Standardization (https://www.iso.org/) and the American National Standards
+  Institute (https://www.ansi.org/).
 
 iso-iec: |
   ISO/IEC documents are available from the International Organization for
@@ -65,13 +64,14 @@ w3c: |
   (https://www.w3.org).
 
 oasis: |
-  OASIS publications are available from the Organization for the
-  Organization for the Advancement of Structured Information Standards
-  (http://www.oasis-open.org)
+  OASIS publications are available from the Organization for the Advancement
+  of Structured Information Standards (http://www.oasis-open.org)
 
 3gpp: |
   3GPP(TM) documents are available from the 3rd Generation Partnership
   Project Web site (http://www.3gpp.org).
 
 ieee-withdrawn: |
-  % has been withdrawn; however, copies can be obtained from Global Engineering, 15 Inverness Way East, Englewood, CO 80112-5704, USA, tel. (303) 792-2181 (http://global.ihs.com/).
+  % has been withdrawn; however, copies can be obtained from Global Engineering,
+  15 Inverness Way East, Englewood, CO 80112-5704, USA, tel. (303) 792-2181
+  (http://global.ihs.com/).

data/lib/metanorma/ieee/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.1.0 -->
+<!-- VERSION v2.1.1 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
 but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <text/>
     </define>
-    <define name="index-primary">
-      <element name="primary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-secondary">
-      <element name="secondary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="index-tertiary">
-      <element name="tertiary">
-        <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
     <define name="review">
       <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
 the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
         </oneOrMore>
       </element>
     </define>
-    <define name="sub">
-      <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
-      <element name="sub">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sup">
-      <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
-      <element name="sup">
-        <zeroOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
-        </zeroOrMore>
-      </element>
-    </define>
     <define name="pagebreak">
       <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
       <element name="pagebreak">
@@ -1094,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -1107,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
           <zeroOrMore>
             <choice>
               <ref name="PureTextElement"/>
-              <ref name="stem"/>
               <ref name="index"/>
               <ref name="index-xref"/>
             </choice>
@@ -2025,10 +1971,7 @@ used in document amendments</a:documentation>
       <element name="name">
         <a:documentation>The symbolic form of the designation</a:documentation>
         <oneOrMore>
-          <choice>
-            <ref name="PureTextElement"/>
-            <ref name="stem"/>
-          </choice>
+          <ref name="PureTextElement"/>
         </oneOrMore>
       </element>
     </element>
@@ -2081,7 +2024,6 @@ used in document amendments</a:documentation>
         <zeroOrMore>
           <choice>
             <ref name="PureTextElement"/>
-            <ref name="stem"/>
             <ref name="index"/>
             <ref name="index-xref"/>
           </choice>
@@ -2291,6 +2233,11 @@ used in document amendments</a:documentation>
       <ref name="RequiredId"/>
       <ref name="NumberingAttributes"/>
       <ref name="BlockAttributes"/>
+      <optional>
+        <attribute name="type">
+          <a:documentation>Semantic classification of note</a:documentation>
+        </attribute>
+      </optional>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>