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/05 06:39:37 UTC
cvs commit: xml-batik/samples/tests markersOrientA.svg markersOrientB.svg markersMisc.svg
vhardy 01/02/04 21:39:36
Modified: samples/tests markersOrientA.svg markersOrientB.svg
markersMisc.svg
Log:
Now share all resources (markers, paint servers) between markersOrientA
and markersOrientB. Added more descriptions to markersMisc.
Revision Changes Path
1.2 +24 -25 xml-batik/samples/tests/markersOrientA.svg
Index: markersOrientA.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/markersOrientA.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markersOrientA.svg 2001/02/04 01:11:14 1.1
+++ markersOrientA.svg 2001/02/05 05:39:33 1.2
@@ -15,7 +15,7 @@
<!-- marker-end. -->
<!-- -->
<!-- @author vhardy@apache.org -->
-<!-- @version $Id: markersOrientA.svg,v 1.1 2001/02/04 01:11:14 vhardy Exp $ -->
+<!-- @version $Id: markersOrientA.svg,v 1.2 2001/02/05 05:39:33 vhardy Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -95,49 +95,48 @@
</defs>
- <g transform="translate(100, 120)">
+ <g transform="translate(110, 120)">
<g id="grid" stroke="black" fill="none">
- <rect x="-30" y="-25" width="325" height="350" fill="url(#gridPattern)"/>
+ <rect x="-30" y="-25" width="300" height="350" fill="url(markersOrientA.svg#gridPattern)"/>
- <rect x="-30" y="-45" width="325" height="20" fill="rgb(240, 240, 240)" />
+ <rect x="-30" y="-45" width="300" height="20" fill="rgb(240, 240, 240)" />
<rect x="-50" y="-25" width="20" height="350" fill="rgb(240, 240, 240)" />
- <line x1="65" y1="-45" x2="65" y2="325" />
- <line x1="190" y1="-45" x2="190" y2="325" />
- <line x1="-50" y1="45" x2="295" y2="45" />
- <line x1="-50" y1="115" x2="295" y2="115" />
- <line x1="-50" y1="185" x2="295" y2="185" />
- <line x1="-50" y1="255" x2="295" y2="255" />
-
- <text class="legend" stroke="none" fill="black" text-anchor="middle" x="15" y="-30">start/end</text>
- <text class="legend" stroke="none" fill="black" text-anchor="middle" x="130" y="-30">Middle w/ moveTo</text>
- <text class="legend" stroke="none" fill="black" text-anchor="middle" x="240" y="-30">Middle w/ lineTo</text>
+ <line x1="70" y1="-45" x2="70" y2="325" />
+ <line x1="170" y1="-45" x2="170" y2="325" />
+ <line x1="-50" y1="45" x2="270" y2="45" />
+ <line x1="-50" y1="115" x2="270" y2="115" />
+ <line x1="-50" y1="185" x2="270" y2="185" />
+ <line x1="-50" y1="255" x2="270" y2="255" />
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 10) rotate(-90)">
+ <g class="legend" text-anchor="middle" fill="black" stroke="none">
+ <text transform="translate(-35, 10) rotate(-90)">
moveTo
</text>
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 80) rotate(-90)">
+ <text transform="translate(-35, 80) rotate(-90)">
lineTo
</text>
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 150) rotate(-90)">
+ <text transform="translate(-35, 150) rotate(-90)">
quadTo
</text>
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 220) rotate(-90)">
+ <text transform="translate(-35, 220) rotate(-90)">
cubicTo
</text>
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 290) rotate(-90)">
+ <text transform="translate(-35, 290) rotate(-90)">
close
</text>
+ </g>
+ </g>
+
+ <g id="gridLabels" class="legend" text-anchor="middle">
+ <text x="20" y="-30">start/end</text>
+ <text x="120" y="-30">Middle w/ moveTo</text>
+ <text x="220" y="-30">Middle w/ lineTo</text>
</g>
@@ -234,7 +233,7 @@
<!-- in : moveTo -->
<!-- ==================================== -->
<g marker-mid="url(#midMarker)"
- transform="translate(220, 0)" >
+ transform="translate(200, 0)" >
<!-- Out is a moveTo -->
1.2 +30 -83 xml-batik/samples/tests/markersOrientB.svg
Index: markersOrientB.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/markersOrientB.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markersOrientB.svg 2001/02/04 01:11:14 1.1
+++ markersOrientB.svg 2001/02/05 05:39:33 1.2
@@ -15,7 +15,7 @@
<!-- marker-end. -->
<!-- -->
<!-- @author vhardy@apache.org -->
-<!-- @version $Id: markersOrientB.svg,v 1.1 2001/02/04 01:11:14 vhardy Exp $ -->
+<!-- @version $Id: markersOrientB.svg,v 1.2 2001/02/05 05:39:33 vhardy Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -30,70 +30,16 @@
<text class="title" x="50%" y="40">Markers, Orient 2/2</text>
- <defs>
- <g id="crossHair" marker="none" marker-start="none" marker-end="none" marker-mid="none" stroke="black">
- <line y1="-5" x2="0" y2="5" />
- <line x1="-5" x2="5" y2="0" />
- </g>
-
- <g id="startEndCrossHairs">
- <use x="0" y="20" xlink:href="#crossHair" />
- <use x="30" y="0" xlink:href="#crossHair" />
- </g>
-
- <g id="startMidEndCrossHairs">
- <use x="0" y="20" xlink:href="#crossHair" />
- <use x="20" y="0" xlink:href="#crossHair" />
- <use x="50" y="10" xlink:href="#crossHair" />
- </g>
-
- </defs>
-
<g transform="translate(110, 120)">
-
- <g id="grid" stroke="black" fill="none">
- <rect x="-30" y="-25" width="300" height="350" fill="url(markersOrientA.svg#gridPattern)"/>
-
- <rect x="-30" y="-45" width="300" height="20" fill="rgb(240, 240, 240)" />
- <rect x="-50" y="-25" width="20" height="350" fill="rgb(240, 240, 240)" />
- <line x1="70" y1="-45" x2="70" y2="325" />
- <line x1="170" y1="-45" x2="170" y2="325" />
- <line x1="-50" y1="45" x2="270" y2="45" />
- <line x1="-50" y1="115" x2="270" y2="115" />
- <line x1="-50" y1="185" x2="270" y2="185" />
- <line x1="-50" y1="255" x2="270" y2="255" />
-
- <text class="legend" stroke="none" fill="black" text-anchor="middle" x="20" y="-30">Middle w/quadTo</text>
- <text class="legend" stroke="none" fill="black" text-anchor="middle" x="120" y="-30">Middle w/ cubicTo</text>
- <text class="legend" stroke="none" fill="black" text-anchor="middle" x="220" y="-30">Middle w/ close</text>
-
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 10) rotate(-90)">
- moveTo
- </text>
-
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 80) rotate(-90)">
- lineTo
- </text>
-
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 150) rotate(-90)">
- quadTo
- </text>
-
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 220) rotate(-90)">
- cubicTo
- </text>
-
- <text class="legend" stroke="none" fill="black" text-anchor="middle"
- transform="translate(-35, 290) rotate(-90)">
- close
- </text>
+ <use xlink:href="markersOrientA.svg#grid" />
+ <g class="legend" stroke="none" fill="black" text-anchor="middle" >
+ <text x="20" y="-30">Middle w/quadTo</text>
+ <text x="120" y="-30">Middle w/ cubicTo</text>
+ <text x="220" y="-30">Middle w/ close</text>
</g>
+
<!-- ==================================== -->
<!-- The following 5 paths have two -->
<!-- points, validating the various -->
@@ -109,30 +55,30 @@
<!-- Out is a moveTo -->
<path d="M 0 20 Q 40 40 20 0 M 50 10" class="markedPath"/>
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
<!-- Out is a lineTo -->
<g transform="translate(0, 70)">
<path d="M 0 20 Q 20 20 20 0 L 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
<!-- Out is a quadTo -->
<g transform="translate(0, 140)">
<path d="M 0 20 Q 20 20 20 0 Q 50 0 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
<!-- Out is a cubicTo -->
<g transform="translate(0, 210)">
<path d="M 0 20 Q 20 20 20 0 C 40 -10 80 -20 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
<!-- Out is a close -->
<g transform="translate(0, 280)">
<path d="M 0 20 Q 20 20 20 0 Z" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
</g>
@@ -152,30 +98,30 @@
<!-- Out is a moveTo -->
<path d="M 0 20 C 20 40 40 20 20 0 M 50 10" class="markedPath"/>
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
<!-- Out is a lineTo -->
<g transform="translate(0, 70)">
<path d="M 0 20 C 20 40 40 20 20 0 L 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
<!-- Out is a quadTo -->
<g transform="translate(0, 140)">
<path d="M 0 20 C 20 40 40 20 20 0 Q 50 0 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
<!-- Out is a cubicTo -->
<g transform="translate(0, 210)">
<path d="M 0 20 C 20 40 40 20 20 0 C 40 -10 80 -20 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
<!-- Out is a close -->
<g transform="translate(0, 280)">
<path d="M 0 20 C 20 40 40 20 20 0 Z" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
</g>
@@ -194,33 +140,34 @@
<!-- Out is a moveTo -->
- <path d="M 20 0 Z M 50 10" class="markedPath"/>
- <use xlink:href="#startMidEndCrossHairs" />
+ <path d="M 0 20 Z M 50 10" class="markedPath"/>
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
<!-- Out is a lineTo -->
<g transform="translate(0, 70)">
- <path d="M 20 0 Z L 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <path d="M 0 20 Z L 50 10" class="markedPath" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
<!-- Out is a quadTo -->
<g transform="translate(0, 140)">
- <path d="M 20 0 Z Q 50 0 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <path d="M 0 20 Z Q 70 -30 50 10" class="markedPath" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
<!-- Out is a cubicTo -->
<g transform="translate(0, 210)">
- <path d="M 20 0 Z C 40 -10 80 -20 50 10" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <path d="M 0 20 Z C 40 -10 80 -20 50 10" class="markedPath" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
- <!-- Out is a close -->
+ <!-- Out is a close : NA -->
+ <!--
<g transform="translate(0, 280)">
- <path d="M 20 0 Z Z" class="markedPath" />
- <use xlink:href="#startMidEndCrossHairs" />
+ <path d="M 0 20 Z Z" class="markedPath" />
+ <use xlink:href="markersOrientA.svg#startMidEndCrossHairs" />
</g>
-
+ -->
</g>
</g>
</g>
1.2 +15 -11 xml-batik/samples/tests/markersMisc.svg
Index: markersMisc.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/markersMisc.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- markersMisc.svg 2001/02/04 01:12:50 1.1
+++ markersMisc.svg 2001/02/05 05:39:34 1.2
@@ -15,7 +15,7 @@
<!-- marker-end. -->
<!-- -->
<!-- @author vhardy@apache.org -->
-<!-- @version $Id: markersMisc.svg,v 1.1 2001/02/04 01:12:50 vhardy Exp $ -->
+<!-- @version $Id: markersMisc.svg,v 1.2 2001/02/05 05:39:34 vhardy Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -158,7 +158,7 @@
</defs>
- <g transform="translate(50, 120)">
+ <g transform="translate(50, 140)">
<!-- ==================================== -->
<!-- Simply test the various settings for -->
@@ -189,15 +189,17 @@
marker="url(#markerHidden)"
style="stroke-width:1; stroke:crimson"/>
<use xlink:href="#testPathCrossHairs" />
-
- <use y="50" xlink:href="#testPath"
+
+ <use y="70" xlink:href="#testPath"
marker="url(#markerOverflow)"
style="stroke-width:1; stroke:crimson"/>
- <use y="50" xlink:href="#testPathCrossHairs" />
+ <use y="70" xlink:href="#testPathCrossHairs" />
<g class="label" transform="translate(60, 90)" text-anchor="middle">
- <text y="0">Various values for the </text>
- <text y="14">overflow property</text>
+ <text y="-110">overflow="hidden"</text>
+ <text y="-50">overflow="visible"</text>
+ <text y="30">Various values for the </text>
+ <text y="44">overflow property</text>
</g>
</g>
@@ -231,14 +233,16 @@
style="stroke-width:.5; stroke:crimson"/>
<use xlink:href="#testPathCrossHairs" />
- <use y="50" xlink:href="#testPath"
+ <use y="70" xlink:href="#testPath"
marker="url(#markerUserSpace)"
style="stroke-width:.5; stroke:crimson"/>
- <use y="50" xlink:href="#testPathCrossHairs" />
+ <use y="70" xlink:href="#testPathCrossHairs" />
<g class="label" transform="translate(60, 90)" text-anchor="middle">
- <text y="0">Various values for the </text>
- <text y="14">markerUnits property</text>
+ <text y="-115">markerUnits="strokeWidth"</text>
+ <text y="-45">markerUnits="userSpaceOnUse"</text>
+ <text y="30">Various values for the </text>
+ <text y="44">markerUnits property</text>
</g>
</g>