metanorma-itu 1.0.1 → 1.0.6

data/lib/isodoc/itu/html/itu.scss

@@ -25,7 +25,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
         text-align:left;
         mso-pagination:widow-orphan;
         tab-stops:45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
-        font-size:10.0pt;
+        font-size:12.0pt;
         font-family:$bodyfont;
         mso-fareast-font-family:Calibri;
         mso-bidi-font-family:"Courier New";
@@ -113,7 +113,7 @@ p.SourceTitle
         mso-fareast-font-family:$bodyfont;
         mso-bidi-font-family:$bodyfont;
         mso-ansi-language:EN-GB;}
-p.AdmonitionTitle
+p.AdmonitionTitle, p.RecommendationTitle
         {mso-style-unhide:no;
         mso-style-qformat:yes;
         mso-style-parent:"";
@@ -362,13 +362,36 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle
 	tab-stops:20.15pt;
 	font-size:14.0pt;
 	mso-bidi-font-size:11.0pt;
-	page-break-before:always;
 	font-family:$headerfont;
 	mso-fareast-font-family:$headerfont;
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	font-weight:bold;
+        page-break-before:always;
 	mso-bidi-font-weight:normal;}
+p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
+mso-style-noshow:yes;
+        mso-style-unhide:no;
+        mso-style-parent:"Foreword Title";
+        margin-top:0cm;
+        margin-right:0cm;
+        margin-bottom:15.5pt;
+        margin-left:0cm;
+        text-align:center;
+        line-height:15.5pt;
+        mso-pagination:widow-orphan;
+        page-break-after:avoid;
+        mso-hyphenate:none;
+        tab-stops:20.15pt;
+        font-size:14.0pt;
+        mso-bidi-font-size:11.0pt;
+        font-family:$headerfont;
+        mso-fareast-font-family:$headerfont;
+        mso-bidi-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        font-weight:bold;
+        mso-bidi-font-weight:normal;
+}
 p.Terms, li.Terms, div.Terms
         {mso-style-name:"Term\(s\)";
         mso-style-priority:8;
@@ -823,6 +846,33 @@ div.WordSection1
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
 	mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
 	mso-paper-source:0;}
+@page WordSection2L
+        {
+        size:842.0pt 21.0cm;
+        margin:54.45pt 54.45pt 54.45pt 54.45pt;
+        mso-header-margin:24.1pt;
+        mso-footer-margin:24.1pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
+        mso-paper-source:0;}
+@page WordSection2P
+        {
+        size:21.0cm 842.0pt;
+        margin:54.45pt 54.45pt 54.45pt 54.45pt;
+        mso-header-margin:24.1pt;
+        mso-footer-margin:24.1pt;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
+        mso-paper-source:0;}
+
 div.WordSection2
 	{page:WordSection2;}
 @page WordSection3
@@ -839,6 +889,32 @@ div.WordSection2
 	mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
 	mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
 	mso-paper-source:0;}
+@page WordSection3L
+        {
+        size:842.0pt 21.0cm;
+        margin:2.0cm 2.0cm 2.0cm 2.0cm;
+        mso-header-margin:1.0cm;
+        mso-footer-margin:1.0cm;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
+        mso-paper-source:0;}
+@page WordSection3P
+        {
+        size:21.0cm 842.0pt;
+        margin:2.0cm 2.0cm 2.0cm 2.0cm;
+        mso-header-margin:1.0cm;
+        mso-footer-margin:1.0cm;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-first-header:url("file:///C:/Doc/FILENAME_files/header.html") fh2;
+        mso-first-footer:url("file:///C:/Doc/FILENAME_files/header.html") ff2;
+        mso-paper-source:0;}
 div.WordSection3
 	{page:WordSection3;}
 table.MsoISOTable

data/lib/isodoc/itu/html/word_itu_intro.html

@@ -125,9 +125,9 @@ style='mso-ansi-language:EN-US'>
 <p><br clear=all
          style='page-break-before:always'></p>
 
