metanorma-standoc 1.4.0 → 1.5.0

data/lib/asciidoctor/standoc/cleanup.rb

@@ -16,8 +16,14 @@ module Asciidoctor
     module Cleanup
       def textcleanup(result)
         text = result.flatten.map { |l| l.sub(/\s*$/, "") }  * "\n"
-        if !@keepasciimath
-          text = text.gsub(%r{<stem type="AsciiMath">(.+?)</stem>}m) do |m|
+        !@keepasciimath and text = asciimath2mathml(text)
+        text = text.gsub(/\s+<fn /, "<fn ")
+        text.gsub(%r{<passthrough\s+formats="metanorma">([^<]*)
+                  </passthrough>}mx) { |m| HTMLEntities.new.decode($1) }
+      end
+
+      def asciimath2mathml(text)
+        text = text.gsub(%r{<stem type="AsciiMath">(.+?)</stem>}m) do |m|
             "<amathstem>#{HTMLEntities.new.decode($1)}</amathstem>"
           end
           text = Html2Doc.
@@ -26,9 +32,7 @@ module Asciidoctor
           x.xpath("//*[local-name() = 'math'][not(parent::stem)]").each do |y|
             y.wrap("<stem type='MathML'></stem>")
           end
-          text = x.to_xml
-        end
-        text.gsub(/\s+<fn /, "<fn ")
+          x.to_xml
       end
 
       def cleanup(xmldoc)
@@ -41,7 +45,7 @@ module Asciidoctor
         ref_cleanup(xmldoc)
         note_cleanup(xmldoc)
         clausebefore_cleanup(xmldoc)
-        ref_dl_cleanup(xmldoc)
+        bibitem_cleanup(xmldoc)
         normref_cleanup(xmldoc)
         biblio_cleanup(xmldoc)
         reference_names(xmldoc)

data/lib/asciidoctor/standoc/cleanup_boilerplate.rb

@@ -2,25 +2,25 @@ module Asciidoctor
   module Standoc
     module Cleanup
       def external_terms_boilerplate(sources)
