relaton-nist 1.0.0 → 1.2.1

data/lib/relaton_nist/document_relation.rb

@@ -0,0 +1,5 @@
+module RelatonNist
+  class DocumentRelation < RelatonBib::DocumentRelation
+    TYPES += %w[obsoletedBy supersedes supersededBy].freeze
+  end
+end

data/lib/relaton_nist/hash_converter.rb

@@ -15,11 +15,35 @@ module RelatonNist
 
       private
 
+      # @param item_hash [Hash]
+      # @return [RelatonNist::NistBibliographicItem]
+      def bib_item(item_hash)
+        NistBibliographicItem.new item_hash
+      end
+
       def commentperiod_hash_to_bib(ret)
         return unless ret[:commentperiod]
 
         ret[:commentperiod] = CommentPeriod.new ret[:commentperiod]
       end
+
+      # @param ret [Hash]
+      def relations_hash_to_bib(ret)
+        super
+        return unless ret[:relation]
+
+        ret[:relation] = ret[:relation].map { |r| DocumentRelation.new r }
+
+        # ret[:relation] = array(ret[:relation])
+        # ret[:relation]&.each do |r|
+        #   if r[:description]
+        #     r[:description] = FormattedString.new r[:description]
+        #   end
+        #   relation_bibitem_hash_to_bib(r)
+        #   relation_locality_hash_to_bib(r)
+        #   relation_source_locality_hash_to_bib(r)
+        # end
+      end
     end
   end
 end

data/lib/relaton_nist/nist_bibliographic_item.rb

@@ -30,7 +30,7 @@ module RelatonNist
     # @param validity [RelatonBib:Validity, NilClass]
     # @param fetched [Date, NilClass] default nil
     # @param doctype [String]
-    # @param keyword [Array<RelatonNist::Keyword>]
+    # @param keyword [Array<RelatonBib::Keyword>]
     # @param commentperiod [RelatonNist::CommentPeriod, NilClass]
     #
     # @param date [Array<Hash>]
@@ -51,12 +51,13 @@ module RelatonNist
     # @option abstract [String] :script
     # @option abstract [String] :type
     #
-    # @param relation [Array<Hash>]
+    # @param relation [Array<Hash, RelatonNist::DocumentRelation>]
     # @option relation [String] :type
     # @option relation [RelatonBib::BibliographicItem] :bibitem
     # @option relation [Array<RelatonBib::BibItemLocality>] :bib_locality
     def initialize(**args)
-      @doctype = args.delete(:doctype) || "standard"
+      # @doctype = args.delete(:doctype) || "standard"
+      # args[:doctype] ||= "standard"
       # @keyword = args.delete(:keyword) || []
       @commentperiod = args.delete :commentperiod
       super
@@ -67,8 +68,8 @@ module RelatonNist
       super builder, date_format: :short, **opts do |b|
         if opts[:bibdata]
           b.ext do
-            b.doctype doctype
-            # keyword.each { |kw| kw.to_xml b }
+            b.doctype doctype if doctype
+            # keyword.each { |kw| b.keyword { kw.to_xml b } }
             commentperiod&.to_xml b
           end
         end

data/lib/relaton_nist/nist_bibliography.rb

@@ -1,5 +1,6 @@
 require "relaton_bib"
 require "relaton_nist/nist_bibliographic_item"
+require "relaton_nist/document_relation"
 require "relaton_nist/scrapper"
 require "relaton_nist/hit_collection"
 require "relaton_nist/xml_parser"

data/lib/relaton_nist/scrapper.rb

@@ -16,10 +16,10 @@ module RelatonNist
                     else
                       from_csrs hit_data
                     end
-        doctype = "standard"
+        # doctype = "standard"
         titles = fetch_titles(hit_data)
         unless /^(SP|NISTIR|FIPS) / =~ item_data[:docid][0].id
