metanorma-standoc 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e86d9135fffb1f112db82f9d052632aa36f134a76b03ff48e65dcb841c7cbb4
-  data.tar.gz: ea05dff988ebaf6b51c029d99cbadd195300c3c524acd301157a335257436c01
+  metadata.gz: ec38f1dc395a1d89eb57193772856d31e40e0d4e725f449884529f794a77c341
+  data.tar.gz: be6615f68c933d6028ef70aad058e4ec042d7ff5eabdf489c13abe7743aa1010
 SHA512:
-  metadata.gz: beead161e217dba5841732200aa8cb897900ea90b1a449f092fe63ffe40ca59a6b904b098affd1a475723ac4663ba5dadd09fdab48b661376c4fe659360c79a4
-  data.tar.gz: 43b697f04165938864eab22a1d4d49613adef7ae1703995a5541018fe438f09ff21dd43e37e25ebeab9a0d514b50f64b64d2a8a47c8836b924d4578b9f076d19
+  metadata.gz: 425e48990782c8de5e70d18fb3404eebdfa9b7c0bf1e6e454e89451e4593266d80b87981162881eac9e17aa5dcf6f711e3f2c4c4d61141be15b396446163bb30
+  data.tar.gz: 4d534831af15ebdd19c9e81ea000a13022cd1ed2ff0e9c1bedab90a829cbb105dd454adfe72befedd3341d5a47ca6920925ea6de77266259f93a17f25287a62a

data/lib/asciidoctor/standoc/base.rb

@@ -192,7 +192,7 @@ module Asciidoctor
         end
       end
 
-      def term_source_attr(seen_xref)
+      def term_source_attrs(seen_xref)
         { bibitemid: seen_xref.children[0]["target"],
           format: seen_xref.children[0]["format"],
           type: "inline" }
@@ -203,7 +203,7 @@ module Asciidoctor
           xml_t.origin { |o| o << seen_xref.children[0].to_xml }
         else
           xml_t.origin seen_xref.children[0].content,
-            **attr_code(term_source_attr(seen_xref))
+            **attr_code(term_source_attrs(seen_xref))
         end
         m[:text] && xml_t.modification do |mod|
           mod.p { |p| p << m[:text].sub(/^\s+/, "") }

data/lib/asciidoctor/standoc/biblio.rng

@@ -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">

data/lib/asciidoctor/standoc/blocks.rb

@@ -1,5 +1,6 @@
 require "htmlentities"
 require "uri"
+require_relative "./blocks_notes"
 
 module Asciidoctor
   module Standoc
@@ -8,28 +9,21 @@ module Asciidoctor
         { id: Utils::anchor_or_uuid(node) }
       end
 
-      def id_unnum_attr(node)
+      def id_unnum_attrs(node)
         attr_code( id: Utils::anchor_or_uuid(node),
                   unnumbered: node.option?("unnumbered") ? "true" : nil,
+                  number: node.attr("number"),
                   subsequence: node.attr("subsequence") )
       end
 
-      def formula_attr(node)
-        attr_code( id: Utils::anchor_or_uuid(node),
-                  inequality: node.option?("inequality") ? "true" : nil,
-                  unnumbered: node.option?("unnumbered") ? "true" : nil,
-                  subsequence: node.attr("subsequence") )
-      end
-
-      def termnote_attr(node)
-        attr_code(id_attr(node).merge(
-          "keep-separate": node.attr("keep-separate")))
+      def formula_attrs(node)
+        attr_code(id_unnum_attrs(node).merge(keep_attrs(node).merge(
+          inequality: node.option?("inequality") ? "true" : nil)))
       end
 
-      def note_attr(node)
-        attr_code(id_attr(node).merge(
-          "keep-separate": node.attr("keep-separate"),
-          beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil))
+      def keep_attrs(node)
+        { "keep-with-next": node.attr("keep-with-next"),
+          "keep-lines-together": node.attr("keep-lines-together") }
       end
 
       # We append each contained block to its parent
@@ -44,7 +38,7 @@ module Asciidoctor
       end
 
       def literal_attrs(node)
