diff options
| author | Andreas L. Delmelle <adelmelle@apache.org> | 2005-12-30 00:18:57 +0000 |
|---|---|---|
| committer | Andreas L. Delmelle <adelmelle@apache.org> | 2005-12-30 00:18:57 +0000 |
| commit | 54d297afea37ddc051cc43d26b919e2a95fbc815 (patch) | |
| tree | f28dc317cdf8b81039527412af76515a5096125c /src/java/org/apache/fop/fo | |
| parent | 4c56038f69640db1f3afb96a966d58e9c273b3cf (diff) | |
| download | xmlgraphics-fop-54d297afea37ddc051cc43d26b919e2a95fbc815.tar.gz xmlgraphics-fop-54d297afea37ddc051cc43d26b919e2a95fbc815.zip | |
Tweak page-break-* shorthands; keeps now working properly
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@359939 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo')
| -rw-r--r-- | src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java b/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java index f139b2999..24d1f0f59 100644 --- a/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java @@ -21,6 +21,7 @@ package org.apache.fop.fo.properties; import org.apache.fop.fo.Constants; import org.apache.fop.fo.PropertyList; import org.apache.fop.fo.expr.PropertyException; +import org.apache.fop.fo.properties.KeepProperty; /** * Shorthand parser for page-break-before, page-break-after and page-break-inside. @@ -41,9 +42,8 @@ public class PageBreakShorthandParser implements ShorthandParser { || propId == Constants.PR_KEEP_WITH_NEXT || propId == Constants.PR_KEEP_TOGETHER) { if (property.getEnum() == Constants.EN_AVOID) { - return new EnumProperty(Constants.EN_ALWAYS, "ALWAYS"); - } else { - return new EnumProperty(Constants.EN_AUTO, "AUTO"); + return maker.make(null, Constants.CP_WITHIN_PAGE, + propertyList, "always", propertyList.getFObj()); } } else if (propId == Constants.PR_BREAK_BEFORE || propId == Constants.PR_BREAK_AFTER) { @@ -51,12 +51,12 @@ public class PageBreakShorthandParser implements ShorthandParser { case Constants.EN_ALWAYS: return new EnumProperty(Constants.EN_PAGE, "PAGE"); case Constants.EN_LEFT: - return new EnumProperty(Constants.EN_EVEN_PAGE, "EVEN-PAGE"); + return new EnumProperty(Constants.EN_EVEN_PAGE, "EVEN_PAGE"); case Constants.EN_RIGHT: - return new EnumProperty(Constants.EN_ODD_PAGE, "ODD-PAGE"); + return new EnumProperty(Constants.EN_ODD_PAGE, "ODD_PAGE"); case Constants.EN_AVOID: default: - return new EnumProperty(Constants.EN_AUTO, "AUTO"); + //nop; } } return null; |