merge
authorCameron McCormack <cam@mcc.id.au>
Thu, 28 Mar 2013 12:49:21 +1100
changeset 469 5d3c3eb2bf45
parent 468 bba8cd5c2b2e (current diff)
parent 467 1baa200b0783 (diff)
child 470 40a7f9ef51a0
merge
master/definitions.xml
master/render.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/master/definitions-compositing.xml	Thu Mar 28 12:49:21 2013 +1100
@@ -0,0 +1,33 @@
+<!-- Definitions for Compositing and Blending. -->
+
+<definitions xmlns='http://mcc.id.au/ns/local' xmlns:x='http://mcc.id.au/ns/local'>
+
+  <!-- === defined in this specification ================================== -->
+
+  <!-- ... elements and element-specific attributes ....................... -->
+
+  <!-- ... element categories ............................................ -->
+
+
+  <!-- ... attributes common to multiple elements ........................ -->
+
+  <!-- attribute common to most filter primitives (all except feFlood feImage feMerge feTurbulence) -->
+  
+  <!-- ... attribute categories .......................................... -->
+
+
+  <!-- ... properties ..................................................... -->
+
+
+  <!-- ... interfaces ..................................................... -->
+
+  <!-- ... terms (these will be generated later) .......................... -->
+  <term name='compositing group' href='#groups'/>
+  <term name='group backdrop' href='#groups'/>
+  <term name='knock-out' href='#knock-out'/>
+  <term name='isolation' href='#enable-background'/>
+
+  <!-- === defined in other specifications ================================ -->
+
+
+</definitions>
--- a/master/definitions.xml	Thu Mar 28 12:45:56 2013 +1100
+++ b/master/definitions.xml	Thu Mar 28 12:49:21 2013 +1100
@@ -1364,11 +1364,6 @@
   <term name='InvalidStateError' href='http://www.w3.org/TR/2012/WD-dom-20120405/#invalidstateerror'/>
   <term name='SyntaxError' href='http://www.w3.org/TR/2012/WD-dom-20120405/#syntaxerror'/>
 
-  <term name='compositing group' href='http://www.w3.org/TR/compositing/#groups'/>
-  <term name='group backdrop' href='http://www.w3.org/TR/compositing/#groups'/>
-  <term name='knock-out' href='http://www.w3.org/TR/compositing/#knock-out'/>
-  <term name='isolation' href='http://www.w3.org/TR/compositing/#enable-background'/>
-
   <!-- ... grammar symbols ................................................ -->
   <symbol name='angle' href='http://www.w3.org/TR/2012/WD-css3-values-20120308/#angles'/>
   <symbol name='identifier' href='http://www.w3.org/TR/2012/WD-css3-values-20120308/#identifier'/>
--- a/master/publish.xml	Thu Mar 28 12:45:56 2013 +1100
+++ b/master/publish.xml	Thu Mar 28 12:49:21 2013 +1100
@@ -28,6 +28,7 @@
   <definitions href='definitions.xml'/>
   <definitions href='definitions-filters.xml' base='http://www.w3.org/TR/2012/WD-filter-effects-20121025/'/>
   <definitions href='definitions-masking.xml' base='http://www.w3.org/TR/2012/WD-css-masking-20121115/'/>
+  <definitions href='definitions-compositing.xml' base='http://www.w3.org/TR/2012/WD-compositing-20120816/'/>
 
   <interfaces idl='../build/svg.idlx'/>
 
--- a/master/refs.html	Thu Mar 28 12:45:56 2013 +1100
+++ b/master/refs.html	Thu Mar 28 12:49:21 2013 +1100
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional+edit//EN" "xhtml1-transitional+edit.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:edit="http://xmlns.grorg.org/SVGT12NG/">
 <head>
@@ -64,6 +64,16 @@
     ISBN 3-901-906-33-9.
     <br/>Available at http://www.cie.co.at/publ/abst/15-2004.html.
   </dd>
+  
+  <dt id="ref-COMPOSITINGBLENDING" class="normref">[COMPOSITING-BLENDING]</dt>
+  <dd>
+    <cite class="w3ced"><a href="http://www.w3.org/TR/2012/WD-compositing-20120816">Compositing and Blending</a></cite>,
+    N. Andronikos, R. Cabanier, eds.
+    World Wide Web Consortium, 16 August 2012.
+    <br/>This edition of Compositing and Blending is the <b>Working Draft</b> at http://www.w3.org/TR/2012/WD-compositing-20120816.
+    <br/>The <a href="http://www.w3.org/TR/compositing/">latest edition of Compositing and Blending</a> is available at
+    http://www.w3.org/TR/compositing/.
+  </dd>
 
   <dt id="ref-CSS21" class="normref">[CSS21]</dt>
   <dd>
--- a/master/render.html	Thu Mar 28 12:45:56 2013 +1100
+++ b/master/render.html	Thu Mar 28 12:49:21 2013 +1100
@@ -233,7 +233,7 @@
 set of alpha values which are multiplied to the alpha values
 already present in the graphics to which the mask is applied.
 The resulting alpha value is used as input to the Compositing
-and Blending operations described in the <a href="http://www.w3.org/TR/compositing/">Compositing and Blending Specification</a>.
+and Blending operations described in the Compositing and Blending Specification [<a href="refs.html#ref-COMPOSITINGBLENDING">COMPOSITING-BLENDING</a>].
 Masking is described in detail in
 <a href="https://dvcs.w3.org/hg/FXTF/raw-file/default/masking/index.html"><cite>CSS Masking</cite></a>
 [<a href="refs.html#ref-CSS-MASKING">CSS-MASKING</a>].</dd>