-        attr_code(id_attr(node))
+        attr_code(id_attr(node).merge(keep_attrs(node)))
       end
 
       def literal(node)
@@ -60,80 +54,12 @@ module Asciidoctor
       # NOTE: html escaping is performed by Nokogiri
       def stem(node)
         noko do |xml|
-          xml.formula **formula_attr(node) do |s|
+          xml.formula **formula_attrs(node) do |s|
             stem_parse(node.lines.join("\n"), s, node.style.to_sym)
           end
         end
       end
 
-      def sidebar_attrs(node)
-        todo_attrs(node).merge(attr_code(
-          from: node.attr("from"), to: node.attr("to") || node.attr("from") ))
-      end
-
-      def sidebar(node)
-        return unless draft?
-        noko do |xml|
-          xml.review **(sidebar_attrs(node)) do |r|
-            wrap_in_para(node, r)
-          end
-        end
-      end
-
-      def todo_attrs(node)
-        date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
-        date += "T00:00:00Z" unless /T/.match date
-        attr_code(
-          id: Utils::anchor_or_uuid(node),
-          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
-          date: date )
-      end
-
-      def todo(node)
-        noko do |xml|
-          xml.review **(todo_attrs(node)) do |r|
-            wrap_in_para(node, r)
-          end
-        end
-      end
-
-      def termnote(n)
-        noko do |xml|
-          xml.termnote **termnote_attr(n) do |ex|
-            wrap_in_para(n, ex)
-          end
-        end.join("\n")
-      end
-
-      def note(n)
-        noko do |xml|
-          xml.note **note_attr(n) do |c|
-            wrap_in_para(n, c)
-          end
-        end.join("\n")
-      end
-
-      def admonition_attrs(node)
-        name = node.attr("name")
-        a = node.attr("type") and ["danger", "safety precautions"].each do |t|
-          name = t if a.casecmp(t).zero?
-        end
-        attr_code(id: Utils::anchor_or_uuid(node), type: name,
-                  beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil)
-      end
-
-      def admonition(node)
-        return termnote(node) if in_terms?
-        return note(node) if node.attr("name") == "note"
-        return todo(node) if node.attr("name") == "todo"
-        noko do |xml|
-          xml.admonition **admonition_attrs(node) do |a|
-            node.title.nil? or a.name { |name| name << node.title }
-            wrap_in_para(node, a)
-          end
-        end.join("\n")
-      end
-
       def term_example(node)
         noko do |xml|
           xml.termexample **id_attr(node) do |ex|
@@ -155,7 +81,7 @@ module Asciidoctor
         # prevent A's and other subs inappropriate for pseudocode
         node.blocks.each { |b| b.remove_sub(:replacements) }
         noko do |xml|
-          xml.figure **id_unnum_attr(node).merge(class: "pseudocode") do |ex|
+          xml.figure **example_attrs(node).merge(class: "pseudocode") do |ex|
             figure_title(node, ex)
             wrap_in_para(node, ex)
           end
@@ -163,7 +89,7 @@ module Asciidoctor
       end
 
       def example_attrs(node)
-        attr_code(id_unnum_attr(node))
+        attr_code(id_unnum_attrs(node).merge(keep_attrs(node)))
       end
 
       def example_proper(node)
@@ -181,7 +107,7 @@ module Asciidoctor
       end
 
       def figure_attrs(node)
-        attr_code(id_unnum_attr(node))
+        attr_code(id_unnum_attrs(node).merge(keep_attrs(node)))
       end
 
       def image(node)
@@ -194,7 +120,8 @@ module Asciidoctor
       end
 
       def para_attrs(node)
-        attr_code(align: node.attr("align"), id: Utils::anchor_or_uuid(node))
+        attr_code(keep_attrs(node).merge(align: node.attr("align"), 
+                                        id: Utils::anchor_or_uuid(node)))
       end
 
       def paragraph(node)
@@ -207,7 +134,8 @@ module Asciidoctor
       end
 
       def quote_attrs(node)
-        attr_code(id: Utils::anchor_or_uuid(node), align: node.attr("align"))
+        attr_code(keep_attrs(node).merge(align: node.attr("align"), 
+                                        id: Utils::anchor_or_uuid(node)))
       end
 
       def quote_attribution(node, out)
