Merge
authorNikos Andronikos <nikos.andronikos@cisra.canon.com.au>
Thu, 28 Mar 2013 11:52:05 +1100
changeset 467 1baa200b0783
parent 466 4bce16077562 (current diff)
parent 465 ca751d2b8d2f (diff)
child 469 5d3c3eb2bf45
Merge
master/images/implnote/arcs/Makefile
master/images/implnote/arcs/cx.png
master/images/implnote/arcs/cxcyrxrypsitheta.png
master/images/implnote/arcs/cy.png
master/images/implnote/arcs/delta-theta.png
master/images/implnote/arcs/equal.png
master/images/implnote/arcs/fa.png
master/images/implnote/arcs/fs.png
master/images/implnote/arcs/notequal.png
master/images/implnote/arcs/plus.png
master/images/implnote/arcs/psi.png
master/images/implnote/arcs/rx.png
master/images/implnote/arcs/ry.png
master/images/implnote/arcs/theta.png
master/images/implnote/arcs/theta1.png
master/images/implnote/arcs/theta2.png
master/images/implnote/arcs/x1.png
master/images/implnote/arcs/x1y1x2y2fafs.png
master/images/implnote/arcs/x2.png
master/images/implnote/arcs/y1.png
master/images/implnote/arcs/y2.png
--- a/Makefile	Thu Mar 28 11:50:34 2013 +1100
+++ b/Makefile	Thu Mar 28 11:52:05 2013 +1100
@@ -6,7 +6,6 @@
 	@bash -c "REMOTE_REV=$$(hg id -i http://svgwg.org/hg/svg2-tools); [ \$$? = 0 -o \"\$$REMOTE_REV\" != \"\" ] || exit 0; LOCAL_REV=$$(hg id -i ../svg2-tools); [ \"\$$LOCAL_REV\" = \"\$$REMOTE_REV\" -o \"\$$LOCAL_REV\" = \"\$$REMOTE_REV\"+ ] || (echo \"You must update your svg2-tools repository! (Remote repository has revision \$$REMOTE_REV, but you are at \$$LOCAL_REV.)\"; exit 1)"
 
 all :
-	[ -f /usr/bin/cygpath.exe ] || $(MAKE) -C master/images/implnote/arcs/
 	@../svg2-tools/build.py
 
 pdf : all
@@ -30,6 +29,5 @@
 	rm -rf build/publish/$(ZIPDIR)
 
 clean :
-	$(MAKE) -C master/images/implnote/arcs/ clean
 	@../svg2-tools/build.py -c
 
--- a/master/changes.html	Thu Mar 28 11:50:34 2013 +1100
+++ b/master/changes.html	Thu Mar 28 11:52:05 2013 +1100
@@ -192,11 +192,12 @@
 <h3 id="masking">Clipping, Masking and Compositing chapter</h3>
 <div class="added-since-last-wd">
 <ul>
-  <li>SVG now references CSS Masking [<a href="refs.html#ref-CSS-MASKING">CSS-MASKING</a>] specification.</li>
+  <li>SVG now references CSS Masking [<a href="refs.html#ref-CSS-MASKING">CSS-MASKING</a>] specification.
     <ul>
       <li>Removed definition of clipping/masking properties and elements.</li>
       <li>Keep short introduction to clipping/masking and add reference to CSS Masking</li>
     </ul>
+  </li>
   <li>Added reference to Compositing and Blending spec. Simple alpha compositing it mandatory.</li>
 </ul>
 </div>
