From 09ba854d1b8ca4d0668ed5f2d4d7f279d4de0379 Mon Sep 17 00:00:00 2001
From: Ruben Taelman <ruben.taelman@ugent.be>
Date: Wed, 28 Aug 2024 10:42:56 +0200
Subject: [PATCH 1/5] Use RDF Dataset definition from RDF Concepts

Closes #28
---
 spec/index.html | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/spec/index.html b/spec/index.html
index 8e6c1ce..5147059 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -3124,9 +3124,9 @@ <h2>RDF Dataset</h2>
         predicate and object. Many RDF data stores hold multiple RDF graphs and record information
         about each graph, allowing an application to make queries that involve information from more
         than one graph.</p>
-      <p>A SPARQL query is executed against an <em>RDF Dataset</em> which represents a collection of
+      <p>A SPARQL query is executed against an <a data-cite="RDF12-CONCEPTS#dfn-rdf-dataset">RDF Dataset</a> [[RDF12-CONCEPTS]] which represents a collection of
         graphs. An RDF Dataset comprises one graph, the default graph, which does not have a name, and
-        zero or more named graphs, where each named graph is identified by an IRI. A SPARQL query can
+        zero or more named graphs, where each named graph is identified by an IRI or a blank node. A SPARQL query can
         match different parts of the query pattern against different graphs as described in section
         <a href="#queryDataset">13.3 Querying the Dataset</a>.</p>
       <p>An RDF Dataset may contain zero named graphs; an RDF Dataset always contains one default
@@ -3138,7 +3138,7 @@ <h2>RDF Dataset</h2>
         active graph one of all of the named graphs in the dataset for part of the query.</p>
       <section id="exampleDatasets">
         <h3>Examples of RDF Datasets</h3>
-        <p>The definition of RDF Dataset does not restrict the relationships of named and default
+        <p>The <a data-cite="RDF12-CONCEPTS#dfn-rdf-dataset">definition of RDF Dataset</a> [[RDF12-CONCEPTS]] does not restrict the relationships of named and default
           graphs. Information can be repeated in different graphs; relationships between graphs can be
           exposed. Two useful arrangements are:</p>
         <ul>
@@ -7882,23 +7882,16 @@ <h2>Definition of SPARQL</h2>
         abstract query is then evaluated on an RDF dataset.</p>
       <section id="initDefinitions">
         <h3>Initial Definitions</h3>
-        <section id="sparqlDataset">
-          <h4>RDF Dataset</h4>
-          <div class="defn">
-            <p><b>Definition: <span id="defn_RDFDataset">RDF Dataset</span></b></p>
-            <p>An RDF dataset is a set:<br>
-              { G, (&lt;u<sub>1</sub>&gt;, G<sub>1</sub>), (&lt;u<sub>2</sub>&gt;, G<sub>2</sub>), . .
-              . (&lt;u<sub>n</sub>&gt;, G<sub>n</sub>) }<br>
-              where G and each G<sub>i</sub> are graphs, and each &lt;u<sub>i</sub>&gt; is an IRI. Each
-              &lt;u<sub>i</sub>&gt; is distinct.</p>
-            <p>G is called the default graph. (&lt;u<sub>i</sub>&gt;, G<sub>i</sub>) are called named
-              graphs.</p>
-          </div>
+        <section id="activeGraph">
+          <h4>Active Graph</h4>
           <div class="defn">
             <p><b>Definition: <span id="defn_ActiveGraph">Active Graph</span></b></p>
             <p>The <b>active graph</b> is the graph from the dataset used for basic graph pattern
               matching.</p>
           </div>
+        </section>
+        <section id="rdfDatasetMerge">
+          <h4>RDF Dataset Merge</h4>
           <div class="defn">
             <div id="defn_RDFDatasetMerge">
               <b>Definition: RDF Dataset Merge</b>
@@ -8062,7 +8055,7 @@ <h4>SPARQL Query</h4>
             <ul>
               <li>E is a <a href="#sparqlAlgebra">SPARQL algebra</a> expression
               </li>
-              <li>DS is an <a href="#defn_RDFDataset">RDF Dataset</a>
+              <li>DS is an <a data-cite="RDF12-CONCEPTS#dfn-rdf-dataset">RDF Dataset</a> [[RDF12-CONCEPTS]]
               </li>
               <li>QF is a <a href="#QueryForms">query form</a>
               </li>

