You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-dev@xmlgraphics.apache.org by vh...@apache.org on 2001/02/06 00:34:52 UTC
cvs commit: xml-batik/samples/tests markersShapes.svg markersMisc.svg markersOrientA.svg markersPreserveAspectRatio.svg
vhardy 01/02/05 15:34:52
Modified: samples/tests markersShapes.svg markersMisc.svg
markersOrientA.svg markersPreserveAspectRatio.svg
Log:
Added property setting to reflect new (and correct) implementation of
marker property inheritance.
Revision Changes Path
1.3 +4 -4 xml-batik/samples/tests/markersShapes.svg
Index: markersShapes.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/markersShapes.svg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- markersShapes.svg 2001/02/01 17:15:32 1.2
+++ markersShapes.svg 2001/02/05 23:34:49 1.3
@@ -14,7 +14,7 @@
<!-- This test shows the various shapes that can have markers. -->
<!-- -->
<!-- @author vhardy@apache.org -->
-<!-- @version $Id: markersShapes.svg,v 1.2 2001/02/01 17:15:32 vhardy Exp $ -->
+<!-- @version $Id: markersShapes.svg,v 1.3 2001/02/05 23:34:49 vhardy Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -61,19 +61,19 @@
<marker id="startMarker" markerWidth="4" markerHeight="4"
viewBox="0 0 100 100" orient="0" refX="50" refY="50"
markerUnits="strokeWidth">
- <circle cx="50" cy="50" r="50" fill="url(#whiteSphere)" />
+ <circle cx="50" cy="50" r="50" fill="url(#whiteSphere)" stroke="none"/>
</marker>
<marker id="midMarker" markerWidth="4" markerHeight="4"
viewBox="0 0 100 100" orient="0" refX="50" refY="50"
markerUnits="strokeWidth">
- <circle cx="50" cy="50" r="50" fill="url(#graySphere)" />
+ <circle cx="50" cy="50" r="50" fill="url(#graySphere)" stroke="none"/>
</marker>
<marker id="endMarker" markerWidth="4" markerHeight="4"
viewBox="0 0 100 100" orient="0" refX="50" refY="50"
markerUnits="strokeWidth">
- <circle cx="50" cy="50" r="50" fill="url(#blackSphere)" />
+ <circle cx="50" cy="50" r="50" fill="url(#blackSphere)" stroke="none"/>
</marker>
</defs>
1.3 +7 -7 xml-batik/samples/tests/markersMisc.svg
Index: markersMisc.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/markersMisc.svg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- markersMisc.svg 2001/02/05 05:39:34 1.2
+++ markersMisc.svg 2001/02/05 23:34:50 1.3
@@ -15,7 +15,7 @@
<!-- marker-end. -->
<!-- -->
<!-- @author vhardy@apache.org -->
-<!-- @version $Id: markersMisc.svg,v 1.2 2001/02/05 05:39:34 vhardy Exp $ -->
+<!-- @version $Id: markersMisc.svg,v 1.3 2001/02/05 23:34:50 vhardy Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -58,10 +58,10 @@
<use x="120" xlink:href="#crossHair" />
</g>
- <g id="markerContent">
+ <g id="markerContent" fill="none" stroke="none">
<circle r="1.8" stroke="black" fill="crimson" stroke-width=".4" />
<path d="M 0 -1.8 L 0.3 -0.3 L 1.8 0 L 0.3 0.3 L 0 1.8 L -.2 0.3 L -1.8 0 L -0.3 -0.3 Z"
- fill="yellow" stroke="none" />
+ fill="yellow" stroke="none" />
</g>
<!-- ============================= -->
@@ -72,7 +72,7 @@
markerUnits="strokeWidth" overflow="hidden">
<g>
<use xlink:href="#markerContent" />
- <circle fill="white" cx="-1" cy="-1" r=".4" />
+ <circle fill="white" stroke="none" cx="-1" cy="-1" r=".4" />
</g>
</marker>
@@ -81,7 +81,7 @@
markerUnits="strokeWidth" overflow="hidden">
<g>
<use xlink:href="#markerContent" />
- <circle fill="white" cx="0" cy="0" r=".4" />
+ <circle fill="white" stroke="none" cx="0" cy="0" r=".4" />
</g>
</marker>
@@ -90,7 +90,7 @@
markerUnits="strokeWidth" overflow="hidden">
<g>
<use xlink:href="#markerContent" />
- <circle fill="white" cx="1" cy="1" r=".4" />
+ <circle fill="white" stroke="none" cx="1" cy="1" r=".4" />
</g>
</marker>
@@ -171,7 +171,7 @@
marker-mid="url(#markerCenterRef)"
marker-end="url(#markerTopRef)"
class="markedPath"/>
- <use xlink:href="#testPathCrossHairs" />
+ <!-- <use xlink:href="#testPathCrossHairs" /> -->
<g class="label" transform="translate(60, 50)" text-anchor="middle">
<text y="0">Various values for refX/refY </text>
1.3 +2 -2 xml-batik/samples/tests/markersOrientA.svg
Index: markersOrientA.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/markersOrientA.svg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- markersOrientA.svg 2001/02/05 05:39:33 1.2
+++ markersOrientA.svg 2001/02/05 23:34:50 1.3
@@ -15,7 +15,7 @@
<!-- marker-end. -->
<!-- -->
<!-- @author vhardy@apache.org -->
-<!-- @version $Id: markersOrientA.svg,v 1.2 2001/02/05 05:39:33 vhardy Exp $ -->
+<!-- @version $Id: markersOrientA.svg,v 1.3 2001/02/05 23:34:50 vhardy Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -33,7 +33,7 @@
<defs>
<g id="arrowMarker">
- <g marker="none" >
+ <g stroke="none" >
<circle r="3" />
<rect x="-1" y="0" width="2" height="7" />
<path d="M -3 6 l 6 0 l -3 3 z" />
1.2 +8 -8 xml-batik/samples/tests/markersPreserveAspectRatio.svg
Index: markersPreserveAspectRatio.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/markersPreserveAspectRatio.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markersPreserveAspectRatio.svg 2001/02/04 19:57:34 1.1
+++ markersPreserveAspectRatio.svg 2001/02/05 23:34:50 1.2
@@ -15,7 +15,7 @@
<!-- marker-end. -->
<!-- -->
<!-- @author vhardy@apache.org -->
-<!-- @version $Id: markersPreserveAspectRatio.svg,v 1.1 2001/02/04 19:57:34 vhardy Exp $ -->
+<!-- @version $Id: markersPreserveAspectRatio.svg,v 1.2 2001/02/05 23:34:50 vhardy Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -39,14 +39,14 @@
<path d="M 0 3 l 1 0 l -0.5 -1 z" />
</g>
- <g id="markerContent">
- <rect x="0" y="0" width="3" height="3" fill="black" />
+ <g id="markerContent" stroke="none">
+ <rect x="0" y="0" width="3" height="3" fill="black" />
<use xlink:href="#markerColumn" fill="crimson" />
<use xlink:href="#markerColumn" x="1" fill="gold" />
<use xlink:href="#markerColumn" x="2" fill="orange" />
</g>
- <path id="testPath" d="M 60 20 l 30 0 l 30 0" />
+ <path id="testPath" d="M 60 20 l 30 0 l 30 0" fill="none"/>
<!-- ============================= -->
<!-- Marker Definitions -->
@@ -72,7 +72,7 @@
<marker id="meetNone" markerWidth="20" markerHeight="30"
viewBox="0 0 3 3" orient="0" refX="1.5" refY="1.5"
markerUnits="strokeWidth" overflow="hidden"
- preserveAspectRatio="meet none">
+ preserveAspectRatio="none meet">
<g>
<use xlink:href="#markerContent" />
</g>
@@ -81,7 +81,7 @@
<marker id="sliceNone" markerWidth="20" markerHeight="30"
viewBox="0 0 3 3" orient="0" refX="1.5" refY="1.5"
markerUnits="strokeWidth" overflow="hidden"
- preserveAspectRatio="slice none">
+ preserveAspectRatio="none slice">
<g>
<use xlink:href="#markerContent" />
</g>
@@ -555,8 +555,8 @@
<g marker-start="url(#startEndMarker)" transform="translate(0, 360)"
marker-end="url(#startEndMarker)" stroke="black">
- <!-- <use xlink:href="#testPath" marker-mid="url(#meetNone)" />
- <use xlink:href="#testPath" marker-mid="url(#sliceNone)" x="100"/> -->
+ <use xlink:href="#testPath" marker-mid="url(#meetNone)" />
+ <use xlink:href="#testPath" marker-mid="url(#sliceNone)" x="100"/>
<use xlink:href="#testPath" marker-mid="url(#noneNone)" x="200"/>
</g>