Pull <<navigation-location>> into its own section and rename to <<route-location>>.

This type is common to multiple features in this spec and thus probably
belongs in its own section rather than in the section of one of the
features that uses it.

Author: dbaron

css-navigation-1/Overview.bs

@@ -35,7 +35,9 @@ url: https://drafts.csswg.org/css-view-transitions-1/#capture-the-image
     type: dfn; spec: css-view-transitions-1; text: capture the image;
 </pre>
 
-<h2 id="at-route">Declaring named URL patterns: the ''@route'' rule</h2>
+<h2 id="url-patterns-in-css">Defining URL patterns in CSS</h2>
+
+<h3 id="at-route">Declaring named URL patterns: the ''@route'' rule</h3>
 
 The <dfn at-rule id="at-ruledef-route">@route</dfn> rule
 is an at-rule that associates a name with a [=URL pattern=].
@@ -127,6 +129,42 @@ NOTE: The bracing syntax also allows for future expansion if needed.
 NOTE: Some of the design discussion for this feature has been in
 <a href="https://github.com/w3c/csswg-drafts/issues/12594">w3c/csswg-drafts#12594</a>.
 
+<h3 id="route-value-type">The <<route-location>> value type</h3>
+
+<pre class="prod def" dfn-type="type" nohighlight>
+<dfn><<route-location>></dfn> = <<route-name>> | <<url-pattern()>> | <<url>>
+<dfn><<route-name>></dfn> = <<dashed-ident>>
+</pre>
+
+A <<route-location>> is defined to
+<dfn for="route-location">match</dfn> a URL <var>input</var> if:
+
+<dl class=switch>
+
+: the <<route-location>> is a <<route-name>>
+:: [=URL pattern/match|match a URL pattern=] is non-null given
+    <var>urlPattern</var> as
+    the [=URL pattern=] represented by the ''@route'' rule referenced by the name and
+    <var>input</var> as <var>input</var>.
+
+: the <<route-location>> is a <<url-pattern()>>
+:: [=URL pattern/match|match a URL pattern=] is non-null given
+    <var>urlPattern</var> as
+    the [=URL pattern=] represented by the function (see
+    [=create a URL pattern for url-pattern()=]) and
+    <var>input</var> as <var>input</var>.
+
+: the <<route-location>> is a <<url>>
+:: The given URL [=url/equals=] <var>input</var>.
+
+</dl>
+
+ISSUE: Should it also be possible to reference
+a name defined in a routemap?
+See the
+<a href="https://github.com/WICG/declarative-partial-updates/blob/main/route-matching-explainer.md">route matching explainer</a>
+for details.
+
 <h2 id="conditional-navigation-queries">Conditional rules for navigation queries</h2>
 
 <h3 id="at-navigation">Navigation queries: the ''@navigation'' rule</h3>
@@ -222,13 +260,11 @@ with <<navigation-condition>> defined as:
                     <<navigation-location-between-test>> |
                     <<navigation-type-test>>
 
-<dfn><<navigation-location-test>></dfn> = <<navigation-location-keyword>> : <<navigation-location>>
+<dfn><<navigation-location-test>></dfn> = <<navigation-location-keyword>> : <<route-location>>
 <dfn><<navigation-location-keyword>></dfn> = at | with | from | to
-<dfn><<navigation-location>></dfn> = <<route-name>> | <<url-pattern()>> | <<url>>
-<dfn><<route-name>></dfn> = <<dashed-ident>>
 
 <dfn><<navigation-location-between-test>></dfn> =
-    between : <<navigation-location>> and <<navigation-location>>
+    between : <<route-location>> and <<route-location>>
 
 <dfn><<navigation-type-test>></dfn> = history : <<navigation-type-keyword>>
 <dfn><<navigation-type-keyword>></dfn> = traverse | back | forward | reload
@@ -267,35 +303,35 @@ as follows:
 :: The result is the result of the child subexpression.
 
 : <<navigation-location-test>>
-::    : at: <<navigation-location>>
+::    : at: <<route-location>>
     :: The result is true if
         the [=current at URL=] <var>at</var> of the document is non-null and
-        the <<navigation-location>> [=navigation-location/matches=] <var>at</var>.
+        the <<route-location>> [=route-location/matches=] <var>at</var>.
 
-    : with: <<navigation-location>>
+    : with: <<route-location>>
     :: The result is true if
         the [=current with URL=] <var>other</var> of the document is non-null and
-        the <<navigation-location>> [=navigation-location/matches=] <var>other</var>.
+        the <<route-location>> [=route-location/matches=] <var>other</var>.
 
