Skip to content
Permalink
Browse files

Editorial: start using the Infra Standard

  • Loading branch information...
annevk committed Nov 21, 2016
1 parent ee4b0ba commit 9001b9be7475fdf4a7a2757b5417aa4a9f06b3b6
Showing with 27 additions and 57 deletions.
  1. +27 −57 url.bs
84 url.bs
@@ -7,19 +7,18 @@ Status: LS
No Editor: true
Abstract: The URL Standard defines URLs, domains, IP addresses, the <code title>application/x-www-form-urlencoded</code> format, and their API.
Logo: https://resources.whatwg.org/logo-url.svg
Boilerplate: omit feedback-header, omit conformance
!Participate: <a href=https://github.com/whatwg/url>GitHub whatwg/url</a> (<a href=https://github.com/whatwg/url/issues/new>new issue</a>, <a href="https://github.com/whatwg/url/issues">open issues</a>, <a href="https://www.w3.org/Bugs/Public/buglist.cgi?product=WHATWG&amp;component=URL&amp;resolution=---">legacy open bugs</a>)
!Participate: <a href="https://wiki.whatwg.org/wiki/IRC">IRC: #whatwg on Freenode</a>
!Commits: <a href="https://github.com/whatwg/url/commits">https://github.com/whatwg/url/commits</a>
!Commits: [SNAPSHOT-LINK]
!Commits: <a href="https://twitter.com/urlstandard">@urlstandard</a>
!Translation (non-normative): <span title=Japanese><a href=https://triple-underscore.github.io/URL-ja.html lang=ja hreflang=ja rel=alternate>日本語</a></span>
Indent: 2
Boilerplate: omit feedback-header
</pre>

<script src=https://resources.whatwg.org/file-issue.js async></script>
<script src=https://resources.whatwg.org/commit-snapshot-shortcut-key.js async></script>
<script src=https://resources.whatwg.org/dfn.js defer id=head></script>
<script src=https://resources.whatwg.org/dfn.js defer></script>


<h2 id=goals class=no-num>Goals</h2>
@@ -55,35 +54,15 @@ might increase in scope somewhat.

<h2 id=infrastructure>Infrastructure</h2>

<p>This specification depends on the Infra Standard. [[!INFRA]]

<p>Some terms used in this specification are defined in the
DOM, Encoding, IDNA, and Web IDL Standards.
[[!DOM]]
[[!ENCODING]]
[[!IDNA]]
[[!WEBIDL]]

<p>The <dfn>C0 controls</dfn> are code points in the range U+0000 to U+001F, inclusive.

<p>The <dfn>C0 controls and space</dfn> are <a>C0 controls</a> and code point U+0020.

<p>The <dfn>tab and newline</dfn> are code points U+0009, U+000A, and U+000D.

<p>The <dfn>ASCII digits</dfn> are code points in the range U+0030 to U+0039, inclusive.

<p>The <dfn>ASCII hex digits</dfn> are <a>ASCII digits</a>, code points in the range
U+0041 to U+0046, inclusive, and code points in the range U+0061 to U+0066, inclusive.

<p>The <dfn>ASCII alpha</dfn> are code points in the range U+0041 to U+005A, inclusive,
and in the range U+0061 to U+007A, inclusive.

<p>The <dfn>ASCII alphanumeric</dfn> are <a>ASCII digits</a> and <a>ASCII alpha</a>.

<p>An <dfn>ASCII string</dfn> is a <a>string</a> in the range U+0000 to U+007F, inclusive.

<p>To <dfn>ASCII lowercase</dfn> a <a>string</a>, replace all code points in the range
U+0041 to U+005A, inclusive, with the corresponding code points in the range
U+0061 to U+007A, inclusive.

<hr>

<p>To <dfn>serialize an integer</dfn>, represent it as the shortest possible decimal
@@ -161,7 +140,7 @@ contains bytes that are not <a>ASCII bytes</a> might be insecure and is not reco
<ol>
<li><p>Let <var>bytePoint</var> be the two bytes after <var>byte</var> in
<var>input</var>,
<a lt="utf-8 decode without BOM">decoded</a>, and
<a lt="UTF-8 decode without BOM">decoded</a>, and
then interpreted as hexadecimal number.
<!-- We should have a definition for this that is saner. -->

@@ -949,14 +928,13 @@ if any.
<p>An <dfn export id=syntax-url-absolute>absolute-URL string</dfn> must be one of the following

<ul class=brief>
<li><p>a <a>URL-scheme string</a> that is an <a spec=dom>ASCII case-insensitive</a> match for a
<a>special scheme</a> and not an <a spec=dom>ASCII case-insensitive</a> match for
"<code>file</code>", followed by "<code>:</code>" and a <a>scheme-relative-URL string</a>
<li><p>a <a>URL-scheme string</a> that is <em>not</em> an <a spec=dom>ASCII case-insensitive</a>
match for a <a>special scheme</a>, followed by "<code>:</code>" and a <a>relative-URL string</a>
<li><p>a <a>URL-scheme string</a> that is an <a spec=dom>ASCII case-insensitive</a>
match for "<code>file</code>", followed by "<code>:</code>" and a
<a>scheme-relative-file-URL string</a>
<li><p>a <a>URL-scheme string</a> that is an <a>ASCII case-insensitive</a> match for a
<a>special scheme</a> and not an <a>ASCII case-insensitive</a> match for "<code>file</code>",
followed by "<code>:</code>" and a <a>scheme-relative-URL string</a>
<li><p>a <a>URL-scheme string</a> that is <em>not</em> an <a>ASCII case-insensitive</a> match for a
<a>special scheme</a>, followed by "<code>:</code>" and a <a>relative-URL string</a>
<li><p>a <a>URL-scheme string</a> that is an <a>ASCII case-insensitive</a> match for
"<code>file</code>", followed by "<code>:</code>" and a <a>scheme-relative-file-URL string</a>
</ul>

