bckfnn 2004/10/29 04:19:37
Modified: src/java/org/apache/fop/fo Constants.java
FOPropertyMapping.java
src/java/org/apache/fop/fo/flow Block.java
BlockContainer.java Character.java
ExternalGraphic.java InitialPropertySet.java
Inline.java InstreamForeignObject.java Leader.java
PageNumber.java PageNumberCitation.java
TableBody.java TableColumn.java TableRow.java
src/java/org/apache/fop/fo/pagination Root.java Title.java
src/java/org/apache/fop/fo/properties CommonHyphenation.java
Log:
More properties implemented.
Revision Changes Path
1.18 +11 -2 xml-fop/src/java/org/apache/fop/fo/Constants.java
Index: Constants.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Constants.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Constants.java 29 Oct 2004 10:35:03 -0000 1.17
+++ Constants.java 29 Oct 2004 11:19:35 -0000 1.18
@@ -540,7 +540,16 @@
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
1.35 +38 -14 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
Index: FOPropertyMapping.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- FOPropertyMapping.java 29 Oct 2004 10:35:03 -0000 1.34
+++ FOPropertyMapping.java 29 Oct 2004 11:19:35 -0000 1.35
@@ -661,8 +661,10 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
}
1.49 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Block.java 29 Oct 2004 10:20:55 -0000 1.48
+++ Block.java 29 Oct 2004 11:19:35 -0000 1.49
@@ -91,7 +91,7 @@
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 @@
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 @@
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 @@
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();
1.32 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BlockContainer.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- BlockContainer.java 29 Oct 2004 10:20:55 -0000 1.31
+++ BlockContainer.java 29 Oct 2004 11:19:36 -0000 1.32
@@ -60,7 +60,7 @@
private int span;
private Length width;
private int writingMode;
- // private ToBeImplementedProperty zIndex;
+ private Numeric zIndex;
// End of property values
/**
@@ -94,7 +94,7 @@
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();
}
/**
1.29 +8 -8 xml-fop/src/java/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Character.java 29 Oct 2004 10:20:55 -0000 1.28
+++ Character.java 29 Oct 2004 11:19:36 -0000 1.29
@@ -64,7 +64,7 @@
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 @@
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 @@
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 @@
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);
}
1.48 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
Index: ExternalGraphic.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ExternalGraphic.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- ExternalGraphic.java 29 Oct 2004 10:20:55 -0000 1.47
+++ ExternalGraphic.java 29 Oct 2004 11:19:36 -0000 1.48
@@ -56,7 +56,7 @@
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 @@
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();
1.18 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
Index: InitialPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InitialPropertySet.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- InitialPropertySet.java 28 Oct 2004 10:00:21 -0000 1.17
+++ InitialPropertySet.java 29 Oct 2004 11:19:36 -0000 1.18
@@ -49,7 +49,7 @@
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 @@
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();
1.34 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/Inline.java
Index: Inline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Inline.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Inline.java 29 Oct 2004 10:20:55 -0000 1.33
+++ Inline.java 29 Oct 2004 11:19:36 -0000 1.34
@@ -66,7 +66,7 @@
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 @@
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();
}
1.34 +2 -2
xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- InstreamForeignObject.java 29 Oct 2004 10:20:55 -0000 1.33
+++ InstreamForeignObject.java 29 Oct 2004 11:19:36 -0000 1.34
@@ -56,7 +56,7 @@
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 @@
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();
1.47 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Leader.java 29 Oct 2004 10:20:55 -0000 1.46
+++ Leader.java 29 Oct 2004 11:19:36 -0000 1.47
@@ -71,7 +71,7 @@
// 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 @@
// 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();
}
1.46 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- PageNumber.java 29 Oct 2004 10:20:55 -0000 1.45
+++ PageNumber.java 29 Oct 2004 11:19:36 -0000 1.46
@@ -59,13 +59,13 @@
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 @@
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();
}
1.43 +4 -4 xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- PageNumberCitation.java 29 Oct 2004 10:20:55 -0000 1.42
+++ PageNumberCitation.java 29 Oct 2004 11:19:36 -0000 1.43
@@ -63,13 +63,13 @@
// 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 @@
// 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();
}
1.34 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TableBody.java 28 Oct 2004 10:00:21 -0000 1.33
+++ TableBody.java 29 Oct 2004 11:19:36 -0000 1.34
@@ -45,7 +45,7 @@
// private ToBeImplementedProperty borderBeforePrecedence;
// private ToBeImplementedProperty borderEndPrecedence;
// private ToBeImplementedProperty borderStartPrecedence;
- // private ToBeImplementedProperty visibility;
+ private int visibility;
// End of property values
/**
@@ -67,7 +67,7 @@
// 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();
}
/**
1.34 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TableColumn.java 28 Oct 2004 10:00:21 -0000 1.33
+++ TableColumn.java 29 Oct 2004 11:19:36 -0000 1.34
@@ -44,7 +44,7 @@
private Length columnWidth;
private Numeric numberColumnsRepeated;
private Numeric numberColumnsSpanned;
- // private ToBeImplementedProperty visibility;
+ private int visibility;
// End of property values
/**
@@ -67,7 +67,7 @@
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();
}
/**
1.42 +2 -2 xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java
Index: TableRow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableRow.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- TableRow.java 28 Oct 2004 10:00:21 -0000 1.41
+++ TableRow.java 29 Oct 2004 11:19:36 -0000 1.42
@@ -58,7 +58,7 @@
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 @@
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();
}
/**
1.33 +3 -4 xml-fop/src/java/org/apache/fop/fo/pagination/Root.java
Index: Root.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Root.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Root.java 28 Oct 2004 10:00:23 -0000 1.32
+++ Root.java 29 Oct 2004 11:19:37 -0000 1.33
@@ -37,7 +37,7 @@
*/
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 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 @@
/**
* @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();
}
/**
1.30 +4 -3 xml-fop/src/java/org/apache/fop/fo/pagination/Title.java
Index: Title.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/Title.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Title.java 28 Oct 2004 10:00:23 -0000 1.29
+++ Title.java 29 Oct 2004 11:19:37 -0000 1.30
@@ -46,7 +46,8 @@
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 @@
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();
}
/**
1.5 +2 -1
xml-fop/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
Index: CommonHyphenation.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/CommonHyphenation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CommonHyphenation.java 28 Oct 2004 10:00:24 -0000 1.4
+++ CommonHyphenation.java 29 Oct 2004 11:19:37 -0000 1.5
@@ -70,6 +70,7 @@
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 =
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
