RubyGems - metanorma-itu - Versions diffs - 1.0.16 → 1.1.2 - Mend

metanorma-itu 1.0.16 → 1.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

checksums.yaml +4 -4
data/.github/workflows/macos.yml +0 -1
data/.github/workflows/ubuntu.yml +10 -7
data/.github/workflows/windows.yml +0 -1
data/Rakefile +2 -0
data/lib/asciidoctor/itu/biblio.rng +14 -4
data/lib/asciidoctor/itu/cleanup.rb +72 -72
data/lib/asciidoctor/itu/converter.rb +12 -17
data/lib/asciidoctor/itu/isodoc.rng +444 -1
data/lib/asciidoctor/itu/reqt.rng +23 -0
data/lib/isodoc/itu.rb +1 -0
data/lib/isodoc/itu/base_convert.rb +69 -17
data/lib/isodoc/itu/html/_coverpage.scss +8 -2
data/lib/isodoc/itu/html/html_itu_titlepage.html +1 -4
data/lib/isodoc/itu/html/htmlstyle.scss +8 -4
data/lib/isodoc/itu/html/itu.scss +3 -0
data/lib/isodoc/itu/html/word_itu_intro.html +9 -1
data/lib/isodoc/itu/html/word_itu_titlepage.html +1 -4
data/lib/isodoc/itu/html/wordstyle.scss +5 -5
data/lib/isodoc/itu/i18n-en.yaml +2 -1
data/lib/isodoc/itu/itu.recommendation-annex.xsl +1218 -417
data/lib/isodoc/itu/itu.recommendation.xsl +1218 -417
data/lib/isodoc/itu/itu.resolution.xsl +1218 -417
data/lib/isodoc/itu/metadata.rb +13 -5
data/lib/isodoc/itu/pdf_convert.rb +0 -13
data/lib/isodoc/itu/presentation_xml_convert.rb +10 -0
data/lib/isodoc/itu/ref.rb +38 -15
data/lib/isodoc/itu/terms.rb +9 -22
data/lib/isodoc/itu/word_convert.rb +6 -7
data/lib/isodoc/itu/xref.rb +43 -12
data/lib/metanorma/itu/processor.rb +6 -8
data/lib/metanorma/itu/version.rb +1 -1
data/metanorma-itu.gemspec +3 -2
metadata +25 -11

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1075b0ab1b5ce442ec5e1048b390b717a0722dfb66b5130c934f4a0eaf39caca
-  data.tar.gz: 6d5d755eaf6cfea89ca934e0f54b9c0ef2042da3b289e4fb0297ae7f7efa6267
+  metadata.gz: 7c860fb375c12e21bf639732bb67da38c2939cbec214bbba162f4d773d7d530f
+  data.tar.gz: 56b4e3f438505bde466d3fd5a4f80e9f041128ddedce299a29904c0adf2209b6
 SHA512:
-  metadata.gz: cef7bfe22e96dda2a19678c7f04f60c5a82f76544e6e29f9ae77a34873cc13413139b26c2c84cdbc736438531a034a9c934bc8e9bce96b4d2a6534520948ab75
-  data.tar.gz: 932eb30b185032d66a843bb9981e40cb103df654096528742c9029bb092f500b83f11de6553ffc30ec64867b584d54ff750e8bf00e03fde4f4bc467b76110047
+  metadata.gz: d25adca47938c84b4bebea5e090648d0d337529b6266e858c09353337a1079aad4092f4fc95039cb1fd81b60a23c84063b34288561360beeb49bafacf919f472
+  data.tar.gz: b884cce668cc56da6dd132074686fabc166ea20ffb2dd0694594bf0e9014842e443d22084a6f2cfd4f45d1cd11e55d96fcbe4f571924558afde3e5ec9259645c

data/.github/workflows/macos.yml CHANGED

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           sudo gem install bundler --force

data/.github/workflows/ubuntu.yml CHANGED

@@ -31,7 +31,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         run: |
           gem install bundler
@@ -39,15 +38,19 @@ jobs:
       - name: Run specs
         run: |
           bundle exec rake
-      - name: Trigger dependent repositories
-        if: github.ref == 'refs/heads/master' && matrix.ruby == '2.6'
+      - name: Trigger repositories
+        if: matrix.ruby == '2.6'
         env:
