mirrors
/
fop
mirror of https://github.com/apache/fop.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 48 Wiki Activity
Browse Source

Bind some more of the implemented properties. 


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198110 13f79535-47bb-0310-9956-ffa450edef68
tags/Root_Temp_KnuthStylePageBreaking
Finn Bock 19 years ago
parent
91080f998e
commit
1b4a17a2f8
18 changed files with 106 additions and 106 deletions
Split View Show Diff Stats
  1. 2
    2
      src/java/org/apache/fop/fo/flow/BasicLink.java
  2. 14
    14
      src/java/org/apache/fop/fo/flow/Block.java
  3. 2
    2
      src/java/org/apache/fop/fo/flow/BlockContainer.java
  4. 10
    10
      src/java/org/apache/fop/fo/flow/Character.java
  5. 8
    8
      src/java/org/apache/fop/fo/flow/ExternalGraphic.java
  6. 4
    4
      src/java/org/apache/fop/fo/flow/Float.java
  7. 6
    6
      src/java/org/apache/fop/fo/flow/Inline.java
  8. 6
    6
      src/java/org/apache/fop/fo/flow/InlineContainer.java
  9. 8
    8
      src/java/org/apache/fop/fo/flow/InstreamForeignObject.java
  10. 10
    10
      src/java/org/apache/fop/fo/flow/Leader.java
  11. 2
    2
      src/java/org/apache/fop/fo/flow/ListBlock.java
  12. 2
    2
      src/java/org/apache/fop/fo/flow/ListItem.java
  13. 10
    10
      src/java/org/apache/fop/fo/flow/PageNumber.java
  14. 10
    10
      src/java/org/apache/fop/fo/flow/PageNumberCitation.java
  15. 2
    2
      src/java/org/apache/fop/fo/flow/Table.java
  16. 2
    2
      src/java/org/apache/fop/fo/flow/TableAndCaption.java
  17. 2
    2
      src/java/org/apache/fop/fo/flow/TableCaption.java
  18. 6
    6
      src/java/org/apache/fop/fo/flow/TableCell.java

+ 2
- 2
src/java/org/apache/fop/fo/flow/BasicLink.java View File

