From de6cbf16d72dadc61043336b12c3aa72b9bfb5f3 Mon Sep 17 00:00:00 2001
From: Paul Hoffman <phoffman@proper.com>
Date: Wed, 17 Oct 2018 12:05:30 -0700
Subject: [PATCH] Fixes issue 34 in the new draft

---
 draft-iab-rfc7991bis.redxml   |   7 +-
 draft-iab-rfc7991bis.txt      | 124 +++++++++++++++++-----------------
 draft-iab-rfc7991bis.unpg.txt |   6 +-
 draft-iab-rfc7991bis.xml      |   7 +-
 4 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/draft-iab-rfc7991bis.redxml b/draft-iab-rfc7991bis.redxml
index 1ab3f28..fc0e7b5 100644
--- a/draft-iab-rfc7991bis.redxml
+++ b/draft-iab-rfc7991bis.redxml
@@ -136,6 +136,10 @@ and this document.
 
 <t>Changed the text about what this draft obsoletes and updates.</t>
 
+<t>Removed "It is an error to have both a "src" attribute and content in the &lt;artwork&gt; element."
+from <xref target="element.artwork.attribute.src"/>.</t>
+
+
 <t>[[ More will be added here as the draft progresses. ]]</t>
 
 </list></t>
@@ -738,9 +742,6 @@ See <xref target="cdata.and.escaping"/> for a description of how to deal with is
          In some cases, the prep tool may remove the "src" attribute after processing its value.
          See <xref target="RFC7998"/> for a description of this.
       </t>
-      <t>
-         It is an error to have both a "src" attribute and content in the &lt;artwork&gt; element.
-      </t>
    </section>
 
    <!--artwork/@type-->
diff --git a/draft-iab-rfc7991bis.txt b/draft-iab-rfc7991bis.txt
index a7ede38..0169f5e 100644
--- a/draft-iab-rfc7991bis.txt
+++ b/draft-iab-rfc7991bis.txt
@@ -9,7 +9,7 @@ Expires: April 20, 2019
 
 
                    The "xml2rfc" version 3 Vocabulary
-                        draft-iab-rfc7991bis-00
+                          draft-iab-rfc7991bis
 
 Abstract
 
@@ -87,7 +87,7 @@ Table of Contents
      2.7.  <author>  . . . . . . . . . . . . . . . . . . . . . . . .  17
      2.8.  <back>  . . . . . . . . . . . . . . . . . . . . . . . . .  19
      2.9.  <bcp14> . . . . . . . . . . . . . . . . . . . . . . . . .  19
-     2.10. <blockquote>  . . . . . . . . . . . . . . . . . . . . . .  19
+     2.10. <blockquote>  . . . . . . . . . . . . . . . . . . . . . .  20
      2.11. <boilerplate> . . . . . . . . . . . . . . . . . . . . . .  21
      2.12. <br>  . . . . . . . . . . . . . . . . . . . . . . . . . .  21
      2.13. <city>  . . . . . . . . . . . . . . . . . . . . . . . . .  22
@@ -305,6 +305,9 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    o  Changed the text about what this draft obsoletes and updates.
 
+   o  Removed "It is an error to have both a "src" attribute and content
+      in the <artwork> element." from Section 2.5.6.
+
    o  [[ More will be added here as the draft progresses. ]]
 
 1.4.  Differences from v2 to v3
@@ -327,9 +330,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
    o  Add <aside> for incidental text that will be indented when
       displayed.
 
-   o  Add <sourcecode> to differentiate from <artwork>.
-
-
 
 
 Hoffman                  Expires April 20, 2019                 [Page 6]
@@ -337,6 +337,8 @@ Hoffman                  Expires April 20, 2019                 [Page 6]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   o  Add <sourcecode> to differentiate from <artwork>.
+
    o  Add <table>, <thead>, <tbody>, <tfoot>, <tr>, <td>, and <th> to
       give table functionality like that in HTML.
 
@@ -382,9 +384,7 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
       to render the document.  Add "expiresDate" when an Internet-Draft
       expires.
 
-   o  Add "ascii" attributes to <email>, <organization>, <street>,
-      <city>, <region>, <country>, and <code>.  Also add
-      "asciiFullname", "asciiInitials", and "asciiSurname" to <author>.
+
 
 
 
