deweese 2004/12/03 04:20:17
Modified: samples/tests/spec/structure image.svg
sources/org/apache/batik/css/engine CSSEngine.java
SVGCSSEngine.java
sources/org/apache/batik/css/engine/value
AbstractColorManager.java IdentifierManager.java
sources/org/apache/batik/css/engine/value/css2
DirectionManager.java DisplayManager.java
FontSizeManager.java FontStretchManager.java
FontStyleManager.java FontVariantManager.java
FontWeightManager.java OverflowManager.java
SrcManager.java UnicodeBidiManager.java
VisibilityManager.java
sources/org/apache/batik/css/engine/value/svg
AlignmentBaselineManager.java ClipRuleManager.java
ColorInterpolationManager.java
ColorRenderingManager.java
DominantBaselineManager.java FillRuleManager.java
ImageRenderingManager.java
PointerEventsManager.java
ShapeRenderingManager.java
StrokeLinecapManager.java
StrokeLinejoinManager.java TextAnchorManager.java
TextRenderingManager.java WritingModeManager.java
sources/org/apache/batik/css/engine/value/svg12
MarginShorthandManager.java TextAlignManager.java
sources/org/apache/batik/util CSSConstants.java
test-resources/org/apache/batik/test samplesRendering.xml
Added: samples/tests/spec/styling fontShorthand.svg
samples/tests/spec12/text lineHeightFontShorthand.svg
test-references/samples/tests/spec/styling fontShorthand.png
test-references/samples/tests/spec12/text
lineHeightFontShorthand.png
Log:
1) Added support for 'font' shorthand property.
Revision Changes Path
1.6 +10 -7 xml-batik/samples/tests/spec/structure/image.svg
Index: image.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/structure/image.svg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- image.svg 18 Aug 2004 07:12:16 -0000 1.5
+++ image.svg 3 Dec 2004 12:20:15 -0000 1.6
@@ -19,16 +19,19 @@
limitations under the License.
-->
-<!--
========================================================================= -->
-<!-- Image element references an SVG file
-->
-<!--
-->
-<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id$ -->
-<!--
========================================================================= -->
+<!-- ======================================================================
-->
+<!-- Image element references an SVG file
-->
+<!--
-->
+<!-- @author [EMAIL PROTECTED] -->
+<!-- @version $Id$ -->
+<!-- ======================================================================
-->
<?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?>
-<svg xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; width="450" height="500" viewBox="0
0 450 500">
+<svg width="450" height="500" viewBox="0 0 450 500"
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink"; >
+
<title>Image element references an SVG file</title>
<!-- ============================================================= -->
<!-- Test content -->
1.1 xml-batik/samples/tests/spec/styling/fontShorthand.svg
Index: fontShorthand.svg
===================================================================
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";>
<!--
Copyright 2002 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- ======================================================================
-->
<!-- Image element references an SVG file
-->
<!--
-->
<!-- @author [EMAIL PROTECTED] -->
<!-- @version $Id: fontShorthand.svg,v 1.1 2004/12/03 12:20:15 deweese Exp $
-->
<!-- ======================================================================
-->
<?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?>
<svg width="450" height="500" viewBox="0 0 450 500"
xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink";>
<title>Test the CSS 'font' shorthand property</title>
<text class="title" x="50%" y="30"
>Test the CSS 'font' shorthand property</text>
<style type="text/css"><![CDATA[
@font-face { font-family: "bolder"; src: "Courier" }
.f1 { font: 20px Serif; }
.f2 { font: 20 SanSerif; }
.f3 { font: 20 times; }
.f4 { font: bold 20 times; }
.f5 { font: italic 20 times; }
.f6 { font: bold italic 20 times; }
.f7 { font: italic bold 20 times; }
.f8 { font: 700 20 times; }
.f9 { font: 700 small-caps 20 times; }
.f10 { font: small-caps 700 20 times; }
.f11 { font: small-caps 700 italic 20 times; }
.f12 { font: 700 small-caps italic 20 times; }
.f13 { font: small-caps italic 700 20 times; }
.f14 { font: 200 "bolder"; }
.f15 { font: 200 bolder; }
.f16 { font: 200px bolder; }
.f17 { font: bolder 200 bolder; }
.f18 { font: menu; }
.f19 { font: small-caption; }
]]></style>
<g id="testContent" font-size="8pt" font-family="sanserif">
<text x="225" y="60">default</text>
<text class="f1" x="10" y="60">font: 20px Serif</text>
<text class="f2" x="10" y="80">font: 20 SanSerif</text>
<text class="f3" x="10" y="100">font: 20 times</text>
<text class="f4" x="10" y="120">font: bold 20 times</text>
<text class="f5" x="10" y="140">font: italic 20 times</text>
<text class="f6" x="10" y="160">font: bold italic 20 times</text>
<text class="f7" x="10" y="180">font: italic bold 20 times</text>
<text class="f8" x="10" y="200">font: 200 20 times</text>
<text class="f9" x="10" y="220">font: 700 small-caps 20 times</text>
<text class="f10" x="10" y="240">font: small-caps 700 20 times</text>
<text class="f11" x="10" y="260">font: small-caps 700 italic 20
times</text>
<text class="f12" x="10" y="280">font: 700 small-caps italic 20
times</text>
<text class="f13" x="10" y="300">font: small-caps italic 700 20
times</text>
<g transform="scale(.1)">
<text class="f14" x="100" y="3200">font: 200 "bolder"</text>
<text class="f15" x="100" y="3400">font: 200 bolder</text>
<text class="f16" x="100" y="3600">font: 200px bolder</text>
<text class="f17" x="100" y="3800">font: bolder 200 bolder</text>
</g>
<g font-weight="bold">
<text class="f5" x="10" y="400">font: italic 20 times</text>
</g>
<text x="200" y="400">group font-weight="bold"</text>
<g font-style="italic">
<text class="f4" x="10" y="420">font: bold 20 times</text>
</g>
<text x="200" y="420">group font-style="italic"</text>
<text class="f18" x="10" y="440">File: menu</text>
<text class="f19" x="10" y="460">File: small-caption</text>
</g>
</svg>
1.1
xml-batik/samples/tests/spec12/text/lineHeightFontShorthand.svg
Index: lineHeightFontShorthand.svg
===================================================================
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd";>
<!--
Copyright 2002 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- ======================================================================
-->
<!-- Image element references an SVG file
-->
<!--
-->
<!-- @author [EMAIL PROTECTED] -->
<!-- @version $Id: lineHeightFontShorthand.svg,v 1.1 2004/12/03 12:20:15
deweese Exp $ -->
<!-- ======================================================================
-->
<?xml-stylesheet type="text/css" href="../../resources/style/test.css" ?>
<svg width="450" height="500" viewBox="0 0 450 500"
xmlns="http://www.w3.org/2000/svg"; version="1.2"
xmlns:xlink="http://www.w3.org/1999/xlink";>
<title>Test CSS 'font' shorthand 'line-height'</title>
<text class="title" x="50%" y="30"
>Test CSS 'font' shorthand 'line-height'</text>
<style type="text/css"><![CDATA[
@font-face { font-family: "bolder"; src: "Courier" }
.f1 { font: 20px Serif; }
.f2 { font: 20/2 SanSerif; }
.f3 { font: 20/1 times; }
.f4 { font: bold 20/.5 monico; }
.f5 { font: italic 20/30px times; }
.f6 { font: bold italic 20/15px times; }
.f7 { font: italic bold 20/15px times; }
.f8 { font: 700 20/1em times; }
.f9 { font: 700 20/75% times; }
]]></style>
<g id="testContent" font="8pt sanserif">
<flowRoot><flowRegion
><rect x="10" y="60" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f1"
>font:<flowLine/>20px Serif</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="10" y="100" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f2"
>font:<flowLine/>20/2 SanSerif</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="10" y="180" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f3"
>font:<flowLine/>20/1 times</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="10" y="240" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f3"
>font:<flowLine/>bold 20/.5 times</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="10" y="300" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f4"
>font:<flowLine/>bold 20/.5 times</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="10" y="330" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f5"
>font:<flowLine/>italic 20/30px times</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="10" y="420" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f6"
>font:<flowLine/>bold italic 20/15px
times</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="225" y="60" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f7"
>font:<flowLine/>italic bold 20/15px
times</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="225" y="120" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f8"
>font:<flowLine/>700 20/1em times</flowPara></flowDiv></flowRoot>
<flowRoot><flowRegion
><rect x="225" y="180" width="200" height="90"/></flowRegion>
<flowDiv><flowPara class="f9"
>font:<flowLine/>700 20/75% times</flowPara></flowDiv></flowRoot>
<flowRoot font-size="20"><flowRegion
><rect x="225" y="230" width="200" height="90"/></flowRegion>
<flowDiv><flowPara line-height="1.5"><flowSpan line-height=".75"
>para:
1.5,<flowLine/>line:.75</flowSpan></flowPara></flowDiv></flowRoot>
<flowRoot font-size="20"><flowRegion
><rect x="225" y="290" width="200" height="90"/></flowRegion>
<flowDiv><flowPara line-height=".75"><flowSpan line-height="1.5"
>para:
.75,<flowLine/>line:1.5</flowSpan></flowPara></flowDiv></flowRoot>
<flowRoot font-size="20"><flowRegion
><rect x="225" y="350" width="200" height="90"/></flowRegion>
<flowDiv><flowPara line-height="1"><flowSpan font-size="6"
>blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah
blah</flowSpan></flowPara></flowDiv></flowRoot>
<flowRoot font-size="20"><flowRegion
><rect x="225" y="410" width="200" height="90"/></flowRegion>
<flowDiv><flowPara font-size="6"><flowSpan
>blah blah blah blah blah blah blah blah blah blah blah blah blah
blah blah blah blah blah blah blah blah blah blah blah blah blah
blah</flowSpan></flowPara></flowDiv></flowRoot>
</g>
</svg>
1.42 +2 -1
xml-batik/sources/org/apache/batik/css/engine/CSSEngine.java
Index: CSSEngine.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/CSSEngine.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- CSSEngine.java 5 Nov 2004 01:34:33 -0000 1.41
+++ CSSEngine.java 3 Dec 2004 12:20:15 -0000 1.42
@@ -1156,6 +1156,7 @@
try {
parseStyleSheet(ss, new InputSource(new StringReader(rules)),
uri);
} catch (Exception e) {
+ // e.printStackTrace();
String m = e.getMessage();
if (m == null) m = "";
String s = Messages.formatMessage
1.10 +3 -1
xml-batik/sources/org/apache/batik/css/engine/SVGCSSEngine.java
Index: SVGCSSEngine.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/SVGCSSEngine.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGCSSEngine.java 18 Nov 2004 01:46:56 -0000 1.9
+++ SVGCSSEngine.java 3 Dec 2004 12:20:15 -0000 1.10
@@ -27,6 +27,7 @@
import org.apache.batik.css.engine.value.css2.DirectionManager;
import org.apache.batik.css.engine.value.css2.DisplayManager;
import org.apache.batik.css.engine.value.css2.FontFamilyManager;
+import org.apache.batik.css.engine.value.css2.FontShorthandManager;
import org.apache.batik.css.engine.value.css2.FontSizeAdjustManager;
import org.apache.batik.css.engine.value.css2.FontSizeManager;
import org.apache.batik.css.engine.value.css2.FontStretchManager;
@@ -269,6 +270,7 @@
* The shorthand managers for SVG.
*/
public final static ShorthandManager[] SVG_SHORTHAND_MANAGERS = {
+ new FontShorthandManager(),
new MarkerShorthandManager(),
};
1.6 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/AbstractColorManager.java
Index: AbstractColorManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/AbstractColorManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractColorManager.java 18 Aug 2004 07:12:53 -0000 1.5
+++ AbstractColorManager.java 3 Dec 2004 12:20:15 -0000 1.6
@@ -243,7 +243,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/IdentifierManager.java
Index: IdentifierManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/IdentifierManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IdentifierManager.java 18 Aug 2004 07:12:53 -0000 1.4
+++ IdentifierManager.java 3 Dec 2004 12:20:15 -0000 1.5
@@ -74,5 +74,5 @@
* Returns the map that contains the name/value mappings for each
* possible identifiers.
*/
- protected abstract StringMap getIdentifiers();
+ public abstract StringMap getIdentifiers();
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/DirectionManager.java
Index: DirectionManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/DirectionManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DirectionManager.java 18 Aug 2004 07:12:55 -0000 1.4
+++ DirectionManager.java 3 Dec 2004 12:20:15 -0000 1.5
@@ -67,7 +67,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/DisplayManager.java
Index: DisplayManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/DisplayManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DisplayManager.java 18 Aug 2004 07:12:55 -0000 1.4
+++ DisplayManager.java 3 Dec 2004 12:20:15 -0000 1.5
@@ -99,7 +99,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.10 +10 -1
xml-batik/sources/org/apache/batik/css/engine/value/css2/FontSizeManager.java
Index: FontSizeManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/FontSizeManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FontSizeManager.java 20 Aug 2004 19:29:47 -0000 1.9
+++ FontSizeManager.java 3 Dec 2004 12:20:15 -0000 1.10
@@ -67,6 +67,13 @@
}
/**
+ * Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
+ */
+ public StringMap getIdentifiers() {
+ return values;
+ }
+
+ /**
* Implements [EMAIL PROTECTED] ValueManager#isInheritedProperty()}.
*/
public boolean isInheritedProperty() {
@@ -103,6 +110,8 @@
throw createInvalidIdentifierDOMException(s);
}
return (Value)v;
+ default:
+ break;
}
return super.createValue(lu, engine);
}
1.7 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/FontStretchManager.java
Index: FontStretchManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/FontStretchManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FontStretchManager.java 18 Aug 2004 07:12:55 -0000 1.6
+++ FontStretchManager.java 3 Dec 2004 12:20:15 -0000 1.7
@@ -172,7 +172,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.6 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/FontStyleManager.java
Index: FontStyleManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/FontStyleManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FontStyleManager.java 18 Aug 2004 07:12:55 -0000 1.5
+++ FontStyleManager.java 3 Dec 2004 12:20:15 -0000 1.6
@@ -73,7 +73,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/FontVariantManager.java
Index: FontVariantManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/FontVariantManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FontVariantManager.java 18 Aug 2004 07:12:55 -0000 1.4
+++ FontVariantManager.java 3 Dec 2004 12:20:15 -0000 1.5
@@ -69,7 +69,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.6 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/FontWeightManager.java
Index: FontWeightManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/FontWeightManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FontWeightManager.java 18 Aug 2004 07:12:55 -0000 1.5
+++ FontWeightManager.java 3 Dec 2004 12:20:15 -0000 1.6
@@ -214,7 +214,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/OverflowManager.java
Index: OverflowManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/OverflowManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OverflowManager.java 18 Aug 2004 07:12:55 -0000 1.4
+++ OverflowManager.java 3 Dec 2004 12:20:15 -0000 1.5
@@ -73,7 +73,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.7 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/SrcManager.java
Index: SrcManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/SrcManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SrcManager.java 18 Aug 2004 07:12:55 -0000 1.6
+++ SrcManager.java 3 Dec 2004 12:20:15 -0000 1.7
@@ -166,7 +166,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/UnicodeBidiManager.java
Index: UnicodeBidiManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/UnicodeBidiManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UnicodeBidiManager.java 18 Aug 2004 07:12:56 -0000 1.4
+++ UnicodeBidiManager.java 3 Dec 2004 12:20:15 -0000 1.5
@@ -71,7 +71,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/css2/VisibilityManager.java
Index: VisibilityManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/css2/VisibilityManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VisibilityManager.java 30 Oct 2004 18:38:04 -0000 1.4
+++ VisibilityManager.java 3 Dec 2004 12:20:15 -0000 1.5
@@ -72,7 +72,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/AlignmentBaselineManager.java
Index: AlignmentBaselineManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/AlignmentBaselineManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AlignmentBaselineManager.java 18 Aug 2004 07:12:57 -0000 1.4
+++ AlignmentBaselineManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -86,7 +86,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/ClipRuleManager.java
Index: ClipRuleManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/ClipRuleManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClipRuleManager.java 18 Aug 2004 07:12:57 -0000 1.4
+++ ClipRuleManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -68,7 +68,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/ColorInterpolationManager.java
Index: ColorInterpolationManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/ColorInterpolationManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ColorInterpolationManager.java 18 Aug 2004 07:12:57 -0000 1.4
+++ ColorInterpolationManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -70,7 +70,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/ColorRenderingManager.java
Index: ColorRenderingManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/ColorRenderingManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ColorRenderingManager.java 18 Aug 2004 07:12:57 -0000 1.4
+++ ColorRenderingManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -70,7 +70,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/DominantBaselineManager.java
Index: DominantBaselineManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/DominantBaselineManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DominantBaselineManager.java 18 Aug 2004 07:12:57 -0000 1.4
+++ DominantBaselineManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -92,7 +92,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/FillRuleManager.java
Index: FillRuleManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/FillRuleManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FillRuleManager.java 18 Aug 2004 07:12:57 -0000 1.4
+++ FillRuleManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -68,7 +68,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/ImageRenderingManager.java
Index: ImageRenderingManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/ImageRenderingManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ImageRenderingManager.java 18 Aug 2004 07:12:57 -0000 1.4
+++ ImageRenderingManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -70,7 +70,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/PointerEventsManager.java
Index: PointerEventsManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/PointerEventsManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PointerEventsManager.java 18 Aug 2004 07:12:57 -0000 1.4
+++ PointerEventsManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -86,7 +86,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/ShapeRenderingManager.java
Index: ShapeRenderingManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/ShapeRenderingManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ShapeRenderingManager.java 18 Aug 2004 07:12:58 -0000 1.4
+++ ShapeRenderingManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -72,7 +72,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/StrokeLinecapManager.java
Index: StrokeLinecapManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/StrokeLinecapManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StrokeLinecapManager.java 18 Aug 2004 07:12:58 -0000 1.4
+++ StrokeLinecapManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -70,7 +70,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/StrokeLinejoinManager.java
Index: StrokeLinejoinManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/StrokeLinejoinManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StrokeLinejoinManager.java 18 Aug 2004 07:12:58 -0000 1.4
+++ StrokeLinejoinManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -70,7 +70,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/TextAnchorManager.java
Index: TextAnchorManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/TextAnchorManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TextAnchorManager.java 18 Aug 2004 07:12:58 -0000 1.4
+++ TextAnchorManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -70,7 +70,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/TextRenderingManager.java
Index: TextRenderingManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/TextRenderingManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TextRenderingManager.java 18 Aug 2004 07:12:58 -0000 1.4
+++ TextRenderingManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -72,7 +72,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.5 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg/WritingModeManager.java
Index: WritingModeManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg/WritingModeManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WritingModeManager.java 30 Oct 2004 18:38:04 -0000 1.4
+++ WritingModeManager.java 3 Dec 2004 12:20:16 -0000 1.5
@@ -77,7 +77,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.2 +5 -1
xml-batik/sources/org/apache/batik/css/engine/value/svg12/MarginShorthandManager.java
Index: MarginShorthandManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg12/MarginShorthandManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MarginShorthandManager.java 18 Nov 2004 01:46:56 -0000 1.1
+++ MarginShorthandManager.java 3 Dec 2004 12:20:16 -0000 1.2
@@ -58,6 +58,9 @@
LexicalUnit []lus = new LexicalUnit[4];
int cnt=0;
while (lu != null) {
+ if (cnt == 4)
+ throw createInvalidLexicalUnitDOMException
+ (lu.getLexicalUnitType());
lus[cnt++] = lu;
lu = lu.getNextLexicalUnit();
}
@@ -67,6 +70,7 @@
case 3: lus[3] = lus[1]; break;
default:
}
+
ph.property(SVG12CSSConstants.CSS_MARGIN_TOP_PROPERTY, lus[0],
imp);
ph.property(SVG12CSSConstants.CSS_MARGIN_RIGHT_PROPERTY, lus[1],
imp);
ph.property(SVG12CSSConstants.CSS_MARGIN_BOTTOM_PROPERTY, lus[2],
imp);
1.2 +2 -2
xml-batik/sources/org/apache/batik/css/engine/value/svg12/TextAlignManager.java
Index: TextAlignManager.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/engine/value/svg12/TextAlignManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TextAlignManager.java 18 Nov 2004 01:46:56 -0000 1.1
+++ TextAlignManager.java 3 Dec 2004 12:20:16 -0000 1.2
@@ -74,7 +74,7 @@
/**
* Implements [EMAIL PROTECTED] IdentifierManager#getIdentifiers()}.
*/
- protected StringMap getIdentifiers() {
+ public StringMap getIdentifiers() {
return values;
}
}
1.25 +7 -2 xml-batik/sources/org/apache/batik/util/CSSConstants.java
Index: CSSConstants.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/util/CSSConstants.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- CSSConstants.java 18 Aug 2004 07:15:48 -0000 1.24
+++ CSSConstants.java 3 Dec 2004 12:20:16 -0000 1.25
@@ -140,6 +140,7 @@
String CSS_BUTT_VALUE = "butt";
String CSS_CADETBLUE_VALUE = "cadetblue";
String CSS_CAPTIONTEXT_VALUE = "captiontext";
+ String CSS_CAPTION_VALUE = "caption";
String CSS_CENTER_VALUE = "center";
String CSS_CENTRAL_VALUE = "central";
String CSS_CHARTREUSE_VALUE = "chartreuse";
@@ -212,6 +213,7 @@
String CSS_HIGHLIGHT_VALUE = "highlight";
String CSS_HONEYDEW_VALUE = "honeydew";
String CSS_HOTPINK_VALUE = "hotpink";
+ String CSS_ICON_VALUE = "icon";
String CSS_IDEOGRAPHIC_VALUE = "ideographic";
String CSS_INACTIVEBORDER_VALUE = "inactiveborder";
String CSS_INACTIVECAPTIONTEXT_VALUE = "inactivecaptiontext";
@@ -271,8 +273,9 @@
String CSS_MEDIUMTURQUOISE_VALUE = "mediumturquoise";
String CSS_MEDIUMVIOLETRED_VALUE = "mediumvioletred";
String CSS_MEDIUM_VALUE = "medium";
- String CSS_MENUTEXT_VALUE = "menutext";
String CSS_MENU_VALUE = "menu";
+ String CSS_MENUTEXT_VALUE = "menutext";
+ String CSS_MESSAGE_BOX_VALUE = "message-box";
String CSS_MIDDLE_VALUE = "middle";
String CSS_MIDNIGHTBLUE_VALUE = "midnightblue";
String CSS_MINTCREAM_VALUE = "mintcream";
@@ -346,12 +349,14 @@
String CSS_SLATEGREY_VALUE = "slategrey";
String CSS_SMALLER_VALUE = "smaller";
String CSS_SMALL_CAPS_VALUE = "small-caps";
+ String CSS_SMALL_CAPTION_VALUE = "small-caption";
String CSS_SMALL_VALUE = "small";
String CSS_SNOW_VALUE = "snow";
String CSS_SPRINGGREEN_VALUE = "springgreen";
String CSS_SQUARE_VALUE = "square";
String CSS_SRGB_VALUE = "srgb";
String CSS_START_VALUE = "start";
+ String CSS_STATUS_BAR_VALUE = "status-bar";
String CSS_STEELBLUE_VALUE = "steelblue";
String CSS_STROKE_VALUE = "stroke";
String CSS_SUB_VALUE = "sub";
1.1
xml-batik/test-references/samples/tests/spec/styling/fontShorthand.png
<<Binary file>>
1.1
xml-batik/test-references/samples/tests/spec12/text/lineHeightFontShorthand.png
<<Binary file>>
1.122 +5 -1
xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml
Index: samplesRendering.xml
===================================================================
RCS file:
/home/cvs/xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- samplesRendering.xml 30 Nov 2004 03:23:58 -0000 1.121
+++ samplesRendering.xml 3 Dec 2004 12:20:16 -0000 1.122
@@ -72,6 +72,9 @@
<test id="samples/tests/spec12/text/flowRegionBreak.svg" >
<property name="Validating" class="java.lang.Boolean"
value="false" />
</test>
+ <test id="samples/tests/spec12/text/lineHeightFontShorthand.svg" >
+ <property name="Validating" class="java.lang.Boolean"
value="false" />
+ </test>
<test id="samples/tests/spec12/structure/multi.svg" >
<property name="Validating" class="java.lang.Boolean"
value="false" />
</test>
@@ -291,6 +294,7 @@
<test id="samples/tests/spec/styling/cssMedia.svg" />
<test id="samples/tests/spec/styling/cssMediaList.svg" />
<test id="samples/tests/spec/styling/emptyStyle.svg" />
+ <test id="samples/tests/spec/styling/fontShorthand.svg" />
<test id="samples/tests/spec/styling/smiley.svg" />
<test id="samples/tests/spec/styling/styleElement.svg" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