-<div id="legal"/>
-<div id="license"/>
-<div id="copyright"/>
+<div id="boilerplate-legal-destination"/>
+<div id="boilerplate-license-destination"/>
+<div id="boilerplate-copyright-destination"/>
 
 <b style='mso-bidi-font-weight:normal'><span lang=EN-US style='font-size:12.0pt;
 mso-bidi-font-size:10.0pt;font-family:"Times New Roman",serif;mso-fareast-font-family:

data/lib/isodoc/itu/html/word_itu_titlepage.html

@@ -261,13 +261,13 @@
  </tr>
 </table>
 
-<p class="MsoNormal" align="right" style='margin-top:12.0pt;text-align:right;
+<p class="MsoNormal" align="right" style='margin-top:0.0pt;text-align:right;
 tab-stops:39.7pt 59.55pt 79.4pt 99.25pt right 17.0cm'><span style='mso-bookmark:
 _Hlk526346232'><span lang="EN-US" style='font-size:9.0pt;mso-bidi-font-size:10.0pt;
 font-family:"Arial",sans-serif;mso-bidi-font-family:"Times New Roman";
 mso-ansi-language:EN-US;mso-fareast-language:ZH-CN;mso-no-proof:yes'><v:shape
  id="Picture_x0020_1" o:spid="_x0000_i1033" type="#_x0000_t75" alt="logo_E"
- style='width:121pt;height:50pt;visibility:visible;mso-wrap-style:square'>
+ style='width:70pt;height:70pt;visibility:visible;mso-wrap-style:square'>
 <v:imagedata src="{{ logo_word }}" o:title="logo_E"/>
 </v:shape></span></span><span style='mso-bookmark:_Hlk526346232'><span
 lang="EN-US" style='font-size:9.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;

data/lib/isodoc/itu/html_convert.rb

@@ -58,26 +58,12 @@ module IsoDoc
         end
       end
 
-       def html_preface(docxml)
+      def authority_cleanup(docxml)
+        authority_cleanup1(docxml, "draft-warning")
         super
-        authority_cleanup(docxml)
-        docxml
       end
 
-       def authority_cleanup(docxml)
-         dest = docxml.at("//div[@class = 'draft-warning']")
-         auth = docxml.at("//div[@id = 'draft-warning']")
-         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-         dest and auth and dest.replace(auth.remove)
-         %w(copyright license legal).each do |t|
-           dest = docxml.at("//div[@id = '#{t}']")
-           auth = docxml.at("//div[@class = '#{t}']")
-           auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-           dest and auth and dest.replace(auth.remove)
-         end
-       end
-
-       include BaseConvert
+      include BaseConvert
     end
   end
 end

data/lib/isodoc/itu/metadata.rb

@@ -8,10 +8,12 @@ module IsoDoc
         super
         here = File.dirname(__FILE__)
         set(:logo_html,
-            File.expand_path(File.join(here, "html", "Logo_ITU.jpg")))
+            #File.expand_path(File.join(here, "html", "Logo_ITU.jpg")))
+            File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
         set(:logo_comb,
             File.expand_path(File.join(here, "html", "itu-document-comb.png")))
-        set(:logo_word, File.expand_path(File.join(here, "html", "logo.png")))
+        #set(:logo_word, File.expand_path(File.join(here, "html", "logo.png")))
+        set(:logo_word, File.expand_path(File.join(here, "html", "International_Telecommunication_Union_Logo.svg")))
       end
 
       def title(isoxml, _out)

data/lib/isodoc/itu/pdf_convert.rb

@@ -13,12 +13,6 @@ module IsoDoc
         super
       end
 
-      #def convert1(docxml, filename, dir)
-      #  FileUtils.cp html_doc_path('Logo_ITU.jpg'), File.join(@localdir, "Logo_ITU.jpg")
-      #  @files_to_delete << File.join(@localdir, "Logo_ITU.jpg")
-      #  super
-      #end
-
       def html_toc(docxml)
         docxml
       end
@@ -66,25 +60,6 @@ module IsoDoc
         end
       end
 