From 083c88ee7df0586d55a1e475856397cef00afc29 Mon Sep 17 00:00:00 2001
From: Ruben Taelman <ruben.taelman@ugent.be>
Date: Wed, 18 Sep 2024 12:42:35 +0200
Subject: [PATCH 2/5] Restore sparqlDataset section and informally repeat RDF
 dataset def

---
 spec/index.html | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/spec/index.html b/spec/index.html
index 5147059..0f38301 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -7882,16 +7882,23 @@ <h2>Definition of SPARQL</h2>
         abstract query is then evaluated on an RDF dataset.</p>
       <section id="initDefinitions">
         <h3>Initial Definitions</h3>
-        <section id="activeGraph">
-          <h4>Active Graph</h4>
+        <section id="sparqlDataset">
+          <h4>RDF Dataset</h4>
+          <div>
+            <p>The concept of an <a data-cite="RDF12-CONCEPTS#dfn-rdf-dataset">RDF Dataset</a> is defined in [[RDF12-CONCEPTS]].</p>
+            <p>For the following definitions, we capture each RDF dataset as a set:<br>
+              { G, (&lt;u<sub>1</sub>&gt;, G<sub>1</sub>), (&lt;u<sub>2</sub>&gt;, G<sub>2</sub>), . .
+              . (&lt;u<sub>n</sub>&gt;, G<sub>n</sub>) }<br>
+              where G and each G<sub>i</sub> are graphs, and each &lt;u<sub>i</sub>&gt; is an IRI. Each
+              &lt;u<sub>i</sub>&gt; is distinct.</p>
+            <p>G is called the default graph. (&lt;u<sub>i</sub>&gt;, G<sub>i</sub>) are called named
+              graphs.</p>
+          </div>
           <div class="defn">
             <p><b>Definition: <span id="defn_ActiveGraph">Active Graph</span></b></p>
             <p>The <b>active graph</b> is the graph from the dataset used for basic graph pattern
               matching.</p>
           </div>
-        </section>
-        <section id="rdfDatasetMerge">
-          <h4>RDF Dataset Merge</h4>
           <div class="defn">
             <div id="defn_RDFDatasetMerge">
               <b>Definition: RDF Dataset Merge</b>

From 5293324a0a90d6a7cd020ea7437fe10ed2148d39 Mon Sep 17 00:00:00 2001
From: Ruben Taelman <ruben.taelman@ugent.be>
Date: Wed, 18 Sep 2024 12:47:00 +0200
Subject: [PATCH 3/5] Replace dataset examples with TriG

---
 spec/index.html | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/spec/index.html b/spec/index.html
index 0f38301..a13d49d 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -3149,25 +3149,20 @@ <h3>Examples of RDF Datasets</h3>
         <div class="exampleGroup">
           <b>Example 1:</b>
           <pre class="data nohighlight">
-# <b>Default graph</b>
 PREFIX dc: &lt;http://purl.org/dc/elements/1.1/&gt;
 
 &lt;http://example.org/bob&gt;    dc:publisher  "Bob" .
 &lt;http://example.org/alice&gt;  dc:publisher  "Alice" .
-          </pre>
-          <pre class="data nohighlight">
-# <b>Named graph: http://example.org/bob</b>
-PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
 
-_:a foaf:name "Bob" .
-_:a foaf:mbox &lt;mailto:bob@oldcorp.example.org&gt; .
-          </pre>
-          <pre class="data nohighlight">
-# <b>Named graph: http://example.org/alice</b>
-PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
+GRAPH &lt;http://example.org/bob&gt; {
+    _:a foaf:name "Bob" .
+    _:a foaf:mbox &lt;mailto:bob@oldcorp.example.org&gt; .
+}
 
-_:a foaf:name "Alice" .
-_:a foaf:mbox &lt;mailto:alice@work.example.org&gt; .
+GRAPH &lt;http://example.org/alice&gt; {
+    _:a foaf:name "Alice" .
+    _:a foaf:mbox &lt;mailto:alice@work.example.org&gt; .
+}
           </pre>
         </div>
         <p>In this example, the default graph contains the names of the publishers of two named
@@ -3184,7 +3179,6 @@ <h3>Examples of RDF Datasets</h3>
         </p>
         <div class="exampleGroup">
           <pre class="data nohighlight">
-# <b>Default graph</b>
 PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
 
 _:x foaf:name "Bob" .
