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 10:24:47 UTC
svn commit: r1637644 - in
/xmlgraphics/batik/branches/text-background/sources/org/apache/batik:
bridge/ css/engine/ css/engine/value/css2/ gvt/renderer/ gvt/text/ svggen/
util/
Author: gadams
Date: Sun Nov 9 09:24:46 2014
New Revision: 1637644
URL: http://svn.apache.org/r1637644
Log:
Change background-padding to background-outline.
Added:
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineLengthManager.java
- copied, changed from r1637636, xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingLengthManager.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineShorthandManager.java
- copied, changed from r1637636, xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingShorthandManager.java
Removed:
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingLengthManager.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingShorthandManager.java
Modified:
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/SVGCSSEngine.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.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/SVGTextElementBridge.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/SVGTextElementBridge.java?rev=1637644&r1=1637643&r2=1637644&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 09:24:46 2014
@@ -145,8 +145,8 @@ public class SVGTextElementBridge extend
= GVTAttributedCharacterIterator.TextAttribute.LINE_HEIGHT;
public static final
- AttributedCharacterIterator.Attribute BACKGROUND_PADDING
- = GVTAttributedCharacterIterator.TextAttribute.BACKGROUND_PADDING;
+ AttributedCharacterIterator.Attribute BACKGROUND_OUTLINE
+ = GVTAttributedCharacterIterator.TextAttribute.BACKGROUND_OUTLINE;
protected AttributedString laidoutText;
@@ -770,10 +770,10 @@ public class SVGTextElementBridge extend
switch(property) { // fall-through is intended
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.BACKGROUND_OUTLINE_BOTTOM_INDEX:
+ case SVGCSSEngine.BACKGROUND_OUTLINE_LEFT_INDEX:
+ case SVGCSSEngine.BACKGROUND_OUTLINE_RIGHT_INDEX:
+ case SVGCSSEngine.BACKGROUND_OUTLINE_TOP_INDEX:
case SVGCSSEngine.FILL_INDEX:
case SVGCSSEngine.FILL_OPACITY_INDEX:
case SVGCSSEngine.STROKE_INDEX:
@@ -1640,9 +1640,9 @@ public class SVGTextElementBridge extend
result.put(PAINT_INFO, pi);
elemTPI.put(element, pi);
- // Background padding
- float[] backgroundPadding = TextUtilities.convertBackgroundPadding(element);
- result.put(BACKGROUND_PADDING, backgroundPadding);
+ // Background outline
+ float[] backgroundOutline = TextUtilities.convertBackgroundOutline(element);
+ result.put(BACKGROUND_OUTLINE, backgroundOutline);
// Text path
if (textPath != null) {
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java?rev=1637644&r1=1637643&r2=1637644&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/bridge/TextUtilities.java Sun Nov 9 09:24:46 2014
@@ -303,21 +303,21 @@ public abstract class TextUtilities impl
}
/**
- * Converts the background-padding CSS value to a floats[] instance.
+ * Converts the background-outline CSS value to a floats[] instance.
* @param e the element
*/
- public static float[] convertBackgroundPadding(Element e) {
+ public static float[] convertBackgroundOutline(Element e) {
Value v;
- v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BACKGROUND_PADDING_TOP_INDEX);
+ v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BACKGROUND_OUTLINE_TOP_INDEX);
float top = v.getFloatValue();
- v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BACKGROUND_PADDING_RIGHT_INDEX);
+ v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BACKGROUND_OUTLINE_RIGHT_INDEX);
float right = v.getFloatValue();
- v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BACKGROUND_PADDING_BOTTOM_INDEX);
+ v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BACKGROUND_OUTLINE_BOTTOM_INDEX);
float bottom = v.getFloatValue();
- v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BACKGROUND_PADDING_LEFT_INDEX);
+ v = CSSUtilities.getComputedStyle(e, SVGCSSEngine.BACKGROUND_OUTLINE_LEFT_INDEX);
float left = v.getFloatValue();
return new float[] { top, right, bottom, left };
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=1637644&r1=1637643&r2=1637644&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 09:24:46 2014
@@ -22,8 +22,8 @@ import org.apache.batik.css.engine.value
import org.apache.batik.css.engine.value.ValueConstants;
import org.apache.batik.css.engine.value.ValueManager;
import org.apache.batik.css.engine.value.css2.BackgroundModeManager;
-import org.apache.batik.css.engine.value.css2.BackgroundPaddingShorthandManager;
-import org.apache.batik.css.engine.value.css2.BackgroundPaddingLengthManager;
+import org.apache.batik.css.engine.value.css2.BackgroundOutlineShorthandManager;
+import org.apache.batik.css.engine.value.css2.BackgroundOutlineLengthManager;
import org.apache.batik.css.engine.value.css2.ClipManager;
import org.apache.batik.css.engine.value.css2.CursorManager;
import org.apache.batik.css.engine.value.css2.DirectionManager;
@@ -194,10 +194,10 @@ public class SVGCSSEngine extends CSSEng
new AlignmentBaselineManager(),
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),
- new BackgroundPaddingLengthManager(CSSConstants.CSS_BACKGROUND_PADDING_RIGHT_PROPERTY),
- new BackgroundPaddingLengthManager(CSSConstants.CSS_BACKGROUND_PADDING_TOP_PROPERTY),
+ new BackgroundOutlineLengthManager(CSSConstants.CSS_BACKGROUND_OUTLINE_BOTTOM_PROPERTY),
+ new BackgroundOutlineLengthManager(CSSConstants.CSS_BACKGROUND_OUTLINE_LEFT_PROPERTY),
+ new BackgroundOutlineLengthManager(CSSConstants.CSS_BACKGROUND_OUTLINE_RIGHT_PROPERTY),
+ new BackgroundOutlineLengthManager(CSSConstants.CSS_BACKGROUND_OUTLINE_TOP_PROPERTY),
new BaselineShiftManager(),
new ClipManager(),
new ClipPathManager(),
@@ -277,7 +277,7 @@ public class SVGCSSEngine extends CSSEng
* The shorthand managers for SVG.
*/
public static final ShorthandManager[] SVG_SHORTHAND_MANAGERS = {
- new BackgroundPaddingShorthandManager(),
+ new BackgroundOutlineShorthandManager(),
new FontShorthandManager(),
new MarkerShorthandManager(),
};
@@ -288,12 +288,12 @@ public class SVGCSSEngine extends CSSEng
public static final int ALIGNMENT_BASELINE_INDEX = 0;
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;
- public static final int BACKGROUND_PADDING_TOP_INDEX = BACKGROUND_PADDING_RIGHT_INDEX + 1;
+ public static final int BACKGROUND_OUTLINE_BOTTOM_INDEX = BACKGROUND_MODE_INDEX + 1;
+ public static final int BACKGROUND_OUTLINE_LEFT_INDEX = BACKGROUND_OUTLINE_BOTTOM_INDEX + 1;
+ public static final int BACKGROUND_OUTLINE_RIGHT_INDEX = BACKGROUND_OUTLINE_LEFT_INDEX + 1;
+ public static final int BACKGROUND_OUTLINE_TOP_INDEX = BACKGROUND_OUTLINE_RIGHT_INDEX + 1;
public static final int BASELINE_SHIFT_INDEX =
- BACKGROUND_PADDING_TOP_INDEX + 1;
+ BACKGROUND_OUTLINE_TOP_INDEX + 1;
public static final int CLIP_INDEX = BASELINE_SHIFT_INDEX + 1;
public static final int CLIP_PATH_INDEX = CLIP_INDEX +1;
public static final int CLIP_RULE_INDEX = CLIP_PATH_INDEX + 1;
Copied: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineLengthManager.java (from r1637636, xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingLengthManager.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineLengthManager.java?p2=xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineLengthManager.java&p1=xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingLengthManager.java&r1=1637636&r2=1637644&rev=1637644&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingLengthManager.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineLengthManager.java Sun Nov 9 09:24:46 2014
@@ -30,16 +30,16 @@ import org.w3c.css.sac.LexicalUnit;
import org.w3c.dom.DOMException;
/**
- * This class provides a factory for the 'background-padding-*' properties values.
+ * This class provides a factory for the 'background-outline-*' properties values.
*
* @author <a href="mailto:gadams@apache.org">Glenn Adams</a>
* @version $Id$
*/
-public class BackgroundPaddingLengthManager extends LengthManager {
+public class BackgroundOutlineLengthManager extends LengthManager {
protected String prop;
- public BackgroundPaddingLengthManager(String prop) {
+ public BackgroundOutlineLengthManager(String prop) {
this.prop = prop;
}
@@ -102,7 +102,7 @@ public class BackgroundPaddingLengthMana
* this manager.
*/
protected int getOrientation() {
- // background paddings are always wrt to block width, event for top/bottom.
+ // background outlines are always wrt to block width, event for top/bottom.
return HORIZONTAL_ORIENTATION;
}
}
Copied: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineShorthandManager.java (from r1637636, xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingShorthandManager.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineShorthandManager.java?p2=xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineShorthandManager.java&p1=xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingShorthandManager.java&r1=1637636&r2=1637644&rev=1637644&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundPaddingShorthandManager.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/css/engine/value/css2/BackgroundOutlineShorthandManager.java Sun Nov 9 09:24:46 2014
@@ -28,22 +28,22 @@ import org.w3c.dom.DOMException;
/**
* This class represents an object which provide support for the
- * 'background-padding' shorthand property.
+ * 'background-outline' shorthand property.
*
* @author <a href="mailto:gadams@apache.org">Glenn Adams</a>
* @version $Id$
*/
-public class BackgroundPaddingShorthandManager
+public class BackgroundOutlineShorthandManager
extends AbstractValueFactory
implements ShorthandManager {
- public BackgroundPaddingShorthandManager() { }
+ public BackgroundOutlineShorthandManager() { }
/**
* Implements {@link ValueManager#getPropertyName()}.
*/
public String getPropertyName() {
- return CSSConstants.CSS_BACKGROUND_PADDING_PROPERTY;
+ return CSSConstants.CSS_BACKGROUND_OUTLINE_PROPERTY;
}
/**
@@ -87,9 +87,9 @@ public class BackgroundPaddingShorthandM
default:
}
- ph.property(CSSConstants.CSS_BACKGROUND_PADDING_TOP_PROPERTY, lus[0], imp);
- ph.property(CSSConstants.CSS_BACKGROUND_PADDING_RIGHT_PROPERTY, lus[1], imp);
- ph.property(CSSConstants.CSS_BACKGROUND_PADDING_BOTTOM_PROPERTY, lus[2], imp);
- ph.property(CSSConstants.CSS_BACKGROUND_PADDING_LEFT_PROPERTY, lus[3], imp);
+ ph.property(CSSConstants.CSS_BACKGROUND_OUTLINE_TOP_PROPERTY, lus[0], imp);
+ ph.property(CSSConstants.CSS_BACKGROUND_OUTLINE_RIGHT_PROPERTY, lus[1], imp);
+ ph.property(CSSConstants.CSS_BACKGROUND_OUTLINE_BOTTOM_PROPERTY, lus[2], imp);
+ ph.property(CSSConstants.CSS_BACKGROUND_OUTLINE_LEFT_PROPERTY, lus[3], imp);
}
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java?rev=1637644&r1=1637643&r2=1637644&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/renderer/StrokingTextPainter.java Sun Nov 9 09:24:46 2014
@@ -140,8 +140,8 @@ public class StrokingTextPainter extends
= GVTAttributedCharacterIterator.TextAttribute.LINE_HEIGHT;
public static final
- AttributedCharacterIterator.Attribute BACKGROUND_PADDING
- = GVTAttributedCharacterIterator.TextAttribute.BACKGROUND_PADDING;
+ AttributedCharacterIterator.Attribute BACKGROUND_OUTLINE
+ = GVTAttributedCharacterIterator.TextAttribute.BACKGROUND_OUTLINE;
static Set extendedAtts = new HashSet();
@@ -890,7 +890,7 @@ public class StrokingTextPainter extends
Rectangle2D bounds = computeBackgroundBounds(node, textRuns, mode);
if (!bounds.isEmpty()) {
g2d.setPaint(paint);
- adjustForPadding(bounds, (float[]) textAttributes.get(BACKGROUND_PADDING));
+ adjustForOutline(bounds, (float[]) textAttributes.get(BACKGROUND_OUTLINE));
g2d.fill(bounds);
}
}
@@ -964,7 +964,7 @@ public class StrokingTextPainter extends
Rectangle2D bounds = p.getBounds2D();
if (!bounds.isEmpty()) {
g2d.setPaint(paint);
- adjustForPadding(bounds, (float[]) runaci.getAttribute(BACKGROUND_PADDING));
+ adjustForOutline(bounds, (float[]) runaci.getAttribute(BACKGROUND_OUTLINE));
g2d.fill(bounds);
}
}
@@ -1012,16 +1012,16 @@ public class StrokingTextPainter extends
return new Rectangle2D.Double(x, y, w, h);
}
- private void adjustForPadding(Rectangle2D b, float[] padding) {
- if (padding != null) {
+ private void adjustForOutline(Rectangle2D b, float[] outline) {
+ if (outline != null) {
double x = b.getX();
double y = b.getY();
double w = b.getWidth();
double h = b.getHeight();
- x -= padding[3];
- y -= padding[0];
- w += padding[1] + padding[3];
- h += padding[0] + padding[2];
+ x -= outline[3];
+ y -= outline[0];
+ w += outline[1] + outline[3];
+ h += outline[0] + outline[2];
b.setFrame(x, y, w, h);
}
}
Modified: xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.java?rev=1637644&r1=1637643&r2=1637644&view=diff
==============================================================================
--- xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.java (original)
+++ xmlgraphics/batik/branches/text-background/sources/org/apache/batik/gvt/text/GVTAttributedCharacterIterator.java Sun Nov 9 09:24:46 2014
@@ -351,8 +351,8 @@ public interface GVTAttributedCharacterI
public static final TextAttribute LANGUAGE =
new TextAttribute("LANGUAGE");
- public static final TextAttribute BACKGROUND_PADDING =
- new TextAttribute("BACKGROUND_PADDING");
+ public static final TextAttribute BACKGROUND_OUTLINE =
+ new TextAttribute("BACKGROUND_OUTLINE");
// VALUES
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=1637644&r1=1637643&r2=1637644&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 09:24:46 2014
@@ -34,10 +34,10 @@ public class SVGStylingAttributes implem
static {
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_BACKGROUND_OUTLINE_BOTTOM_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_OUTLINE_LEFT_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_OUTLINE_RIGHT_ATTRIBUTE);
+ attrSet.add(SVG_BACKGROUND_OUTLINE_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=1637644&r1=1637643&r2=1637644&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 09:24:46 2014
@@ -38,11 +38,11 @@ public interface CSSConstants {
String CSS_ALIGNMENT_BASELINE_PROPERTY = "alignment-baseline";
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";
- String CSS_BACKGROUND_PADDING_LEFT_PROPERTY = "background-padding-left";
- String CSS_BACKGROUND_PADDING_RIGHT_PROPERTY = "background-padding-right";
- String CSS_BACKGROUND_PADDING_TOP_PROPERTY = "background-padding-top";
+ String CSS_BACKGROUND_OUTLINE_PROPERTY = "background-outline";
+ String CSS_BACKGROUND_OUTLINE_BOTTOM_PROPERTY = "background-outline-bottom";
+ String CSS_BACKGROUND_OUTLINE_LEFT_PROPERTY = "background-outline-left";
+ String CSS_BACKGROUND_OUTLINE_RIGHT_PROPERTY = "background-outline-right";
+ String CSS_BACKGROUND_OUTLINE_TOP_PROPERTY = "background-outline-top";
String CSS_BASELINE_SHIFT_PROPERTY = "baseline-shift";
String CSS_CLIP_PROPERTY = "clip";
String CSS_CLIP_PATH_PROPERTY = "clip-path";
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=1637644&r1=1637643&r2=1637644&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 09:24:46 2014
@@ -442,11 +442,11 @@ public interface SVGConstants extends CS
String SVG_ATTRIBUTE_TYPE_ATTRIBUTE = "attributeType";
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;
- String SVG_BACKGROUND_PADDING_LEFT_ATTRIBUTE = CSS_BACKGROUND_PADDING_LEFT_PROPERTY;
- String SVG_BACKGROUND_PADDING_RIGHT_ATTRIBUTE = CSS_BACKGROUND_PADDING_RIGHT_PROPERTY;
- String SVG_BACKGROUND_PADDING_TOP_ATTRIBUTE = CSS_BACKGROUND_PADDING_TOP_PROPERTY;
+ String SVG_BACKGROUND_OUTLINE_ATTRIBUTE = CSS_BACKGROUND_OUTLINE_PROPERTY;
+ String SVG_BACKGROUND_OUTLINE_BOTTOM_ATTRIBUTE = CSS_BACKGROUND_OUTLINE_BOTTOM_PROPERTY;
+ String SVG_BACKGROUND_OUTLINE_LEFT_ATTRIBUTE = CSS_BACKGROUND_OUTLINE_LEFT_PROPERTY;
+ String SVG_BACKGROUND_OUTLINE_RIGHT_ATTRIBUTE = CSS_BACKGROUND_OUTLINE_RIGHT_PROPERTY;
+ String SVG_BACKGROUND_OUTLINE_TOP_ATTRIBUTE = CSS_BACKGROUND_OUTLINE_TOP_PROPERTY;
String SVG_BASE_FREQUENCY_ATTRIBUTE = "baseFrequency";
String SVG_BASE_PROFILE_ATTRIBUTE = "baseProfile";
String SVG_BEGIN_ATTRIBUTE = "begin";