relaton-itu 1.0.1 → 1.3.0

data/lib/relaton_itu/editorial_group.rb

@@ -16,8 +16,9 @@ module RelatonItu
     # @param subgroup [Hash, RelatonItu::ItuGroup, NilClass]
     # @param workgroup [Hash, RelatonItu::ItuGroup, NilClass]
     def initialize(bureau:, group:, subgroup: nil, workgroup: nil)
-      raise ArgumentError, "invalid bureau: #{bureau}" unless BUREAUS.include? bureau
-
+      unless BUREAUS.include? bureau
+        warn "[relaton-itu] WARNING: invalid bureau: #{bureau}"
+      end
       @bureau = bureau
       @group = group.is_a?(Hash) ? ItuGroup.new(group) : group
       @subgroup = subgroup.is_a?(Hash) ? ItuGroup.new(subgroup) : subgroup
@@ -25,10 +26,10 @@ module RelatonItu
     end
 
     # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
+    def to_xml(builder) # rubocop:disable Metrics/AbcSize
       builder.editorialgroup do
         builder.bureau bureau
-        builder.group { |b| group.to_xml b }
+        builder.group { |b| group.to_xml b } if group
         builder.subgroup { |b| group.to_xml b } if subgroup
         builder.workgroup { |b| group.to_xml b } if workgroup
       end
@@ -36,10 +37,23 @@ module RelatonItu
 
     # @return [Hash]
     def to_hash
-      hash = { "bureau" => bureau, "group" => group.to_hash }
+      hash = { "bureau" => bureau }
+      hash["group"] = group.to_hash if group
       hash["subgroup"] = subgroup.to_hash if subgroup
       hash["workgroup"] = workgroup.to_hash if workgroup
       hash
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix) # rubocop:disable Metrics/AbcSize
+      pref = prefix.empty? ? prefix : prefix + "."
+      pref += "editorialgroup"
+      out = "#{pref}.bureau:: #{bureau}\n"
+      out += group.to_asciibib "#{pref}.group" if group
+      out += subgroup.to_asciibib "#{pref}.subgroup" if subgroup
+      out += workgroup.to_asciibib "#{pref}.workgroup" if workgroup
+      out
+    end
   end
 end

data/lib/relaton_itu/hash_converter.rb

@@ -1,5 +1,5 @@
 module RelatonItu
-  class HashConverter < RelatonIsoBib::HashConverter
+  class HashConverter < RelatonBib::HashConverter
     class << self
       private
 
@@ -9,6 +9,15 @@ module RelatonItu
 
         ret[:editorialgroup] = EditorialGroup.new eg
       end
+
+      # @param ret [Hash]
+      def structuredidentifier_hash_to_bib(ret)
+        return unless ret[:structuredidentifier]
+
+        ret[:structuredidentifier] = StructuredIdentifier.new(
+          ret[:structuredidentifier]
+        )
+      end
     end
   end
 end

data/lib/relaton_itu/itu_bibliographic_item.rb

@@ -1,5 +1,5 @@
 module RelatonItu
-  class ItuBibliographicItem < RelatonIsoBib::IsoBibliographicItem
+  class ItuBibliographicItem < RelatonBib::BibliographicItem
     TYPES = %w[
       recommendation recommendation-supplement recommendation-amendment
       recommendation-corrigendum recommendation-errata recommendation-annex
@@ -7,12 +7,11 @@ module RelatonItu
       joint-itu-iso-iec
     ].freeze
 
+    # @params structuredidentifier [RelatonItu::StructuredIdentifier]
     def initialize(**args)
-      @doctype = args.delete :doctype
-      if doctype && !TYPES.include?(doctype)
-        raise ArgumentError, "invalid doctype: #{doctype}"
+      if args[:doctype] && !TYPES.include?(args[:doctype])
+        warn "[relaton-itu] WARNING: invalid doctype: #{args[:doctype]}"
       end
-
       super
     end
   end

data/lib/relaton_itu/itu_bibliography.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require "relaton_iso_bib"
+require "relaton_bib"
 require "relaton_itu/itu_bibliographic_item"
 require "relaton_itu/editorial_group"
+require "relaton_itu/structured_identifier"
 require "relaton_itu/itu_group"
 require "relaton_itu/scrapper"
 require "relaton_itu/hit_collection"
