relaton-nist 1.1.0 → 1.3.1

data/lib/relaton_nist/comment_period.rb

@@ -34,5 +34,16 @@ module RelatonNist
       hash["extended"] = extended.to_s if extended
       hash
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix)
+      pref = prefix.empty? ? prefix : prefix + "."
+      pref += "commentperiod"
+      out = "#{pref}.from:: #{from}\n"
+      out += "#{pref}.to:: #{to}\n" if to
+      out += "#{pref}.extended:: #{extended}\n" if extended
+      out
+    end
   end
 end

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/hit_collection.rb

@@ -17,10 +17,10 @@ module RelatonNist
     # @param year [String]
     # @param opts [Hash]
     # @option opts [String] :stage
-    def initialize(ref_nbr, year = nil, opts = {})
+    def initialize(ref_nbr, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize
       super ref_nbr, year
 
-      /(?<docid>(SP|FIPS)\s[0-9-]+)/ =~ text
+      /(?<docid>(SP|FIPS)\s[0-9-]+\w?)/ =~ text
       @array = docid ? from_json(docid, **opts) : from_csrc(**opts)
 
       @array.sort! do |a, b|
@@ -45,28 +45,28 @@ module RelatonNist
         from = d.strftime "%m/%d/%Y"
         to   = d.next_year.prev_day.strftime "%m/%d/%Y"
       end
-      url  = "#{DOMAIN}/publications/search?keywords-lg=#{text}"
+      url = "#{DOMAIN}/publications/search?keywords-lg=#{text}"
       url += "&dateFrom-lg=#{from}" if from
       url += "&dateTo-lg=#{to}" if to
-      url += if /PD/ =~ opts[:stage]
+      url += if /PD/.match? opts[:stage]
                "&status-lg=Draft,Retired Draft,Withdrawn"
              else
                "&status-lg=Final,Withdrawn"
              end
 
-      doc  = Nokogiri::HTML OpenURI.open_uri(::Addressable::URI.parse(url).normalize)
+      doc = Nokogiri::HTML OpenURI.open_uri(::Addressable::URI.parse(url).normalize)
       doc.css("table.publications-table > tbody > tr").map do |h|
         link  = h.at("td/div/strong/a")
         serie = h.at("td[1]").text.strip
         code  = h.at("td[2]").text.strip
         title = link.text
-        doc_url   = DOMAIN + link[:href]
+        doc_url = DOMAIN + link[:href]
         status = h.at("td[4]").text.strip.downcase
         release_date = Date.strptime h.at("td[5]").text.strip, "%m/%d/%Y"
         Hit.new(
           {
-            code: code, serie: serie, title: title, url: doc_url, status: status,
-            release_date: release_date
+            code: code, serie: serie, title: title, url: doc_url,
+            status: status, release_date: release_date
           }, self
         )
       end
@@ -91,17 +91,18 @@ module RelatonNist
     # @param docid [String]
     # @param stage [String]
     # @return [Array<Hach>]
-    def select_data(docid, **opts)
+    def select_data(docid, **opts) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength,Metrics/PerceivedComplexity
       d = Date.strptime year, "%Y" if year
+      didrx = Regexp.new(docid)
       data.select do |doc|
         next unless match_year?(doc, d)
 
-        if /PD/ =~ opts[:stage]
+        if /PD/.match? opts[:stage]
           next unless %w[draft-public draft-prelim].include? doc["status"]
         else
           next unless doc["status"] == "final"
         end
-        doc["docidentifier"] =~ Regexp.new(docid)
+        doc["docidentifier"] =~ didrx
       end
     end
 
@@ -129,7 +130,9 @@ module RelatonNist
     #
     # @prarm ctime [Time, NilClass]
     def fetch_data(ctime)
-      resp = OpenURI.open_uri("https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.meta")
+      resp = OpenURI.open_uri(
+        "https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.meta"
+      )
       if !ctime || ctime < resp.last_modified
         @data = nil
         zip = OpenURI.open_uri "https://csrc.nist.gov/CSRC/media/feeds/metanorma/pubs-export.zip"

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
@@ -82,5 +83,13 @@ module RelatonNist
       hash["commentperiod"] = commentperiod.to_hash if commentperiod
       hash
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix = "")
+      out = super
+      out += commentperiod.to_asciibib prefix if commentperiod
+      out
+    end
   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"
@@ -120,7 +121,7 @@ module RelatonNist
       end
 
       def nistbib_search_filter(code, year, opts)
-        idregex = %r{[0-9-]{3,}}
+        idregex = %r{[0-9-]{3,}\w?}
         docid = code.match(idregex).to_s
         serie = code.match(%r{(FISP|SP|NISTIR)(?=\s)})
         warn "[relaton-nist] (\"#{code}\") fetching..."

data/lib/relaton_nist/scrapper.rb

@@ -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
@@ -373,7 +376,7 @@ module RelatonNist
 
       # 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]
@@ -402,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(

data/lib/relaton_nist/version.rb

@@ -1,3 +1,3 @@
 module RelatonNist
-  VERSION = "1.1.0".freeze
+  VERSION = "1.3.1".freeze
 end

data/lib/relaton_nist/xml_parser.rb

@@ -1,28 +1,25 @@
 module RelatonNist
   class XMLParser < RelatonBib::XMLParser
     class << self
-      def from_xml(xml)
-        doc = Nokogiri::XML xml
-        doc.remove_namespaces!
-        nistitem = doc.at("/bibitem|/bibdata")
-        if nistitem
-          NistBibliographicItem.new(item_data(nistitem))
-        elsif
-          warn "[relaton-nist] can't find bibitem or bibdata element in the XML"
-        end
-      end
-
       private
 
-      def item_data(nistitem)
+      # @param intem [Nokogiri::XML::Document]
+      # @return [Hash]
+      def item_data(item)
         data = super
-        ext = nistitem.at "./ext"
+        ext = item.at "./ext"
         return data unless ext
 
         data[:commentperiod] = fetch_commentperiod(ext)
         data
       end
 
+      # @param item_hash [Hash]
+      # @return [RelatonNist::NistBibliographicItem]
+      def bib_item(item_hash)
+        NistBibliographicItem.new item_hash
+      end
+
       def fetch_status(item)
         status = item.at "./status"
         return unless status
@@ -43,6 +40,12 @@ module RelatonNist
           extended: cp.at("extended")&.text
         )
       end
+
+      # @param item [Nokogiri::XML::Element]
+      # @return [Array<RelatonBib::DocumentRelation>]
+      def fetch_relations(item)
+        super item, DocumentRelation
+      end
     end
   end
 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.1.0"
+  spec.add_dependency "relaton-bib", "~> 1.3.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.1.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-08-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.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.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
@@ -220,7 +220,7 @@ homepage: https://github.com/metanorma/relaton-nist
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonNist: retrive NIST standards.'
 test_files: []

data/grammars/isostandard.rng

@@ -1,530 +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">
-        <zeroOrMore>
-          <choice>
-            <ref name="note"/>
-            <ref name="admonition"/>
-          </choice>
-        </zeroOrMore>
-        <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>
-        <value>amendment</value>
-        <value>technical-corrigendum</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="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
-  <define name="stagename">
-    <element name="stagename">
-      <text/>
-    </element>
-  </define>
-</grammar>