-       def html_preface(docxml)
-        super
-        authority_cleanup(docxml)
-        docxml     
-      end
-
-       def authority_cleanup(docxml)
-         dest = docxml.at("//div[@class = 'draft-warning']")
-         auth = docxml.at("//div[@id = 'draft-warning']")
-         auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-         dest and auth and dest.replace(auth.remove)
-         %w(copyright license legal).each do |t|
-           dest = docxml.at("//div[@id = '#{t}']")
-           auth = docxml.at("//div[@class = '#{t}']")
-           auth&.xpath(".//h1 | .//h2")&.each { |h| h["class"] = "IntroTitle" }
-           dest and auth and dest.replace(auth.remove)
-         end
-       end
-
       include BaseConvert
     end
   end

data/lib/isodoc/itu/ref.rb

@@ -42,9 +42,8 @@ module IsoDoc
       end
 
       def bibitem_ref_code(b)
-        id = b.at(ns("./docidentifier[@type = 'ITU']"))
-        id ||= b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
-                     "or @type = 'ISSN' or @type = 'ISBN')]"))
+        id = b.at(ns("./docidentifier[@type = 'metanorma']"))
+        id ||= b.at(ns("./docidentifier[@type = 'ITU']"))
         id ||= b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'ISSN' or "\
                        "@type = 'ISBN')]"))
         id ||= b.at(ns("./docidentifier"))
@@ -66,9 +65,10 @@ module IsoDoc
 
       def render_identifiers(ids)
         ids.map do |id|
-          (id["type"] == "ITU" ? titlecase(id.parent&.at(ns("./ext/doctype"))&.text ||
-                                           "recommendation") + " " : "") +
-                                          docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
+          (id["type"] == "ITU" ?
+           titlecase(id.parent&.at(ns("./ext/doctype"))&.text ||
+                     "recommendation") + " " : "") +
+                    docid_prefix(id["type"], id.text.sub(/^\[/, "").sub(/\]$/, ""))
         end.join(" | ")
       end
 

data/lib/isodoc/itu/word_convert.rb

@@ -73,7 +73,6 @@ module IsoDoc
         word_history_cleanup(docxml)
         authority_hdr_cleanup(docxml)
         super
-        authority_cleanup(docxml)
         docxml
       end
 
@@ -166,23 +165,6 @@ module IsoDoc
         @wordstylesheet&.unlink
       end
 
-=begin
-      def eref_parse(node, out)
-        linkend = get_linkend(node)
-        if node["type"] == "footnote"
-          out.sup { |s| s << linkend }
-        else
-          out << linkend
-        end
-      end
-
-      def xref_parse(node, out)
-        #target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".html#") :
-        #  "##{node["target"]}"
-        out << get_linkend(node)
-      end
-=end
-
       def link_parse(node, out)
         out.a **attr_code(href: node["target"], title: node["alt"], class: "url") do |l|
           if node.text.empty?
@@ -201,7 +183,7 @@ module IsoDoc
           end
         end
         %w(copyright license legal).each do |t|
-          docxml&.xpath("//div[@class = '#{t}']").each do |d|
+          docxml&.xpath("//div[@class = 'boilerplate-#{t}']").each do |d|
             p = d&.at("./descendant::h1[2]") and
               p.previous = "<p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>"
             d.xpath(".//h1 | .//h2").each do |p|
@@ -217,8 +199,8 @@ module IsoDoc
         auth = docxml.at("//div[@id = 'draft-warning']")
         dest and auth and dest.replace(auth.remove)
         %w(copyright license legal).each do |t|
-          dest = docxml.at("//div[@id = '#{t}']")
-          auth = docxml.at("//div[@class = '#{t}']")
+          dest = docxml.at("//div[@id = 'boilerplate-#{t}-destination']")
+          auth = docxml.at("//div[@class = 'boilerplate-#{t}']")
           next unless auth && dest
           t == "copyright" and p = auth&.at(".//p[@class = 'Normalaftertitle']") and
             p["class"] = "boilerplateHdr"

data/lib/metanorma/itu/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ITU
-    VERSION = "1.0.1"
+    VERSION = "1.0.6"
   end
 end

data/metanorma-itu.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-standoc", "~> 1.3.0"
   spec.add_dependency "isodoc", "~> 1.0.0"
 