<p>any optionally followed by "<code>?</code>" and a <a>URL-query string</a>.
@@ -1035,10 +1013,10 @@ following
</ul>

<p>A <dfn export id=syntax-url-path-segment-dot>single-dot path segment</dfn> must be
"<code>.</code>" or an <a spec=dom>ASCII case-insensitive</a> match for "<code>%2e</code>".
"<code>.</code>" or an <a>ASCII case-insensitive</a> match for "<code>%2e</code>".

<p>A <dfn export id=syntax-url-path-segment-dotdot>double-dot path segment</dfn> must be
"<code>..</code>" or an <a spec=dom>ASCII case-insensitive</a> match for "<code>.%2e</code>",
"<code>..</code>" or an <a>ASCII case-insensitive</a> match for "<code>.%2e</code>",
"<code>%2e.</code>", or "<code>%2e%2e</code>".

<p>A <dfn export id=syntax-url-query>URL-query string</dfn> must be zero or more <a>URL units</a>.
@@ -1180,16 +1158,15 @@ string <var>input</var>, optionally with a <a>base URL</a> <var>base</var>, opti
<ol>
<li><p>Set <var>url</var> to a new <a for=/>URL</a>.

<li><p>If <var>input</var> contains any leading or trailing
<a>C0 controls and space</a>, <a>syntax violation</a>.
<li><p>If <var>input</var> contains any leading or trailing <a>C0 control or space</a>,
<a>syntax violation</a>.

<li><p>Remove any leading and trailing <a>C0 controls and space</a> from
<var>input</var>.
<li><p>Remove any leading and trailing <a>C0 control or space</a> from <var>input</var>.
</ol>

<li><p>If <var>input</var> contains any <a>tab and newline</a>, <a>syntax violation</a>.
<li><p>If <var>input</var> contains any <a>ASCII tab or newline</a>, <a>syntax violation</a>.

<li><p>Remove all <a>tab and newline</a> from <var>input</var>.
<li><p>Remove all <a>ASCII tab or newline</a> from <var>input</var>.

<li><p>Let <var>state</var> be <var>state override</var>
if given, or <a>scheme start state</a> otherwise.
@@ -2260,9 +2237,8 @@ steps:
these substeps:

<ol>
<li><p>Let <var>result</var> be the result of
<a lt=concept-encoding-get>getting an encoding</a> for <var>value</var>,
<a lt="utf-8 decode without BOM">decoded</a>.
<li><p>Let <var>result</var> be the result of <a>getting an encoding</a> for <var>value</var>,
<a lt="UTF-8 decode without BOM">decoded</a>.

<li><p>If <var>result</var> is not failure, unset <i>use _charset_ flag</i> and set
<var>encoding</var> to <var>result</var>.
@@ -2379,8 +2355,8 @@ name-value-type tuples. [[HTML]]

<p>The
<dfn id=concept-urlencoded-string-parser lt='urlencoded string parser'><code>application/x-www-form-urlencoded</code> string parser</dfn>
takes a string <var>input</var>, <a lt="utf-8 encode">UTF-8 encodes</a> it, and then returns the
result of <a lt='urlencoded parser'><code>application/x-www-form-urlencoded</code> parsing</a> it.
takes a string <var>input</var>, <a>UTF-8 encodes</a> it, and then returns the result of
<a lt='urlencoded parser'><code>application/x-www-form-urlencoded</code> parsing</a> it.



@@ -2964,11 +2940,8 @@ neighboring rights to this work.
<pre class="biblio">
{
"IDNA": {
"authors": [
"Mark Davis",
"Michel Suignard"
],
"href": "http://www.unicode.org/reports/tr46/",
"authors": ["Mark Davis", "Michel Suignard"],
"title": "Unicode IDNA Compatibility Processing",
"publisher": "Unicode Consortium"
},
@@ -2983,14 +2956,11 @@ neighboring rights to this work.

<pre class="anchors">
urlPrefix: https://w3c.github.io/FileAPI/; type: dfn
text: blob url store; url: #BlobURLStore
text: blob url store; url: #BlobURLStore
urlPrefix: https://w3c.github.io/media-source/#idl-def-; type: interface
text: MediaSource; url: MediaSource
text: MediaSource; url: MediaSource
urlPrefix: https://www.w3.org/TR/mediacapture-streams/#idl-def-; type: interface
text: MediaStream; url: MediaStream
urlPrefix: https://encoding.spec.whatwg.org/; type: dfn; spec: ENCODING
text: ascii byte
text: string
text: MediaStream; url: MediaStream
url: http://www.unicode.org/reports/tr46/#ToASCII; type: dfn; text: toascii; spec: IDNA
url: http://www.unicode.org/reports/tr46/#ToUnicode; type: dfn; text: tounicode; spec: IDNA
</pre>

0 comments on commit 9001b9b

Please sign in to comment.
You can’t perform that action at this time.