-          GH_USERNAME: ${{ secrets.PAT_USERNAME }}
-          GH_ACCESS_TOKEN: ${{ secrets.PAT_TOKEN }}
+          GH_USERNAME: metanorma-ci
+          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
         run: |
           curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
           [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          for repo in $DEPENDENT_REPOS
+          CLIENT_PAYLOAD=$(cat <<EOF
+          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
+          EOF
+          )
+          for repo in $REPOS
           do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "{ \"ref\": \"${GITHUB_REF}\" }"
+            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
           done

data/.github/workflows/windows.yml CHANGED

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
       - name: Update gems
         shell: pwsh
         run: |

data/Rakefile CHANGED

@@ -1,6 +1,8 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require 'isodoc/gem_tasks'
+IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec

data/lib/asciidoctor/itu/biblio.rng CHANGED

@@ -532,7 +532,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -661,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -1021,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">

data/lib/asciidoctor/itu/cleanup.rb CHANGED

@@ -71,46 +71,46 @@ module Asciidoctor
           x.at("//sections/clause[descendant::definitions]")
         unless x.at("//sections/clause/title[text() = 'Conventions']")
           ins.next = "<clause id='_#{UUIDTools::UUID.random_create}'>"\
-          "<title>Conventions</title><p>"\
-          "#{@labels['clause_empty']}</p></clause>"
-          end
-          end
+            "<title>Conventions</title><p>"\
+            "#{@labels['clause_empty']}</p></clause>"
+        end
+      end
-          def cleanup(xmldoc)
-          symbols_cleanup(xmldoc)
-          super
-          obligations_cleanup(xmldoc)
-          xmldoc
-          end
+      def cleanup(xmldoc)
+        symbols_cleanup(xmldoc)
+        super
+        obligations_cleanup(xmldoc)
+        xmldoc
+      end
-          def smartquotes_cleanup(xmldoc)
-          return super if @smartquotes
-          xmldoc.traverse do |n|
+      def smartquotes_cleanup(xmldoc)
+        return super if @smartquotes
+        xmldoc.traverse do |n|
           next unless n.text?
           n.replace(HTMLEntities.new.encode(
             n.text.gsub(/\u2019|\u2018|\u201a|\u201b/, "'").
             gsub(/\u201c|\u201d|\u201e|\u201f/, '"'), :basic))
-          end
-          xmldoc
-          end
+        end
+        xmldoc
+      end
-          def termdef_cleanup(xmldoc)
-          xmldoc.xpath("//term/preferred").each do |p|
+      def termdef_cleanup(xmldoc)
+        xmldoc.xpath("//term/preferred").each do |p|
           if ["terms defined elsewhere",
-          "terms defined in this recommendation"].include? p.text.downcase
-          p.name = "title"
-          p.parent.name = "terms"
-          end
-          end
-          super
+              "terms defined in this recommendation"].include? p.text.downcase
+            p.name = "title"
+            p.parent.name = "terms"
           end
+        end
+        super
+      end
-          def termdef_boilerplate_cleanup(xmldoc)
-          end
+      def termdef_boilerplate_cleanup(xmldoc)
+      end
-          def symbols_cleanup(xmldoc)
-          sym = xmldoc.at("//definitions/title")
-          sym and sym&.next_element&.name == "dl" and
+      def symbols_cleanup(xmldoc)
+        sym = xmldoc.at("//definitions/title")
+        sym and sym&.next_element&.name == "dl" and
           sym.next = "<p>#{@symbols_boilerplate}</p>"
       end
@@ -118,55 +118,55 @@ module Asciidoctor
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'ITU']")
-          return 1 if bib.at("#{PUBLISHER}[name = 'International "\
-                             "Telecommunication Union']")
-          return 2 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
-          return 2 if bib.at("#{PUBLISHER}[name = 'International Organization "\
-                             "for Standardization']")
-          return 3 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
-          return 3 if bib.at("#{PUBLISHER}[name = 'International "\
-                             "Electrotechnical Commission']")
-          return 4 if bib.at("./docidentifier[@type][not(@type = 'DOI' or "\
-                             "@type = 'metanorma' or @type = 'ISSN' or @type = "\
-                             "'ISBN')]")
-          5
-        end
+        return 1 if bib.at("#{PUBLISHER}[name = 'International "\
+                           "Telecommunication Union']")
+        return 2 if bib.at("#{PUBLISHER}[abbreviation = 'ISO']")
+        return 2 if bib.at("#{PUBLISHER}[name = 'International Organization "\
+                           "for Standardization']")
+        return 3 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
+        return 3 if bib.at("#{PUBLISHER}[name = 'International "\
+                           "Electrotechnical Commission']")
+        return 4 if bib.at("./docidentifier[@type][not(@type = 'DOI' or "\
+                           "@type = 'metanorma' or @type = 'ISSN' or @type = "\
+                           "'ISBN')]")
+        5
+      end
-        def sort_biblio(bib)
-          bib.sort do |a, b|
-            sort_biblio_key(a) <=> sort_biblio_key(b)
-          end
+      def sort_biblio(bib)
+        bib.sort do |a, b|
+          sort_biblio_key(a) <=> sort_biblio_key(b)
         end
