abstract out URL escaping

Author: annevk

cssom/Overview.html

@@ -1934,12 +1934,9 @@ <h4 id=the-cssrule-interface><span class=secno>7.2.2. </span>The <code
 
     <ol>
      <li>The literal string "<code>@import</code>", followed by a space
-      (U+0020), followed by the literal string '<code><a
-      href="#url">url("</a></code>', followed by the <a
-      href="#escape-a-string" title="escape a string">escaped</a> value of
-      the <code title=dom-CSSImportRule-href><a
-      href="#dom-cssimportrule-href">href</a></code> attribute, followed by
-      '<code>")</code>'.
+      (U+0020), followed by the <a href="#escape-a-url" title="escape a
+      URL">URL escaped</a> value of the <code title=dom-CSSImportRule-href><a
+      href="#dom-cssimportrule-href">href</a></code> attribute.
 
      <li>If the associated <code><a href="#medialist">MediaList</a></code>
       object is not empty, a space (U+0020), followed by the value of the
@@ -1971,11 +1968,10 @@ <h4 id=the-cssrule-interface><span class=secno>7.2.2. </span>The <code
      title=dom-CSSNamespaceRule-prefix><a
      href="#dom-cssnamespacerule-prefix">prefix</a></code> attribute (if
      any), followed by a space (U+0020) if there is a prefix, followed by the
-     literal string '<code><a href="#url">url("</a></code>' followed by the
-     <a href="#escape-a-string" title="escape a string">string escaped</a>
-     value of the <code title=dom-CSSNamespaceRule-namespaceURI><a
+     <a href="#escape-a-url" title="escape a URL">URL escaped</a> value of
+     the <code title=dom-CSSNamespaceRule-namespaceURI><a
      href="#dom-cssnamespacerule-namespaceuri">namespaceURI</a></code>
-     attribute, followed by the literal string '<code>");</code>'.
+     attribute, followed the character "<code>;</code>" (U+003B).
   </dl>
 
   <p>The <dfn id=dom-cssrule-parentrule
@@ -3429,10 +3425,8 @@ <h4 id=serializing-css-values><span class=secno>7.4.2. </span>Serializing
    <dt>&lt;uri>
 
    <dd>
-    <p>The literal string '<code title="">url("</code>', followed by the <a
-     href="#escape-a-string" title="escape a string">escaped</a>
-     <span>absolute URL</span>, followed by the literal string
-     '<code>")</code>'.
+    <p>The <span>absolute URL</span> <a href="#escape-a-url" title="escape a
+     URL">escaped</a>.
   </dl>
 
   <p>To <dfn id=escape-a-character>escape a character</dfn> means to create a
@@ -3496,7 +3490,12 @@ <h4 id=serializing-css-values><span class=secno>7.4.2. </span>Serializing
   </ul>
 
   <p class=note>"<code>'</code>" (U+0027) is not escaped because strings are
-   always serialized with '<code>"</code>' (U+0022).</p>
+   always serialized with '<code>"</code>' (U+0022).
+
+  <p>To <dfn id=escape-a-url>escape a URL</dfn> means to create a string
+   represented by '<code><a href="#url">url("</a></code>', followed by the <a
+   href="#escape-a-string" title="escape a string">escaped</a> value of the
+   given string, followed by <code>")</code>.</p>
   <!--
   <ol>
    <li><p>Relative lengths (<code>em</code>, <code>ex</code>, <code>px</code>,

cssom/Overview.src.html

@@ -1548,10 +1548,9 @@ <h4>The <code title="">CSSRule</code> Interface</h4>
     <p>The result of concatenating these strings:</p>
     <ol>
      <li>The literal string "<code>@import</code>", followed by a space
-     (U+0020), followed by the literal string '<code>url("</code>', followed
-     by the <span title="escape a string">escaped</span> value of the
-     <code title="dom-CSSImportRule-href">href</code> attribute, followed by
-     '<code>")</code>'.</li>
+     (U+0020), followed by the <span title="escape a URL">URL escaped</span>
+     value of the <code title="dom-CSSImportRule-href">href</code>
+     attribute.</li>
      <li>If the associated <code>MediaList</code> object is not empty, a
      space (U+0020), followed by the value of the
      <code title="dom-MediaList-mediaText">mediaText</code> attribute of the
@@ -1575,10 +1574,9 @@ <h4>The <code title="">CSSRule</code> Interface</h4>
    <span title="escape an identifier">identifier escaped</span> value of the
    <code title="dom-CSSNamespaceRule-prefix">prefix</code> attribute (if
    any), followed by a space (U+0020) if there is a prefix, followed by the
-   literal string '<code>url("</code>' followed by the
-   <span title="escape a string">string escaped</span> value of the
+   <span title="escape a URL">URL escaped</span> value of the
    <code title="dom-CSSNamespaceRule-namespaceURI">namespaceURI</code>
-   attribute, followed by the literal string '<code>");</code>'.</p></dd>
+   attribute, followed the character "<code>;</code>" (U+003B).</p></dd>
   </dl>
 
 
@@ -2110,9 +2108,8 @@ <h4>Serializing CSS Values</h4>
    the literal string "<code>s</code>".</dd>
 
    <dt>&lt;uri></dt>
-   <dd><p>The literal string '<code title="">url("</code>', followed by the
-   <span title="escape a string">escaped</span> <span>absolute URL</span>,
-   followed by the literal string '<code>")</code>'.</p></dd>
+   <dd><p>The <span>absolute URL</span>
+   <span title="escape a URL">escaped</span>.</p></dd>
   </dl>
 
   <p>To <dfn>escape a character</dfn> means to create a string of
@@ -2163,6 +2160,11 @@ <h4>Serializing CSS Values</h4>
   <p class="note">"<code>'</code>" (U+0027) is not escaped because strings
   are always serialized with '<code>"</code>' (U+0022).</p>
 
+  <p>To <dfn>escape a URL</dfn> means to create a string represented by
+  '<code>url("</code>', followed by the
+  <span title="escape a string">escaped</span> value of the given string,
+  followed by <code>")</code>.</p>
+  
   <!--
   <ol>
    <li><p>Relative lengths (<code>em</code>, <code>ex</code>, <code>px</code>,