@@ -66,14 +67,6 @@ module RelatonItu
         nil
       end
 
-      # def fetch_pages(hits, threads)
-      #   workers = RelatonBib::WorkersPool.new threads
-      #   workers.worker { |w| { i: w[:i], hit: w[:hit].fetch } }
-      #   hits.each_with_index { |hit, i| workers << { i: i, hit: hit } }
-      #   workers.end
-      #   workers.result.sort_by { |a| a[:i] }.map { |x| x[:hit] }
-      # end
-
       def search_filter(code)
         docidrx = %r{\w+\.\d+|\w\sSuppl\.\s\d+} # %r{^ITU-T\s[^\s]+}
         c = code.sub(/Imp\s?/, "").match(docidrx).to_s

data/lib/relaton_itu/itu_group.rb

@@ -28,6 +28,16 @@ module RelatonItu
         hash["finish"] = finish if finish
         hash
       end
+
+      # @param prefix [String]
+      # @return [String]
+      def to_asciibib(prefix)
+        pref = prefix.empty? ? prefix : prefix + "."
+        pref += "period"
+        out = "#{pref}.start:: #{start}\n"
+        out += "#{pref}.finish:: #{finish}\n" if finish
+        out
+      end
     end
 
     TYPES = %w[tsag study-group work-group].freeze
@@ -72,5 +82,16 @@ module RelatonItu
       hash["period"] = period.to_hash if period
       hash
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix)
+      pref = prefix.empty? ? prefix : prefix + "."
+      out = "#{pref}name:: #{name}\n"
+      out += "#{pref}type:: #{type}\n" if type
+      out += "#{pref}acronym:: #{acronym}\n" if acronym
+      out += period.to_asciibib prefix if period
+      out
+    end
   end
 end

data/lib/relaton_itu/scrapper.rb

@@ -43,6 +43,7 @@ module RelatonItu
 
         ItuBibliographicItem.new(
           fetched: Date.today.to_s,
+          type: "standard",
           docid: fetch_docid(doc),
           edition: edition,
           language: ["en"],
@@ -170,7 +171,7 @@ module RelatonItu
         doc.xpath('//div[contains(@id, "tab_sup")]//table/tr[position()>2]').map do |r|
           ref = r.at('./td/span[contains(@id, "title_e")]/nobr/a')
           fref = RelatonBib::FormattedRef.new(content: ref.text, language: "en", script: "Latn")
-          bibitem = RelatonIsoBib::IsoBibliographicItem.new(formattedref: fref)
+          bibitem = ItuBibliographicItem.new(formattedref: fref, type: "standard")
           { type: "complements", bibitem: bibitem }
         end
       end
@@ -183,30 +184,7 @@ module RelatonItu
         t = doc.at("//td[@class='title']|//div/table[1]/tr[4]/td/strong")
         return [] unless t
 
-        titles = t.text.sub(/\w\.Imp\s?\d+\u00A0:\u00A0/, "").split " - "
-        case titles.size
-        when 0
-          intro, main, part = nil, "", nil
-        when 1
-          intro, main, part = nil, titles[0], nil
-        when 2
-          if /^(Part|Partie) \d+:/ =~ titles[1]
-            intro, main, part = nil, titles[0], titles[1]
-          else
-            intro, main, part = titles[0], titles[1], nil
-          end
-        when 3
-          intro, main, part = titles[0], titles[1], titles[2]
-        else
-          intro, main, part = titles[0], titles[1], titles[2..-1]&.join(" -- ")
-        end
-        [{
-          title_intro: intro,
-          title_main: main,
-          title_part: part,
-          language: "en",
-          script: "Latn",
-        }]
+        RelatonBib::TypedTitleString.from_string t.text, "en", "Latn"
       end
 
       # Fetch dates
@@ -284,7 +262,7 @@ module RelatonItu
       # Fetch copyright.
       # @param code [String]
       # @param doc [Nokogiri::HTML::Document]
-      # @return [Hash]
+      # @return [Array<Hash>]
       def fetch_copyright(code, doc)
         abbreviation = code.match(/^[^-]+/).to_s
         case abbreviation
@@ -294,7 +272,8 @@ module RelatonItu
         end
         fdate = doc.at("//table/tr/td/span[contains(@id, 'Label5')]")
         from = fdate&.text || ob_date(doc)
-        { owner: { name: name, abbreviation: abbreviation, url: url }, from: from }
+        [{ owner: [{ name: name, abbreviation: abbreviation, url: url }],
+           from: from }]
       end
     end
   end

data/lib/relaton_itu/structured_identifier.rb

@@ -0,0 +1,51 @@
+module RelatonItu
+  class StructuredIdentifier
+    # @return [String]
+    attr_reader :bureau, :docnumber
+
+    # @return [String, NilClass]
+    attr_reader :annexid
+
+    # @param bureau [String] T, D, or R
+    # @param docnumber [String]
+    # @param annexid [String, NilClass]
+    def initialize(bureau:, docnumber:, annexid: nil)
+      unless EditorialGroup::BUREAUS.include? bureau
+        warn "[relaton-itu] WARNING: invalid bureau: #{bureau}"
+      end
+      @bureau = bureau
+      @docnumber = docnumber
+      @annexid = annexid
+    end
+
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.structuredidentifier do |b|
+        b.bureau bureau
+        b.docnumber docnumber
+        b.annexid annexid if annexid
+      end
+    end
+
+    # @return [Hash]
+    def to_hash
+      hash = { bureau: bureau, docnumber: docnumber }
+      hash[:annexid] = annexid if annexid
+      hash
+    end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix)
+      pref = prefix.empty? ? prefix : prefix + "."
+      pref += "structuredidentifier"
+      out = "#{pref}.bureau:: #{bureau}\n#{pref}.docnumber:: #{docnumber}\n"
+      out += "#{pref}.annexid:: #{annexid}\n" if annexid
+      out
+    end
+
+    def presence?
+      true
+    end
+  end
+end

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.0.1".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/relaton_itu/xml_parser.rb

