[css-navigation-1] Also allow <<url>> in <<navigation-location>>.

Author: dbaron

css-navigation-1/Overview.bs

@@ -224,7 +224,7 @@ with <<navigation-condition>> defined as:
 
 <dfn><<navigation-location-test>></dfn> = <<navigation-location-keyword>> : <<navigation-location>>
 <dfn><<navigation-location-keyword>></dfn> = at | with | from | to
-<dfn><<navigation-location>></dfn> = <<route-name>> | <<url-pattern()>>
+<dfn><<navigation-location>></dfn> = <<route-name>> | <<url-pattern()>> | <<url>>
 <dfn><<route-name>></dfn> = <<dashed-ident>>
 
 <dfn><<navigation-location-between-test>></dfn> =
@@ -292,14 +292,10 @@ as follows:
     :: 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,
-        [=URL pattern/match|match a URL pattern=] is non-null
-        given <var>urlPattern</var> as
-        the [=navigation location URL pattern=] of one of the two <<navigation-location>>s
-        and <var>input</var> as <var>from</var>, and
-        [=URL pattern/match|match a URL pattern=] is non-null
-        given <var>urlPattern</var> as
-        the [=navigation location URL pattern=] of the other of the two <<navigation-location>>s
-        and <var>input</var> as <var>to</var>.
+        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>.
 
 : <<navigation-type-test>>
 ::    : history: traverse
@@ -321,28 +317,35 @@ 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>
 
-The <dfn>navigation location URL pattern</dfn> of a <<navigation-location>>
-depends on the type of <<navigation-location>>:
+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>.
 
-: <<route-name>>
-::    the URL pattern represented by the ''@route'' rule referenced by the name.
+: 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>.
 
-: <<url-pattern()>>
-::    The [=URL pattern=] represented by the function; see
-    [=create a URL pattern for url-pattern()=].
+: 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 <<navigation-location>> is defined to
-<dfn for="navigation-location">match</dfn> a URL <var>input</var> if
-[=URL pattern/match|match a URL pattern=] is non-null given
-<var>urlPattern</var> as the [=navigation location URL pattern=] of the
-<<navigation-location>> and
-<var>input</var> as <var>input</var>.
 
 A <dfn>document's navigation API</dfn> is
 the result of the following steps on <var>document</var>:
@@ -500,7 +503,7 @@ ISSUE: Should we use ''at''/''with''/''from''/''to'' or
 ''current''/''other''/''from''/''to''?
 
 The <dfn>active navigation URL</dfn> for an <<active-navigation-condition>> is:
-<dl switch>
+<dl class=switch>
 <dt>If the <<navigation-relation>> is ''at''
 <dd>The [=current at URL=] of the document
 <dt>If the <<navigation-relation>> is ''with'' or is omitted