-    : from: <<navigation-location>>
+    : from: <<route-location>>
     :: The result is true if
         the [=current from URL=] <var>from</var> of the document is non-null and
-        the <<navigation-location>> [=navigation-location/matches=] <var>from</var>.
+        the <<route-location>> [=route-location/matches=] <var>from</var>.
 
-    : to: <<navigation-location>>
+    : to: <<route-location>>
     :: The result is true if
         the [=current to URL=] <var>to</var> of the document is non-null and
-        the <<navigation-location>> [=navigation-location/matches=] <var>to</var>.
+        the <<route-location>> [=route-location/matches=] <var>to</var>.
 
 : <<navigation-location-between-test>>
-::    : between: <<navigation-location>> and <<navigation-location>>
+::    : between: <<route-location>> and <<route-location>>
     :: The result is true if
         the [=current from URL=] <var>from</var> of the document is non-null,
         the [=current to URL=] <var>to</var> of the document is non-null,
-        one of the two <<navigation-location>>s
-        [=navigation-location/matches=] <var>from</var>,
-        and the other of the two <<navigation-location>>s
-        [=navigation-location/matches=] <var>to</var>.
+        one of the two <<route-location>>s
+        [=route-location/matches=] <var>from</var>,
+        and the other of the two <<route-location>>s
+        [=route-location/matches=] <var>to</var>.
 
 : <<navigation-type-test>>
 ::    : history: traverse
@@ -317,36 +353,6 @@ as follows:
     <span class='note'>It exists only for future-compatibility,
     so that new syntax additions do not invalidate too much of a <<navigation-condition>> in older user agents.</span>
 
-A <<navigation-location>> is defined to
-<dfn for="navigation-location">match</dfn> a URL <var>input</var> if:
-
-<dl class=switch>
-
-: the <<navigation-location>> is a <<route-name>>
-:: [=URL pattern/match|match a URL pattern=] is non-null given
-    <var>urlPattern</var> as
-    the [=URL pattern=] represented by the ''@route'' rule referenced by the name and
-    <var>input</var> as <var>input</var>.
-
-: the <<navigation-location>> is a <<url-pattern()>>
-:: [=URL pattern/match|match a URL pattern=] is non-null given
-    <var>urlPattern</var> as
-    the [=URL pattern=] represented by the function (see
-    [=create a URL pattern for url-pattern()=]) and
-    <var>input</var> as <var>input</var>.
-
-: the <<navigation-location>> is a <<url>>
-:: The given URL [=url/equals=] <var>input</var>.
-
-</dl>
-
-ISSUE: Should it also be possible to reference
-a name defined in a routemap?
-See the
-<a href="https://github.com/WICG/declarative-partial-updates/blob/main/route-matching-explainer.md">route matching explainer</a>
-for details.
-
-
 A <dfn>document's navigation API</dfn> is
 the result of the following steps on <var>document</var>:
 
@@ -409,10 +415,10 @@ which matches any links that link to the site's homepage:
 
 </div>
 
-The '':link-to()'' pseudo-class takes a single argument, a <<navigation-location>>,
+The '':link-to()'' pseudo-class takes a single argument, a <<route-location>>,
 and the pseudo-class matches any element where both:
 * the element matches '':any-link''
-* the <<navigation-location>> [=navigation-location/matches=] the target of the link
+* the <<route-location>> [=route-location/matches=] the target of the link
 
 <h3 id="active-navigation-pseudo-class">The ''::active-navigation()'' pseudo-class</h3>
 
@@ -492,7 +498,7 @@ and the pseudo-class matches any element where:
 
 <pre class="prod def" dfn-type="type" nohighlight>
 <dfn><<active-navigation-condition>></dfn> =
-  <<navigation-relation>>? [ <<navigation-location>> | link-href ]?
+  <<navigation-relation>>? [ <<route-location>> | link-href ]?
 <dfn><<navigation-relation>></dfn> = at | with | from | to
 </pre>
 
@@ -519,7 +525,7 @@ the following steps return true:
 1. Let <var>navigationURL</var> be
     the [=active navigation URL=] of the <<active-navigation-condition>>
 1. If <var>navigationURL</var> is null, return false.
-1. If a <<navigation-location>> is present:
+1. If a <<route-location>> is present:
     1. Let <var>targetMatchResult</var> be the result of
         [=URL pattern/match|match a URL pattern=]
         given <var>urlPattern</var> and <var>linkTarget</var>.