--- a/master/images/implnote/arcs/Makefile	Thu Mar 28 11:50:34 2013 +1100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# Makefile for generating SVGs and PNGs from the MathML documents in this directory.
-
-THISDIR=$(abspath .)
-TARGETDIR=$(abspath ../../../../build/publish/images/implnote/arcs)
-TOOLSDIR=$(abspath ../../../../../svg2-tools)
-
-SVG2PNG=java -jar $(TOOLSDIR)/batik/batik-rasterizer.jar
-
-MML_FILES=$(wildcard *.mml)
-
-all : $(MML_FILES:%.mml=$(TARGETDIR)/%.png)
-
-$(TARGETDIR)/%.svg : %.mml
-	mkdir -p $(TARGETDIR)
-	cd $(TOOLSDIR)/math && ./math2svg.py -o [email protected] $(THISDIR)/$<
-
-$(TARGETDIR)/%.png : $(TARGETDIR)/%.svg
-	$(SVG2PNG) -cssUser 'data:text/css,svg{text-rendering:geometricPrecision}' -d [email protected] $<
-clean :
-	rm -f $(MML_FILES:%.mml=$(TARGETDIR)/%.png) $(MML_FILES:%.mml=$(TARGETDIR)/%.svg)
-
-.PRECIOUS : $(TARGETDIR)/%.svg
-.PHONY : all clean
Binary file master/images/implnote/arcs/cx.png has changed
Binary file master/images/implnote/arcs/cxcyrxrypsitheta.png has changed
Binary file master/images/implnote/arcs/cy.png has changed
Binary file master/images/implnote/arcs/delta-theta.png has changed
Binary file master/images/implnote/arcs/equal.png has changed
Binary file master/images/implnote/arcs/fa.png has changed
Binary file master/images/implnote/arcs/fs.png has changed
Binary file master/images/implnote/arcs/image004.png has changed
Binary file master/images/implnote/arcs/image006.png has changed
Binary file master/images/implnote/arcs/image008.png has changed
Binary file master/images/implnote/arcs/image010.png has changed
Binary file master/images/implnote/arcs/image012.png has changed
Binary file master/images/implnote/arcs/image014.png has changed
Binary file master/images/implnote/arcs/image016.png has changed
Binary file master/images/implnote/arcs/image018.png has changed
Binary file master/images/implnote/arcs/image020.png has changed
Binary file master/images/implnote/arcs/image022.png has changed
Binary file master/images/implnote/arcs/image024.png has changed
Binary file master/images/implnote/arcs/image026.png has changed
Binary file master/images/implnote/arcs/image028.png has changed
Binary file master/images/implnote/arcs/notequal.png has changed
Binary file master/images/implnote/arcs/plus.png has changed
Binary file master/images/implnote/arcs/psi.png has changed
Binary file master/images/implnote/arcs/rx.png has changed
Binary file master/images/implnote/arcs/ry.png has changed
Binary file master/images/implnote/arcs/theta.png has changed
Binary file master/images/implnote/arcs/theta1.png has changed
Binary file master/images/implnote/arcs/theta2.png has changed
Binary file master/images/implnote/arcs/x1.png has changed
Binary file master/images/implnote/arcs/x1y1x2y2fafs.png has changed
Binary file master/images/implnote/arcs/x2.png has changed
Binary file master/images/implnote/arcs/y1.png has changed
Binary file master/images/implnote/arcs/y2.png has changed
--- a/master/intro.html	Thu Mar 28 11:50:34 2013 +1100
+++ b/master/intro.html	Thu Mar 28 11:52:05 2013 +1100
@@ -294,8 +294,10 @@
   on them.  See <a href="struct.html#ConditionalProcessing">Conditional processing</a>
   for details.  The conditional processing attributes defined in
   SVG 1.1 are <edit:attributecategory name='conditional processing'/>.</dd>
+</dl>
 
-  <div class="ready-for-wg-review">
+<div class="ready-for-wg-review">
+<dl class="definitions">
   <dt id="TermContextElement">context element</dt>
   <dd>The context element of an element is defined as follows:
   <ul>
@@ -312,8 +314,10 @@
   <p class="issue">Should <a>gradient elements</a> also be
   context elements?</p>
   </dd>
-  </div>
+</dl>
+</div>
 
+<dl class="definitions">
   <dt id="TermCoreAttribute">core attributes</dt>
   <dd>The core attributes are those attributes that can be specified
   on any SVG element.  See <a href="struct.html#CommonAttributes">Common attributes</a>.
--- a/master/linking.html	Thu Mar 28 11:50:34 2013 +1100
+++ b/master/linking.html	Thu Mar 28 11:52:05 2013 +1100
@@ -191,9 +191,9 @@
   <li>the <a>'script'</a> element must reference an external resource that provides the script content</li>
   <li>the <a>'stroke'</a> property (see <a href="painting.html#SpecifyingPaint">Specifying paint</a> for reference rules)</li>
   <li>the <a>'textPath'</a> element must reference a <a>'path'</a> element</li>
-<div class="ready-for-wg-review">
-  <li>the <a>'tref'</a> element can reference any element (including non-SVG elements)</li>
-</div>
+  <li>
+    <div class="ready-for-wg-review">the <a>'tref'</a> element can reference any element (including non-SVG elements)</div>
+  </li>
   <li>the <a>'set'</a> element (see <a href="animate.html#TargetElement">Identifying the target element for an animation</a> for reference rules)</li>
   <li>the <a>'use'</a> element can reference any local or non-local resource</li>
 </ul>
--- a/master/painting.html	Thu Mar 28 11:50:34 2013 +1100
+++ b/master/painting.html	Thu Mar 28 11:52:05 2013 +1100
@@ -1363,7 +1363,7 @@
 <p class="issue">Need to do. This isn't as trivial as it first looks since we have to deal
   with rx != ry and an arbitrary rotation.</p>
 
-<p>For a quadratic Bézier:
+<p>For a quadratic Bézier:</p>
 
   <div role="math" aria-describedby="math-quadratic-start">
     <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
@@ -1497,12 +1497,12 @@
     <pre id="math-quadratic-end">$$\kappa(0) = {2\over3}{(P_1-P_0)\times((P_0-P_1)+(P_2-P_1))\over|P_1-P_0|^3}$$</pre>
   </div>
 
-  Where <var>&#x03BA;(0)</var> and <var>&#x03BA;(1)</var> are the
+  <p>Where <var>&#x03BA;(0)</var> and <var>&#x03BA;(1)</var> are the
   signed curvatures at the start and end of the path segment
   respectively, and the <var>P</var>'s are the three points that
   define the quadratic Bézier.</p>
 
