Skip to content

Commit 423099c

Browse files
committed
[css-navigation-1] Rename route to navigation in most places.
This is per the resolution in: #12594 (comment)
1 parent 5d2b5f2 commit 423099c

File tree

1 file changed

+47
-47
lines changed

1 file changed

+47
-47
lines changed

css-navigation-1/Overview.bs

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ url: https://html.spec.whatwg.org/multipage/browsing-the-web.html#has-been-revea
3535
type: dfn; spec: html; text: has been revealed;
3636
</pre>
3737

38-
<h2 id="condional-route-queries">Conditional rules for route queries</h2>
38+
<h2 id="condional-navigatio-queries">Conditional rules for navigatio queries</h2>
3939

40-
<h3 id="at-route">Route queries: the ''@route'' rule</h3>
40+
<h3 id="at-navigation">Navigation queries: the ''@navigation'' rule</h3>
4141

42-
The <dfn at-rule id="at-ruledef-route">@route</dfn> rule
42+
The <dfn at-rule id="at-ruledef-navigation">@navigation</dfn> rule
4343
is a conditional group rule
4444
whose condition tests
4545
characteristics of the current URL
4646
or of the state of navigation between two URLs.
47-
These queries are called <dfn export>route queries</dfn>.
47+
These queries are called <dfn export>navigation queries</dfn>.
4848

4949
Authors can use it to:
5050
* write style sheets that apply to multiple pages
@@ -57,37 +57,37 @@ Authors can use it to:
5757
(or make other appropriate style changes)
5858
in response to navigations.
5959

60-
The syntax of the condition in the ''@route'' rule
60+
The syntax of the condition in the ''@navigation'' rule
6161
is similar to that defined for
6262
<<supports-condition>> in [[CSS-CONDITIONAL-3]].
6363
Negation, conjunction, and disjunction are all needed
6464
so that authors can specify the interaction of multiple styles
6565
in ways that are most intuitive and require the simplest code.
6666

67-
The syntax of the ''@route'' rule is:
67+
The syntax of the ''@navigation'' rule is:
6868

