From 97b47f9576e792019119a6600a2eab3bd97606e1 Mon Sep 17 00:00:00 2001
From: "Henry H. Andrews" <hha1@cornell.edu>
Date: Wed, 7 Dec 2022 14:24:23 -0800
Subject: [PATCH 1/4] Fix accidental ABNF omission

Taking the index of the result of an index manipulation was
shown in the example and intended to work, but left out of
the ABNF apparently by accident.

Also, rework the ABNF to keep it within the text RFC line width.
---
 relative-json-pointer.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/relative-json-pointer.xml b/relative-json-pointer.xml
index 0521fac2..05f6af31 100644
--- a/relative-json-pointer.xml
+++ b/relative-json-pointer.xml
@@ -98,10 +98,11 @@
                 </preamble>
                 <artwork>
 <![CDATA[
-   relative-json-pointer =  non-negative-integer [index-manipulation] <json-pointer>
-   relative-json-pointer =/ non-negative-integer "#"
+   relative-json-pointer =  origin-specification <json-pointer>
+   relative-json-pointer =/ origin-specification "#"
+   origin-specification  =  non-negative-integer [index-manipulation]
    index-manipulation    =  ("+" / "-") non-negative-integer
-   non-negative-integer      =  %x30 / %x31-39 *( %x30-39 )
+   non-negative-integer  =  %x30 / %x31-39 *( %x30-39 )
            ; "0", or digits without a leading "0"
 ]]>
                 </artwork>

From f833869e4b1e7943b6693b7d0e1da6c1d908daea Mon Sep 17 00:00:00 2001
From: "Henry H. Andrews" <hha1@cornell.edu>
Date: Tue, 17 Jan 2023 08:51:29 -0800
Subject: [PATCH 2/4] Better Rel JSON Ptr ABNF per Austin Wright

Also, use <sourcecode> tag.
---
 relative-json-pointer.xml | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/relative-json-pointer.xml b/relative-json-pointer.xml
index 05f6af31..cf152f57 100644
--- a/relative-json-pointer.xml
+++ b/relative-json-pointer.xml
@@ -92,27 +92,19 @@
                 length or start with a '/' (%x2F).  Similarly, a JSON Pointer will
                 never be ambiguous with the '#'.
             </t>
-            <figure align="center">
-                <preamble>
-                    The ABNF syntax of a Relative JSON Pointer is:
-                </preamble>
-                <artwork>
-<![CDATA[
-   relative-json-pointer =  origin-specification <json-pointer>
-   relative-json-pointer =/ origin-specification "#"
-   origin-specification  =  non-negative-integer [index-manipulation]
-   index-manipulation    =  ("+" / "-") non-negative-integer
-   non-negative-integer  =  %x30 / %x31-39 *( %x30-39 )
-           ; "0", or digits without a leading "0"
-]]>
-                </artwork>
-                <postamble>
-                    where &lt;json-pointer&gt; follows the production defined in
-                    <xref target="RFC6901">RFC 6901, Section 3</xref> ("Syntax").
-                </postamble>
-            </figure>
             <t>
+                The ABNF syntax of a Relative JSON Pointer is:
             </t>
+            <sourcecode type="abnf9110"><![CDATA[
+  relative-json-pointer = origin-specification json-pointer
+                        / origin-specification "#"
+                        ; json-pointer from RFC 6901
+
+  origin-specification  = non-negative-integer [ index-manipulation ]
+  index-manipulation    = ( "+" / "-" ) non-negative-integer
+  non-negative-integer  = "0" / %x31-39 *DIGIT
+                        ; zero, or digits without a leading zero
+]]></sourcecode>
         </section>
 
         <section title="Evaluation">

From 0fc1f305cf73cb9dbeb4613625bca13080018ad9 Mon Sep 17 00:00:00 2001
From: "Henry H. Andrews" <andrews_henry@yahoo.com>
Date: Tue, 17 Jan 2023 09:49:57 -0800
Subject: [PATCH 3/4] Changelog for rel-json-ptr

---
 relative-json-pointer.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/relative-json-pointer.xml b/relative-json-pointer.xml
index cf152f57..c3851f4d 100644
--- a/relative-json-pointer.xml
+++ b/relative-json-pointer.xml
@@ -322,6 +322,12 @@
             </t>
             <t>
                 <list style="hanging">
+                    <t hangText="draft-handrews-relative-json-pointer-03">
+                        <list style="symbols">
+                            <t>Fix ABNF omission for using # with index manipulation</t>
+                            <t>Clarify handling of leading "0"</t>
+                        </list>
+                    </t>
                     <t hangText="draft-bhutton-relative-json-pointer-00">
                         <list style="symbols">
                             <t>Add array forward and backward index manipulation</t>

From ee1fd04e2595e3f4c8fd35c6202bfa92fe28d893 Mon Sep 17 00:00:00 2001
From: "Henry H. Andrews" <andrews_henry@yahoo.com>
Date: Tue, 17 Jan 2023 11:04:04 -0800
Subject: [PATCH 4/4] Update for next draft identifier.

---
 relative-json-pointer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/relative-json-pointer.xml b/relative-json-pointer.xml
index c3851f4d..3bc5337a 100644
--- a/relative-json-pointer.xml
+++ b/relative-json-pointer.xml
@@ -12,7 +12,7 @@
 <?rfc rfcedstyle="yes"?>
 <?rfc comments="yes"?>
 <?rfc inline="yes" ?>
-<rfc category="info" docName="draft-bhutton-relative-json-pointer-00" ipr="trust200902" submissionType="IETF">
+<rfc category="info" docName="draft-handrews-relative-json-pointer-03" ipr="trust200902" submissionType="IETF">
     <front>
         <title abbrev="Relative JSON Pointers">Relative JSON Pointers</title>