-  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-14 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -274,20 +260,21 @@ files:
 - lib/asciidoctor/itu.rb
 - lib/asciidoctor/itu/basicdoc.rng
 - lib/asciidoctor/itu/biblio.rng
+- lib/asciidoctor/itu/boilerplate.xml
 - lib/asciidoctor/itu/cleanup.rb
 - lib/asciidoctor/itu/converter.rb
 - lib/asciidoctor/itu/front.rb
 - lib/asciidoctor/itu/i18n-en.yaml
 - lib/asciidoctor/itu/isodoc.rng
-- lib/asciidoctor/itu/isostandard.rng
 - lib/asciidoctor/itu/itu.rng
-- lib/asciidoctor/itu/itu_intro.xml
 - lib/asciidoctor/itu/macros.rb
 - lib/asciidoctor/itu/reqt.rng
 - lib/asciidoctor/itu/validate.rb
 - lib/isodoc/itu.rb
 - lib/isodoc/itu/base_convert.rb
+- lib/isodoc/itu/html/International_Telecommunication_Union_Logo.svg
 - lib/isodoc/itu/html/Logo_ITU.jpg
+- lib/isodoc/itu/html/_coverpage.scss
 - lib/isodoc/itu/html/header.html
 - lib/isodoc/itu/html/html_itu_intro.html
 - lib/isodoc/itu/html/html_itu_titlepage.html

data/lib/asciidoctor/itu/isostandard.rng

