GNOME.org
 

dia r4202 - in trunk: . doc shapes/Contact shapes/RDP shapes/SDL

Author: hans
Date: Sun Jan 18 16:31:04 2009
New Revision: 4202
URL: http://svn.gnome.org/viewvc/dia?rev=4202&view=rev

Log:
2009-01-18  Hans Breuer  <hans breuer org>

	[xmllint --dtdvalid doc/shape.dtd shapes/**/*.shape >/dev/null]
	* shapes/Contact/c_ifnot.shape shapes/RDP/t_transition.shape
	  shapes/RDP/transition.shape shapes/SDL/comment.shape 
	  shapes/SDL/function.shape shapes/SDL/macro.shape 
	  shapes/SDL/return.shape shapes/SDL/stop.shape : removed superfluous
	'svg:' prefix on style attribute
	* shapes/RDP/place_marquee.shape : removed attribute 'color' from 
	svg:circle element; it would be ambiguous and did not validate.
	Both foreground and background color are set in the style attribute.
	* docs/shape.dtd : changed circle attribute cy to be IMPLIED only
	Together this reduces the complaints of xmllint down to zero. Given
	the recent updates on 
	http://svn.gnome.org/viewvc/dia/trunk/doc/custom-shapes?view=log
	IMO enough to close bug #86402



Modified:
   trunk/ChangeLog
   trunk/doc/shape.dtd
   trunk/shapes/Contact/c_ifnot.shape
   trunk/shapes/RDP/place_marquee.shape
   trunk/shapes/RDP/t_transition.shape
   trunk/shapes/RDP/transition.shape
   trunk/shapes/SDL/comment.shape
   trunk/shapes/SDL/function.shape
   trunk/shapes/SDL/macro.shape
   trunk/shapes/SDL/note.shape
   trunk/shapes/SDL/return.shape
   trunk/shapes/SDL/stop.shape

Modified: trunk/doc/shape.dtd
==============================================================================
--- trunk/doc/shape.dtd	(original)
+++ trunk/doc/shape.dtd	Sun Jan 18 16:31:04 2009
@@ -97,7 +97,7 @@
 <!ELEMENT svg:circle EMPTY >
 <!ATTLIST svg:circle
   cx CDATA #REQUIRED
-  cy CDATA #REQUIRED
+  cy CDATA #IMPLIED
   r CDATA #REQUIRED
   style CDATA #IMPLIED >
 

Modified: trunk/shapes/Contact/c_ifnot.shape
==============================================================================
--- trunk/shapes/Contact/c_ifnot.shape	(original)
+++ trunk/shapes/Contact/c_ifnot.shape	Sun Jan 18 16:31:04 2009
@@ -16,6 +16,6 @@
     <svg:rect x="-2" y="-3" width="4" height="4" style="stroke:none"/>
     <svg:polyline points="-2,0 -.75,0 -.75,-.875"/>
     <svg:polyline points="-1,-1 1,0 2,0 "/>
-    <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" svg:style="stroke-width:.05"/>
+    <svg:line x1="-.5" y1="-2.2" x2=".5" y2="-2.2" style="stroke-width:.05"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/RDP/place_marquee.shape
==============================================================================
--- trunk/shapes/RDP/place_marquee.shape	(original)
+++ trunk/shapes/RDP/place_marquee.shape	Sun Jan 18 16:31:04 2009
@@ -19,7 +19,7 @@
 
   <svg:svg width="1.0" height="1.0">
     <svg:circle cx="0" r="1.5"/>
-    <svg:circle color="#ff0000" style="stroke: #ff000; fill: #ff0000" cx="0" r="0.1"/> 	
+    <svg:circle style="stroke: #ff000; fill: #ff0000" cx="0" r="0.1"/> 	
 
   </svg:svg>
 </shape>

Modified: trunk/shapes/RDP/t_transition.shape
==============================================================================
--- trunk/shapes/RDP/t_transition.shape	(original)
+++ trunk/shapes/RDP/t_transition.shape	Sun Jan 18 16:31:04 2009
@@ -12,7 +12,7 @@
   <textbox x1="-0.9" y1="-0.9" x2="0.9" y2="-0.2"/>
   <aspectratio type="fixed"/>
    <svg:svg> 
-     <svg:rect x="-0.5" y="-1" width="1" height="0.5" svg:style="stroke:none"/>
+     <svg:rect x="-0.5" y="-1" width="1" height="0.5" style="stroke:none"/>
     <svg:line x1="-0.5" y1="-0.1" x2="0.5" y2="-0.1"/>
     <svg:line x1="-0.5" y1="0" x2="0.5" y2="0"/>
 	

Modified: trunk/shapes/RDP/transition.shape
==============================================================================
--- trunk/shapes/RDP/transition.shape	(original)
+++ trunk/shapes/RDP/transition.shape	Sun Jan 18 16:31:04 2009
@@ -11,7 +11,7 @@
   <textbox x1="-0.9" y1="-0.9" x2="0.9" y2="-0.2"/>
   <aspectratio type="fixed"/>
    <svg:svg> 
-     <svg:rect x="-0.5" y="-1" width="1" height="0.5" svg:style="stroke:none"/>
+     <svg:rect x="-0.5" y="-1" width="1" height="0.5" style="stroke:none"/>
     <svg:line x1="-0.5" y1="0" x2="0.5" y2="0"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/SDL/comment.shape
==============================================================================
--- trunk/shapes/SDL/comment.shape	(original)
+++ trunk/shapes/SDL/comment.shape	Sun Jan 18 16:31:04 2009
@@ -8,10 +8,10 @@
   <point x="1.25" y="1" main="yes"/></connections>
   <textbox x1="0.25" y1="0" x2="2.25" y2="2"/>
   <svg:svg width="2.5" height="2">