@@ -39,7 +39,7 @@ import org.apache.fop.layoutmgr.BasicLinkLayoutManager;
public class BasicLink extends Inline {
// The value of properties relevant for fo:basic-link.
// private ToBeImplementedProperty destinationPlacementOffset;
// private ToBeImplementedProperty dominantBaseline;
private int dominantBaseline;
private String externalDestination;
// private ToBeImplementedProperty indicateDestination;
private String internalDestination;
@@ -65,7 +65,7 @@ public class BasicLink extends Inline {
public void bind(PropertyList pList) throws FOPException {
super.bind(pList);
// destinationPlacementOffset = pList.get(PR_DESTINATION_PLACEMENT_OFFSET);
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
externalDestination = pList.get(PR_EXTERNAL_DESTINATION).getString();
// indicateDestination = pList.get(PR_INDICATE_DESTINATION);
internalDestination = pList.get(PR_INTERNAL_DESTINATION).getString();

+ 14
- 14
src/java/org/apache/fop/fo/flow/Block.java View File

@@ -82,20 +82,20 @@ public class Block extends FObjMixed {
private int breakAfter;
private int breakBefore;
private ColorType color;
// private ToBeImplementedProperty textDepth;
// private ToBeImplementedProperty textAltitude;
// private ToBeImplementedProperty hyphenationKeep;
// private ToBeImplementedProperty hyphenationLadderCount;
private Length textDepth;
private Length textAltitude;
private int hyphenationKeep;
private Numeric hyphenationLadderCount;
private String id;
// private ToBeImplementedProperty intrusionDisplace;
private int intrusionDisplace;
private KeepProperty keepTogether;
private KeepProperty keepWithNext;
private KeepProperty keepWithPrevious;
// private ToBeImplementedProperty lastLineEndIndent;
private int linefeedTreatment;
private SpaceProperty lineHeight;
// private ToBeImplementedProperty lineHeightShiftAdjustment;
// private ToBeImplementedProperty lineStackingStrategy;
private int lineHeightShiftAdjustment;
private int lineStackingStrategy;
private Numeric orphans;
private int whiteSpaceTreatment;
private int span;
@@ -140,20 +140,20 @@ public class Block extends FObjMixed {
breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
color = pList.get(PR_COLOR).getColorType();
// textDepth = pList.get(PR_TEXT_DEPTH);
// textAltitude = pList.get(PR_TEXT_ALTITUDE);
// hyphenationKeep = pList.get(PR_HYPHENATION_KEEP);
// hyphenationLadderCount = pList.get(PR_HYPHENATION_LADDER_COUNT);
textDepth = pList.get(PR_TEXT_DEPTH).getLength();
textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
hyphenationKeep = pList.get(PR_HYPHENATION_KEEP).getEnum();
hyphenationLadderCount = pList.get(PR_HYPHENATION_LADDER_COUNT).getNumeric();
id = pList.get(PR_ID).getString();
// intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE);
intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
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);
linefeedTreatment = pList.get(PR_LINEFEED_TREATMENT).getEnum();
lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
// lineHeightShiftAdjustment = pList.get(PR_LINE_HEIGHT_SHIFT_ADJUSTMENT);
// lineStackingStrategy = pList.get(PR_LINE_STACKING_STRATEGY);
lineHeightShiftAdjustment = pList.get(PR_LINE_HEIGHT_SHIFT_ADJUSTMENT).getEnum();
lineStackingStrategy = pList.get(PR_LINE_STACKING_STRATEGY).getEnum();
orphans = pList.get(PR_ORPHANS).getNumeric();
whiteSpaceTreatment = pList.get(PR_WHITE_SPACE_TREATMENT).getEnum();
span = pList.get(PR_SPAN).getEnum();

+ 2
- 2
src/java/org/apache/fop/fo/flow/BlockContainer.java View File

@@ -51,7 +51,7 @@ public class BlockContainer extends FObj {
private Length height;
private String id;
private LengthRangeProperty inlineProgressionDimension;
// private ToBeImplementedProperty intrusionDisplace;
private int intrusionDisplace;
private KeepProperty keepTogether;
private KeepProperty keepWithNext;
private KeepProperty keepWithPrevious;
@@ -85,7 +85,7 @@ public class BlockContainer extends FObj {
height = pList.get(PR_HEIGHT).getLength();
id = pList.get(PR_ID).getString();
inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
// intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE);
intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();

+ 10
- 10
src/java/org/apache/fop/fo/flow/Character.java View File

@@ -63,15 +63,15 @@ public class Character extends FObj {
private CommonHyphenation commonHyphenation;
private CommonMarginInline commonMarginInline;
private CommonRelativePosition commonRelativePosition;
// private ToBeImplementedProperty alignmentAdjust;
private Length alignmentAdjust;
// private ToBeImplementedProperty treatAsWordSpace;
// private ToBeImplementedProperty alignmentBaseline;
private int alignmentBaseline;
private Length baselineShift;
private char character;
private ColorType color;
// private ToBeImplementedProperty dominantBaseline;
// private ToBeImplementedProperty textDepth;
// private ToBeImplementedProperty textAltitude;
private int dominantBaseline;
private Length textDepth;
private Length textAltitude;
// private ToBeImplementedProperty glyphOrientationHorizontal;
// private ToBeImplementedProperty glyphOrientationVertical;
private String id;
@@ -111,15 +111,15 @@ public class Character extends FObj {
commonMarginInline = pList.getMarginInlineProps();
commonRelativePosition = pList.getRelativePositionProps();

// alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST);
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
// treatAsWordSpace = pList.get(PR_TREAT_AS_WORD_SPACE);
// alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE);
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
character = pList.get(PR_CHARACTER).getCharacter();
color = pList.get(PR_COLOR).getColorType();
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
// textDepth = pList.get(PR_TEXT_DEPTH);
// textAltitude = pList.get(PR_TEXT_ALTITUDE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
textDepth = pList.get(PR_TEXT_DEPTH).getLength();
textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
// glyphOrientationHorizontal = pList.get(PR_GLYPH_ORIENTATION_HORIZONTAL);
// glyphOrientationVertical = pList.get(PR_GLYPH_ORIENTATION_VERTICAL);
id = pList.get(PR_ID).getString();

+ 8
- 8
src/java/org/apache/fop/fo/flow/ExternalGraphic.java View File

@@ -50,8 +50,8 @@ public class ExternalGraphic extends FObj {
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonMarginInline commonMarginInline;
private CommonRelativePosition commonRelativePosition;
// private ToBeImplementedProperty alignmentAdjust;
// private ToBeImplementedProperty alignmentBaseline;
private Length alignmentAdjust;
private int alignmentBaseline;
private Length baselineShift;
private LengthRangeProperty blockProgressionDimension;
// private ToBeImplementedProperty clip;
@@ -59,7 +59,7 @@ public class ExternalGraphic extends FObj {
// private ToBeImplementedProperty contentType;
private Length contentWidth;
private int displayAlign;
// private ToBeImplementedProperty dominantBaseline;
private int dominantBaseline;
private Length height;
private String id;
private LengthRangeProperty inlineProgressionDimension;
@@ -68,7 +68,7 @@ public class ExternalGraphic extends FObj {
private Length lineHeight;
private int overflow;
private int scaling;
// private ToBeImplementedProperty scalingMethod;
private int scalingMethod;
private String src;
private int textAlign;
private int verticalAlign; //Extra
@@ -93,8 +93,8 @@ public class ExternalGraphic extends FObj {
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
commonMarginInline = pList.getMarginInlineProps();
commonRelativePosition = pList.getRelativePositionProps();
// alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST);
// alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE);
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
// clip = pList.get(PR_CLIP);
@@ -102,7 +102,7 @@ public class ExternalGraphic extends FObj {
// contentType = pList.get(PR_CONTENT_TYPE);
contentWidth = pList.get(PR_CONTENT_WIDTH).getLength();
displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
height = pList.get(PR_HEIGHT).getLength();
id = pList.get(PR_ID).getString();
inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
@@ -111,7 +111,7 @@ public class ExternalGraphic extends FObj {
lineHeight = pList.get(PR_LINE_HEIGHT).getLength();
overflow = pList.get(PR_OVERFLOW).getEnum();
scaling = pList.get(PR_SCALING).getEnum();
// scalingMethod = pList.get(PR_SCALING_METHOD);
scalingMethod = pList.get(PR_SCALING_METHOD).getEnum();
src = pList.get(PR_SRC).getString();
textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
verticalAlign = pList.get(PR_VERTICAL_ALIGN).getEnum();

+ 4
- 4
src/java/org/apache/fop/fo/flow/Float.java View File

@@ -32,8 +32,8 @@ import org.apache.fop.fo.ValidationException;
*/
public class Float extends FObj {
// The value of properties relevant for fo:float.
// private ToBeImplementedProperty float;
// private ToBeImplementedProperty clear;
private int float_;
private int clear;
// End of property values

static boolean notImplementedWarningGiven = false;
@@ -54,8 +54,8 @@ public class Float extends FObj {
* @see org.apache.fop.fo.FObj#bind(PropertyList)
*/
public void bind(PropertyList pList) throws FOPException {
// float = pList.get(PR_FLOAT);
// clear = pList.get(PR_CLEAR);
float_ = pList.get(PR_FLOAT).getEnum();
clear = pList.get(PR_CLEAR).getEnum();
}

/**

+ 6
- 6
src/java/org/apache/fop/fo/flow/Inline.java View File

@@ -52,12 +52,12 @@ public class Inline extends FObjMixed {
private CommonFont commonFont;
private CommonMarginInline commonMarginInline;
private CommonRelativePosition commonRelativePosition;
// private ToBeImplementedProperty alignmentAdjust;
// private ToBeImplementedProperty alignmentBaseline;
private Length alignmentAdjust;
private int alignmentBaseline;
private Length baselineShift;
private LengthRangeProperty blockProgressionDimension;
private ColorType color;
// private ToBeImplementedProperty dominantBaseline;
private int dominantBaseline;
private Length height;
private String id;
private LengthRangeProperty inlineProgressionDimension;
@@ -92,12 +92,12 @@ public class Inline extends FObjMixed {
commonFont = pList.getFontProps();
commonMarginInline = pList.getMarginInlineProps();
commonRelativePosition = pList.getRelativePositionProps();
// alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST);
// alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE);
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
color = pList.get(PR_COLOR).getColorType();
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
height = pList.get(PR_HEIGHT).getLength();
id = pList.get(PR_ID).getString();
inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();

+ 6
- 6
src/java/org/apache/fop/fo/flow/InlineContainer.java View File

@@ -45,13 +45,13 @@ public class InlineContainer extends FObj {
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonMarginInline commonMarginInline;
private CommonRelativePosition commonRelativePosition;
// private ToBeImplementedProperty alignmentAdjust;
// private ToBeImplementedProperty alignmentBaseline;
private Length alignmentAdjust;
private int alignmentBaseline;
private Length baselineShift;
private LengthRangeProperty blockProgressionDimension;
// private ToBeImplementedProperty clip;
private int displayAlign;
// private ToBeImplementedProperty dominantBaseline;
private int dominantBaseline;
private Length height;
private String id;
private LengthRangeProperty inlineProgressionDimension;
@@ -79,13 +79,13 @@ public class InlineContainer extends FObj {
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
commonMarginInline = pList.getMarginInlineProps();
commonRelativePosition = pList.getRelativePositionProps();
// alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST);
// alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE);
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
// clip = pList.get(PR_CLIP);
displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
height = pList.get(PR_HEIGHT).getLength();
id = pList.get(PR_ID).getString();
inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();

+ 8
- 8
src/java/org/apache/fop/fo/flow/InstreamForeignObject.java View File

@@ -50,8 +50,8 @@ public class InstreamForeignObject extends FObj {
private CommonBorderPaddingBackground commonBorderPaddingBackground;
private CommonMarginInline commonMarginInline;
private CommonRelativePosition commonRelativePosition;
// private ToBeImplementedProperty alignmentAdjust;
// private ToBeImplementedProperty alignmentBaseline;
private Length alignmentAdjust;
private int alignmentBaseline;
private Length baselineShift;
private LengthRangeProperty blockProgressionDimension;
// private ToBeImplementedProperty clip;
@@ -59,7 +59,7 @@ public class InstreamForeignObject extends FObj {
// private ToBeImplementedProperty contentType;
private Length contentWidth;
private int displayAlign;
// private ToBeImplementedProperty dominantBaseline;
private int dominantBaseline;
private Length height;
private String id;
private LengthRangeProperty inlineProgressionDimension;
@@ -68,7 +68,7 @@ public class InstreamForeignObject extends FObj {
private Length lineHeight;
private int overflow;
private int scaling;
// private ToBeImplementedProperty scalingMethod;
private int scalingMethod;
private int textAlign;
private int verticalAlign; // shorthand!!!
private Length width;
@@ -92,8 +92,8 @@ public class InstreamForeignObject extends FObj {
commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps();
commonMarginInline = pList.getMarginInlineProps();
commonRelativePosition = pList.getRelativePositionProps();
// alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST);
// alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE);
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
blockProgressionDimension = pList.get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange();
// clip = pList.get(PR_CLIP);
@@ -101,7 +101,7 @@ public class InstreamForeignObject extends FObj {
// contentType = pList.get(PR_CONTENT_TYPE);
contentWidth = pList.get(PR_CONTENT_WIDTH).getLength();
displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
height = pList.get(PR_HEIGHT).getLength();
id = pList.get(PR_ID).getString();
inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
@@ -110,7 +110,7 @@ public class InstreamForeignObject extends FObj {
lineHeight = pList.get(PR_LINE_HEIGHT).getLength();
overflow = pList.get(PR_OVERFLOW).getEnum();
scaling = pList.get(PR_SCALING).getEnum();
// scalingMethod = pList.get(PR_SCALING_METHOD);
scalingMethod = pList.get(PR_SCALING_METHOD).getEnum();
textAlign = pList.get(PR_TEXT_ALIGN).getEnum();
verticalAlign = pList.get(PR_VERTICAL_ALIGN).getEnum();
width = pList.get(PR_WIDTH).getLength();

+ 10
- 10
src/java/org/apache/fop/fo/flow/Leader.java View File

@@ -52,13 +52,13 @@ public class Leader extends FObjMixed {
private CommonFont commonFont;
private CommonMarginInline commonMarginInline;
private CommonRelativePosition commonRelativePosition;
// private ToBeImplementedProperty alignmentAdjust;
// private ToBeImplementedProperty alignmentBaseline;
private Length alignmentAdjust;
private int alignmentBaseline;
private Length baselineShift;
private ColorType color;
// private ToBeImplementedProperty dominantBaseline;
// private ToBeImplementedProperty textDepth;
// private ToBeImplementedProperty textAltitude;
private int dominantBaseline;
private Length textDepth;
private Length textAltitude;
private String id;
private KeepProperty keepWithNext;
private KeepProperty keepWithPrevious;
@@ -92,13 +92,13 @@ public class Leader extends FObjMixed {
commonFont = pList.getFontProps();
commonMarginInline = pList.getMarginInlineProps();
commonRelativePosition = pList.getRelativePositionProps();
// alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST);
// alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE);
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
color = pList.get(PR_COLOR).getColorType();
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
// textDepth = pList.get(PR_TEXT_DEPTH);
// textAltitude = pList.get(PR_TEXT_ALTITUDE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
textDepth = pList.get(PR_TEXT_DEPTH).getLength();
textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
id = pList.get(PR_ID).getString();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();

+ 2
- 2
src/java/org/apache/fop/fo/flow/ListBlock.java View File

@@ -50,7 +50,7 @@ public class ListBlock extends FObj {
private int breakAfter;
private int breakBefore;
private String id;
// private ToBeImplementedProperty intrusionDisplace;
private int intrusionDisplace;
private KeepProperty keepTogether;
private KeepProperty keepWithNext;
private KeepProperty keepWithPrevious;
@@ -80,7 +80,7 @@ public class ListBlock extends FObj {
breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
id = pList.get(PR_ID).getString();
// intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE);
intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();

+ 2
- 2
src/java/org/apache/fop/fo/flow/ListItem.java View File

@@ -49,7 +49,7 @@ public class ListItem extends FObj {
private int breakAfter;
private int breakBefore;
private String id;
// private ToBeImplementedProperty intrusionDisplace;
private int intrusionDisplace;
private KeepProperty keepTogether;
private KeepProperty keepWithNext;
private KeepProperty keepWithPrevious;
@@ -78,7 +78,7 @@ public class ListItem extends FObj {
breakAfter = pList.get(PR_BREAK_AFTER).getEnum();
breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
id = pList.get(PR_ID).getString();
// intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE);
intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();

+ 10
- 10
src/java/org/apache/fop/fo/flow/PageNumber.java View File

@@ -50,19 +50,19 @@ public class PageNumber extends FObj {
private CommonFont commonFont;
private CommonMarginInline commonMarginInline;
private CommonRelativePosition commonRelativePosition;
// private ToBeImplementedProperty alignmentAdjust;
// private ToBeImplementedProperty alignmentBaseline;
private Length alignmentAdjust;
private int alignmentBaseline;
private Length baselineShift;
// private ToBeImplementedProperty dominantBaseline;
private int dominantBaseline;
private String id;
private KeepProperty keepWithNext;
private KeepProperty keepWithPrevious;
// private ToBeImplementedProperty letterSpacing;
private Length lineHeight;
// private ToBeImplementedProperty scoreSpaces;
// private ToBeImplementedProperty textAltitude;
private Length textAltitude;
private int textDecoration;
// private ToBeImplementedProperty textDepth;
private Length textDepth;
// private ToBeImplementedProperty textShadow;
private int textTransform;
// private ToBeImplementedProperty visibility;
@@ -87,19 +87,19 @@ public class PageNumber extends FObj {
commonFont = pList.getFontProps();
commonMarginInline = pList.getMarginInlineProps();
commonRelativePosition = pList.getRelativePositionProps();
// alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST);
// alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE);
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
id = pList.get(PR_ID).getString();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
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);
// textAltitude = pList.get(PR_TEXT_ALTITUDE);
textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
textDecoration = pList.get(PR_TEXT_DECORATION).getEnum();
// textDepth = pList.get(PR_TEXT_DEPTH);
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);

+ 10
- 10
src/java/org/apache/fop/fo/flow/PageNumberCitation.java View File

@@ -53,10 +53,10 @@ public class PageNumberCitation extends FObj {
private CommonFont commonFont;
private CommonMarginInline commonMarginInline;
private CommonRelativePosition commonRelativePosition;
// private ToBeImplementedProperty alignmentAdjust;
// private ToBeImplementedProperty alignmentBaseline;
private Length alignmentAdjust;
private int alignmentBaseline;
private Length baselineShift;
// private ToBeImplementedProperty dominantBaseline;
private int dominantBaseline;
private String id;
private KeepProperty keepWithNext;
private KeepProperty keepWithPrevious;
@@ -64,9 +64,9 @@ public class PageNumberCitation extends FObj {
private Length lineHeight;
private String refId;
// private ToBeImplementedProperty scoreSpaces;
// private ToBeImplementedProperty textAltitude;
private Length textAltitude;
private int textDecoration;
// private ToBeImplementedProperty textDepth;
private Length textDepth;
// private ToBeImplementedProperty textShadow;
private int textTransform;
// private ToBeImplementedProperty visibility;
@@ -91,10 +91,10 @@ public class PageNumberCitation extends FObj {
commonFont = pList.getFontProps();
commonMarginInline = pList.getMarginInlineProps();
commonRelativePosition = pList.getRelativePositionProps();
// alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST);
// alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE);
alignmentAdjust = pList.get(PR_ALIGNMENT_ADJUST).getLength();
alignmentBaseline = pList.get(PR_ALIGNMENT_BASELINE).getEnum();
baselineShift = pList.get(PR_BASELINE_SHIFT).getLength();
// dominantBaseline = pList.get(PR_DOMINANT_BASELINE);
dominantBaseline = pList.get(PR_DOMINANT_BASELINE).getEnum();
id = pList.get(PR_ID).getString();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();
@@ -102,9 +102,9 @@ public class PageNumberCitation extends FObj {
lineHeight = pList.get(PR_LINE_HEIGHT).getLength();
refId = pList.get(PR_REF_ID).getString();
// scoreSpaces = pList.get(PR_SCORE_SPACES);
// textAltitude = pList.get(PR_TEXT_ALTITUDE);
textAltitude = pList.get(PR_TEXT_ALTITUDE).getLength();
textDecoration = pList.get(PR_TEXT_DECORATION).getEnum();
// textDepth = pList.get(PR_TEXT_DEPTH);
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);

+ 2
- 2
src/java/org/apache/fop/fo/flow/Table.java View File

@@ -61,7 +61,7 @@ public class Table extends FObj {
private int breakBefore;
private String id;
private LengthRangeProperty inlineProgressionDimension;
// private ToBeImplementedProperty intrusionDisplace;
private int intrusionDisplace;
private Length height;
private KeepProperty keepTogether;
private KeepProperty keepWithNext;
@@ -107,7 +107,7 @@ public class Table extends FObj {
breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
id = pList.get(PR_ID).getString();
inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
// intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE);
intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
height = pList.get(PR_HEIGHT).getLength();
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();

+ 2
- 2
src/java/org/apache/fop/fo/flow/TableAndCaption.java View File

@@ -48,7 +48,7 @@ public class TableAndCaption extends FObj {
private int breakBefore;
private int captionSide;
private String id;
// private ToBeImplementedProperty intrusionDisplace;
private int intrusionDisplace;
private KeepProperty keepTogether;
private KeepProperty keepWithNext;
private KeepProperty keepWithPrevious;
@@ -86,7 +86,7 @@ public class TableAndCaption extends FObj {
breakBefore = pList.get(PR_BREAK_BEFORE).getEnum();
captionSide = pList.get(PR_CAPTION_SIDE).getEnum();
id = pList.get(PR_ID).getString();
// intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE);
intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
keepWithNext = pList.get(PR_KEEP_WITH_NEXT).getKeep();
keepWithPrevious = pList.get(PR_KEEP_WITH_PREVIOUS).getKeep();

+ 2
- 2
src/java/org/apache/fop/fo/flow/TableCaption.java View File

@@ -49,7 +49,7 @@ public class TableCaption extends FObj {
private Length height;
private String id;
private LengthRangeProperty inlineProgressionDimension;
// private ToBeImplementedProperty intrusionDisplace;
private int intrusionDisplace;
private KeepProperty keepTogether;
private Length width;
// End of property values
@@ -83,7 +83,7 @@ public class TableCaption extends FObj {
height = pList.get(PR_HEIGHT).getLength();
id = pList.get(PR_ID).getString();
inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
// intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE);
intrusionDisplace = pList.get(PR_INTRUSION_DISPLACE).getEnum();
keepTogether = pList.get(PR_KEEP_TOGETHER).getKeep();
width = pList.get(PR_WIDTH).getLength();
}

+ 6
- 6
src/java/org/apache/fop/fo/flow/TableCell.java View File

@@ -58,14 +58,14 @@ public class TableCell extends FObj {
private Numeric columnNumber;
private int displayAlign;
private int relativeAlign;
// private ToBeImplementedProperty emptyCells;
// private ToBeImplementedProperty endsRow;
private int emptyCells;
private int endsRow;
private Length height;
private String id;
private LengthRangeProperty inlineProgressionDimension;
private Numeric numberColumnsSpanned;
private Numeric numberRowsSpanned;
// private ToBeImplementedProperty startsRow;
private int startsRow;
private Length width;
// End of property values

@@ -132,14 +132,14 @@ public class TableCell extends FObj {
columnNumber = pList.get(PR_COLUMN_NUMBER).getNumeric();
displayAlign = pList.get(PR_DISPLAY_ALIGN).getEnum();
relativeAlign = pList.get(PR_RELATIVE_ALIGN).getEnum();
// emptyCells = pList.get(PR_EMPTY_CELLS);
// endsRow = pList.get(PR_ENDS_ROW);
emptyCells = pList.get(PR_EMPTY_CELLS).getEnum();
endsRow = pList.get(PR_ENDS_ROW).getEnum();
height = pList.get(PR_HEIGHT).getLength();
id = pList.get(PR_ID).getString();
inlineProgressionDimension = pList.get(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange();
numberColumnsSpanned = pList.get(PR_NUMBER_COLUMNS_SPANNED).getNumeric();
numberRowsSpanned = pList.get(PR_NUMBER_ROWS_SPANNED).getNumeric();
// startsRow = pList.get(PR_STARTS_ROW);
startsRow = pList.get(PR_STARTS_ROW).getEnum();
width = pList.get(PR_WIDTH).getLength();
}


Write Preview
Loading…
Cancel
Save