@@ -1,857 +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">
-  <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">
-      <optional>
-        <ref name="doctype"/>
-      </optional>
-      <ref name="editorialgroup"/>
-      <zeroOrMore>
-        <ref name="ics"/>
-      </zeroOrMore>
-      <ref name="structuredidentifier"/>
-    </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>
-            </choice>
-          </element>
-        </choice>
-      </element>
-    </define>
-    <define name="sections">
-      <element name="sections">
-        <ref name="clause"/>
-        <choice>
-          <ref name="term-clause"/>
-          <ref name="terms"/>
-        </choice>
-        <optional>
-          <ref name="definitions"/>
-        </optional>
-        <oneOrMore>
-          <ref name="clause"/>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="Basic-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>
-      <group>
-        <oneOrMore>
-          <ref name="BasicBlock"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
-    </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>
-          <oneOrMore>
-            <ref name="BasicBlock"/>
-          </oneOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <oneOrMore>
-          <ref name="content-subsection"/>
-        </oneOrMore>
-      </choice>
-    </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="references">
-      <element name="references">
-        <optional>
-          <attribute name="id">
-            <data type="ID"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="obligation">
-            <choice>
-              <value>normative</value>
-              <value>informative</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <ref name="section-title"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="bibitem"/>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="references"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="definitions">
-      <element name="definitions">
-        <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>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <ref name="dl"/>
-      </element>
-    </define>
-    <define name="terms">
-      <element name="terms">
-        <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>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <choice>
-          <oneOrMore>
-            <ref name="term"/>
-          </oneOrMore>
-          <group>
-            <zeroOrMore>
-              <ref name="terms"/>
-            </zeroOrMore>
-            <optional>
-              <ref name="definitions"/>
-            </optional>
-          </group>
-        </choice>
-      </element>
-    </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="figure">
-      <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <ref name="tname"/>
-        </optional>
-        <choice>
-          <ref name="image"/>
-          <oneOrMore>
-            <ref name="subfigure"/>
-          </oneOrMore>
-        </choice>
-        <zeroOrMore>
-          <ref name="fn"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="dl"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="li">
-      <element name="li">
-        <group>
-          <optional>
-            <!-- ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )+ -->
-            <attribute name="id">
-              <data type="ID"/>
-            </attribute>
-          </optional>
-          <oneOrMore>
-            <ref name="BasicBlock"/>
-          </oneOrMore>
-        </group>
-        <!-- exclude figures? -->
-      </element>
-    </define>
-    <define name="dd">
-      <element name="dd">
-        <zeroOrMore>
-          <!--
-            ( paragraph-with-footnote | table | note | formula | admonition | ol | ul | dl | quote | sourcecode | review | example )*
-            exclude figures?
-          -->
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="admonition">
-      <element name="admonition">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <attribute name="type">
-          <choice>
-            <value>danger</value>
-            <value>caution</value>
-            <value>warning</value>
-            <value>important</value>
-            <value>safety precautions</value>
-          </choice>
-        </attribute>
-        <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="xref">
-      <element name="xref">
-        <attribute name="target">
-          <data type="IDREF"/>
-        </attribute>
-        <text/>
-      </element>
-    </define>
-    <define name="hyperlink">
-      <element name="link">
-        <attribute name="target">
-          <data type="anyURI"/>
-        </attribute>
-        <text/>
-      </element>
-    </define>
-    <define name="thead">
-      <element name="thead">
-        <oneOrMore>
-          <ref name="tr"/>
-        </oneOrMore>
-      </element>
-    </define>
-    <define name="td">
-      <element name="td">
-        <optional>
-          <attribute name="colspan"/>
-        </optional>
-        <optional>
-          <attribute name="rowspan"/>
-        </optional>
-        <optional>
-          <attribute name="align">
-            <choice>
-              <value>left</value>
-              <value>right</value>
-              <value>center</value>
-            </choice>
-          </attribute>
-        </optional>
-        <choice>
-          <zeroOrMore>
-            <choice>
-              <ref name="TextElement"/>
-              <ref name="fn"/>
-            </choice>
-          </zeroOrMore>
-          <oneOrMore>
-            <ref name="paragraph-with-footnote"/>
-          </oneOrMore>
-        </choice>
-      </element>
-    </define>
-    <define name="th">
-      <element name="th">
-        <optional>
-          <attribute name="colspan"/>
-        </optional>
-        <optional>
-          <attribute name="rowspan"/>
-        </optional>
-        <optional>
-          <attribute name="align">
-            <choice>
-              <value>left</value>
-              <value>right</value>
-              <value>center</value>
-            </choice>
-          </attribute>
-        </optional>
-        <choice>
-          <zeroOrMore>
-            <choice>
-              <ref name="TextElement"/>
-              <ref name="fn"/>
-            </choice>
-          </zeroOrMore>
-          <oneOrMore>
-            <ref name="paragraph-with-footnote"/>
-          </oneOrMore>
-        </choice>
-      </element>
-    </define>
-    <define name="table-note">
-      <element name="note">
-        <optional>
-          <attribute name="id">
-            <data type="ID"/>
-          </attribute>
-        </optional>
-        <ref name="paragraph"/>
-      </element>
-    </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>
-  </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="bibliography">
-    <element name="bibliography">
-      <oneOrMore>
-        <choice>
-          <ref name="references"/>
-          <ref name="reference-clause"/>
-        </choice>
-      </oneOrMore>
-    </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="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </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="technical-committee">
-    <element name="technical-committee">
-      <ref name="IsoWorkgroup"/>
-    </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="IsoWorkgroup">
-    <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
-    </optional>
-    <optional>
-      <attribute name="type"/>
-    </optional>
-    <text/>
-  </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="subfigure">
-    <element name="figure">
-      <attribute name="id">
-        <data type="ID"/>
-      </attribute>
-      <optional>
-        <ref name="tname"/>
-      </optional>
-      <ref name="image"/>
-    </element>
-  </define>
-  <define name="termdocsource">
-    <element name="termdocsource">
-      <ref name="CitationType"/>
-    </element>
-  </define>
-  <define name="ics">
-    <element name="ics">
-      <element name="code">
-        <text/>
-      </element>
-      <element name="text">
-        <text/>
-      </element>
-    </element>
-  </define>
-  <define name="term-clause">
-    <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>
-        <choice>
-          <ref name="term-clause"/>
-          <ref name="terms"/>
-          <ref name="definitions"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="reference-clause">
-    <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>
-      <choice>
-        <oneOrMore>
-          <ref name="reference-clause"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="references"/>
-        </zeroOrMore>
-      </choice>
-    </element>
-  </define>
-  <define name="annex-appendix">
-    <element name="appendix">
-      <ref name="Clause-Section"/>
-    </element>
-  </define>
-</grammar>