-    <svg:line x1="0.50" y1="0" x2="0.25" y2="0" svg:style="stroke-width:1"/>
-    <svg:line x1="0.50" y1="2" x2="0.25" y2="2" svg:style="stroke-width:1"/>
-    <svg:line x1="0.25" y1="0" x2="0.25" y2="2" svg:style="stroke-width:1"/>
-    <svg:line x1="0" y1="1" x2="0.25" y2="1" svg:style="stroke-width:1"/>
+    <svg:line x1="0.50" y1="0" x2="0.25" y2="0" style="stroke-width:1"/>
+    <svg:line x1="0.50" y1="2" x2="0.25" y2="2" style="stroke-width:1"/>
+    <svg:line x1="0.25" y1="0" x2="0.25" y2="2" style="stroke-width:1"/>
+    <svg:line x1="0" y1="1" x2="0.25" y2="1" style="stroke-width:1"/>
   </svg:svg>
 
 </shape>

Modified: trunk/shapes/SDL/function.shape
==============================================================================
--- trunk/shapes/SDL/function.shape	(original)
+++ trunk/shapes/SDL/function.shape	Sun Jan 18 16:31:04 2009
@@ -12,7 +12,7 @@
   <textbox x1="0.25" y1="0" x2="2.25" y2="2"/>
   <svg:svg width="2.5" height="2">
     <svg:polygon points="0,0 2.5,0 2.5,2 0,2" style="fill: default"/>
-    <svg:line x1="0.25" y1="0" x2="0.25" y2="2" svg:style="stroke-width:1"/>
-    <svg:line x1="2.25" y1="0" x2="2.25" y2="2" svg:style="stroke-width:1"/>
+    <svg:line x1="0.25" y1="0" x2="0.25" y2="2" style="stroke-width:1"/>
+    <svg:line x1="2.25" y1="0" x2="2.25" y2="2" style="stroke-width:1"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/SDL/macro.shape
==============================================================================
--- trunk/shapes/SDL/macro.shape	(original)
+++ trunk/shapes/SDL/macro.shape	Sun Jan 18 16:31:04 2009
@@ -12,6 +12,6 @@
   <textbox x1="0.25" y1="0" x2="2.25" y2="2"/>
   <svg:svg width="2.5" height="2">
     <svg:polygon points="0,0 2.5,0 2.5,2 0,2" style="fill: default"/>
-    <svg:line x1="0.25" y1="0" x2="0.25" y2="2" svg:style="stroke-width:1"/>
+    <svg:line x1="0.25" y1="0" x2="0.25" y2="2" style="stroke-width:1"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/SDL/note.shape
==============================================================================
--- trunk/shapes/SDL/note.shape	(original)
+++ trunk/shapes/SDL/note.shape	Sun Jan 18 16:31:04 2009
@@ -12,7 +12,7 @@
   <textbox x1="0.25" y1="0" x2="2.25" y2="2"/>
   <svg:svg width="2.5" height="2">
     <svg:polygon points="0,0 2.1,0 2.5,0.4 2.5,2 0,2" style="fill: default"/>
-    <svg:line x1="2.1" y1="0" x2="2.1" y2="0.4" svg:style="stroke-width:1"/>
-    <svg:line x1="2.1" y1="0.4" x2="2.5" y2="0.4" svg:style="stroke-width:1"/>
+    <svg:line x1="2.1" y1="0" x2="2.1" y2="0.4" style="stroke-width:1"/>
+    <svg:line x1="2.1" y1="0.4" x2="2.5" y2="0.4" style="stroke-width:1"/>
   </svg:svg>
 </shape>

Modified: trunk/shapes/SDL/return.shape
==============================================================================
--- trunk/shapes/SDL/return.shape	(original)
+++ trunk/shapes/SDL/return.shape	Sun Jan 18 16:31:04 2009
@@ -8,8 +8,8 @@
   <point x="0.5" y="0.5" main="yes"/></connections>
   <svg:svg width="1" height="1">
     <svg:circle cx="0.5" cy="0.5" r="0.5" style="fill: default"/>
-    <svg:line x1="0.15" y1="0.15" x2="0.85" y2="0.85" svg:style="stroke-width:1"/>
-    <svg:line x1="0.85" y1="0.15" x2="0.15" y2="0.85" svg:style="stroke-width:1"/>
+    <svg:line x1="0.15" y1="0.15" x2="0.85" y2="0.85" style="stroke-width:1"/>
+    <svg:line x1="0.85" y1="0.15" x2="0.15" y2="0.85" style="stroke-width:1"/>
   </svg:svg>
 
 </shape>

Modified: trunk/shapes/SDL/stop.shape
==============================================================================
--- trunk/shapes/SDL/stop.shape	(original)
+++ trunk/shapes/SDL/stop.shape	Sun Jan 18 16:31:04 2009
@@ -7,8 +7,8 @@
     <point x="0.5" y="0"/>
   <point x="0.5" y="0.5" main="yes"/></connections>
   <svg:svg width="1" height="1">
-    <svg:line x1="0" y1="0" x2="1" y2="1" svg:style="stroke-width:1"/>
-    <svg:line x1="1" y1="0" x2="0" y2="1" svg:style="stroke-width:1"/>
+    <svg:line x1="0" y1="0" x2="1" y2="1" style="stroke-width:1"/>
+    <svg:line x1="1" y1="0" x2="0" y2="1" style="stroke-width:1"/>
   </svg:svg>
 
 </shape>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]