+      end
-        # sort by: doc class (ITU, ISO, IEC, other standard (not DOI &c), other
-        # then standard class (docid class other than DOI &c)
-        # then alphanumeric doc id (not DOI &c)
-        # then title
-        def sort_biblio_key(bib)
-          pubclass = pub_class(bib)
-          num = bib&.at("./docnumber")&.text
-          id = bib&.at("./docidentifier[not(@type = 'DOI' or @type = "\
-                       "'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")
-          metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
-          abbrid = metaid unless /^\[\d+\]$/.match(metaid)
-          type = id['type'] if id
-          title = bib&.at("./title[@type = 'main']")&.text ||
-            bib&.at("./title")&.text || bib&.at("./formattedref")&.text
-          "#{pubclass} :: #{type} :: #{id&.text || metaid} :: #{title}"
-        end
+      # sort by: doc class (ITU, ISO, IEC, other standard (not DOI &c), other
+      # then standard class (docid class other than DOI &c)
+      # then alphanumeric doc id (not DOI &c)
+      # then title
+      def sort_biblio_key(bib)
+        pubclass = pub_class(bib)
+        num = bib&.at("./docnumber")&.text
+        id = bib&.at("./docidentifier[not(@type = 'DOI' or @type = "\
+                     "'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")
+        metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
+        abbrid = metaid unless /^\[\d+\]$/.match(metaid)
+        type = id['type'] if id
+        title = bib&.at("./title[@type = 'main']")&.text ||
+          bib&.at("./title")&.text || bib&.at("./formattedref")&.text
+        "#{pubclass} :: #{type} :: #{id&.text || metaid} :: #{title}"
+      end
-        def biblio_reorder(xmldoc)
-          xmldoc.xpath("//references").each do |r|
-            biblio_reorder1(r)
-          end
+      def biblio_reorder(xmldoc)
+        xmldoc.xpath("//references").each do |r|
+          biblio_reorder1(r)
         end
+      end
-        def normref_cleanup(xmldoc)
-          super
-          r = xmldoc.at(NORM_REF) || return
-          title = r.at("./title") and
-            title.content = "References"
-        end
+      def normref_cleanup(xmldoc)
+        super
+        r = xmldoc.at(NORM_REF) || return
+        title = r.at("./title") and
+          title.content = "References"
       end
     end
   end
+end

data/lib/asciidoctor/itu/converter.rb CHANGED

@@ -53,21 +53,12 @@ module Asciidoctor
         end.join("\n")
       end
-      def document(node)
-        init(node)
-        ret1 = makexml(node)
-        ret = ret1.to_xml(indent: 2)
-        unless node.attr("nodoc") || !node.attr("docfile")
-          filename = node.attr("docfile").gsub(/\.adoc/, ".xml").
-            gsub(%r{^.*/}, "")
-          File.open(filename, "w") { |f| f.write(ret) }
-          html_converter(node).convert filename unless node.attr("nodoc")
-          word_converter(node).convert filename unless node.attr("nodoc")
-          pdf_converter(node).convert filename unless node.attr("nodoc")
-        end
-        @log.write(@localdir + @filename + ".err") unless @novalid
-        @files_to_delete.each { |f| FileUtils.rm f }
-        ret
+      def outputs(node, ret)
+        File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
+        presentation_xml_converter(node).convert(@filename + ".xml")
+        html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
+        doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
+        pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
       end
       def validate(doc)
@@ -137,7 +128,7 @@ module Asciidoctor
         super
       end
-       def metadata_keywords(node, xml)
+      def metadata_keywords(node, xml)
         return unless node.attr("keywords")
         node.attr("keywords").split(/,[ ]*/).sort.each_with_index do |kw, i|
           xml.keyword (i == 0 ? kw.capitalize : kw)
@@ -152,6 +143,10 @@ module Asciidoctor
         super.merge(hierarchical_assets: node.attr("hierarchical-object-numbering"))
       end