@@ -393,6 +393,9 @@ Hoffman                  Expires April 20, 2019                 [Page 7]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   o  Add "ascii" attributes to <email>, <organization>, <street>,
+      <city>, <region>, <country>, and <code>.  Also add
+      "asciiFullname", "asciiInitials", and "asciiSurname" to <author>.
       This allows an author to specify their information in their native
       scripts as the primary entry and still allow the ASCII-equivalent
       values to appear in the processed documents.
@@ -438,9 +441,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    o  Deprecate <texttable>, <ttcol>, and <c>; replace them with the new
       table elements (<table> and the elements that can be contained
-      within it).
-
-
 
 
 
@@ -449,6 +449,8 @@ Hoffman                  Expires April 20, 2019                 [Page 8]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+      within it).
+
    o  Deprecate <facsimile> because it is rarely used.
 
    o  Deprecate <format> because it is not useful and has caused
@@ -495,8 +497,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
    o  Allow more than one <artwork>, or more than one <sourcecode>, in
       <figure>.
 
-   o  In <front>, make <date> optional.
-
 
 
 
@@ -505,6 +505,8 @@ Hoffman                  Expires April 20, 2019                 [Page 9]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   o  In <front>, make <date> optional.
+
    o  In <date>, add restrictions to the "date" and "year" attributes
       when used in the <front> for the document's boilerplate text.
 
@@ -551,8 +553,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    Tools interpreting the XML described here will collapse horizontal
    whitespace and line breaks to a single whitespace (except inside
-   <artwork> and <sourcecode>) and will trim leading and trailing
-   whitespace.  Tab characters (U+0009) inside <artwork> and
 
 
 
@@ -561,6 +561,8 @@ Hoffman                  Expires April 20, 2019                [Page 10]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   <artwork> and <sourcecode>) and will trim leading and trailing
+   whitespace.  Tab characters (U+0009) inside <artwork> and
    <sourcecode> are prohibited.
 
    Some of the elements have attributes that are not described in this
@@ -607,8 +609,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    Content model:
 
-   In this order:
-
 
 
 
@@ -617,6 +617,8 @@ Hoffman                  Expires April 20, 2019                [Page 11]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   In this order:
+
    1.  One optional <postal> element (Section 2.37)
 
    2.  One optional <phone> element (Section 2.36)
@@ -662,8 +664,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    o  <sup> elements (Section 2.52)
 
-   o  <tt> elements (Section 2.62)
-
 
 
 
@@ -673,6 +673,8 @@ Hoffman                  Expires April 20, 2019                [Page 12]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   o  <tt> elements (Section 2.62)
+
    o  <xref> elements (Section 2.66)
 
 2.4.  <area>
@@ -718,8 +720,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
    o  Inline, but using XInclude (see Appendix B.1), such as: <artwork
       type="svg"><xi:include href=...>
 
-   o  As a data: URI, such as: <artwork type="svg" src="data:image/
-      svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3...">
 
 
 
@@ -729,6 +729,9 @@ Hoffman                  Expires April 20, 2019                [Page 13]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   o  As a data: URI, such as: <artwork type="svg" src="data:image/
+      svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3...">
+
    o  As a URI to an external entity, such as: <artwork type="svg"
       src="http://www.example.com/...">
 
@@ -773,9 +776,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    o  "left" (default)
 
-   o  "center"
-
-   o  "right"
 
 
 