-          doctype = id_cleanup(item_data[:docid][0].id)
+          # doctype = id_cleanup(item_data[:docid][0].id)
           item_data[:docid][0] = RelatonBib::DocumentIdentifier.new(
             id: titles[0][:content].upcase, type: "NIST",
           )
@@ -78,9 +78,9 @@ module RelatonNist
       # Strip status from doc id
       # @param id String
       # @return String
-      def id_cleanup(id)
-        id.sub(/ \(WITHDRAWN\)/, "").sub(/ \(([^) ]+ )?DRAFT\)/i, "")
-      end
+      # def id_cleanup(id)
+      #   id.sub(/ \(WITHDRAWN\)/, "").sub(/ \(([^) ]+ )?DRAFT\)/i, "")
+      # end
 
       # Get page.
       # @param path [String] page's path
@@ -235,15 +235,18 @@ module RelatonNist
             )
           end
           if contr["surname"]
-            affiliation = RelatonBib::Affiliation.new organization: org
+            affiliation = []
+            affiliation << RelatonBib::Affiliation.new(organization: org) if org
             entity = RelatonBib::Person.new(
-              name: full_name(contr, lang, script), affiliation: [affiliation],
+              name: full_name(contr, lang, script), affiliation: affiliation,
             )
-          else
+          elsif org
             entity = org
           end
-          RelatonBib::ContributionInfo.new entity: entity, role: [type: role]
-        end
+          if entity
+            RelatonBib::ContributionInfo.new entity: entity, role: [type: role]
+          end
+        end.compact
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
@@ -304,7 +307,7 @@ module RelatonNist
       def name_parts(part, lang, script)
         return [] unless part
 
-        [RelatonBib::LocalizedString.new(name[part], lang, script)]
+        [RelatonBib::LocalizedString.new(part, lang, script)]
       end
 
       # @param doc [String, Hash]
@@ -325,7 +328,9 @@ module RelatonNist
       # @param doc [Nokigiri::HTML::Document]
       # @return [Array<Hash>]
       def fetch_abstract(doc)
