You are viewing a plain text version of this content. The canonical link for it is here.
Posted to batik-commits@xmlgraphics.apache.org by ga...@apache.org on 2014/11/09 09:53:23 UTC
svn commit: r1637641 - in
/xmlgraphics/batik/branches/text-background/sources/org/apache/batik:
bridge/ css/engine/ svggen/ util/
Author: gadams
Date: Sun Nov 9 08:53:22 2014
New Revision: 1637641
URL: http://svn.apache.org/r1637641
Log:
Rename background to background-color per discussion with SVG WG members.
Modified:
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/PaintServer.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVGCSSEngine.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/svggen/SVGStylingAttributes.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/CSSConstants.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/SVGConstants.java
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/PaintServer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/PaintServer.java?rev=1637641&r1=1637640&r2=1637641&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/PaintServer.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/PaintServer.java Sun Nov 9 08:53:22 2014
@@ -260,7 +260,7 @@ public abstract class PaintServer
GraphicsNode backgroundNode,
BridgeContext ctx) {
Value v = CSSUtilities.getComputedStyle
- (backgroundElement, SVGCSSEngine.BACKGROUND_INDEX);
+ (backgroundElement, SVGCSSEngine.BACKGROUND_COLOR_INDEX);
float opacity = 1f;
return convertPaint(backgroundElement,
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java?rev=1637641&r1=1637640&r2=1637641&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java Sun Nov 9 08:53:22 2014
@@ -768,8 +768,12 @@ public class SVGTextElementBridge extend
*/
protected void handleCSSPropertyChanged(int property) {
switch(property) { // fall-through is intended
- case SVGCSSEngine.BACKGROUND_INDEX:
+ case SVGCSSEngine.BACKGROUND_COLOR_INDEX:
case SVGCSSEngine.BACKGROUND_MODE_INDEX:
+ case SVGCSSEngine.BACKGROUND_PADDING_BOTTOM_INDEX:
+ case SVGCSSEngine.BACKGROUND_PADDING_LEFT_INDEX:
+ case SVGCSSEngine.BACKGROUND_PADDING_RIGHT_INDEX:
+ case SVGCSSEngine.BACKGROUND_PADDING_TOP_INDEX:
case SVGCSSEngine.FILL_INDEX:
case SVGCSSEngine.FILL_OPACITY_INDEX:
case SVGCSSEngine.STROKE_INDEX:
@@ -1942,7 +1946,7 @@ public class SVGTextElementBridge extend
(sm.isNullCascaded(SVGCSSEngine.STROKE_INDEX)) &&
(sm.isNullCascaded(SVGCSSEngine.STROKE_WIDTH_INDEX)) &&
(sm.isNullCascaded(SVGCSSEngine.OPACITY_INDEX)) &&
- (sm.isNullCascaded(SVGCSSEngine.BACKGROUND_INDEX)) &&
+ (sm.isNullCascaded(SVGCSSEngine.BACKGROUND_COLOR_INDEX)) &&
(sm.isNullCascaded(SVGCSSEngine.BACKGROUND_MODE_INDEX))) {
// If not, keep the same decorations.
return pi;
@@ -1966,7 +1970,7 @@ public class SVGTextElementBridge extend
pi.visible = CSSUtilities.convertVisibility(element);
StyleMap sm = ((CSSStylableElement)element).getComputedStyleMap(null);
Paint backgroundPaint = PaintServer.convertBackgroundPaint(element, node, ctx);
- if (!sm.isNullCascaded(SVGCSSEngine.BACKGROUND_INDEX))
+ if (!sm.isNullCascaded(SVGCSSEngine.BACKGROUND_COLOR_INDEX))
pi.backgroundPaint = backgroundPaint;
BackgroundMode backgroundMode = TextUtilities.convertBackgroundMode(element);
if (!sm.isNullCascaded(SVGCSSEngine.BACKGROUND_MODE_INDEX))
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVGCSSEngine.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVGCSSEngine.java?rev=1637641&r1=1637640&r2=1637641&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVGCSSEngine.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVGCSSEngine.java Sun Nov 9 08:53:22 2014
@@ -192,7 +192,7 @@ public class SVGCSSEngine extends CSSEng
*/
public static final ValueManager[] SVG_VALUE_MANAGERS = {
new AlignmentBaselineManager(),
- new SVGColorManager(CSSConstants.CSS_BACKGROUND_PROPERTY, ValueConstants.TRANSPARENT_VALUE),
+ new SVGColorManager(CSSConstants.CSS_BACKGROUND_COLOR_PROPERTY, ValueConstants.TRANSPARENT_VALUE),
new BackgroundModeManager(),
new BackgroundPaddingLengthManager(CSSConstants.CSS_BACKGROUND_PADDING_BOTTOM_PROPERTY),
new BackgroundPaddingLengthManager(CSSConstants.CSS_BACKGROUND_PADDING_LEFT_PROPERTY),
@@ -286,8 +286,8 @@ public class SVGCSSEngine extends CSSEng
// The property indexes.
//
public static final int ALIGNMENT_BASELINE_INDEX = 0;
- public static final int BACKGROUND_INDEX = ALIGNMENT_BASELINE_INDEX + 1;
- public static final int BACKGROUND_MODE_INDEX = BACKGROUND_INDEX + 1;
+ public static final int BACKGROUND_COLOR_INDEX = ALIGNMENT_BASELINE_INDEX + 1;
+ public static final int BACKGROUND_MODE_INDEX = BACKGROUND_COLOR_INDEX + 1;
public static final int BACKGROUND_PADDING_BOTTOM_INDEX = BACKGROUND_MODE_INDEX + 1;
public static final int BACKGROUND_PADDING_LEFT_INDEX = BACKGROUND_PADDING_BOTTOM_INDEX + 1;
public static final int BACKGROUND_PADDING_RIGHT_INDEX = BACKGROUND_PADDING_LEFT_INDEX + 1;
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/svggen/SVGStylingAttributes.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/svggen/SVGStylingAttributes.java?rev=1637641&r1=1637640&r2=1637641&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/svggen/SVGStylingAttributes.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/svggen/SVGStylingAttributes.java Sun Nov 9 08:53:22 2014
@@ -32,7 +32,12 @@ public class SVGStylingAttributes implem
static Set attrSet = new HashSet();
static {
- attrSet.add(SVG_BACKGROUND_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_COLOR_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_MODE_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_PADDING_BOTTOM_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_PADDING_LEFT_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_PADDING_RIGHT_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_PADDING_TOP_ATTRIBUTE);
attrSet.add(SVG_CLIP_PATH_ATTRIBUTE);
attrSet.add(SVG_COLOR_INTERPOLATION_ATTRIBUTE);
attrSet.add(SVG_COLOR_RENDERING_ATTRIBUTE);
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/CSSConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/CSSConstants.java?rev=1637641&r1=1637640&r2=1637641&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/CSSConstants.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/CSSConstants.java Sun Nov 9 08:53:22 2014
@@ -36,7 +36,7 @@ public interface CSSConstants {
// The CSS property names.
//
String CSS_ALIGNMENT_BASELINE_PROPERTY = "alignment-baseline";
- String CSS_BACKGROUND_PROPERTY = "background";
+ String CSS_BACKGROUND_COLOR_PROPERTY = "background-color";
String CSS_BACKGROUND_MODE_PROPERTY = "background-mode";
String CSS_BACKGROUND_PADDING_PROPERTY = "background-padding";
String CSS_BACKGROUND_PADDING_BOTTOM_PROPERTY = "background-padding-bottom";
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/SVGConstants.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/SVGConstants.java?rev=1637641&r1=1637640&r2=1637641&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/SVGConstants.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/util/SVGConstants.java Sun Nov 9 08:53:22 2014
@@ -440,7 +440,7 @@ public interface SVGConstants extends CS
String SVG_ALPHABETIC_ATTRIBUTE = "alphabetic";
String SVG_ATTRIBUTE_NAME_ATTRIBUTE = "attributeName";
String SVG_ATTRIBUTE_TYPE_ATTRIBUTE = "attributeType";
- String SVG_BACKGROUND_ATTRIBUTE = CSS_BACKGROUND_PROPERTY;
+ String SVG_BACKGROUND_COLOR_ATTRIBUTE = CSS_BACKGROUND_COLOR_PROPERTY;
String SVG_BACKGROUND_MODE_ATTRIBUTE = CSS_BACKGROUND_MODE_PROPERTY;
String SVG_BACKGROUND_PADDING_ATTRIBUTE = CSS_BACKGROUND_PADDING_PROPERTY;
String SVG_BACKGROUND_PADDING_BOTTOM_ATTRIBUTE = CSS_BACKGROUND_PADDING_BOTTOM_PROPERTY;