[css-shapes] <basic-shape> changes from TPAC

Author: astearns

css-shapes-2/Overview.html

@@ -12,7 +12,7 @@
    rel=dcterms.rights>
   <meta content="CSS Shapes Module Level 2" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-10-01 name=dcterms.date>
+  <meta content=2013-11-11 name=dcterms.date>
   <meta content="Alan Stearns" name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
   <meta content="http://dev.w3.org/csswg/www-style/" name=dcterms.identifier><!--<script src='http://test.csswg.org/harness/annotate.js#css-shapes_DEV' type='text/javascript' defer></script>-->
@@ -46,7 +46,7 @@
 
    <h1 id=css-shapes-module>CSS Shapes Module Level 2</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 1 October 2013</h2>
+   <h2 class="no-num no-toc">Editor's Draft 11 November 2013</h2>
 
    <dl>
     <dt>This version:
@@ -109,7 +109,7 @@ <h2 class="no-num no-toc" id=abstract>Abstract</h2>
 
   <p>This draft contains the features of CSS relating to wrapping content
    around and inside shapes. It (implicitly for now) includes and extends the
-   functionality of CSS Shapes Level 1 <a href="#CSS-SHAPES"
+   functionality of CSS Shapes Level 1 <a href="#ref-CSS-SHAPES"
    rel=biblioentry>[CSS-SHAPES]<!--{{CSS-SHAPES}}--></a>. The main points of
    extension compared to level 1 include additional ways of defining shapes,
    defining an exclusion area using a shape, and restricting an element's
@@ -277,7 +277,26 @@ <h3 id=basic-shapes-from-svg-syntax><span class=secno>3.1. </span>Basic
 
   <p>Add the final <a
    href="http://www.w3.org/TR/css-shapes/#basic-shapes-from-svg-syntax">level
-   1</a> section with a possible addition of path().
+   1</a> section with a possible addition of path() and a rejiggered
+   rectangle().
+
+  <dl>
+   <dt><dfn id=rectangle>rectangle()</dfn> = rectangle( &lt;<shape-arg>>{4} [
+    round &lt;&lt;‘<code class=property>border-radius</code>’>> ]? )
+    </shape-arg>
+
+   <dd>
+    <ul>
+     <li> The first four arguments represent <strong>x, y, width</strong> and
+      <strong>height</strong> of the rectangle. Negative values for width and
+      height are invalid.
+
+     <li> The optional &lt;&lt;‘<code
+      class=property>border-radius</code>’>> argument(s) define rounded
+      corners for the rectangle using the ‘<code
+      class=property>border-radius</code>’ shorthand syntax.
+    </ul>
+  </dl>
 
   <div class="issue-marker wrapper">
    <div class=issue-marker data-bug_id=16448 data-bug_status=ASSIGNED> <a
@@ -638,7 +657,7 @@ <h3 class=no-ref id=conventions> Document conventions</h3>
 
   <p>All of the text of this specification is normative except sections
    explicitly marked as non-normative, examples, and notes. <a
-   href="#RFC2119" rel=biblioentry>[RFC2119]<!--{{!RFC2119}}--></a>
+   href="#ref-RFC2119" rel=biblioentry>[RFC2119]<!--{{!RFC2119}}--></a>
 
   <p>Examples in this specification are introduced with the words “for
    example” or are set apart from the normative text with
@@ -760,7 +779,7 @@ <h3 class=no-num id=normative-references>Normative references</h3>
    <dd style="display: none"><!-- keeps the doc valid if the DL is empty -->
     <!---->
 
-   <dt id=RFC2119>[RFC2119]
+   <dt id=ref-RFC2119>[RFC2119]
 
    <dd>S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key
     words for use in RFCs to Indicate Requirement Levels.</cite></a> Internet
@@ -779,7 +798,7 @@ <h3 class=no-num id=other-references>Other references</h3>
    <dd style="display: none"><!-- keeps the doc valid if the DL is empty -->
     <!---->
 
-   <dt id=CSS-SHAPES>[CSS-SHAPES]
+   <dt id=ref-CSS-SHAPES>[CSS-SHAPES]
 
    <dd>Vincent Hardy; Rossen Atanassov; Alan Stearns. <a
     href="http://www.w3.org/TR/2013/WD-css-shapes-1-20130620/"><cite>CSS
@@ -807,6 +826,9 @@ <h2 class=no-num id=index>Index</h2>
    <li>Float area, <a href="#float-area"
     title="section 2."><strong>2.</strong></a>
 
+   <li>rectangle(), <a href="#rectangle"
+    title="section 3.1."><strong>3.1.</strong></a>
+
    <li>renderer, <a href="#renderer"
     title="section 4."><strong>4.</strong></a>
 

css-shapes-2/Overview.src.html

@@ -173,8 +173,30 @@ <h2 id="shapes">Shapes</h2>
   <h3 id="basic-shapes-from-svg-syntax">Basic Shapes</h3>
   <p>Add the final 
     <a href="http://www.w3.org/TR/css-shapes/#basic-shapes-from-svg-syntax">level 1</a> 
-    section with a possible addition of path().
-  </p> 
+    section with a possible addition of path() and a rejiggered rectangle().
+  </p>
+
+  <dl>
+    <dt><dfn>rectangle()</dfn> =
+      rectangle( <<shape-arg>>{4} [ round <<'border-radius'>> ]? )
+    </dt>
+    <dd>
+      <ul>
+        <li>
+          The first four arguments represent
+          <strong>x, y, width</strong> and
+          <strong>height</strong>
+          of the rectangle.
+          Negative values for width and height are invalid.
+        </li>
+        <li>
+          The optional <<'border-radius'>> argument(s)
+          define rounded corners for the rectangle
+          using the 'border-radius' shorthand syntax.
+        </li>
+      </ul>
+    </dd>
+  </dl>
 
 <div class="issue-marker wrapper">
     <div class="issue-marker" data-bug_id="16448" data-bug_status="ASSIGNED">