-<p>For a cubic Bézier:
+<p>For a cubic Bézier:</p>
 
   <div role="math" aria-describedby="math-cubic-start">
     <math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
@@ -1636,7 +1636,7 @@
     <pre id="math-cubic-end">$$\kappa(1) = {2\over3}{(P_3-P_2)\times((P_1-P_2)+(P_3-P_2))\over|P_3-P_2|^3}$$</pre>
   </div>
 
-  Where <var>&#x03BA;(0)</var> and <var>&#x03BA;(1)</var> are the
+  <p>Where <var>&#x03BA;(0)</var> and <var>&#x03BA;(1)</var> are the
   signed curvatures at the start and end of the path segment
   respectively, and the <var>P</var>'s are the four points that define
   the cubic Bézier. Note, if
@@ -1723,61 +1723,44 @@
          effects through this property but this version restricts it to being able to
          specify the non-scaling stroke behavior. </p>
 
-      <div id="VectorEffectProperty" class="propdef">
-         <dl>
-            <dt id="propdef-vector-effect">
-               <span class="index-def propdef-title prop-name" title="'vector-effect'">'vector-effect'</span>
-            </dt>
-            <dd>
-               <table summary="vector-effect property" class="propinfo" cellspacing="0" cellpadding="0">
-                  <tr valign="baseline">
-                     <td>
-                        <em>Value:</em>   </td>
-                     <td> non-scaling-stroke | none | <a class="noxref" href="http://www.w3.org/TR/CSS2/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 href="intro.html#TermGraphicsElement"><span class="svg-term">graphics elements</span></a>
-                     </td>
-                  </tr>
-                  <tr valign="baseline">
-                     <td>
-                        <em>Inherited:</em>   </td>
-                     <td> no </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>
-                  <tr valign="baseline">
-                     <td>
-                        <em>Computed value:</em>   </td>
-                     <td> Specified value, except inherit </td>
-                  </tr>
-               </table>
-            </dd>
-         </dl>
-      </div>
-
+<table class="propdef">
+  <tr>
+    <th>Name:</th>
+    <td><dfn id="VectorEffectProperty">vector-effect</dfn></td>
+  </tr>
+  <tr>
+    <th>Value:</th>
+    <td>non-scaling-stroke | none</td>
+  </tr>
+  <tr>
+    <th>Initial:</th>
+    <td>none</td>
+  </tr>
+  <tr>
+    <th>Applies to:</th>
+    <td><a>graphics elements</a></td>
+  </tr>
+  <tr>
+    <th>Inherited:</th>
+    <td>no</td>
+  </tr>
+  <tr>
+    <th>Percentages:</th>
+    <td>N/A</td>
+  </tr>
+  <tr>
+    <th>Media:</th>
+    <td>visual</td>
+  </tr>
+  <tr>
+    <th>Computed&#160;value:</th>
+    <td>as specified</td>
+  </tr>
+  <tr>
+    <th><a>Animatable</a>:</th>
+    <td>yes</td>
+  </tr>
+</table>
 
       <dl>
          <dt class="prop-value"> none </dt>
@@ -2246,7 +2229,7 @@
   </div>
 </div>
 
-<h3 id="MarkerReferences">Referencing <a>'marker element'</a> elements</h3>
+<h3 id="MarkerReferences">Referencing <span class="element-name">'marker'</span> elements</h3>
 
 <p>A number of marker properties allow specifying a <a>'marker element'</a> using a <a>&lt;marker-ref&gt;</a> value.</p>
 
--- a/master/types.html	Thu Mar 28 11:50:34 2013 +1100
+++ b/master/types.html	Thu Mar 28 11:52:05 2013 +1100
@@ -2921,9 +2921,11 @@
 
 </div>
 </dd>
+</dl>
 
 <div class="ready-for-wg-review">
 
+<dl class="attributes">
 <dt id="__svg__SVGAnimatedLength__cm" class="attribute"><b>cm</b><span class="idl-type-parenthetical"> (float)</span></dt>
 <dd class="attribute">
   <div>On getting, returns the base value of the animated length in <b>cm</b>.
@@ -2972,9 +2974,9 @@
   On setting, changes the base value to be in <b>px</b> and to have the specified magnitude.</div>
 </dd>
 
+</dl>
 </div>
 
-</dl>
 </dd>
 </dl>
 
@@ -3410,10 +3412,11 @@
 
 </div>
 </dd>
-
+</dl>
 
 <div class="ready-for-wg-review">
 
+<dl class="attributes">
 <dt id="__svg__SVGAnimatedLengthList__cm" class="attribute"><b>cm</b><span class="idl-type-parenthetical"> (float)</span></dt>
 <dd class="attribute">
   <div>On getting, returns the value of the first <a>SVGLength</a> of the animated length's base value in <b>cm</b>.
@@ -3485,10 +3488,10 @@
   <b>px</b> and to have the specified magnitude.  If the base value list is empty, it adds
   a new <a>SVGLength</a> object with the given <b>px</b> value.</div>
 </dd>
+</dl>
 
 </div>
 
-</dl>
 </dd>
 </dl>