@@ -1,23 +1,16 @@
 require "nokogiri"
 
 module RelatonItu
-  class XMLParser < RelatonIsoBib::XMLParser
+  class XMLParser < RelatonBib::XMLParser
     class << self
-      # Override RelatonIsoBib::XMLParser.form_xml method.
-      # @param xml [String]
+      private
+
+      # @param item_hash [Hash]
       # @return [RelatonItu::ItuBibliographicItem]
-      def from_xml(xml)
-        doc = Nokogiri::XML(xml)
-        ituitem = doc.at "/bibitem|/bibdata"
-        if ituitem
-          ItuBibliographicItem.new item_data(ituitem)
-        elsif
-          warn "[relaton-itu] can't find bibitem or bibdata element in the XML"
-        end
+      def bib_item(item_hash)
+        ItuBibliographicItem.new item_hash
       end
 
-      private
-
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonItu::EditorialGroup]
       def fetch_editorialgroup(ext)
@@ -54,6 +47,18 @@ module RelatonItu
           start: period.at("start").text, finish: period.at("end")&.text,
         )
       end
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [RelatonItu::StructuredIdentifier]
+      def fetch_structuredidentifier(ext)
+        sid = ext.at "./structuredidentifier"
+        return unless sid
+
+        br = sid.at("bureau").text
+        dn = sid.at("docnumber").text
+        an = sid.at("annexid")&.text
+        StructuredIdentifier.new(bureau: br, docnumber: dn, annexid: an)
+      end
     end
   end
 end

data/relaton-itu.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path("..", __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-iso-bib", "~> 1.0.0"
+  spec.add_dependency "relaton-bib", "~> 1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -151,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaton-iso-bib
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.3.0
 description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
   model'
 email:
@@ -187,7 +187,6 @@ files:
 - grammars/basicdoc.rng
 - grammars/biblio.rng
 - grammars/isodoc.rng
-- grammars/isostandard.rng
 - grammars/itu.rng
 - grammars/reqt.rng
 - lib/relaton_itu.rb
@@ -200,6 +199,7 @@ files:
 - lib/relaton_itu/itu_group.rb
 - lib/relaton_itu/processor.rb
 - lib/relaton_itu/scrapper.rb
+- lib/relaton_itu/structured_identifier.rb
 - lib/relaton_itu/version.rb
 - lib/relaton_itu/xml_parser.rb
 - relaton-itu.gemspec

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>