6969
<pre class="prod def" nohighlight>
70-
@route <<route-condition>> {
70+
@navigation <<navigation-condition>> {
7171
<<rule-list>>
7272
}
7373
</pre>
7474

75-
with <<route-condition>> defined as:
75+
with <<navigation-condition>> defined as:
7676

7777
<pre class="prod def" dfn-type="type" nohighlight>
78-
<dfn><<route-condition>></dfn> = not <<route-in-parens>>
79-
| <<route-in-parens>> [ and <<route-in-parens>> ]*
80-
| <<route-in-parens>> [ or <<route-in-parens>> ]*
81-
<dfn><<route-in-parens>></dfn> = ( <<route-condition>> ) | ( <<route-test>> ) | <<general-enclosed>>
82-
<dfn><<route-test>></dfn> = <<route-location>> | <<route-keyword>> : <<route-location>>
83-
<dfn><<route-keyword>></dfn> = at | from | to
84-
<dfn><<route-location>></dfn> = <<urlpattern()>>
78+
<dfn><<navigation-condition>></dfn> = not <<navigation-in-parens>>
79+
| <<navigation-in-parens>> [ and <<navigation-in-parens>> ]*
80+
| <<navigation-in-parens>> [ or <<navigation-in-parens>> ]*
81+
<dfn><<navigation-in-parens>></dfn> = ( <<navigation-condition>> ) | ( <<navigation-test>> ) | <<general-enclosed>>
82+
<dfn><<navigation-test>></dfn> = <<navigation-location>> | <<navigation-keyword>> : <<navigation-location>>
83+
<dfn><<navigation-keyword>></dfn> = at | from | to
84+
<dfn><<navigation-location>></dfn> = <<urlpattern()>>
8585
</pre>
8686

8787
The above grammar is purposely very loose for forwards-compatibility reasons,
8888
since the <<general-enclosed>> production
8989
allows for substantial future extensibility.
90-
Any ''@route'' rule that does not parse according to the grammar above
90+
Any ''@navigation'' rule that does not parse according to the grammar above
9191
(that is, a rule that does not match this loose grammar
9292
which includes the <<general-enclosed>> production)
9393
is invalid.
@@ -97,31 +97,31 @@ processors <strong>must</strong> ignore such a rule (including all of its conten
9797
Many of these grammar terms are associated with a boolean result,
9898
as follows:
9999

100-
: <<route-condition>>
101-
:: : not <<route-in-parens>>
102-
:: The result is the negation of the <<route-in-parens>> term.
100+
: <<navigation-condition>>
101+
:: : not <<navigation-in-parens>>
102+
:: The result is the negation of the <<navigation-in-parens>> term.
103103

104-
: <<route-in-parens>> [ and <<route-in-parens>> ]*
104+
: <<navigation-in-parens>> [ and <<navigation-in-parens>> ]*
105105
::
106-
The result is true if all of the <<route-in-parens>> child terms are true,
106+
The result is true if all of the <<navigation-in-parens>> child terms are true,
107107
and false otherwise.
108108

109-
: <<route-in-parens>> [ or <<route-in-parens>> ]*
109+
: <<navigation-in-parens>> [ or <<navigation-in-parens>> ]*
110110
::
111-
The result is false if all of the <<route-in-parens>> child terms are false,
111+
The result is false if all of the <<navigation-in-parens>> child terms are false,
112112
and true otherwise.
113113

114-
: <<route-in-parens>>
114+
: <<navigation-in-parens>>
115115
:: The result is the result of the child subexpression.
116116

117-
: <<route-test>>
118-
:: : <<route-location>>
119-
: at: <<route-location>>
117+
: <<navigation-test>>
118+
:: : <<navigation-location>>
119+
: at: <<navigation-location>>
120120
:: The result is true if
121121
the document's [=Document/URL=] [=URL pattern/match|matches=]
122-
the [=route location URL pattern=] of <<route-location>>.
122+
the [=navigation location URL pattern=] of <<navigation-location>>.
123123

124-
: from: <<route-location>>
124+
: from: <<navigation-location>>
125125
:: The result is true if
126126
the [=document's navigation API=] of the document
127127
is non-null, and either:
@@ -130,7 +130,7 @@ as follows:
130130
its [=from entry=]'s {{NavigationHistoryEntry/url}}
131131
is non-null and
132132
[=URL pattern/match|matches=]
133-
the [=route location URL pattern=] of <<route-location>>.
133+
the [=navigation location URL pattern=] of <<navigation-location>>.
134134

135135
* its [=activation=] is non-null,
136136
the document's [=has been revealed=] is false or
@@ -139,9 +139,9 @@ as follows:
139139
{{NavigationHistoryEntry/url}}'s
140140
is non-null and
141141
[=URL pattern/match|matches=]
142-
the [=route location URL pattern=] of <<route-location>>.
142+
the [=navigation location URL pattern=] of <<navigation-location>>.
143143

144-
: to: <<route-location>>
144+
: to: <<navigation-location>>
145145
:: The result is true if
146146
the [=document's navigation API=] of the document
147147
is non-null, and either:
@@ -150,7 +150,7 @@ as follows:
150150
and its {{NavigateEvent/destination}}'s
151151
{{NavigationDestination/url}}
152152
[=URL pattern/match|matches=]
153-
the [=route location URL pattern=] of <<route-location>>.
153+
the [=navigation location URL pattern=] of <<navigation-location>>.
154154

155155
ISSUE: This assumes that the [=ongoing navigate event=]
156156
and the [=transition=] have the same lifetime,
@@ -169,7 +169,7 @@ as follows:
169169
{{NavigationHistoryEntry/url}}'s
170170
is non-null and
171171
[=URL pattern/match|matches=]
172-
the [=route location URL pattern=] of <<route-location>>.
172+
the [=navigation location URL pattern=] of <<navigation-location>>.
173173

174174
TODO: Update this definition to handle redirects better.
175175
In particular, we'd like the ''to:'' URL to change
@@ -190,16 +190,16 @@ as follows:
190190

191191
Authors must not use <<general-enclosed>> in their stylesheets.
192192
<span class='note'>It exists only for future-compatibility,
193-
so that new syntax additions do not invalidate too much of a <<route-condition>> in older user agents.</span>
193+
so that new syntax additions do not invalidate too much of a <<navigation-condition>> in older user agents.</span>
194194

195-
The <dfn>route location URL pattern</dfn> of a <<route-location>>
196-
depends on the type of <<route-location>>:
195+
The <dfn>navigation location URL pattern</dfn> of a <<navigation-location>>
196+
depends on the type of <<navigation-location>>:
197197

198198
: <<urlpattern()>>
199199
:: The [=URL pattern=] represented by the function; see
200200
[=create a URL pattern for urlpattern()=].
201201

202-
ISSUE: There is currently only one type of <<route-location>>
202+
ISSUE: There is currently only one type of <<navigation-location>>
203203
but we should consider adding another,
204204
which would be just a name that references
205205
a name defined in a routemap.
@@ -216,34 +216,34 @@ the result of the following steps on <var>document</var>:
216216

217217
1. Return <var>window</var>'s [=navigation API=].
218218

219-
The condition of the ''@route'' rule
220-
is the result of the <<route-condition>> in its prelude.
219+
The condition of the ''@navigation'' rule
220+
is the result of the <<navigation-condition>> in its prelude.
221221

222-
<h3 id="route-when-function">The ''@when/route()'' function for ''@when''</h3>
222+
<h3 id="navigation-when-function">The ''@when/navigation()'' function for ''@when''</h3>
223223

224224
This specification defines an additional function for the ''@when'' rule:
225225

226226
<pre class="prod">
227-
<dfn for="@when" function>route()</dfn> = route( <<route-condition>> )
227+
<dfn for="@when" function>navigation()</dfn> = navigation( <<navigation-condition>> )
228228
</pre>
229229

230-
The ''@when/route()'' function is associated with the boolean result that
230+
The ''@when/navigation()'' function is associated with the boolean result that
231231
its contained condition is associated with.
232232

233-
<h3 id="route-if-function">The ''if()/route()'' function for ''if()''</h3>
233+
<h3 id="navigation-if-function">The ''if()/navigation()'' function for ''if()''</h3>
234234

235235
This specification defines an additional function for the ''if()'' function's
236236
<<if-test>> production:
237237

238238
<pre class="prod">
239-
<dfn for="if()" function>route()</dfn> = route( <<route-condition>> )
239+
<dfn for="if()" function>navigation()</dfn> = navigation( <<navigation-condition>> )
240240
</pre>
241241

242242
ISSUE: This should probably have a more formal definition of the function,
243243
but I can't find the formal definitions of the existing ''if()'' functions
244244
to model it after.
245245

246-
<h2 id="link-route-pseudo-classes">Pseudo-classes for route-related links</h2>
246+
<h2 id="link-navigation-pseudo-classes">Pseudo-classes for navigation-related links</h2>
247247

248248
TODO: To be written.
249249

@@ -275,7 +275,7 @@ using the steps of the <dfn>create a URL pattern for urlpattern()</dfn> algorith
275275

276276
<div class="issue">
277277
Do we want this to be the base URL all the time?
278-
For use of ''urlpattern()'' in ''@route'',
278+
For use of ''urlpattern()'' in ''@navigation'',
279279
it's likely more useful for the base URL
280280
to be the document URL rather than the style sheet URL.
281281
However, it would be very awkward for ''urlpattern()''

0 commit comments

Comments
 (0)