--- a/master/definitions.xml Tue May 22 22:08:07 2012 +1000
+++ b/master/definitions.xml Wed May 23 12:30:49 2012 +1000
@@ -1519,6 +1519,7 @@
<symbol name='transform-list' href='types.html#DataTypeTransformList'/>
<symbol name='iri' href='types.html#DataTypeIRI'/>
<symbol name='FuncIRI' href='types.html#DataTypeFuncIRI'/>
+ <symbol name='funciri' href='types.html#DataTypeFuncIRI'/>
<symbol name="XML-Name" href="types.html#DataTypeXML-Name"/>
<!-- ... terms (these will be generated later) .......................... -->
--- a/master/painting.html Tue May 22 22:08:07 2012 +1000
+++ b/master/painting.html Wed May 23 12:30:49 2012 +1000
@@ -1565,7 +1565,50 @@
only the rendering aspects of <a>'marker element'</a> elements are
processed.</p>
-<h3 id="MarkerProperties">Marker properties</h3>
+<h3 id="MarkerProperties">Marker properties: the <span class="property">'marker-start'</span>,
+<span class="property">'marker-mid'</span> and <span class="property">'marker-end'</span>
+properties</h3>
+
+<table class="propdef">
+ <tr>
+ <th>Name:</th>
+ <td><dfn id="MarkerStartProperty">marker-start</dfn>,
+ <dfn id="MarkerMidProperty">marker-mid</dfn>,
+ <dfn id="MarkerEndProperty">marker-end</dfn></td>
+ </tr>
+ <tr>
+ <th>Value:</th>
+ <td>none | <a><funciri></a></td>
+ </tr>
+ <tr>
+ <th>Initial:</th>
+ <td>none</td>
+ </tr>
+ <tr>
+ <th>Applies to:</th>
+ <td><a>'path'</a>, <a>'line'</a>, <a>'polyline'</a> and <a>'polygon'</a></td>
+ </tr>
+ <tr>
+ <th>Inherited:</th>
+ <td>yes</td>
+ </tr>
+ <tr>
+ <th>Percentages:</th>
+ <td>N/A</td>
+ </tr>
+ <tr>
+ <th>Media:</th>
+ <td>visual</td>
+ </tr>
+ <tr>
+ <th>Computed value:</th>
+ <td>As specified.</td>
+ </tr>
+ <tr>
+ <th><a href="animate.html#Animatable">Animatable</a>:</th>
+ <td>yes</td>
+ </tr>
+</table>
<p><a>'marker-start'</a> defines the arrowhead or polymarker that shall
be drawn at the first vertex of the given <a>'path'</a> element or
@@ -1581,50 +1624,8 @@
<a>'marker-end'</a> to <span class="prop-value">none</span>. (Note that
the same comment applies to <a>'polygon'</a> elements.)</p>
- <div class="propdef">
- <dl>
- <dt id="MarkerStartProperty"><span class='propdef-title property'>'marker-start'</span></dt>
- <dt id="MarkerMidProperty"><span class='propdef-title property'>'marker-mid'</span></dt>
- <dt id="MarkerEndProperty"><span class='propdef-title property'>'marker-end'</span></dt>
- <dd>
- <table summary="marker properties" class="propinfo"
- cellspacing="0" cellpadding="0">
- <tr valign="baseline">
- <td><em>Value:</em> </td>
- <td>none | <funciri> |
- <a class="noxref" href="http://www.w3.org/TR/2008/REC-CSS2-20080411/cascade.html#value-def-inherit"><span class="value-inst-inherit noxref">inherit</span></a>
- </td>
- </tr>
- <tr valign="baseline">
- <td><em>Initial:</em> </td>
- <td>none</td>
- </tr>
- <tr valign="baseline">
- <td><em>Applies to:</em> </td>
- <td><a>'path'</a>, <a>'line'</a>, <a>'polyline'</a> and
- <a>'polygon'</a> elements</td>
- </tr>
- <tr valign="baseline">
- <td><em>Inherited:</em> </td>
- <td>yes</td>
- </tr>
- <tr valign="baseline">
- <td><em>Percentages:</em> </td>
- <td>N/A</td>
- </tr>
- <tr valign="baseline">
- <td><em>Media:</em> </td>
- <td>visual</td>
- </tr>
- <tr valign="baseline">
- <td><em><a
- href="animate.html#Animatable">Animatable</a>:</em> </td>
- <td>yes</td>
- </tr>
- </table>
- </dd>
- </dl>
- </div>
+<p>Possible values for <a>'marker-start'</a>, <a>'marker-mid'</a> and
+<a>'marker-end'</a> are:</p>
<dl>
<dt><span class='prop-value'>none</span></dt>
@@ -1641,52 +1642,53 @@
be drawn.</dd>
</dl>
-<p id="MarkerProperty">The <a>'marker property'</a> property specifies
-the marker symbol that shall be used for all points on the sets the
-value for all vertices on the given <a>'path'</a> element or
-<a href="shapes.html">basic shape</a>. It is a short-hand for the three
-individual marker properties:</p>
+<h3 id="MarkerShorthand">Marker shorthand: the <span class="property">'marker property'</span>
+property</h3>
- <div class="propdef">
- <dl>
- <dt><span class="propdef-title property">'marker'</span></dt>
- <dd>
- <table summary="marker property" class="propinfo"
- cellspacing="0" cellpadding="0">
- <tr valign="baseline">
- <td><em>Value:</em> </td>
- <td>see individual properties</td>
- </tr>
- <tr valign="baseline">
- <td><em>Initial:</em> </td>
- <td>see individual properties</td>
- </tr>
- <tr valign="baseline">
- <td><em>Applies to:</em> </td>
- <td><a>'path'</a>, <a>'line'</a>, <a>'polyline'</a> and
- <a>'polygon'</a> elements</td>
- </tr>
- <tr valign="baseline">
- <td><em>Inherited:</em> </td>
- <td>yes</td>
- </tr>
- <tr valign="baseline">
- <td><em>Percentages:</em> </td>
- <td>N/A</td>
- </tr>
- <tr valign="baseline">
- <td><em>Media:</em> </td>
- <td>visual</td>
- </tr>
- <tr valign="baseline">
- <td><em><a
- href="animate.html#Animatable">Animatable</a>:</em> </td>
- <td>yes</td>
- </tr>
- </table>
- </dd>
- </dl>
- </div>
+<table class="propdef">
+ <tr>
+ <th>Name:</th>
+ <td><dfn id="MarkerProperty">marker</dfn></td>
+ </tr>
+ <tr>
+ <th>Value:</th>
+ <td>none | <a><funciri></a></td>
+ </tr>
+ <tr>
+ <th>Initial:</th>
+ <td>not defined for shorthand properties</td>
+ </tr>
+ <tr>
+ <th>Applies to:</th>
+ <td><a>'path'</a>, <a>'line'</a>, <a>'polyline'</a> and <a>'polygon'</a></td>
+ </tr>
+ <tr>
+ <th>Inherited:</th>
+ <td>yes</td>
+ </tr>
+ <tr>
+ <th>Percentages:</th>
+ <td>N/A</td>
+ </tr>
+ <tr>
+ <th>Media:</th>
+ <td>visual</td>
+ </tr>
+ <tr>
+ <th>Computed value:</th>
+ <td>see individual properties</td>
+ </tr>
+ <tr>
+ <th><a href="animate.html#Animatable">Animatable</a>:</th>
+ <td>yes</td>
+ </tr>
+</table>
+
+<p>The <a>'marker property'</a> property specifies
+the marker symbol that shall be used for all points on the given
+element. It is a shorthand for setting the three individual marker
+properties – <a>'marker-start'</a>, <a>'marker-mid'</a> and <a>'marker-end'</a> –
+to the same value.</p>
<h3 id="MarkerAlgorithm">Details on how markers are rendered</h3>