git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198112 13f79535-47bb-0310-9956-ffa450edef68tags/Root_Temp_KnuthStylePageBreaking
@@ -540,7 +540,16 @@ public interface Constants { | |||
int COLLAPSE_WITH_PRECEDENCE = 149; | |||
int SHOW = 150; | |||
int HIDE = 151; | |||
int ENUM_COUNT = 151; | |||
int EMBED = 152; | |||
int BIDI_OVERRIDE = 153; | |||
int LTR = 154; | |||
int RTL = 155; | |||
int CHARACTER_BY_CHARACTER = 156; | |||
int SUPPRESS = 157; | |||
int PAGINATE = 158; | |||
int BOUNDED_IN_ONE_DIMENSION = 159; | |||
int UNBOUNDED = 160; | |||
int ENUM_COUNT = 160; | |||
// Enumeration Interfaces | |||
@@ -661,8 +661,10 @@ public class FOPropertyMapping implements Constants { | |||
CorrespondingPropertyMaker corr; | |||
// background-attachment | |||
m = new ToBeImplementedProperty.Maker(PR_BACKGROUND_ATTACHMENT); | |||
m = new EnumProperty.Maker(PR_BACKGROUND_ATTACHMENT); | |||
m.setInherited(false); | |||
m.addEnum("scroll", makeEnumProperty(SCROLL, "SCROLL")); | |||
m.addEnum("fixed", makeEnumProperty(FIXED, "FIXED")); | |||
m.setDefault("scroll"); | |||
addPropertyMaker("background-attachment", m); | |||
@@ -1057,8 +1059,10 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("font-family", m); | |||
// font-selection-strategy | |||
m = new ToBeImplementedProperty.Maker(PR_FONT_SELECTION_STRATEGY); | |||
m = new EnumProperty.Maker(PR_FONT_SELECTION_STRATEGY); | |||
m.setInherited(true); | |||
m.addEnum("auto", makeEnumProperty(AUTO, "AUTO")); | |||
m.addEnum("character-by-character", makeEnumProperty(CHARACTER_BY_CHARACTER, "CHARACTER_BY_CHARACTER")); | |||
m.setDefault("auto"); | |||
addPropertyMaker("font-selection-strategy", m); | |||
@@ -1131,7 +1135,7 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("language", m); | |||
// script | |||
m = new ToBeImplementedProperty.Maker(PR_SCRIPT); | |||
m = new StringProperty.Maker(PR_SCRIPT); | |||
m.setInherited(true); | |||
m.setDefault("auto"); | |||
addPropertyMaker("script", m); | |||
@@ -1537,7 +1541,7 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("hyphenation-ladder-count", m); | |||
// last-line-end-indent | |||
m = new ToBeImplementedProperty.Maker(PR_LAST_LINE_END_INDENT); | |||
m = new LengthProperty.Maker(PR_LAST_LINE_END_INDENT); | |||
m.setInherited(true); | |||
m.setDefault("0pt"); | |||
addPropertyMaker("last-line-end-indent", m); | |||
@@ -1666,8 +1670,11 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("letter-spacing", m); | |||
// suppress-at-line-break | |||
m = new ToBeImplementedProperty.Maker(PR_SUPPRESS_AT_LINE_BREAK); | |||
m = new EnumProperty.Maker(PR_SUPPRESS_AT_LINE_BREAK); | |||
m.setInherited(false); | |||
m.addEnum("auto", makeEnumProperty(AUTO, "AUTO")); | |||
m.addEnum("suppress", makeEnumProperty(SUPPRESS, "SUPPRESS")); | |||
m.addEnum("retain", makeEnumProperty(RETAIN, "RETAIN")); | |||
m.setDefault("auto"); | |||
addPropertyMaker("suppress-at-line-break", m); | |||
@@ -1703,7 +1710,10 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("text-transform", m); | |||
// treat-as-word-space | |||
m = new ToBeImplementedProperty.Maker(PR_TREAT_AS_WORD_SPACE); | |||
m = new EnumProperty.Maker(PR_TREAT_AS_WORD_SPACE); | |||
m.addEnum("auto", makeEnumProperty(AUTO, "AUTO")); | |||
m.addEnum("true", makeEnumProperty(TRUE, "TRUE")); | |||
m.addEnum("false", makeEnumProperty(FALSE, "FALSE")); | |||
m.setInherited(false); | |||
m.setDefault("auto"); | |||
addPropertyMaker("treat-as-word-space", m); | |||
@@ -2178,8 +2188,12 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("maximum-repeats", m); | |||
// media-usage | |||
m = new ToBeImplementedProperty.Maker(PR_MEDIA_USAGE); | |||
m = new EnumProperty.Maker(PR_MEDIA_USAGE); | |||
m.setInherited(false); | |||
m.addEnum("auto", makeEnumProperty(AUTO, "AUTO")); | |||
m.addEnum("paginate", makeEnumProperty(PAGINATE, "PAGINATE")); | |||
m.addEnum("bounded-in-one-dimension", makeEnumProperty(BOUNDED_IN_ONE_DIMENSION, "BOUNDED_IN_ONE_DIMENSION")); | |||
m.addEnum("unbounded", makeEnumProperty(UNBOUNDED, "UNBOUNDED")); | |||
m.setDefault("auto"); | |||
addPropertyMaker("media-usage", m); | |||
@@ -2379,8 +2393,10 @@ public class FOPropertyMapping implements Constants { | |||
PropertyMaker m; | |||
// direction | |||
m = new ToBeImplementedProperty.Maker(PR_DIRECTION); | |||
m = new EnumProperty.Maker(PR_DIRECTION); | |||
m.setInherited(true); | |||
m.addEnum("ltr", makeEnumProperty(LTR, "LTR")); | |||
m.addEnum("rtl", makeEnumProperty(RTL, "RTL")); | |||
m.setDefault("ltr"); | |||
addPropertyMaker("direction", m); | |||
@@ -2411,8 +2427,11 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("text-depth", m); | |||
// unicode-bidi | |||
m = new ToBeImplementedProperty.Maker(PR_UNICODE_BIDI); | |||
m = new EnumProperty.Maker(PR_UNICODE_BIDI); | |||
m.setInherited(false); | |||
m.addEnum("normal", makeEnumProperty(NORMAL, "NORMAL")); | |||
m.addEnum("embed", makeEnumProperty(EMBED, "EMBED")); | |||
m.addEnum("bidi-override", makeEnumProperty(BIDI_OVERRIDE, "BIDI_OVERRIDE")); | |||
m.setDefault("normal"); | |||
addPropertyMaker("unicode-bidi", m); | |||
@@ -2433,7 +2452,7 @@ public class FOPropertyMapping implements Constants { | |||
PropertyMaker m; | |||
// content-type | |||
m = new ToBeImplementedProperty.Maker(PR_CONTENT_TYPE); | |||
m = new StringProperty.Maker(PR_CONTENT_TYPE); | |||
m.setInherited(false); | |||
m.setDefault("auto"); | |||
addPropertyMaker("content-type", m); | |||
@@ -2463,7 +2482,8 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("ref-id", m); | |||
// score-spaces | |||
m = new ToBeImplementedProperty.Maker(PR_SCORE_SPACES); | |||
m = new EnumProperty.Maker(PR_SCORE_SPACES); | |||
m.useGeneric(genericBoolean); | |||
m.setInherited(true); | |||
m.setDefault("true"); | |||
addPropertyMaker("score-spaces", m); | |||
@@ -2475,14 +2495,18 @@ public class FOPropertyMapping implements Constants { | |||
addPropertyMaker("src", m); | |||
// visibility | |||
m = new ToBeImplementedProperty.Maker(PR_VISIBILITY); | |||
m = new EnumProperty.Maker(PR_VISIBILITY); | |||
m.setInherited(false); | |||
m.addEnum("visible", makeEnumProperty(VISIBLE, "VISIBLE")); | |||
m.addEnum("hidden", makeEnumProperty(HIDDEN, "HIDDEN")); | |||
m.addEnum("collapse", makeEnumProperty(COLLAPSE, "COLLAPSE")); | |||
m.setDefault("visible"); | |||
addPropertyMaker("visibility", m); | |||
// z-index | |||
m = new ToBeImplementedProperty.Maker(PR_Z_INDEX); | |||
m = new NumberProperty.Maker(PR_Z_INDEX); | |||
m.setInherited(false); | |||
m.addEnum("auto", makeEnumProperty(AUTO, "AUTO")); | |||
m.setDefault("auto"); | |||
addPropertyMaker("z-index", m); | |||
} |
@@ -91,7 +91,7 @@ public class Block extends FObjMixed { | |||
private KeepProperty keepTogether; | |||
private KeepProperty keepWithNext; | |||
private KeepProperty keepWithPrevious; | |||
// private ToBeImplementedProperty lastLineEndIndent; | |||
private Length lastLineEndIndent; | |||
private int linefeedTreatment; | |||
private SpaceProperty lineHeight; | |||
private int lineHeightShiftAdjustment; | |||
@@ -102,7 +102,7 @@ public class Block extends FObjMixed { | |||
private int textAlign; | |||
private int textAlignLast; | |||
private Length textIndent; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
private int whiteSpaceCollapse; | |||
private Numeric widows; | |||
private int wrapOption; | |||
@@ -149,7 +149,7 @@ public class Block extends FObjMixed { | |||
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep(); | |||
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep(); | |||
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep(); | |||
// lastLineEndIndent = pList.get(PR_LAST_LINE_END_INDENT); | |||
lastLineEndIndent = pList.get(PR_LAST_LINE_END_INDENT).getLength(); | |||
linefeedTreatment = pList.get(PR_LINEFEED_TREATMENT).getEnum(); | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getSpace(); | |||
lineHeightShiftAdjustment = pList.get(PR_LINE_HEIGHT_SHIFT_ADJUSTMENT).getEnum(); | |||
@@ -160,7 +160,7 @@ public class Block extends FObjMixed { | |||
textAlign = pList.get(PR_TEXT_ALIGN).getEnum(); | |||
textAlignLast = pList.get(PR_TEXT_ALIGN_LAST).getEnum(); | |||
textIndent = pList.get(PR_TEXT_INDENT).getLength(); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
whiteSpaceCollapse = pList.get(PR_WHITE_SPACE_COLLAPSE).getEnum(); | |||
widows = pList.get(PR_WIDOWS).getNumeric(); | |||
wrapOption = pList.get(PR_WRAP_OPTION).getEnum(); |
@@ -60,7 +60,7 @@ public class BlockContainer extends FObj { | |||
private int span; | |||
private Length width; | |||
private int writingMode; | |||
// private ToBeImplementedProperty zIndex; | |||
private Numeric zIndex; | |||
// End of property values | |||
/** | |||
@@ -94,7 +94,7 @@ public class BlockContainer extends FObj { | |||
span = pList.get(PR_SPAN).getEnum(); | |||
width = pList.get(PR_WIDTH).getLength(); | |||
writingMode = pList.get(PR_WRITING_MODE).getEnum(); | |||
// zIndex = pList.get(PR_Z_INDEX); | |||
zIndex = pList.get(PR_Z_INDEX).getNumeric(); | |||
} | |||
/** |
@@ -64,7 +64,7 @@ public class Character extends FObj { | |||
private CommonMarginInline commonMarginInline; | |||
private CommonRelativePosition commonRelativePosition; | |||
private Length alignmentAdjust; | |||
// private ToBeImplementedProperty treatAsWordSpace; | |||
private int treatAsWordSpace; | |||
private int alignmentBaseline; | |||
private Length baselineShift; | |||
private char character; | |||
@@ -79,12 +79,12 @@ public class Character extends FObj { | |||
private KeepProperty keepWithPrevious; | |||
private Property letterSpacing; | |||
private Length lineHeight; | |||
// private ToBeImplementedProperty scoreSpaces; | |||
// private ToBeImplementedProperty suppressAtLineBreak; | |||
private int scoreSpaces; | |||
private int suppressAtLineBreak; | |||
private int textDecoration; | |||
// private ToBeImplementedProperty textShadow; | |||
private int textTransform; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
private Property wordSpacing; | |||
// End of property values | |||
@@ -112,7 +112,7 @@ public class Character extends FObj { | |||
commonRelativePosition = pList.getRelativePositionProps(); | |||
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength(); | |||
// treatAsWordSpace = pList.get(PR_TREAT_AS_WORD_SPACE); | |||
treatAsWordSpace = pList.get(PR_TREAT_AS_WORD_SPACE).getEnum(); | |||
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum(); | |||
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength(); | |||
character = pList.get(PR_CHARACTER).getCharacter(); | |||
@@ -127,12 +127,12 @@ public class Character extends FObj { | |||
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep(); | |||
letterSpacing = pList.get(PR_LETTER_SPACING); | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getLength(); | |||
// scoreSpaces = pList.get(PR_SCORE_SPACES); | |||
// suppressAtLineBreak = pList.get(PR_SUPPRESS_AT_LINE_BREAK); | |||
scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum(); | |||
suppressAtLineBreak = pList.get(PR_SUPPRESS_AT_LINE_BREAK).getEnum(); | |||
textDecoration = pList.get(PR_TEXT_DECORATION).getEnum(); | |||
// textShadow = pList.get(PR_TEXT_SHADOW); | |||
textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum(); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
wordSpacing = pList.get(PR_WORD_SPACING); | |||
} | |||
@@ -56,7 +56,7 @@ public class ExternalGraphic extends FObj { | |||
private LengthRangeProperty blockProgressionDimension; | |||
// private ToBeImplementedProperty clip; | |||
private Length contentHeight; | |||
// private ToBeImplementedProperty contentType; | |||
private String contentType; | |||
private Length contentWidth; | |||
private int displayAlign; | |||
private int dominantBaseline; | |||
@@ -99,7 +99,7 @@ public class ExternalGraphic extends FObj { | |||
blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange(); | |||
// clip = pList.get(PR_CLIP); | |||
contentHeight = pList.get(PR_CONTENT_HEIGHT).getLength(); | |||
// contentType = pList.get(PR_CONTENT_TYPE); | |||
contentType = pList.get(PR_CONTENT_TYPE).getString(); | |||
contentWidth = pList.get(PR_CONTENT_WIDTH).getLength(); | |||
displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum(); | |||
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum(); |
@@ -49,7 +49,7 @@ public class InitialPropertySet extends FObj { | |||
private String id; | |||
// private ToBeImplementedProperty letterSpacing; | |||
private Length lineHeight; | |||
// private ToBeImplementedProperty scoreSpaces; | |||
private int scoreSpaces; | |||
private int textDecoration; | |||
// private ToBeImplementedProperty textShadow; | |||
private int textTransform; | |||
@@ -76,7 +76,7 @@ public class InitialPropertySet extends FObj { | |||
id = pList.get(PR_ID).getString(); | |||
// letterSpacing = pList.get(PR_LETTER_SPACING); | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getLength(); | |||
// scoreSpaces = pList.get(PR_SCORE_SPACES); | |||
scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum(); | |||
textDecoration = pList.get(PR_TEXT_DECORATION).getEnum(); | |||
// textShadow = pList.get(PR_TEXT_SHADOW); | |||
textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum(); |
@@ -66,7 +66,7 @@ public class Inline extends FObjMixed { | |||
private KeepProperty keepWithPrevious; | |||
private Length lineHeight; | |||
private int textDecoration; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
private Length width; | |||
private int wrapOption; | |||
// End of property values | |||
@@ -106,7 +106,7 @@ public class Inline extends FObjMixed { | |||
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep(); | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getLength(); | |||
textDecoration = pList.get(PR_TEXT_DECORATION).getEnum(); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
width = pList.get(PR_WIDTH).getLength(); | |||
wrapOption = pList.get(PR_WRAP_OPTION).getEnum(); | |||
} |
@@ -56,7 +56,7 @@ public class InstreamForeignObject extends FObj { | |||
private LengthRangeProperty blockProgressionDimension; | |||
// private ToBeImplementedProperty clip; | |||
private Length contentHeight; | |||
// private ToBeImplementedProperty contentType; | |||
private String contentType; | |||
private Length contentWidth; | |||
private int displayAlign; | |||
private int dominantBaseline; | |||
@@ -98,7 +98,7 @@ public class InstreamForeignObject extends FObj { | |||
blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange(); | |||
// clip = pList.get(PR_CLIP); | |||
contentHeight = pList.get(PR_CONTENT_HEIGHT).getLength(); | |||
// contentType = pList.get(PR_CONTENT_TYPE); | |||
contentType = pList.get(PR_CONTENT_TYPE).getString(); | |||
contentWidth = pList.get(PR_CONTENT_WIDTH).getLength(); | |||
displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum(); | |||
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum(); |
@@ -71,7 +71,7 @@ public class Leader extends FObjMixed { | |||
// private ToBeImplementedProperty letterSpacing; | |||
private Length lineHeight; | |||
// private ToBeImplementedProperty textShadow; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
private SpaceProperty wordSpacing; | |||
// End of property values | |||
@@ -126,7 +126,7 @@ public class Leader extends FObjMixed { | |||
// letterSpacing = pList.get(PR_LETTER_SPACING); | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getLength(); | |||
// textShadow = pList.get(PR_TEXT_SHADOW); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
wordSpacing = pList.get(PR_WORD_SPACING).getSpace(); | |||
} | |||
@@ -59,13 +59,13 @@ public class PageNumber extends FObj { | |||
private KeepProperty keepWithPrevious; | |||
// private ToBeImplementedProperty letterSpacing; | |||
private Length lineHeight; | |||
// private ToBeImplementedProperty scoreSpaces; | |||
private int scoreSpaces; | |||
private Length textAltitude; | |||
private int textDecoration; | |||
private Length textDepth; | |||
// private ToBeImplementedProperty textShadow; | |||
private int textTransform; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
private SpaceProperty wordSpacing; | |||
private int wrapOption; | |||
// End of property values | |||
@@ -96,13 +96,13 @@ public class PageNumber extends FObj { | |||
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep(); | |||
// letterSpacing = pList.get(PR_LETTER_SPACING); | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getLength(); | |||
// scoreSpaces = pList.get(PR_SCORE_SPACES); | |||
scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum(); | |||
textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength(); | |||
textDecoration = pList.get(PR_TEXT_DECORATION).getEnum(); | |||
textDepth = pList.get(PR_TEXT_DEPTH).getLength(); | |||
// textShadow = pList.get(PR_TEXT_SHADOW); | |||
textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum(); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
wordSpacing = pList.get(PR_WORD_SPACING).getSpace(); | |||
wrapOption = pList.get(PR_WRAP_OPTION).getEnum(); | |||
} |
@@ -63,13 +63,13 @@ public class PageNumberCitation extends FObj { | |||
// private ToBeImplementedProperty letterSpacing; | |||
private Length lineHeight; | |||
private String refId; | |||
// private ToBeImplementedProperty scoreSpaces; | |||
private int scoreSpaces; | |||
private Length textAltitude; | |||
private int textDecoration; | |||
private Length textDepth; | |||
// private ToBeImplementedProperty textShadow; | |||
private int textTransform; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
private SpaceProperty wordSpacing; | |||
private int wrapOption; | |||
// End of property values | |||
@@ -101,13 +101,13 @@ public class PageNumberCitation extends FObj { | |||
// letterSpacing = pList.get(PR_LETTER_SPACING); | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getLength(); | |||
refId = pList.get(PR_REF_ID).getString(); | |||
// scoreSpaces = pList.get(PR_SCORE_SPACES); | |||
scoreSpaces = pList.get(PR_SCORE_SPACES).getEnum(); | |||
textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength(); | |||
textDecoration = pList.get(PR_TEXT_DECORATION).getEnum(); | |||
textDepth = pList.get(PR_TEXT_DEPTH).getLength(); | |||
// textShadow = pList.get(PR_TEXT_SHADOW); | |||
textTransform = pList.get(PR_TEXT_TRANSFORM).getEnum(); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
wordSpacing = pList.get(PR_WORD_SPACING).getSpace(); | |||
wrapOption = pList.get(PR_WRAP_OPTION).getEnum(); | |||
} |
@@ -45,7 +45,7 @@ public class TableBody extends FObj { | |||
// private ToBeImplementedProperty borderBeforePrecedence; | |||
// private ToBeImplementedProperty borderEndPrecedence; | |||
// private ToBeImplementedProperty borderStartPrecedence; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
// End of property values | |||
/** | |||
@@ -67,7 +67,7 @@ public class TableBody extends FObj { | |||
// borderBeforePrecedence = pList.get(PR_BORDER_BEFORE_PRECEDENCE); | |||
// borderEndPrecedence = pList.get(PR_BORDER_END_PRECEDENCE); | |||
// borderStartPrecedence = pList.get(PR_BORDER_START_PRECEDENCE); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
} | |||
/** |
@@ -44,7 +44,7 @@ public class TableColumn extends FObj { | |||
private Length columnWidth; | |||
private Numeric numberColumnsRepeated; | |||
private Numeric numberColumnsSpanned; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
// End of property values | |||
/** | |||
@@ -67,7 +67,7 @@ public class TableColumn extends FObj { | |||
columnWidth = pList.get(PR_COLUMN_WIDTH).getLength(); | |||
numberColumnsRepeated = pList.get(PR_NUMBER_COLUMNS_REPEATED).getNumeric(); | |||
numberColumnsSpanned = pList.get(PR_NUMBER_COLUMNS_SPANNED).getNumeric(); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
} | |||
/** |
@@ -58,7 +58,7 @@ public class TableRow extends FObj { | |||
private KeepProperty keepTogether; | |||
private KeepProperty keepWithNext; | |||
private KeepProperty keepWithPrevious; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
// End of property values | |||
private boolean setup = false; | |||
@@ -90,7 +90,7 @@ public class TableRow extends FObj { | |||
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep(); | |||
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep(); | |||
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep(); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
} | |||
/** |
@@ -37,7 +37,7 @@ import org.apache.fop.fo.extensions.ExtensionElementMapping; | |||
*/ | |||
public class Root extends FObj { | |||
// The value of properties relevant for fo:root. | |||
// private ToBeImplementedProperty mediaUsage; | |||
private int mediaUsage; | |||
// End of property values | |||
private LayoutMasterSet layoutMasterSet; | |||
@@ -63,7 +63,6 @@ public class Root extends FObj { | |||
*/ | |||
public Root(FONode parent) { | |||
super(parent); | |||
// this.propertyList.get("media-usage"); | |||
pageSequences = new java.util.ArrayList(); | |||
if (parent != null) { | |||
//throw new FOPException("root must be root element"); | |||
@@ -73,8 +72,8 @@ public class Root extends FObj { | |||
/** | |||
* @see org.apache.fop.fo.FObj#bind(PropertyList) | |||
*/ | |||
public void bind(PropertyList pList) { | |||
// prMediaUsage = pList.get(PR_MEDIA_USAGE); | |||
public void bind(PropertyList pList) throws FOPException { | |||
mediaUsage = pList.get(PR_MEDIA_USAGE).getEnum(); | |||
} | |||
/** |
@@ -46,7 +46,8 @@ public class Title extends FObjMixed { | |||
private CommonMarginInline commonMarginInline; | |||
private ColorType color; | |||
private Length lineHeight; | |||
// private ToBeImplementedProperty visibility; | |||
private int visibility; | |||
// End of property values | |||
/** | |||
* @param parent FONode that is the parent of this object | |||
@@ -63,7 +64,7 @@ public class Title extends FObjMixed { | |||
commonMarginInline = pList.getMarginInlineProps(); | |||
color = pList.get(PR_COLOR).getColorType(); | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getLength(); | |||
// visibility = pList.get(PR_VISIBILITY); | |||
visibility = pList.get(PR_VISIBILITY).getEnum(); | |||
} | |||
/** |
@@ -70,6 +70,7 @@ public class CommonHyphenation { | |||
public CommonHyphenation(PropertyList pList) throws PropertyException { | |||
language = pList.get(Constants.PR_LANGUAGE).getString(); | |||
country = pList.get(Constants.PR_COUNTRY).getString(); | |||
script = pList.get(Constants.PR_SCRIPT).getString(); | |||
hyphenate = pList.get(Constants.PR_HYPHENATE).getEnum(); | |||
hyphenationCharacter = pList.get(Constants.PR_HYPHENATION_CHARACTER).getCharacter(); | |||
hyphenationPushCharacterCount = |