+      def presentation_xml_converter(node)
+        IsoDoc::ITU::PresentationXMLConvert.new(html_extract_attributes(node))
+      end
       def html_converter(node)
         IsoDoc::ITU::HtmlConvert.new(html_extract_attributes(node))
       end
@@ -160,7 +155,7 @@ module Asciidoctor
         IsoDoc::ITU::PdfConvert.new(html_extract_attributes(node))
       end
-      def word_converter(node)
+      def doc_converter(node)
         IsoDoc::ITU::WordConvert.new(doc_extract_attributes(node))
       end
     end

data/lib/asciidoctor/itu/isodoc.rng CHANGED

@@ -53,9 +53,96 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
+    <define name="ul">
+      <element name="ul">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <oneOrMore>
+          <ref name="li"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="ol">
+      <element name="ol">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <attribute name="type">
+          <choice>
+            <value>roman</value>
+            <value>alphabet</value>
+            <value>arabic</value>
+            <value>roman_upper</value>
+            <value>alphabet_upper</value>
+          </choice>
+        </attribute>
+        <oneOrMore>
+          <ref name="li"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="dl">
+      <element name="dl">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <oneOrMore>
+          <ref name="dt"/>
+          <ref name="dd"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -69,6 +156,19 @@
         <optional>
           <attribute name="subsequence"/>
         </optional>
+        <optional>
+          <attribute name="number"/>
+        </optional>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -89,6 +189,296 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="table">
+      <element name="table">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="unnumbered">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="number"/>
+        </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>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </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>
+    <define name="figure">
+      <element name="figure">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="unnumbered">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="number"/>
+        </optional>
+        <optional>
+          <attribute name="subsequence"/>
+        </optional>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="class"/>
+        </optional>
+        <optional>
+          <ref name="source"/>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <choice>
+          <ref name="image"/>
+          <ref name="video"/>
+          <ref name="audio"/>
+          <ref name="pre"/>
+          <oneOrMore>
+            <ref name="paragraph-with-footnote"/>
+          </oneOrMore>
+          <zeroOrMore>
+            <ref name="figure"/>
+          </zeroOrMore>
+        </choice>
+        <zeroOrMore>
+          <ref name="fn"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="dl"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourcecode">
+      <element name="sourcecode">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="unnumbered">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="number"/>
+        </optional>
+        <optional>
+          <attribute name="subsequence"/>
+        </optional>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="lang"/>
+        </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="callout"/>
+          </choice>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="annotation"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="formula">
+      <element name="formula">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="unnumbered">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="number"/>
+        </optional>
+        <optional>
+          <attribute name="subsequence"/>
+        </optional>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="inequality">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <ref name="stem"/>
+        <optional>
+          <ref name="dl"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="ParagraphType">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <optional>
+        <attribute name="align">
+          <ref name="Alignments"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="keep-with-next">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="keep-lines-together">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <zeroOrMore>
+        <ref name="TextElement"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="note"/>
+      </zeroOrMore>
+    </define>
+    <define name="paragraph-with-footnote">
+      <element name="p">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="align">
+            <ref name="Alignments"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <choice>
+            <ref name="TextElement"/>
+            <ref name="fn"/>
+          </choice>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="quote">
+      <element name="quote">
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+        <optional>
+          <attribute name="alignment">
+            <ref name="Alignments"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <ref name="quote-source"/>
+        </optional>
+        <optional>
+          <ref name="quote-author"/>
+        </optional>
+        <oneOrMore>
+          <ref name="paragraph-with-footnote"/>
+        </oneOrMore>
+        <zeroOrMore>
+          <ref name="note"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
       <optional>
@@ -157,6 +547,30 @@
         <attribute name="id">
           <data type="ID"/>
         </attribute>
+        <optional>
+          <attribute name="unnumbered">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="number"/>
+        </optional>
+        <optional>
+          <attribute name="subsequence"/>
+        </optional>
+        <optional>
+          <attribute name="keep-with-next">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="keep-lines-together">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="type"/>
+        </optional>
         <oneOrMore>
           <choice>
             <ref name="paragraph"/>
@@ -902,7 +1316,36 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <optional>
+        <attribute name="unnumbered">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="number"/>
+      </optional>
+      <optional>
+        <attribute name="subsequence"/>
+      </optional>
+      <optional>
+        <attribute name="keep-with-next">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="keep-lines-together">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">