@@ -231,10 +159,11 @@ module Asciidoctor
       end
 
       def listing_attrs(node)
-        attr_code(lang: node.attr("language"),
-                  id: Utils::anchor_or_uuid(node),
-                  unnumbered: node.option?("unnumbered") ? "true" : nil,
-                  filename: node.attr("filename"))
+        attr_code(keep_attrs(node).merge(lang: node.attr("language"),
+                                        id: Utils::anchor_or_uuid(node),
+                                        unnumbered: node.option?("unnumbered") ? "true" : nil,
+                                        number: node.attr("number"),
+                                        filename: node.attr("filename")))
       end
 
       # NOTE: html escaping is performed by Nokogiri
@@ -251,7 +180,8 @@ module Asciidoctor
 
       def pass(node)
         noko do |xml|
-          xml.passthrough **attr_code(formats: node.attr("format")) do |p|
+          xml.passthrough **attr_code(formats: 
+                                      node.attr("format") || "metanorma") do |p|
             p << HTMLEntities.new.encode(node.content, :basic, :hexadecimal)
           end
         end

data/lib/asciidoctor/standoc/blocks_notes.rb

@@ -0,0 +1,89 @@
+module Asciidoctor
+  module Standoc
+    module Blocks
+      def termnote_attrs(node)
+        attr_code(id_attr(node).merge(
+          unnumbered: node.attr("unnumbered"),
+          number: node.attr("number"),
+          subsequence: node.attr("subsequence"),
+          "keep-with-next": node.attr("keep-with-next"),
+          "keep-lines-together": node.attr("keep-with-next"),
+          "keep-separate": node.attr("keep-separate")))
+      end
+
+      def note_attrs(node)
+        attr_code(termnote_attrs(node).merge(
+          type: node.attr("type"),
+          beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil))
+      end
+
+      def sidebar_attrs(node)
+        todo_attrs(node).merge(attr_code(
+          from: node.attr("from"), to: node.attr("to") || node.attr("from") ))
+      end
+
+      def sidebar(node)
+        return unless draft?
+        noko do |xml|
+          xml.review **(sidebar_attrs(node)) do |r|
+            wrap_in_para(node, r)
+          end
+        end
+      end
+
+      def todo_attrs(node)
+        date = node.attr("date") || Date.today.iso8601.gsub(/\+.*$/, "")
+        date += "T00:00:00Z" unless /T/.match date
+        attr_code(
+          id: Utils::anchor_or_uuid(node),
+          reviewer: node.attr("reviewer") || node.attr("source") || "(Unknown)",
+          date: date )
+      end
+
+      def todo(node)
+        noko do |xml|
+          xml.review **(todo_attrs(node)) do |r|
+            wrap_in_para(node, r)
+          end
+        end
+      end
+
+      def termnote(n)
+        noko do |xml|
+          xml.termnote **termnote_attrs(n) do |ex|
+            wrap_in_para(n, ex)
+          end
+        end.join("\n")
+      end
+
+      def note(n)
+        noko do |xml|
+          xml.note **note_attrs(n) do |c|
+            wrap_in_para(n, c)
+          end
+        end.join("\n")
+      end
+
+      def admonition_attrs(node)
+        name = node.attr("name")
+        a = node.attr("type") and ["danger", "safety precautions"].each do |t|
+          name = t if a.casecmp(t).zero?
+        end
+        attr_code(keep_attrs(node).merge(id: Utils::anchor_or_uuid(node), type: name,
+                  beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil))
+      end
+
+      def admonition(node)
+        return termnote(node) if in_terms?
+        return note(node) if node.attr("name") == "note"
+        return todo(node) if node.attr("name") == "todo"
+        noko do |xml|
+          xml.admonition **admonition_attrs(node) do |a|
+            node.title.nil? or a.name { |name| name << node.title }
+            wrap_in_para(node, a)
+          end
+        end.join("\n")
+      end
+    end
+  end
+end

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_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

@@ -122,6 +122,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 +131,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 +209,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/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"/>
@@ -910,6 +1316,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"/>