@@ -785,6 +785,10 @@ Hoffman                  Expires April 20, 2019                [Page 14]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   o  "center"
+
+   o  "right"
+
 2.5.2.  "alt" Attribute
 
    Alternative text description of the artwork (which is more than just
@@ -829,10 +833,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
    If no URI scheme is given in the attribute, the attribute is
    considered to be a local filename relative to the current directory.
    Processing tools must be careful to not accept dangerous values for
-   the filename, particularly those that contain absolute references
-   outside the current directory.  Document creators should think hard
-   before using relative URIs due to possible later problems if files
-   move around on the disk.  Also, documents should most likely use
 
 
 
@@ -841,14 +841,15 @@ Hoffman                  Expires April 20, 2019                [Page 15]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   the filename, particularly those that contain absolute references
+   outside the current directory.  Document creators should think hard
+   before using relative URIs due to possible later problems if files
+   move around on the disk.  Also, documents should most likely use
    explicit URI schemes wherever possible.
 
    In some cases, the prep tool may remove the "src" attribute after
    processing its value.  See [RFC7998] for a description of this.
 
-   It is an error to have both a "src" attribute and content in the
-   <artwork> element.
-
 2.5.7.  "type" Attribute
 
    Specifies the type of the artwork.  The value of this attribute is
@@ -888,7 +889,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    This element appears as a child element of <section> (Section 2.46).
 
-   Content model:
 
 
 
@@ -897,6 +897,8 @@ Hoffman                  Expires April 20, 2019                [Page 16]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   Content model:
+
    In any order:
 
    o  <artwork> elements (Section 2.5)
@@ -943,8 +945,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    This element appears as a child element of <front> (Section 2.26).
 
-   Content model:
-
 
 
 
@@ -953,6 +953,8 @@ Hoffman                  Expires April 20, 2019                [Page 17]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   Content model:
+
    In this order:
 
    1.  One optional <organization> element (Section 2.35)
@@ -997,8 +999,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    Allowed values:
 
-   o  "editor"
-
 
 
 
@@ -1009,6 +1009,8 @@ Hoffman                  Expires April 20, 2019                [Page 18]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   o  "editor"
+
 2.7.7.  "surname" Attribute
 
    The author's surname, to be used in conjunction with the separately
@@ -1053,9 +1055,7 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
    Content model: only text content.
 
-2.10.  <blockquote>
 
-   Specifies that a block of text is a quotation.
 
 
 
@@ -1065,6 +1065,10 @@ Hoffman                  Expires April 20, 2019                [Page 19]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+2.10.  <blockquote>
+
+   Specifies that a block of text is a quotation.
+
    This element appears as a child element of <section> (Section 2.46).
 
    Content model:
@@ -1108,10 +1112,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
       *  <relref> elements (Section 2.44)
 
-      *  <strong> elements (Section 2.50)
-
-      *  <sub> elements (Section 2.51)
-
 
 
 
@@ -1121,6 +1121,10 @@ Hoffman                  Expires April 20, 2019                [Page 20]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+      *  <strong> elements (Section 2.50)
+
+      *  <sub> elements (Section 2.51)
+
       *  <sup> elements (Section 2.52)
 
       *  <tt> elements (Section 2.62)
@@ -1165,10 +1169,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
    element are ignored.
 
    This element appears as a child element of <td> (Section 2.56) and
-   <th> (Section 2.58).
-
-   Content model: this element does not have any contents.
-
 
 
 
@@ -1177,6 +1177,10 @@ Hoffman                  Expires April 20, 2019                [Page 21]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   <th> (Section 2.58).
+
+   Content model: this element does not have any contents.
+
 2.13.  <city>
 
    Gives the city name in a postal address.
@@ -1221,10 +1225,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
    They might appear either inline and visually highlighted, at the end
    of the document, or not at all, depending on the formatting tool.
 
-   This element appears as a child element of <annotation>
-   (Section 2.3), <blockquote> (Section 2.10), <c> (Section 3.1), <dd>
-   (Section 2.18), <dt> (Section 2.21), <em> (Section 2.22), <li>
-   (Section 2.29), <name> (Section 2.32), <postamble> (Section 3.5),
 
 
 
@@ -1233,6 +1233,10 @@ Hoffman                  Expires April 20, 2019                [Page 22]
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
+   This element appears as a child element of <annotation>
+   (Section 2.3), <blockquote> (Section 2.10), <c> (Section 3.1), <dd>
+   (Section 2.18), <dt> (Section 2.21), <em> (Section 2.22), <li>
+   (Section 2.29), <name> (Section 2.32), <postamble> (Section 3.5),
    <preamble> (Section 3.6), <strong> (Section 2.50), <sub>
    (Section 2.51), <sup> (Section 2.52), <t> (Section 2.53), <td>
    (Section 2.56), <th> (Section 2.58), <tt> (Section 2.62), and <ttcol>
@@ -1280,10 +1284,6 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
 
 
 
-
-
-
-
 Hoffman                  Expires April 20, 2019                [Page 23]
 
 Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
@@ -7970,7 +7970,7 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
          inside tt  70
       blankLines attribute
          in vspace element  81
-      blockquote element  19, 98
+      blockquote element  20, 98
          anchor attribute  21
          cite attribute  21
          inside section  53
@@ -8093,7 +8093,7 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
          back  19, 50
          bcp14  12, 19-20, 25, 28-29, 36, 43, 60-62, 65, 68, 70, 75,
             77-78
-         blockquote  19, 53
+         blockquote  20, 53
          boilerplate  21, 34
          br  21, 65, 68
          c  75, 79
@@ -8151,9 +8151,9 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
          sourcecode  20, 25, 32, 35, 53, 57, 65, 67
          spanx  12, 62, 75, 77-78
          street  42, 59
-         strong  12, 20, 23, 26, 28-29, 36, 43, 59, 61-62, 66, 68, 71,
+         strong  12, 21, 23, 26, 28-29, 36, 43, 59, 61-62, 66, 68, 71,
             75, 77-78
-         sub  12, 20, 23, 26, 28-29, 36, 43, 60, 63, 66, 68, 71, 75,
+         sub  12, 21, 23, 26, 28-29, 36, 43, 60, 63, 66, 68, 71, 75,
             77-78
          sup  12, 21, 23, 26, 28-29, 36, 43, 60-61, 63, 66, 68, 71, 75,
             77-78
@@ -8168,7 +8168,7 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
          thead  64, 69
          title  33, 69
          tr  64, 67, 69-70
-         tt  12, 21, 23, 26, 28-29, 36, 38, 43, 60-63, 66, 68, 70, 75,
+         tt  13, 21, 23, 26, 28-29, 36, 38, 43, 60-63, 66, 68, 70, 75,
 
 
 
@@ -8631,7 +8631,7 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
          inside postal  42
       strong element  59, 98
          inside annotation  12
-         inside blockquote  20
+         inside blockquote  21
          inside c  75
          inside cref  23
          inside dd  26
@@ -8653,7 +8653,7 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
          in texttable element  80
       sub element  60, 98
          inside annotation  12
-         inside blockquote  20
+         inside blockquote  21
          inside c  75
          inside cref  23
          inside dd  26
@@ -8802,7 +8802,7 @@ Internet-Draft     The "xml2rfc" version 3 Vocabulary       October 2018
          inside tfoot  67
          inside thead  69
       tt element  70, 98
-         inside annotation  12
+         inside annotation  13
          inside blockquote  21
          inside c  75
          inside cref  23
diff --git a/draft-iab-rfc7991bis.unpg.txt b/draft-iab-rfc7991bis.unpg.txt
index 8e3664a..98f5370 100644
--- a/draft-iab-rfc7991bis.unpg.txt
+++ b/draft-iab-rfc7991bis.unpg.txt
@@ -246,6 +246,9 @@ Table of Contents
 
    o  Changed the text about what this draft obsoletes and updates.
 
+   o  Removed "It is an error to have both a "src" attribute and content
+      in the <artwork> element." from Section 2.5.6.
+
    o  [[ More will be added here as the draft progresses. ]]
 
 1.4.  Differences from v2 to v3
@@ -705,9 +708,6 @@ Table of Contents
    In some cases, the prep tool may remove the "src" attribute after
    processing its value.  See [RFC7998] for a description of this.
 
-   It is an error to have both a "src" attribute and content in the
-   <artwork> element.
-
 2.5.7.  "type" Attribute
 
    Specifies the type of the artwork.  The value of this attribute is
diff --git a/draft-iab-rfc7991bis.xml b/draft-iab-rfc7991bis.xml
index c4a63da..fc9660f 100644
--- a/draft-iab-rfc7991bis.xml
+++ b/draft-iab-rfc7991bis.xml
@@ -170,6 +170,10 @@ and this document.
 
 <t>Changed the text about what this draft obsoletes and updates.</t>
 
+<t>Removed "It is an error to have both a "src" attribute and content in the &lt;artwork&gt; element."
+from <xref target="element.artwork.attribute.src"/>.</t>
+
+
 <t>[[ More will be added here as the draft progresses. ]]</t>
 
 </list></t>
@@ -783,9 +787,6 @@ See <xref target="cdata.and.escaping"/> for a description of how to deal with is
          In some cases, the prep tool may remove the "src" attribute after processing its value.
          See <xref target="RFC7998"/> for a description of this.
       </t>
-      <t>
-         It is an error to have both a "src" attribute and content in the &lt;artwork&gt; element.
-      </t>
    </section>
 
    <!--artwork/@type-->