@@ -3192,20 +3186,16 @@ <h3>Examples of RDF Datasets</h3>
 
 _:y foaf:name "Alice" .
 _:y foaf:mbox &lt;mailto:alice@work.example.org&gt; .
-          </pre>
-          <pre class="data nohighlight">
-# <b>Named graph: http://example.org/bob</b>
-PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
 
-_:a foaf:name "Bob" .
-_:a foaf:mbox &lt;mailto:bob@oldcorp.example.org&gt; .
-          </pre>
-          <pre class="data nohighlight">
-# <b>Named graph: http://example.org/alice</b>
-PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
+GRAPH &lt;http://example.org/bob&gt; {
+    _:a foaf:name "Bob" .
+    _:a foaf:mbox &lt;mailto:bob@oldcorp.example.org&gt; .
+}
 
-_:a foaf:name "Alice" .
-_:a foaf:mbox &lt;<a href="mailto:alice@work.example">mailto:alice@work.example</a>&gt; .
+GRAPH &lt;http://example.org/alice&gt; {
+    _:a foaf:name "Alice" .
+    _:a foaf:mbox &lt;mailto:alice@work.example&gt; .
+}
           </pre>
           <p>In an RDF merge, blank nodes in the merged graph are not shared with blank nodes from
             the graphs being merged.</p>

From 77b9f726746e2bd7ba58c29e46716913857e2d81 Mon Sep 17 00:00:00 2001
From: Ruben Taelman <ruben.taelman@ugent.be>
Date: Wed, 18 Sep 2024 12:56:59 +0200
Subject: [PATCH 4/5] Allow graphs in dataset to be identified by blank nodes

---
 spec/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/index.html b/spec/index.html
index a13d49d..9d93533 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -7879,7 +7879,7 @@ <h4>RDF Dataset</h4>
             <p>For the following definitions, we capture each RDF dataset as a set:<br>
               { G, (&lt;u<sub>1</sub>&gt;, G<sub>1</sub>), (&lt;u<sub>2</sub>&gt;, G<sub>2</sub>), . .
               . (&lt;u<sub>n</sub>&gt;, G<sub>n</sub>) }<br>
-              where G and each G<sub>i</sub> are graphs, and each &lt;u<sub>i</sub>&gt; is an IRI. Each
+              where G and each G<sub>i</sub> are graphs, and each &lt;u<sub>i</sub>&gt; is an IRI or blank node. Each
               &lt;u<sub>i</sub>&gt; is distinct.</p>
             <p>G is called the default graph. (&lt;u<sub>i</sub>&gt;, G<sub>i</sub>) are called named
               graphs.</p>

From 44d060e537f336d509ffbec58f8d215a2bc64c3f Mon Sep 17 00:00:00 2001
From: Ruben Taelman <rubensworks@users.noreply.github.com>
Date: Thu, 19 Sep 2024 08:33:13 +0200
Subject: [PATCH 5/5] Update spec/index.html

Co-authored-by: Ted Thibodeau Jr <tthibodeau@openlinksw.com>
---
 spec/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/index.html b/spec/index.html
index 9d93533..60c0743 100644
--- a/spec/index.html
+++ b/spec/index.html
@@ -7877,8 +7877,8 @@ <h4>RDF Dataset</h4>
           <div>
             <p>The concept of an <a data-cite="RDF12-CONCEPTS#dfn-rdf-dataset">RDF Dataset</a> is defined in [[RDF12-CONCEPTS]].</p>
             <p>For the following definitions, we capture each RDF dataset as a set:<br>
-              { G, (&lt;u<sub>1</sub>&gt;, G<sub>1</sub>), (&lt;u<sub>2</sub>&gt;, G<sub>2</sub>), . .
-              . (&lt;u<sub>n</sub>&gt;, G<sub>n</sub>) }<br>
+              { G, (&lt;u<sub>1</sub>&gt;, G<sub>1</sub>), (&lt;u<sub>2</sub>&gt;, G<sub>2</sub>),
+              ... (&lt;u<sub>n</sub>&gt;, G<sub>n</sub>) }<br>
               where G and each G<sub>i</sub> are graphs, and each &lt;u<sub>i</sub>&gt; is an IRI or blank node. Each
               &lt;u<sub>i</sub>&gt; is distinct.</p>
             <p>G is called the default graph. (&lt;u<sub>i</sub>&gt;, G<sub>i</sub>) are called named