bckfnn      2004/10/29 03:20:56

  Modified:    src/java/org/apache/fop/fo/flow BasicLink.java Block.java
                        BlockContainer.java Character.java
                        ExternalGraphic.java Float.java Inline.java
                        InlineContainer.java InstreamForeignObject.java
                        Leader.java ListBlock.java ListItem.java
                        PageNumber.java PageNumberCitation.java Table.java
                        TableAndCaption.java TableCaption.java
                        TableCell.java
  Log:
  Bind some more of the implemented properties.
  
  Revision  Changes    Path
  1.34      +2 -2      xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java
  
  Index: BasicLink.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/BasicLink.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- BasicLink.java    28 Oct 2004 10:00:21 -0000      1.33
  +++ BasicLink.java    29 Oct 2004 10:20:55 -0000      1.34
  @@ -39,7 +39,7 @@
   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 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();
  
  
  
  1.48      +14 -14    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.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Block.java        28 Oct 2004 10:00:21 -0000      1.47
  +++ Block.java        29 Oct 2004 10:20:55 -0000      1.48
  @@ -82,20 +82,20 @@
       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 @@
           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();
  
  
  
  1.31      +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.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- BlockContainer.java       28 Oct 2004 10:00:21 -0000      1.30
  +++ BlockContainer.java       29 Oct 2004 10:20:55 -0000      1.31
  @@ -51,7 +51,7 @@
       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 @@
           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();
  
  
  
  1.28      +10 -10    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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Character.java    28 Oct 2004 10:00:21 -0000      1.27
  +++ Character.java    29 Oct 2004 10:20:55 -0000      1.28
  @@ -63,15 +63,15 @@
       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 @@
           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();
  
  
  
  1.47      +8 -8      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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- ExternalGraphic.java      28 Oct 2004 10:00:21 -0000      1.46
  +++ ExternalGraphic.java      29 Oct 2004 10:20:55 -0000      1.47
  @@ -50,8 +50,8 @@
       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 @@
       // 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 @@
       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 @@
           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 @@
           // 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 @@
           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();
  
  
  
  1.20      +4 -4      xml-fop/src/java/org/apache/fop/fo/flow/Float.java
  
  Index: Float.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Float.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Float.java        28 Oct 2004 10:00:21 -0000      1.19
  +++ Float.java        29 Oct 2004 10:20:55 -0000      1.20
  @@ -32,8 +32,8 @@
    */
   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 @@
        * @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();
       }
   
       /**
  
  
  
  1.33      +6 -6      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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Inline.java       28 Oct 2004 10:00:21 -0000      1.32
  +++ Inline.java       29 Oct 2004 10:20:55 -0000      1.33
  @@ -52,12 +52,12 @@
       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 @@
           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();
  
  
  
  1.24      +6 -6      xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java
  
  Index: InlineContainer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/InlineContainer.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- InlineContainer.java      28 Oct 2004 10:00:21 -0000      1.23
  +++ InlineContainer.java      29 Oct 2004 10:20:55 -0000      1.24
  @@ -45,13 +45,13 @@
       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 @@
           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();
  
  
  
  1.33      +8 -8      
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.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- InstreamForeignObject.java        28 Oct 2004 10:00:21 -0000      1.32
  +++ InstreamForeignObject.java        29 Oct 2004 10:20:55 -0000      1.33
  @@ -50,8 +50,8 @@
       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 @@
       // 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 @@
       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 @@
           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 @@
           // 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 @@
           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();
  
  
  
  1.46      +10 -10    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.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- Leader.java       28 Oct 2004 10:00:21 -0000      1.45
  +++ Leader.java       29 Oct 2004 10:20:55 -0000      1.46
  @@ -52,13 +52,13 @@
       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 @@
           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();
  
  
  
  1.35      +2 -2      xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java
  
  Index: ListBlock.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListBlock.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- ListBlock.java    28 Oct 2004 10:00:21 -0000      1.34
  +++ ListBlock.java    29 Oct 2004 10:20:55 -0000      1.35
  @@ -50,7 +50,7 @@
       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 @@
           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();
  
  
  
  1.34      +2 -2      xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java
  
  Index: ListItem.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/ListItem.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- ListItem.java     28 Oct 2004 10:00:21 -0000      1.33
  +++ ListItem.java     29 Oct 2004 10:20:55 -0000      1.34
  @@ -49,7 +49,7 @@
       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 @@
           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();
  
  
  
  1.45      +10 -10    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.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- PageNumber.java   28 Oct 2004 10:00:21 -0000      1.44
  +++ PageNumber.java   29 Oct 2004 10:20:55 -0000      1.45
  @@ -50,19 +50,19 @@
       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 @@
           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);
  
  
  
  1.42      +10 -10    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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- PageNumberCitation.java   28 Oct 2004 10:00:21 -0000      1.41
  +++ PageNumberCitation.java   29 Oct 2004 10:20:55 -0000      1.42
  @@ -53,10 +53,10 @@
       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 @@
       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 @@
           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 @@
           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);
  
  
  
  1.41      +2 -2      xml-fop/src/java/org/apache/fop/fo/flow/Table.java
  
  Index: Table.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Table.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Table.java        28 Oct 2004 10:00:21 -0000      1.40
  +++ Table.java        29 Oct 2004 10:20:55 -0000      1.41
  @@ -61,7 +61,7 @@
       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 @@
           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();
  
  
  
  1.23      +2 -2      xml-fop/src/java/org/apache/fop/fo/flow/TableAndCaption.java
  
  Index: TableAndCaption.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableAndCaption.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- TableAndCaption.java      28 Oct 2004 10:00:21 -0000      1.22
  +++ TableAndCaption.java      29 Oct 2004 10:20:55 -0000      1.23
  @@ -48,7 +48,7 @@
       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 @@
           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();
  
  
  
  1.23      +2 -2      xml-fop/src/java/org/apache/fop/fo/flow/TableCaption.java
  
  Index: TableCaption.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCaption.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- TableCaption.java 28 Oct 2004 10:00:21 -0000      1.22
  +++ TableCaption.java 29 Oct 2004 10:20:55 -0000      1.23
  @@ -49,7 +49,7 @@
       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 @@
           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();
       }
  
  
  
  1.40      +6 -6      xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
  
  Index: TableCell.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- TableCell.java    28 Oct 2004 10:00:21 -0000      1.39
  +++ TableCell.java    29 Oct 2004 10:20:55 -0000      1.40
  @@ -58,14 +58,14 @@
       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 @@
           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();
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to