-        IsoDoc::Function::I18n::l10n(
-          @external_terms_boilerplate.gsub(/%/, sources || "???"),
+        @i18n.l10n(
+          @i18n.external_terms_boilerplate.gsub(/%/, sources || "???"),
           @lang, @script)
       end
 
       def internal_external_terms_boilerplate(sources)
-        IsoDoc::Function::I18n::l10n(
-          @internal_external_terms_boilerplate.gsub(/%/, sources || "??"),
+        @i18n.l10n(
+          @i18n.internal_external_terms_boilerplate.gsub(/%/, sources || "??"),
           @lang, @script)
       end
 
       def term_defs_boilerplate(div, source, term, preface, isodoc)
-        div.next = @term_def_boilerplate
+        a = @i18n.term_def_boilerplate and div.next = a
         source.each do |s|
           @anchors[s["bibitemid"]] or
             @log.add("Crossreferences", nil, "term source #{s['bibitemid']} not referenced")
         end
         if source.empty? && term.nil?
-          div.next = @no_terms_boilerplate
+          div.next = @i18n.no_terms_boilerplate
         else
           div.next = term_defs_boilerplate_cont(source, term, isodoc)
         end
@@ -30,7 +30,7 @@ module Asciidoctor
         sources = isodoc.sentence_join(src.map do |s|
           %{<eref bibitemid="#{s['bibitemid']}"/>}
         end)
-        if src.empty? then @internal_terms_boilerplate
+        if src.empty? then @i18n.internal_terms_boilerplate
         elsif term.nil? then external_terms_boilerplate(sources)
         else
           internal_external_terms_boilerplate(sources)
@@ -42,7 +42,7 @@ module Asciidoctor
         ["reference", "bibitem"].include? e.name
       end
       f.at("./title").next =
-        "<p>#{(refs.empty? ? @norm_empty_pref : @norm_with_refs_pref)}</p>"
+        "<p>#{(refs.empty? ? @i18n.norm_empty_pref : @i18n.norm_with_refs_pref)}</p>"
     end
 
       TERM_CLAUSE = "//sections/terms | "\
@@ -54,13 +54,9 @@ module Asciidoctor
         x = xmldoc.dup
         x.root.add_namespace(nil, self.class::XML_NAMESPACE)
         xml = Nokogiri::XML(x.to_xml)
-        conv = html_converter(EmptyAttr.new)
-        @lang = xmldoc&.at("//bibdata/language")&.text
-        @script = xmldoc&.at("//bibdata/script")&.text
-        conv.i18n_init(@lang, @script)
-        conv.metadata_init(@lang, @script, conv.labels)
-        conv.info(xml, nil)
-        conv
+        @isodoc ||= isodoc(@lang, @script)
+        @isodoc.info(xml, nil)
+        @isodoc
       end
 
       def boilerplate_cleanup(xmldoc)
@@ -83,15 +79,6 @@ module Asciidoctor
         preface.previous = b
       end
 
-      class EmptyAttr
-        def attr(_x)
-          nil
-        end
-        def attributes
-          {}
-        end
-      end
-
       def boilerplate_file(xmldoc)
         File.join(@libdir, "boilerplate.xml")
       end

data/lib/asciidoctor/standoc/cleanup_inline.rb

@@ -34,7 +34,7 @@ module Asciidoctor
       # extending localities to cover ISO referencing
       LOCALITY_REGEX_STR = <<~REGEXP.freeze
         ^((?<locality>section|clause|part|paragraph|chapter|page|
-                      table|annex|figure|example|note|formula|list|
+                      table|annex|figure|example|note|formula|list|time|anchor|
                       locality:[^ \\t\\n\\r:,;=]+)(\\s+|=)
                (?<ref>[^"][^ \\t\\n,:-]*|"[^"]+")
                  (-(?<to>[^"][^ \\t\\n,:-]*|"[^"]"))?|

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -50,7 +50,8 @@ module Asciidoctor
       # only numeric references are renumbered
       def biblio_renumber(xmldoc)
         r = xmldoc.at("//references[@normative = 'false'] | "\
-                      "//clause[.//references[@normative = 'false']]") or return
+                      "//clause[.//references[@normative = 'false']] | "\
+                      "//annex[.//references[@normative = 'false']]") or return
         r.xpath(".//bibitem[not(ancestor::bibitem)]").each_with_index do |b, i|
           next unless docid = b.at("./docidentifier[@type = 'metanorma']")
           next unless  /^\[\d+\]$/.match(docid.text)
@@ -122,6 +123,7 @@ module Asciidoctor
       def ref_dl_cleanup(xmldoc)
         xmldoc.xpath("//clause[@bibitem = 'true']").each do |c|
           bib = dl_bib_extract(c) or next
+          validate_ref_dl(bib, c)
           bibitemxml = RelatonBib::BibliographicItem.new(
             RelatonBib::HashConverter::hash_to_bib(bib)).to_xml or next
           bibitem = Nokogiri::XML(bibitemxml)
@@ -130,6 +132,18 @@ module Asciidoctor
         end
       end
 
+      def validate_ref_dl(bib, c)
+        unless bib["id"]
+          @log.add("Anchors", c, "The following reference is missing "\
+                   "an anchor:\n" + c.to_xml)
+          return
+        end
+        bib["title"] or @log.add("Bibliography", c, "Reference #{bib['id']} "\
+                                 "is missing a title")
+        bib["docid"] or @log.add("Bibliography", c, "Reference #{bib['id']} "\
+                                 "is missing a document identifier (docid)")
+      end
+
       def extract_from_p(tag, bib, key)
         return unless bib[tag]
         "<#{key}>#{bib[tag].at('p').children}</#{key}>"
@@ -196,6 +210,38 @@ module Asciidoctor
       def fetch_termbase(termbase, id)
         ""
       end
+
+      def read_local_bibitem(uri)
+        return nil if %r{^http[s]?://}.match(uri)
+        file = @localdir + uri + ".rxl"
+        File.file?(file) or file = @localdir + uri + ".xml"
+        File.file?(file) or return nil
+        xml = Nokogiri::XML(File.read(file, encoding: "utf-8"))
+        ret = xml.at("//*[local-name() = 'bibdata']") or return nil
+        ret = Nokogiri::XML(ret.to_xml.sub(
+          %r{(<bibdata[^>]*?) xmlns=("[^"]+"|'[^']+')}, "\\1")).root
+        ret.name = "bibitem"
+        ins = ret.at("./*[local-name() = 'docidentifier']") or return nil
+        ins.previous = %{<uri type="citation">#{uri}</uri>}
+        ret&.at("./*[local-name() = 'ext']")&.remove
+        ret
+      end
+
+      # if citation uri points to local file, get bibitem from it
+      def fetch_local_bibitem(xmldoc)
+        xmldoc.xpath("//bibitem[formattedref]"\
+                     "[uri[@type = 'citation']]").each do |b|
+          uri = b&.at("./uri[@type = 'citation']")&.text
+          bibitem = read_local_bibitem(uri) or next
+          bibitem["id"] = b["id"]
+          b.replace(bibitem)
+        end
+      end
+
+      def bibitem_cleanup(xmldoc)
+        ref_dl_cleanup(xmldoc)
+        fetch_local_bibitem(xmldoc)
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/cleanup_section.rb

@@ -39,6 +39,7 @@ module Asciidoctor
           dupabstract.traverse { |n| n.remove_attribute("id") }
           dupabstract.remove_attribute("language")
           dupabstract.remove_attribute("script")
+          dupabstract&.at("./title")&.remove
           bibabstract.next = dupabstract
         end
       end
@@ -105,6 +106,7 @@ module Asciidoctor
       def sections_cleanup(x)
         sections_order_cleanup(x)
         sections_level_cleanup(x)
+        sections_names_cleanup(x)
       end
 
       def obligations_cleanup(x)
@@ -118,15 +120,15 @@ module Asciidoctor
         (s = x.at("//introduction")) && s["obligation"] = "informative"
         (s = x.at("//acknowledgements")) && s["obligation"] = "informative"
         x.xpath("//references").each { |r| r["obligation"] = "informative" }
-        x.xpath("//preface//clause").each { |r| r["obligation"] = "informative" }
+        x.xpath("//preface//clause").each do |r|
+          r["obligation"] = "informative"
+        end
       end
 
       def obligations_cleanup_norm(x)
-        (s = x.at("//clause[title = 'Scope']")) && s["obligation"] = "normative"
-        (s = x.at("//clause[title = 'Symbols and Abbreviated Terms']")) &&
-          s["obligation"] = "normative"
+        (s = x.at("//clause[@type = 'scope']")) && s["obligation"] = "normative"
         x.xpath("//terms").each { |r| r["obligation"] = "normative" }
-        x.xpath("//symbols-abbrevs").each { |r| r["obligation"] = "normative" }
+        x.xpath("//definitions").each { |r| r["obligation"] = "normative" }
       end
 
       def obligations_cleanup_inherit(x)
@@ -149,6 +151,71 @@ module Asciidoctor
           ins.previous = x.remove
         end
       end
+
+      def get_or_make_title(node)
+          unless node.at("./title")
+            if node.children.empty?
+              node << "<title/>"
+            else
+              node.children.first.previous = "<title/>"
+            end
+          end
+          node.at("./title")
+      end
+
+      def replace_title(doc, xpath, text, first = false)
+        return unless text
+        doc.xpath(xpath).each_with_index do |node, i|
+          next if first && !i.zero?
+          title = get_or_make_title(node)
+          fn = title.xpath("./fn")
+          fn.each { |n| n.remove }
+          title.content = text
+          fn.each { |n| title << n }
+        end
+      end
+
+      def sections_names_cleanup(x)
+        replace_title(x, "//clause[@type = 'scope']", @i18n&.scope)
+        replace_title(x, "//preface//abstract", @i18n&.abstract)
+        replace_title(x, "//foreword", @i18n&.foreword)
+        replace_title(x, "//introduction", @i18n&.introduction)
+        replace_title(x, "//acknowledgements", @i18n&.acknowledgements)
+        section_names_refs_cleanup(x)
+        section_names_terms_cleanup(x)
+      end
+
+      def section_names_refs_cleanup(x)
+        replace_title(x, "//references[@normative = 'true']",
+                      @i18n&.normref, true)
+        replace_title(x, "//references[@normative = 'false']",
+                      @i18n&.bibliography, true)
+      end
+
+      NO_SYMABBR = "[.//definitions[not(@type)]]"
+      SYMABBR = "[.//definitions[@type = 'symbols']"\
+        "[@type = 'abbreviated_terms']]".freeze
+      SYMnoABBR = "[.//definitions[@type = 'symbols']"\
+        "[not(@type = 'abbreviated_terms')]]".freeze
+      ABBRnoSYM = "[.//definitions[not(@type = 'symbols')]"\
+        "[@type = 'abbreviated_terms']]".freeze
+
+      def section_names_terms_cleanup(x)
+        replace_title(x, "//definitions[@type = 'symbols']", @i18n&.symbols)
+        replace_title(x, "//definitions[@type = 'abbreviated_terms']", @i18n&.abbrev)
+        replace_title(x, "//definitions[not(@type)]", @i18n&.symbolsabbrev)
+        replace_title(x, "//terms#{SYMnoABBR} | //clause[.//terms]#{SYMnoABBR}",
+                      @i18n&.termsdefsymbols, true)
+        replace_title(x, "//terms#{ABBRnoSYM} | //clause[.//terms]#{ABBRnoSYM}",
+                      @i18n&.termsdefabbrev, true)
+        replace_title(x, "//terms#{SYMABBR} | //clause[.//terms]#{SYMABBR}",
+                      @i18n&.termsdefsymbolsabbrev, true)
+        replace_title(x, "//terms#{NO_SYMABBR} | //clause[.//terms]#{NO_SYMABBR}",
+                      @i18n&.termsdefsymbolsabbrev, true)
+        replace_title(
+          x, "//terms[not(.//definitions)] | //clause[.//terms][not(.//definitions)]",
+          @i18n&.termsdef, true)
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -76,6 +76,15 @@ module Asciidoctor
         end
       end
 
+      def termnote_example_cleanup(xmldoc)
+        xmldoc.xpath("//termnote[not(ancestor::term)]").each do |x|
+          x.name = "note"
+        end
+        xmldoc.xpath("//termexample[not(ancestor::term)]").each do |x|
+          x.name = "note"
+        end
+      end
+
       def termdef_cleanup(xmldoc)
         termdef_from_termbase(xmldoc)
         termdef_unnest_cleanup(xmldoc)
@@ -83,6 +92,7 @@ module Asciidoctor
         termdomain_cleanup(xmldoc)
         termdefinition_cleanup(xmldoc)
         termdomain1_cleanup(xmldoc)
+        termnote_example_cleanup(xmldoc)
         termdef_boilerplate_cleanup(xmldoc)
         termdef_subclause_cleanup(xmldoc)
         term_children_cleanup(xmldoc) 

data/lib/asciidoctor/standoc/converter.rb

@@ -11,7 +11,6 @@ require "asciidoctor/standoc/table"
 require "asciidoctor/standoc/validate"
 require "asciidoctor/standoc/utils"
 require "asciidoctor/standoc/cleanup"
-require "asciidoctor/standoc/i18n"
 require "asciidoctor/standoc/reqt"
 require_relative "./macros.rb"
 require_relative "./log.rb"
@@ -21,6 +20,22 @@ module Asciidoctor
     # A {Converter} implementation that generates Standoc output, and a document
     # schema encapsulation of the document for validation
     class Converter
+      Asciidoctor::Extensions.register do
+        preprocessor Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor
+        preprocessor Asciidoctor::Standoc::Datamodel::DiagramPreprocessor
+        preprocessor Asciidoctor::Standoc::Yaml2TextPreprocessor
+        inline_macro Asciidoctor::Standoc::AltTermInlineMacro
+        inline_macro Asciidoctor::Standoc::DeprecatedTermInlineMacro
+        inline_macro Asciidoctor::Standoc::DomainTermInlineMacro
+        inline_macro Asciidoctor::Standoc::InheritInlineMacro
+        inline_macro Asciidoctor::Standoc::HTML5RubyMacro
+        inline_macro Asciidoctor::Standoc::ConceptInlineMacro
+        block Asciidoctor::Standoc::ToDoAdmonitionBlock
+        treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
+        block Asciidoctor::Standoc::PlantUMLBlockMacro
+        block Asciidoctor::Standoc::PseudocodeBlockMacro
+      end
+
       include ::Asciidoctor::Converter
       include ::Asciidoctor::Writer
 
@@ -32,7 +47,6 @@ module Asciidoctor
       include ::Asciidoctor::Standoc::Section
       include ::Asciidoctor::Standoc::Table
       include ::Asciidoctor::Standoc::Utils
-      include ::Asciidoctor::Standoc::I18n
       include ::Asciidoctor::Standoc::Cleanup
       include ::Asciidoctor::Standoc::Validate
 

data/lib/asciidoctor/standoc/inline.rb

@@ -135,7 +135,7 @@ module Asciidoctor
         results.nil? and
           @log.add('Math', nil,
                    "latexmlmath failed to process equation:\n#{lxm_input}")
-        results
+        results&.sub(%r{<math ([^>]+ )?display="block"}, "<math \\1")
       end
 
       def stem_parse(text, xml, style)

data/lib/asciidoctor/standoc/isodoc.rng

@@ -64,6 +64,85 @@
         <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">
@@ -77,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>
@@ -97,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>
@@ -165,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"/>
@@ -516,6 +922,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -555,9 +964,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -586,6 +992,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -605,9 +1014,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -636,6 +1042,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -774,6 +1183,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -910,6 +1322,27 @@
       <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>
       <oneOrMore>
         <choice>
           <ref name="paragraph"/>