-        abstract_content = doc.xpath('//div[contains(@class, "pub-abstract-callout")]/div[1]/p').text
+        abstract_content = doc.xpath(
+          '//div[contains(@class, "pub-abstract-callout")]/div[1]/p',
+        ).text
         [{
           content: abstract_content,
           language: "en",
@@ -336,7 +341,7 @@ module RelatonNist
 
       # Fetch copyright.
       # @param doc [Nokogiri::HTL::Document, String]
-      # @return [Hash]
+      # @return [Array<Hash>]
       def fetch_copyright(doc)
         name = "National Institute of Standards and Technology"
         url = "www.nist.gov"
@@ -345,9 +350,11 @@ module RelatonNist
               doc.at("//span[@id='pub-release-date']").text.strip
             end
         from = d.match(/\d{4}/).to_s
-        { owner: { name: name, abbreviation: "NIST", url: url }, from: from }
+        [{ owner: [{ name: name, abbreviation: "NIST", url: url }], from: from }]
       end
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
       # Fetch links.
       # @param doc [Nokogiri::HTML::Document, Hash]
       # @return [Array<Hash>]
@@ -365,10 +372,11 @@ module RelatonNist
         links << { type: "doi", content: doi } if doi
         links
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Fetch relations.
       # @param doc [Nokogiri::HTML::Document]
-      # @return [Array<RelatonBib::DocumentRelation>]
+      # @return [Array<RelatonNist::DocumentRelation>]
       def fetch_relations(doc)
         relations = doc.xpath('//span[@id="pub-supersedes-container"]/a').map do |r|
           doc_relation "supersedes", r.text, DOMAIN + r[:href]
@@ -382,6 +390,7 @@ module RelatonNist
           doc_relation "updates", r.text, DOMAIN + r[:href]
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def fetch_relations_json(doc)
         relations = doc["supersedes"].map do |r|
@@ -396,9 +405,9 @@ module RelatonNist
       # @param type [String]
       # @param ref [String]
       # @param uri [String]
-      # @return [RelatonBib::DocumentRelation]
+      # @return [RelatonNist::DocumentRelation]
       def doc_relation(type, ref, uri, lang = "en", script = "Latn")
-        RelatonBib::DocumentRelation.new(
+        DocumentRelation.new(
           type: type,
           bibitem: RelatonBib::BibliographicItem.new(
             formattedref: RelatonBib::FormattedRef.new(
@@ -409,6 +418,8 @@ module RelatonNist
         )
       end
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<RelatonBib::Series>]
       def fetch_series(doc)
@@ -418,14 +429,14 @@ module RelatonNist
           next if s.name == "span"
 
           iter = if idx.zero? then "I"
-                   #  elsif status == "final" && idx == (series.size - 1) then "F"
                  else idx + 1
                  end
 
           content = s.text.match(/^[^\(]+/).to_s.strip.squeeze " "
 
           ref = case s.text
-                when /^Draft/ then content.match(/(?<=Draft\s).+/).to_s + " (#{iter}PD)"
+                when /^Draft/
+                  content.match(/(?<=Draft\s).+/).to_s + " (#{iter}PD)"
                 when /\(Draft\)/ then content + " (#{iter}PD)"
                 else content
                 end
@@ -436,6 +447,7 @@ module RelatonNist
           RelatonBib::Series.new(formattedref: fref)
         end.select { |s| s }
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       # @param doc [Nokogiri::HTML::Document, Hash]
       # @return [Array<RelatonNist::Keyword>]
@@ -448,6 +460,7 @@ module RelatonNist
         kws.map { |kw| kw.is_a?(String) ? kw : kw.text }
       end
 
+      # rubocop:disable Metrics/AbcSize
       # @param doc [Nokogiri::HTML::Document]
       # @return [RelatonNist::CommentPeriod, NilClass]
       def fetch_commentperiod(doc)
@@ -459,11 +472,13 @@ module RelatonNist
         d = doc.at("//span[@id='pub-release-date']").text.strip
         from = Date.strptime(d, "%B %Y").to_s
 
-        ex = doc.at "//strong[contains(.,'The comment closing date has been extended to')]"
+        ex = doc.at "//strong[contains(.,'The comment closing date has been "\
+        "extended to')]"
         ext = ex&.text&.match(/\w+\s\d{2},\s\d{4}/).to_s
         extended = ext.empty? ? nil : Date.strptime(ext, "%B %d, %Y")
         CommentPeriod.new from: from, to: to, extended: extended
       end
+      # rubocop:enable Metrics/AbcSize
 
       # @param json [Hash]
       # @return [RelatonNist::CommentPeriod, NilClass]

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.0.0".freeze
+  VERSION = "1.2.1".freeze
 end

data/relaton_nist.gemspec

@@ -34,6 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.0.0"
+  spec.add_dependency "relaton-bib", "~> 1.2.0"
   spec.add_dependency "rubyzip"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-nist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -200,11 +200,11 @@ files:
 - grammars/basicdoc.rng
 - grammars/biblio.rng
 - grammars/isodoc.rng
-- grammars/isostandard.rng
 - grammars/nist.rng
 - grammars/reqt.rng
 - lib/relaton_nist.rb
 - lib/relaton_nist/comment_period.rb
+- lib/relaton_nist/document_relation.rb
 - lib/relaton_nist/document_status.rb
 - lib/relaton_nist/hash_converter.rb
 - lib/relaton_nist/hit.rb

data/grammars/isostandard.rng

@@ -1,522 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <!-- default namespace isostandard = "https://www.metanorma.com/ns/iso" -->
-  <include href="isodoc.rng">
-    <start>
-      <ref name="iso-standard"/>
-    </start>
-    <define name="organization">
-      <element name="organization">
-        <oneOrMore>
-          <ref name="orgname"/>
-        </oneOrMore>
-        <optional>
-          <ref name="abbreviation"/>
-        </optional>
-        <optional>
-          <ref name="uri"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="org-identifier"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="contact"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="technical-committee"/>
-        </optional>
-        <optional>
-          <ref name="subcommittee"/>
-        </optional>
-        <optional>
-          <ref name="workgroup"/>
-        </optional>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
-      </element>
-    </define>
-    <define name="BibDataExtensionType">
-      <ref name="doctype"/>
-      <ref name="editorialgroup"/>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <ref name="structuredidentifier"/>
-      <optional>
-        <ref name="stagename"/>
-      </optional>
-    </define>
-    <define name="bdate">
-      <element name="date">
-        <attribute name="type">
-          <choice>
-            <ref name="BibliographicDateType"/>
-            <text/>
-          </choice>
-        </attribute>
-        <choice>
-          <group>
-            <element name="from">
-              <ref name="ISO8601Date"/>
-            </element>
-            <optional>
-              <element name="to">
-                <ref name="ISO8601Date"/>
-              </element>
-            </optional>
-          </group>
-          <element name="on">
-            <choice>
-              <ref name="ISO8601Date"/>
-              <value>--</value>
-              <value>–</value>
-            </choice>
-          </element>
-        </choice>
-      </element>
-    </define>
-    <define name="ul">
-      <element name="ul">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <oneOrMore>
-          <ref name="ul_li"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="sections">
-      <element name="sections">
-        <ref name="clause"/>
-        <optional>
-          <choice>
-            <ref name="term-clause"/>
-            <ref name="terms"/>
-          </choice>
-        </optional>
-        <optional>
-          <ref name="definitions"/>
-        </optional>
-        <oneOrMore>
-          <ref name="clause"/>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="Clause-Section">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <choice>
-        <group>
-          <oneOrMore>
-            <ref name="BasicBlock"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <oneOrMore>
-          <ref name="clause-subsection"/>
-        </oneOrMore>
-      </choice>
-    </define>
-    <define name="term">
-      <element name="term">
-        <optional>
-          <attribute name="id">
-            <data type="ID"/>
-          </attribute>
-        </optional>
-        <ref name="preferred"/>
-        <zeroOrMore>
-          <ref name="admitted"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="deprecates"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="termdomain"/>
-        </optional>
-        <ref name="definition"/>
-        <zeroOrMore>
-          <ref name="termnote"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="termexample"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="termsource"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="definition">
-      <element name="definition">
-        <oneOrMore>
-          <choice>
-            <ref name="paragraph"/>
-            <ref name="figure"/>
-            <ref name="formula"/>
-          </choice>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="annex">
-      <element name="annex">
-        <optional>
-          <attribute name="id">
-            <data type="ID"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="language"/>
-        </optional>
-        <optional>
-          <attribute name="script"/>
-        </optional>
-        <optional>
-          <attribute name="inline-header">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="obligation">
-            <choice>
-              <value>normative</value>
-              <value>informative</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <ref name="section-title"/>
-        </optional>
-        <zeroOrMore>
-          <!--
-            allow hanging paragraps in annexes: they introduce lists
-            ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | figure | quote | sourcecode | review | example )*,
-          -->
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="clause-hanging-paragraph-with-footnote"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="annex-appendix"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="AdmonitionType">
-      <choice>
-        <value>danger</value>
-        <value>caution</value>
-        <value>warning</value>
-        <value>important</value>
-        <value>safety precautions</value>
-      </choice>
-    </define>
-    <define name="preface">
-      <element name="preface">
-        <optional>
-          <ref name="preface_abstract"/>
-        </optional>
-        <ref name="foreword"/>
-        <optional>
-          <ref name="introduction"/>
-        </optional>
-      </element>
-    </define>
-    <define name="DocumentType">
-      <choice>
-        <value>international-standard</value>
-        <value>technical-specification</value>
-        <value>technical-report</value>
-        <value>publicly-available-specification</value>
-        <value>international-workshop-agreement</value>
-        <value>guide</value>
-      </choice>
-    </define>
-    <define name="structuredidentifier">
-      <element name="structuredidentifier">
-        <optional>
-          <attribute name="type"/>
-        </optional>
-        <group>
-          <ref name="documentnumber"/>
-          <optional>
-            <ref name="tc-documentnumber"/>
-          </optional>
-        </group>
-      </element>
-    </define>
-    <define name="foreword">
-      <element name="foreword">
-        <ref name="Basic-Section"/>
-      </element>
-    </define>
-    <define name="introduction">
-      <element name="introduction">
-        <ref name="Content-Section"/>
-      </element>
-    </define>
-    <define name="editorialgroup">
-      <element name="editorialgroup">
-        <oneOrMore>
-          <ref name="technical-committee"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="subcommittee"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="workgroup"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
-      </element>
-    </define>
-    <define name="Content-Section">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <choice>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <oneOrMore>
-          <ref name="content-subsection"/>
-        </oneOrMore>
-      </choice>
-    </define>
-    <define name="table">
-      <element name="table">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <attribute name="width"/>
-        </optional>
-        <optional>
-          <attribute name="unnumbered">
-            <data type="boolean"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="subsequence"/>
-        </optional>
-        <optional>
-          <attribute name="alt"/>
-        </optional>
-        <optional>
-          <attribute name="summary"/>
-        </optional>
-        <optional>
-          <attribute name="uri">
-            <data type="anyURI"/>
-          </attribute>
-        </optional>
-        <optional>
-          <ref name="tname"/>
-        </optional>
-        <optional>
-          <ref name="thead"/>
-        </optional>
-        <ref name="tbody"/>
-        <optional>
-          <ref name="tfoot"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="table-note"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="dl"/>
-        </optional>
-      </element>
-    </define>
-  </include>
-  <!-- end overrides -->
-  <!--
-    We display the Normative References between scope and terms; but to keep the
-    grammar simple, we keep the references together
-  -->
-  <define name="iso-standard">
-    <element name="iso-standard">
-      <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="termdocsource"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="boilerplate"/>
-      </optional>
-      <ref name="preface"/>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annex"/>
-      </zeroOrMore>
-      <ref name="bibliography"/>
-    </element>
-  </define>
-  <define name="documentnumber">
-    <element name="project-number">
-      <optional>
-        <attribute name="part">
-          <data type="int"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="subpart">
-          <data type="int"/>
-        </attribute>
-      </optional>
-      <text/>
-    </element>
-  </define>
-  <define name="tc-documentnumber">
-    <element name="tc-document-number">
-      <data type="int"/>
-    </element>
-  </define>
-  <define name="subcommittee">
-    <element name="subcommittee">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="workgroup">
-    <element name="workgroup">
-      <ref name="IsoWorkgroup"/>
-    </element>
-  </define>
-  <define name="secretariat">
-    <element name="secretariat">
-      <text/>
-    </element>
-  </define>
-  <define name="clause-hanging-paragraph-with-footnote">
-    <element name="clause">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="obligation">
-          <choice>
-            <value>normative</value>
-            <value>informative</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <zeroOrMore>
-        <!-- allow hanging paragraphs in annexes: they introduce lists -->
-        <ref name="BasicBlock"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="note"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="clause-hanging-paragraph-with-footnote"/>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="annex-appendix">
-    <element name="appendix">
-      <ref name="Clause-Section"/>
-    </element>
-  </define>
-  <define name="ul_li">
-    <element name="li">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="uncheckedcheckbox">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="checkedcheckbox">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <oneOrMore>
-        <ref name="paragraph-with-footnote"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="stagename">
-    <element name="stagename">
-      <text/>
-    </element>
-  </define>
-</grammar>