diff --git a/draft-iab-rfc7991bis.xml b/draft-iab-rfc7991bis.xml index 9885cdf..06efd30 100644 --- a/draft-iab-rfc7991bis.xml +++ b/draft-iab-rfc7991bis.xml @@ -1106,11 +1106,9 @@ See for a description of how to deal with is Optional <displayreference> elements () -
  • - Optional <references> elements ()
  • - + One <references> element ()
  • @@ -3129,7 +3127,7 @@ See for a description of how to deal with is This vocabulary supports the split with the <name> child element. In general, the title should be either "Normative References" or "Informative References". - This element appears as a child element of <back> (). + This element appears as a child element of <back> () and <references> (). Content model: In this order: @@ -3139,17 +3137,28 @@ See for a description of how to deal with is One optional <name> element ()
  • -
  • - In any order: -
      -
    • - - <reference> elements ()
    • -
    • - - <referencegroup> elements ()
    • -
    -
  • + Either: +
      + +
    • + + One or more <references> elements ()
    • + +
    + Or: +
      +
    • + In any order: +
        +
      • + + <reference> elements ()
      • +
      • + + <referencegroup> elements ()
      • +
      +
    • +
    @@ -4521,7 +4530,7 @@ See for a description of how to deal with is - + Controls whether the table appears left justified, centered (default), or right justified. Tables are aligned relative to the left margin of the document. @@ -7635,7 +7644,7 @@ include "svg.rnc" attribute xml:base { text }?, attribute xml:lang { text }?, displayreference*, - references*, + references, section* } @@ -7655,7 +7664,7 @@ include "svg.rnc" attribute anchor { xsd:ID }?, attribute title { text }?, name?, - (reference | referencegroup)* + (references+ | (reference | referencegroup)*) } reference = @@ -8598,7 +8607,7 @@ to the v3 schema. + attribute xml:base { text }?, + attribute xml:lang { text }?, + displayreference*, -+ references*, ++ references, + section* + } + displayreference = @@ -8618,7 +8627,7 @@ to the v3 schema. + attribute anchor { xsd:ID }?, + attribute title { text }?, + name?, -+ (reference | referencegroup)* ++ (references+ | (reference | referencegroup)*) } reference = element reference { diff --git a/xml2rfcv3.rng b/xml2rfcv3.rng index ea7a295..1524c0c 100755 --- a/xml2rfcv3.rng +++ b/xml2rfcv3.rng @@ -1941,9 +1941,7 @@ - - - + @@ -1985,12 +1983,17 @@ - - - - - - + + + + + + + + + + +