Skip to content

Commit

Permalink
fixed markup errors
Browse files Browse the repository at this point in the history
  • Loading branch information
siusin committed Feb 24, 2016
1 parent 4a5a2c7 commit 5595315
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 27 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions publish/imports/WD-html-imports-20160225/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head><meta lang="" property="dc:language" content="en">
<meta charset="utf-8">
<title>HTML Imports</title>
<link rel="stylesheet" href="../../assets/styles/respec-complement.css" type="text/css">
<link rel="stylesheet" href="respec-complement.css" type="text/css">


<style>/*****************************************************************
Expand Down Expand Up @@ -123,7 +123,7 @@
}
</style><link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/W3C-WD"><!--[if lt IE 9]><script src='https://www.w3.org/2008/site/js/html5shiv.js'></script><![endif]--><script id="initialUserConfig" type="application/json">{
"specStatus": "WD",
"shortName": "imports",
"shortName": "html-imports",
"previousPublishDate": "2014-03-11",
"previousMaturity": "WD",
"editors": [
Expand Down Expand Up @@ -187,13 +187,13 @@
</p>
<h1 class="title p-name" id="title" property="dcterms:title">HTML Imports</h1>

<h2 id="w3c-working-draft-24-february-2016"><abbr title="World Wide Web Consortium">W3C</abbr> Working Draft <time property="dcterms:issued" class="dt-published" datetime="2016-02-24">24 February 2016</time></h2>
<h2 id="w3c-working-draft-25-february-2016"><abbr title="World Wide Web Consortium">W3C</abbr> Working Draft <time property="dcterms:issued" class="dt-published" datetime="2016-02-25">25 February 2016</time></h2>
<dl>

<dt>This version:</dt>
<dd><a class="u-url" href="http://www.w3.org/TR/2016/WD-imports-20160224/">http://www.w3.org/TR/2016/WD-imports-20160224/</a></dd>
<dd><a class="u-url" href="http://www.w3.org/TR/2016/WD-html-imports-20160225/">http://www.w3.org/TR/2016/WD-html-imports-20160225/</a></dd>
<dt>Latest published version:</dt>
<dd><a href="http://www.w3.org/TR/imports/">http://www.w3.org/TR/imports/</a></dd>
<dd><a href="http://www.w3.org/TR/html-imports/">http://www.w3.org/TR/html-imports/</a></dd>


<dt>Latest editor's draft:</dt>
Expand All @@ -205,7 +205,7 @@ <h2 id="w3c-working-draft-24-february-2016"><abbr title="World Wide Web Consorti


<dt>Previous version:</dt>
<dd><a rel="dcterms:replaces" href="http://www.w3.org/TR/2014/WD-imports-20140311/">http://www.w3.org/TR/2014/WD-imports-20140311/</a></dd>
<dd><a rel="dcterms:replaces" href="http://www.w3.org/TR/2014/WD-html-imports-20140311/">http://www.w3.org/TR/2014/WD-html-imports-20140311/</a></dd>


<dt>Editors:</dt>
Expand Down Expand Up @@ -454,7 +454,7 @@ <h3 id="h-import-dependent" resource="#h-import-dependent"><span property="xhv:r

</p><p>An <a href="#dfn-imported-document">imported document</a> also has one or more <dfn id="dfn-import-import-predecessor" data-dfn-type="dfn">import predecessors</dfn>. An <a href="#dfn-import-import-predecessor">import predecessor</a> is a document. If the URL of document <var>A</var> is located before the URL of document <var>B</var> in the <a href="#dfn-import-link-list">import link list</a> of <var>B</var>'s <a href="#dfn-import-parent">import parent</a>, and the located <a href="#dfn-import-link-link">link</a> is marked as a <a href="#dfn-import-link-list-branch">branch</a>, then <var>A</var> is <a href="#dfn-import-import-predecessor">import predecessor</a> of <var>B</var>.</p>

<p>The <dfn id="dfn-import-import-ancestor-predecessor" data-dfn-type="dfn">import ancestor predecessors</dfn> of document <var>A</var> is defined as follows: If document <var>B</var> is an <a href="#dfn-import-import-predecessor">import predecessor</a> of document <var>C</var>, and <var>C</var> is an <a href="#dfn-import-import-ancestor">import ancestor</a> of <var>A</var>, <var>B</var> is an <a href="#dfn-import-import-ancestor- predecessor">import ancestor predecessors</a> of <var>A</var>.</p>
<p>The <dfn id="dfn-import-import-ancestor-predecessor" data-dfn-type="dfn">import ancestor predecessors</dfn> of document <var>A</var> is defined as follows: If document <var>B</var> is an <a href="#dfn-import-import-predecessor">import predecessor</a> of document <var>C</var>, and <var>C</var> is an <a href="#dfn-import-import-ancestor">import ancestor</a> of <var>A</var>, <var>B</var> is an <a href="#dfn-import-import-ancestor-predecessor">import ancestor predecessors</a> of <var>A</var>.</p>

<p>The <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/dom.html#document"><code>Document</code></a> that is in either <a href="#dfn-import-import-ancestor-predecessor">import ancestor predecessors</a> or <a href="#dfn-import-import-predecessor">import predecessors</a> of document <var>A</var>, or is linked from <a href="#dfn-import-link-list-branch">branch</a> item of <var>A</var>'s <a href="#dfn-import-link-list">import link list</a>, is the <dfn id="dfn-import-dependent" data-dfn-type="dfn">import dependent</dfn> of <var>A</var>.</p>

Expand All @@ -464,7 +464,7 @@ <h3 id="h-import-dependent" resource="#h-import-dependent"><span property="xhv:r
<p>The linking structure of <a href="#dfn-import-link-list">import link lists</a> forms a directed graph. Each node of the graph is a document and its edge is a <a href="#dfn-import-link-link">link</a>. <a href="#dfn-import-link-list-branch">Branches</a> are intended to form a spanning tree of the graph. This tree gives the deterministic order of the script execution.</p>

<figure id="fig-import-list">
<img src="../../assets/images/import-link-list.png">
<img src="import-link-list.png">
<figcaption>Fig. <span class="figno">1</span> <span class="fig-title">
An example of import link lists.
</span></figcaption>
Expand Down Expand Up @@ -607,7 +607,7 @@ <h2 id="additions-to-document-write">Additions to <code>document.write()</code>
</ol>
</section>

<h3 id="additions-to-document-write">Additions to <code>document.close()</code> method</h3>
<h3 id="additions-to-document-close">Additions to <code>document.close()</code> method</h3>

<p>Add following step as the first step of the definition:</p>

Expand Down Expand Up @@ -686,14 +686,14 @@ <h3 id="h-fetching-import" resource="#h-fetching-import"><span property="xhv:rol
<dd><var>IMPORT</var>, the <a href="#dfn-imported-document">imported document</a>.</dd>
</dl>
<ol>
<li>If <var>LOCATION</var> is already in the <a href="#dfn-import-map">import map</a>:</li>
<li><ol>
<li>If <var>LOCATION</var> is already in the <a href="#dfn-import-map">import map</a>:
<ol>
<li>Let <var>IMPORT</var> be the <a href="#dfn-imported-document">imported document</a> for <var>LOCATION</var> and <strong>stop</strong>.</li>
</ol></li>
<li><a href="http://fetch.spec.whatwg.org/#concept-fetch">Fetch a resource</a> from <var>LOCATION</var> with <a href="http://fetch.spec.whatwg.org/#concept-request-origin">request's origin</a> set to the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin">origin</a> of the <a href="#dfn-master-document">master document</a>, the <a href="http://fetch.spec.whatwg.org/#concept-request-mode">mode</a> to <i>CORS</i> and the <a href="http://fetch.spec.whatwg.org/#concept-request-credentials-mode">credentials mode</a> to <i>same-origin</i>.</li>
<li><a href="http://fetch.spec.whatwg.org/#concept-fetch">Fetch a resource</a> from <var>LOCATION</var> with <a href="http://fetch.spec.whatwg.org/#concept-request-origin">request's origin</a> set to the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin">origin</a> of the <a href="#dfn-master-document">master document</a>, the <a href="http://fetch.spec.whatwg.org/#concept-request-mode">mode</a> to <i>CORS</i> and the <a href="http://fetch.spec.whatwg.org/#concept-request-credentials-mode">credentials mode</a> to <i>same-origin</i>.
<ol>
<li>If fetched <a href="http://fetch.spec.whatwg.org/#concept-response-type">response type</a> is <i>error</i> or the response has a <a href="https://fetch.spec.whatwg.org/#concept-header">header</a> whose name is <code>Content-Disposition</code>:</li>
<li><ul>
<li>If fetched <a href="http://fetch.spec.whatwg.org/#concept-response-type">response type</a> is <i>error</i> or the response has a <a href="https://fetch.spec.whatwg.org/#concept-header">header</a> whose name is <code>Content-Disposition</code>:
<ul>
<li>Add <var>LOCATION</var> and <strong>null</strong> to the <a href="#dfn-import-map">import map</a> and <strong>stop</strong>.
</li></ul></li>
<li>Let <var>IMPORT</var> be a new <a href="http://dom.spec.whatwg.org/#document"><code>Document</code></a>, <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/dom.html#the-document's-address">the document's address</a> of which is <var>LOCATION</var></li>
Expand All @@ -708,7 +708,7 @@ <h3 id="h-fetching-import" resource="#h-fetching-import"><span property="xhv:rol
<ol>
<li><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task">Queue a task</a> from the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#networking-task-source">networking task source</a> for <var>PARSER</var> to process implied <code>EOF</code> character</li>
</ol>
</li></ol>
</li></ol></li>
</ol>
</section>

Expand Down Expand Up @@ -850,14 +850,14 @@ <h3 id="h-import-link-tree" resource="#h-import-link-tree"><span property="xhv:r
<li>Let <var>TREE</var>'s value be <var>CURRENT</var>
</li><li>Let <var>TREE</var>'s <a href="http://dom.spec.whatwg.org/#concept-tree-parent">parent</a> be <var>PARENT</var>.</li>
<li>Make <var>TREE</var>'s <a href="http://dom.spec.whatwg.org/#concept-tree-child">child</a> list empty.</li>
<li>For each <var>LINK</var>, a <code>link</code> element of an import in <var>CURRENT</var>, in document order:</li>
<li>For each <var>LINK</var>, a <code>link</code> element of an import in <var>CURRENT</var>, in document order:
<ol>
<li>Let <var>IMPORT</var> be the import of <var>LINK</var>.</li>
<li>If <var>IMPORT</var> is not in <var>POOL<var>, try next.</var></var></li>
<li>Remove <var>LINK</var> from <var>POOL</var>.</li>
<li>Invoke the <a href="#dfn-import-link-tree-forming">import tree forming</a> algorithm with <var>TREE</var> as <var>PARENT</var>, <var>IMPORT</var> as <var>CURRENT</var> and <var>POOL</var> as <var>POOL</var>, let the result be <var>CHILD</var>.
</li><li>Append <var>CHILD</var> to <var>TREE</var>'s <a href="http://dom.spec.whatwg.org/#concept-tree-child">child</a> list.</li>
</ol>
</ol></li>
<li><strong>stop</strong>.</li>
</ol>
</section>
Expand Down
51 changes: 51 additions & 0 deletions publish/imports/WD-html-imports-20160225/respec-complement.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
span.shadow-boundary {
color: Gray;
}

table {
border: 1px solid #ccc;
}

table code {
background-color: transparent;
}

td, th {
padding: 0.5em;
vertical-align: top;
}

td {
border-bottom: 1px solid #ddd;
}

tr:last-of-type td {
border-bottom: none;
}

th {
text-align: left;
background-color: #eee;
}

div.algorithm {
padding: 0 0 0 20px;
border-left: .5em solid #EAF7F9;
}

#bug-assist-form {
position: fixed;
width: 10em;
top: 5em;
right: 1em;
font-family: Tahoma,sans-serif;
font-size: 11px;
opacity:0.8;
text-align:right;
}

var {
font-size: 0.8em;
color: #005A9C;
font-style: normal;
}
20 changes: 10 additions & 10 deletions spec/imports/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script class='remove'>
var respecConfig = {
specStatus: "ED",
shortName: "imports",
shortName: "html-imports",
editors: [
{ name: "Dimitri Glazkov", url: "mailto:dglazkov@chromium.org", company: "Google, Inc.", w3cid: 40456 },
{ name: "Hajime Morrita", url: "mailto:morrita@chromium.org", company: "Google, Inc.", w3cid: 50024 }],
Expand Down Expand Up @@ -108,7 +108,7 @@ <h3>Import Dependent</h3>

<p>An <a href="#dfn-imported-document">imported document</a> also has one or more <dfn id="dfn-import-import-predecessor">import predecessors</dfn>. An <a href="#dfn-import-import-predecessor">import predecessor</a> is a document. If the URL of document <var>A</var> is located before the URL of document <var>B</var> in the <a href="#dfn-import-link-list">import link list</a> of <var>B</var>'s <a href="#dfn-import-parent">import parent</a>, and the located <a href="#dfn-import-link-link">link</a> is marked as a <a href="#dfn-import-link-list-branch">branch</a>, then <var>A</var> is <a href="#dfn-import-import-predecessor">import predecessor</a> of <var>B</var>.</p>

<p>The <dfn id="dfn-import-import-ancestor-predecessor">import ancestor predecessors</dfn> of document <var>A</var> is defined as follows: If document <var>B</var> is an <a href="#dfn-import-import-predecessor">import predecessor</a> of document <var>C</var>, and <var>C</var> is an <a href="#dfn-import-import-ancestor">import ancestor</a> of <var>A</var>, <var>B</var> is an <a href="#dfn-import-import-ancestor- predecessor">import ancestor predecessors</a> of <var>A</var>.</p>
<p>The <dfn id="dfn-import-import-ancestor-predecessor">import ancestor predecessors</dfn> of document <var>A</var> is defined as follows: If document <var>B</var> is an <a href="#dfn-import-import-predecessor">import predecessor</a> of document <var>C</var>, and <var>C</var> is an <a href="#dfn-import-import-ancestor">import ancestor</a> of <var>A</var>, <var>B</var> is an <a href="#dfn-import-import-ancestor-predecessor">import ancestor predecessors</a> of <var>A</var>.</p>

<p>The <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/dom.html#document"><code>Document</code></a> that is in either <a href="#dfn-import-import-ancestor-predecessor">import ancestor predecessors</a> or <a href="#dfn-import-import-predecessor">import predecessors</a> of document <var>A</var>, or is linked from <a href="#dfn-import-link-list-branch">branch</a> item of <var>A</var>'s <a href="#dfn-import-link-list">import link list</a>, is the <dfn id="dfn-import-dependent">import dependent</dfn> of <var>A</var>.</p>

Expand Down Expand Up @@ -261,7 +261,7 @@ <h3 id="additions-to-document-write">Additions to <code>document.write()</code>
</ol>
</section>

<h3 id="additions-to-document-write">Additions to <code>document.close()</code> method</h3>
<h3 id="additions-to-document-close">Additions to <code>document.close()</code> method</h3>

<p>Add following step as the first step of the definition:</p>

Expand Down Expand Up @@ -340,14 +340,14 @@ <h3>Fetching Import</h3>
<dd><var>IMPORT</var>, the <a href="#dfn-imported-document">imported document</a>.</dd>
</dl>
<ol>
<li>If <var>LOCATION</var> is already in the <a href="#dfn-import-map">import map</a>:</li>
<li><ol>
<li>If <var>LOCATION</var> is already in the <a href="#dfn-import-map">import map</a>:
<ol>
<li>Let <var>IMPORT</var> be the <a href="#dfn-imported-document">imported document</a> for <var>LOCATION</var> and <strong>stop</strong>.</li>
</ol></li>
<li><a href="http://fetch.spec.whatwg.org/#concept-fetch">Fetch a resource</a> from <var>LOCATION</var> with <a href="http://fetch.spec.whatwg.org/#concept-request-origin">request's origin</a> set to the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin">origin</a> of the <a href="#dfn-master-document">master document</a>, the <a href="http://fetch.spec.whatwg.org/#concept-request-mode">mode</a> to <i>CORS</i> and the <a href="http://fetch.spec.whatwg.org/#concept-request-credentials-mode">credentials mode</a> to <i>same-origin</i>.</li>
<li><a href="http://fetch.spec.whatwg.org/#concept-fetch">Fetch a resource</a> from <var>LOCATION</var> with <a href="http://fetch.spec.whatwg.org/#concept-request-origin">request's origin</a> set to the <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/origin-0.html#origin">origin</a> of the <a href="#dfn-master-document">master document</a>, the <a href="http://fetch.spec.whatwg.org/#concept-request-mode">mode</a> to <i>CORS</i> and the <a href="http://fetch.spec.whatwg.org/#concept-request-credentials-mode">credentials mode</a> to <i>same-origin</i>.
<ol>
<li>If fetched <a href="http://fetch.spec.whatwg.org/#concept-response-type">response type</a> is <i>error</i> or the response has a <a href="https://fetch.spec.whatwg.org/#concept-header">header</a> whose name is <code>Content-Disposition</code>:</li>
<li><ul>
<li>If fetched <a href="http://fetch.spec.whatwg.org/#concept-response-type">response type</a> is <i>error</i> or the response has a <a href="https://fetch.spec.whatwg.org/#concept-header">header</a> whose name is <code>Content-Disposition</code>:
<ul>
<li>Add <var>LOCATION</var> and <strong>null</strong> to the <a href="#dfn-import-map">import map</a> and <strong>stop</strong>.
</ul></li>
<li>Let <var>IMPORT</var> be a new <a href="http://dom.spec.whatwg.org/#document"><code>Document</code></a>, <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/dom.html#the-document's-address">the document's address</a> of which is <var>LOCATION</var></li>
Expand Down Expand Up @@ -504,14 +504,14 @@ <h3>Import Link Tree</h3>
<li>Let <var>TREE</var>'s value be <var>CURRENT</var>
<li>Let <var>TREE</var>'s <a href="http://dom.spec.whatwg.org/#concept-tree-parent">parent</a> be <var>PARENT</var>.</li>
<li>Make <var>TREE</var>'s <a href="http://dom.spec.whatwg.org/#concept-tree-child">child</a> list empty.</li>
<li>For each <var>LINK</var>, a <code>link</code> element of an import in <var>CURRENT</var>, in document order:</li>
<li>For each <var>LINK</var>, a <code>link</code> element of an import in <var>CURRENT</var>, in document order:
<ol>
<li>Let <var>IMPORT</var> be the import of <var>LINK</var>.</li>
<li>If <var>IMPORT</var> is not in <var>POOL<var>, try next.</li>
<li>Remove <var>LINK</var> from <var>POOL</var>.</li>
<li>Invoke the <a href="#dfn-import-link-tree-forming">import tree forming</a> algorithm with <var>TREE</var> as <var>PARENT</var>, <var>IMPORT</var> as <var>CURRENT</var> and <var>POOL</var> as <var>POOL</var>, let the result be <var>CHILD</var>.
<li>Append <var>CHILD</var> to <var>TREE</var>'s <a href="http://dom.spec.whatwg.org/#concept-tree-child">child</a> list.</li>
</ol>
</ol></li>
<li><strong>stop</strong>.</li>
</ol>
</section>
Expand Down

0 comments on commit 5595315

Please sign in to comment.