cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Character.java

2003-10-23 Thread gmazza 
gmazza  2003/10/23 15:28:31

  Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java Character.java
  Log:
  Removed unused hyphenation property variables.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.41.2.20 +16 -19xml-fop/src/org/apache/fop/fo/flow/Attic/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Block.java,v
  retrieving revision 1.41.2.19
  retrieving revision 1.41.2.20
  diff -u -r1.41.2.19 -r1.41.2.20
  --- Block.java21 Sep 2003 01:04:19 -  1.41.2.19
  +++ Block.java23 Oct 2003 22:28:30 -  1.41.2.20
  @@ -51,21 +51,21 @@
   package org.apache.fop.fo.flow;
   
   // FOP
  -import org.apache.fop.fo.FObjMixed;
  -import org.apache.fop.fo.FObj;
  -import org.apache.fop.fo.PropertyList;
  -import org.apache.fop.fo.Status;
  -import org.apache.fop.fo.FONode;
  -import org.apache.fop.layout.Area;
  -import org.apache.fop.layout.BlockArea;
  -import org.apache.fop.layout.AccessibilityProps;
  -import org.apache.fop.layout.AuralProps;
  -import org.apache.fop.layout.BorderAndPadding;
  -import org.apache.fop.layout.BackgroundProps;
  -import org.apache.fop.layout.HyphenationProps;
  -import org.apache.fop.layout.MarginProps;
  -import org.apache.fop.layout.RelativePositionProps;
  -import org.apache.fop.apps.FOPException;
  +import org.apache.fop.fo.FObjMixed;
  +import org.apache.fop.fo.FObj;
  +import org.apache.fop.fo.PropertyList;
  +import org.apache.fop.fo.Status;
  +import org.apache.fop.fo.FONode;
  +import org.apache.fop.layout.Area;
  +import org.apache.fop.layout.BlockArea;
  +import org.apache.fop.layout.AccessibilityProps;
  +import org.apache.fop.layout.AuralProps;
  +import org.apache.fop.layout.BorderAndPadding;
  +import org.apache.fop.layout.BackgroundProps;
  +import org.apache.fop.layout.HyphenationProps;
  +import org.apache.fop.layout.MarginProps;
  +import org.apache.fop.layout.RelativePositionProps;
  +import org.apache.fop.apps.FOPException;
   
   /*
 Modified by Mark Lillywhite [EMAIL PROTECTED] The changes
  @@ -176,9 +176,6 @@
   
   // Common Font Properties
   //this.fontState = propMgr.getFontState(area.getFontInfo());
  -
  -// Common Hyphenation Properties
  -HyphenationProps mHyphProps = propMgr.getHyphenationProps();
   
   // Common Margin Properties-Block
   MarginProps mProps = propMgr.getMarginProps();
  
  
  
  1.12.2.6  +15 -19xml-fop/src/org/apache/fop/fo/flow/Attic/Character.java
  
  Index: Character.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Attic/Character.java,v
  retrieving revision 1.12.2.5
  retrieving revision 1.12.2.6
  diff -u -r1.12.2.5 -r1.12.2.6
  --- Character.java21 Sep 2003 01:04:19 -  1.12.2.5
  +++ Character.java23 Oct 2003 22:28:31 -  1.12.2.6
  @@ -51,21 +51,20 @@
   package org.apache.fop.fo.flow;
   
   // fop
  -import org.apache.fop.fo.PropertyList;
  -import org.apache.fop.fo.Status;
  -import org.apache.fop.datatypes.ColorType;
  -import org.apache.fop.layout.BlockArea;
  -import org.apache.fop.layout.Area;
  -import org.apache.fop.layout.AuralProps;
  -import org.apache.fop.layout.BorderAndPadding;
  -import org.apache.fop.layout.BackgroundProps;
  -import org.apache.fop.layout.HyphenationProps;
  -import org.apache.fop.layout.MarginInlineProps;
  -import org.apache.fop.layout.RelativePositionProps;
  -import org.apache.fop.fo.FObj;
  -import org.apache.fop.layout.LineArea;
  -import org.apache.fop.apps.FOPException;
  -
  +import org.apache.fop.fo.PropertyList;
  +import org.apache.fop.fo.Status;
  +import org.apache.fop.datatypes.ColorType;
  +import org.apache.fop.layout.BlockArea;
  +import org.apache.fop.layout.Area;
  +import org.apache.fop.layout.AuralProps;
  +import org.apache.fop.layout.BorderAndPadding;
  +import org.apache.fop.layout.BackgroundProps;
  +import org.apache.fop.layout.HyphenationProps;
  +import org.apache.fop.layout.MarginInlineProps;
  +import org.apache.fop.layout.RelativePositionProps;
  +import org.apache.fop.fo.FObj;
  +import org.apache.fop.layout.LineArea;
  +import org.apache.fop.apps.FOPException;
   
   /**
* this class represents the flow object 'fo:character'. Its use is defined by
  @@ -123,9 +122,6 @@
   
   // Common Font Properties
   //this.fontState = propMgr.getFontState(area.getFontInfo());
  -
  -// Common Hyphenation Properties
  -HyphenationProps mHyphProps = propMgr.getHyphenationProps();
   
   // Common Margin Properties-Inline
   MarginInlineProps mProps = propMgr.getMarginInlineProps();
  
  
  

-
To unsubscribe, e-ma

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java

2003-03-06 Thread pietsch 
pietsch 2003/03/06 15:24:41

  Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java
  Log:
  Fixed problem with page-number-citations referring to blocks
  with a break-before="page".
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.41.2.17 +12 -9 xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.41.2.16
  retrieving revision 1.41.2.17
  diff -u -r1.41.2.16 -r1.41.2.17
  --- Block.java2 Mar 2003 13:47:44 -   1.41.2.16
  +++ Block.java6 Mar 2003 23:24:40 -   1.41.2.17
  @@ -101,6 +101,7 @@
   
   String id;
   int span;
  +boolean breakStatusBeforeChecked = false;
   
   // this may be helpful on other FOs too
   boolean anythingLaidOut = false;
  @@ -119,6 +120,16 @@
   }
   
   public int layout(Area area) throws FOPException {
  +if (!breakStatusBeforeChecked) {
  +breakStatusBeforeChecked = true;
  +// no break if first in area tree, or leading in context
  +// area
  +int breakBeforeStatus = propMgr.checkBreakBefore(area);
  +if (breakBeforeStatus != Status.OK) {
  +return breakBeforeStatus;
  +}
  +}
  +
   BlockArea blockArea;
   
   if (!anythingLaidOut) {
  @@ -190,14 +201,6 @@
   }
   
   this.marker = 0;
  -
  -// no break if first in area tree, or leading in context
  -// area
  -int breakBeforeStatus = propMgr.checkBreakBefore(area);
  -if (breakBeforeStatus != Status.OK) {
  -return breakBeforeStatus;
  -}
  -
   }
   
   if ((spaceBefore != 0) && (this.marker == 0)) {
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java

2002-11-30 Thread klease 
klease  2002/11/30 14:50:14

  Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java
  Log:
  Fix a small bug in the infinite loop prevention logic
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.41.2.13 +2 -1  xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.41.2.12
  retrieving revision 1.41.2.13
  diff -u -r1.41.2.12 -r1.41.2.13
  --- Block.java28 Nov 2002 15:23:23 -  1.41.2.12
  +++ Block.java30 Nov 2002 22:50:14 -  1.41.2.13
  @@ -96,6 +96,7 @@
   }
   
   if (this.marker == START) {
  +noLayoutCount=0; // Reset the "loop counter".
   
   // Common Accessibility Properties
   AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java

2002-11-28 Thread chrisg 
chrisg  2002/11/28 07:23:23

  Modified:.Tag: fop-0_20_2-maintain CHANGES
   src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java
  Log:
  Added infinite loop detection (just halts processing, see bug #8878)
  Submitted by: Rhett Aultman ([EMAIL PROTECTED])
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.10.2.33 +2 -1  xml-fop/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/xml-fop/CHANGES,v
  retrieving revision 1.10.2.32
  retrieving revision 1.10.2.33
  diff -u -r1.10.2.32 -r1.10.2.33
  --- CHANGES   26 Nov 2002 18:15:18 -  1.10.2.32
  +++ CHANGES   28 Nov 2002 15:23:22 -  1.10.2.33
  @@ -1,6 +1,7 @@
   ==
   Done since 0.20.4 release
  -
  +- Added infinite loop detection (just halts processing, see bug #8878)
  +  Submitted by: Rhett Aultman ([EMAIL PROTECTED])
   - Added autoselecting  portrait/landscape on PCL Renderer (see bug #6638)
 Submitted by: [EMAIL PROTECTED] (Vicente Salvador)
   - Improved AWT Font-measuring/rendering (see bug #14657)
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.41.2.12 +13 -2 xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.41.2.11
  retrieving revision 1.41.2.12
  diff -u -r1.41.2.11 -r1.41.2.12
  --- Block.java22 Nov 2002 15:10:46 -  1.41.2.11
  +++ Block.java28 Nov 2002 15:23:23 -  1.41.2.12
  @@ -56,12 +56,15 @@
   
   int areaHeight = 0;
   int contentWidth = 0;
  +int infLoopThreshhold = 50;
   
   String id;
   int span;
   
   // this may be helpful on other FOs too
   boolean anythingLaidOut = false;
  +//Added to see how long it's been since nothing was laid out.
  +int noLayoutCount = 0;
   
   public Block(FObj parent, PropertyList propertyList)
   throws FOPException {
  @@ -77,8 +80,16 @@
   public int layout(Area area) throws FOPException {
   BlockArea blockArea;
   
  -// log.error(" b:LAY[" + marker + "] ");
  +if (!anythingLaidOut) {
  +noLayoutCount++;
  +}
  +if (noLayoutCount > infLoopThreshhold) {
  +throw new FOPException(
  +"No meaningful layout in block after many attempts.  "+
  +"Infinite loop is assumed.  Processing halted.");
  +}
   
  +// log.error(" b:LAY[" + marker + "] ");
   
   if (this.marker == BREAK_AFTER) {
   return Status.OK;
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java

2002-08-16 Thread keiron 

keiron  2002/08/16 05:30:41

  Modified:src/org/apache/fop/fo/flow Block.java
  Log:
  debug not that useful
  
  Revision  ChangesPath
  1.60  +3 -2  xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- Block.java7 Aug 2002 16:54:57 -   1.59
  +++ Block.java16 Aug 2002 12:30:41 -  1.60
  @@ -221,7 +221,7 @@
   }
   
   private void handleWhiteSpace() {
  -getLogger().debug("fo:block: handleWhiteSpace");
  +//getLogger().debug("fo:block: handleWhiteSpace");
   if (firstInlineChild != null) {
   boolean bInWS = false;
   boolean bPrevWasLF = false;
  @@ -340,3 +340,4 @@
   }
   }
   }
  +
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Inline.java Leader.java Marker.java Wrapper.java

2002-08-10 Thread pietsch 

pietsch 2002/08/10 13:09:40

  Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain FONode.java
FOText.java FObj.java FObjMixed.java
PropertyManager.java
   src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java Inline.java Leader.java Marker.java
Wrapper.java
  Log:
  Better fix for setting TextDecoration.
  Changed error handling and detection of markers which
  are not initial children of their parent.
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.21.2.6  +6 -1  xml-fop/src/org/apache/fop/fo/FONode.java
  
  Index: FONode.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
  retrieving revision 1.21.2.5
  retrieving revision 1.21.2.6
  diff -u -r1.21.2.5 -r1.21.2.6
  --- FONode.java   2 Aug 2002 20:28:47 -   1.21.2.5
  +++ FONode.java   10 Aug 2002 20:09:40 -  1.21.2.6
  @@ -202,4 +202,9 @@
   ((FONode)children.get(this.marker)).rollback(snapshot);
   }
   
  +
  +public boolean mayPrecedeMarker() {
  +return false;
  +}  
  +
   }
  
  
  
  1.24.2.4  +29 -38xml-fop/src/org/apache/fop/fo/FOText.java
  
  Index: FOText.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOText.java,v
  retrieving revision 1.24.2.3
  retrieving revision 1.24.2.4
  diff -u -r1.24.2.3 -r1.24.2.4
  --- FOText.java   6 Jul 2002 19:05:29 -   1.24.2.3
  +++ FOText.java   10 Aug 2002 20:09:40 -  1.24.2.4
  @@ -22,53 +22,38 @@
*/
   public class FOText extends FONode {
   
  -protected char[] ca;
  -protected int length;
  +private char[] ca;
   
  -FontState fs;
  -float red;
  -float green;
  -float blue;
  -int wrapOption;
  -int whiteSpaceCollapse;
  -int verticalAlign;
  +private FontState fs;
  +private float red;
  +private float green;
  +private float blue;
  +private int wrapOption;
  +private int whiteSpaceCollapse;
  +private int verticalAlign;
   
   // Textdecoration
  -protected boolean underlined = false;
  -protected boolean overlined = false;
  -protected boolean lineThrough = false;
  -
  -TextState ts;
  +private TextState ts;
   
   public FOText(StringBuffer b, FObj parent) {
   super(parent);
  -this.length = b.length();
  -this.ca = new char[this.length];
  -b.getChars(0,length,ca,0);
  -}
  -
  -public void setUnderlined(boolean ul) {
  -this.underlined = ul;
  +this.ca = new char[b.length()];
  +b.getChars(0,b.length(),ca,0);
   }
   
  -public void setOverlined(boolean ol) {
  -this.overlined = ol;
  +public void setTextState(TextState ts) {
  +this.ts = ts;
   }
   
  -public void setLineThrough(boolean lt) {
  -this.lineThrough = lt;
  -}
  -
  -
   public boolean willCreateArea() {
   this.whiteSpaceCollapse =
   this.parent.properties.get("white-space-collapse").getEnum();
   if (this.whiteSpaceCollapse == WhiteSpaceCollapse.FALSE
  -&& length > 0) {
  +&& ca.length > 0) {
   return true;
   }
   
  -for (int i = 0; i < length; i++) {
  +for (int i = 0; i < ca.length; i++) {
   char ch = ca[i];
   if (!((ch == ' ') || (ch == '\n') || (ch == '\r')
   || (ch == '\t'))) {// whitespace
  @@ -78,10 +63,21 @@
   return false;
   }
   
  +public boolean mayPrecedeMarker() {
  +for (int i = 0; i < ca.length; i++) {
  +char ch = ca[i];
  +if ((ch != ' ') || (ch != '\n') || (ch != '\r')
  +|| (ch != '\t')) {// whitespace
  +return true;
  +}
  +}
  +return false;
  +}
  +  
   public Status layout(Area area) throws FOPException {
   if (!(area instanceof BlockArea)) {
   log.error("text outside block area"
  -   + new String(ca, 0, length));
  +   + new String(ca, 0, ca.length));
   return new Status(Status.OK);
   }
   if (this.marker == START) {
  @@ -116,17 +112,12 @@
   this.parent.properties.get("wrap-option").getEnum();
   this.whiteSpaceCollapse =
   this.parent.properties.get("white-space-collapse").getEnum();
  -this.ts = new TextState();
  -ts.setUnderlined(underlined);
  -ts.setOverlined(overlined);
  -ts.setLineThrough(lineThrough);
  -
   this.marker = 0;
   }

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Table.java

2002-07-27 Thread pietsch 

pietsch 2002/07/27 13:08:29

  Modified:src/org/apache/fop/fo Tag: fop-0_20_2-maintain FONode.java
   src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java Table.java
  Log:
  Removed some unused code
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.21.2.4  +1 -12 xml-fop/src/org/apache/fop/fo/FONode.java
  
  Index: FONode.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
  retrieving revision 1.21.2.3
  retrieving revision 1.21.2.4
  diff -u -r1.21.2.3 -r1.21.2.4
  --- FONode.java   19 Jul 2002 20:41:00 -  1.21.2.3
  +++ FONode.java   27 Jul 2002 20:08:28 -  1.21.2.4
  @@ -61,9 +61,6 @@
   protected int forcedStartOffset = 0;
   protected int forcedWidth = 0;
   
  -protected int widows = 0;
  -protected int orphans = 0;
  -
   protected LinkSet linkSet;
   
   // count of areas generated-by/returned-by
  @@ -117,14 +114,6 @@
   for (int i = 0; i < numChildren; i++) {
   ((FONode)children.elementAt(i)).resetMarker();
   }
  -}
  -
  -public void setWidows(int wid) {
  -widows = wid;
  -}
  -
  -public void setOrphans(int orph) {
  -orphans = orph;
   }
   
   public void removeAreas() {
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.41.2.6  +1 -68 xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.41.2.5
  retrieving revision 1.41.2.6
  diff -u -r1.41.2.5 -r1.41.2.6
  --- Block.java24 Jul 2002 01:06:22 -  1.41.2.5
  +++ Block.java27 Jul 2002 20:08:28 -  1.41.2.6
  @@ -53,8 +53,6 @@
   int spaceAfter;
   int textIndent;
   int keepWithNext;
  -int blockWidows;
  -int blockOrphans;
   
   int areaHeight = 0;
   int contentWidth = 0;
  @@ -111,34 +109,6 @@
   // Common Relative Position Properties
   RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
   
  -// this.properties.get("break-after");
  -// this.properties.get("break-before");
  -// this.properties.get("color");
  -// this.properties.get("text-depth");
  -// this.properties.get("text-altitude");
  -// this.properties.get("hyphenation-keep");
  -// this.properties.get("hyphenation-ladder-count");
  -// this.properties.get("id");
  -// this.properties.get("keep-together");
  -// this.properties.get("keep-with-next");
  -// this.properties.get("keep-with-previous");
  -// this.properties.get("last-line-end-indent");
  -// this.properties.get("linefeed-treatment");
  -// this.properties.get("line-height");
  -// this.properties.get("line-height-shift-adjustment");
  -// this.properties.get("line-stacking-strategy");
  -// this.properties.get("orphans");
  -// this.properties.get("white-space-treatment");
  -// this.properties.get("span");
  -// this.properties.get("text-align");
  -// this.properties.get("text-align-last");
  -// this.properties.get("text-indent");
  -// this.properties.get("visibility");
  -// this.properties.get("white-space-collapse");
  -// this.properties.get("widows");
  -// this.properties.get("wrap-option");
  -// this.properties.get("z-index");
  -
   this.align = this.properties.get("text-align").getEnum();
   this.alignLast = this.properties.get("text-align-last").getEnum();
   this.breakAfter = this.properties.get("break-after").getEnum();
  @@ -157,13 +127,6 @@
   this.keepWithNext =
   this.properties.get("keep-with-next").getEnum();
   
  -this.blockWidows =
  -this.properties.get("widows").getNumber().intValue();
  -this.blockOrphans =
  -this.properties.get("orphans").getNumber().intValue();
  -
  -
  -
   this.id = this.properties.get("id").getString();
   
   if (area instanceof BlockArea) {
  @@ -182,36 +145,6 @@
   return new Status(breakBeforeStatus);
   }
   
  -int numChildren = this.children.size();
  -for (int i = 0; i < numChildren; i++) {
  -FONode fo = (FONode)children.elementAt(i);
  -if (fo instanceof FOText) {
  -if (((FOText)fo).willCreateArea()) {
  -fo.setWidows(blockWi

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java

2002-06-18 Thread keiron 

keiron  2002/06/18 06:41:42

  Modified:src/org/apache/fop/fo/flow Block.java
  Log:
  prevents error for unknown xml
  
  Revision  ChangesPath
  1.57  +2 -2  xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- Block.java5 Jun 2002 14:52:27 -   1.56
  +++ Block.java18 Jun 2002 13:41:42 -  1.57
  @@ -392,7 +392,7 @@
   // Handle whitespace based on values of properties
   // Handle a sequence of inline-producing children in
   // one pass
  -if (((FObj) child).generatesInlineAreas()) {
  +if (child instanceof FObj && ((FObj) child).generatesInlineAreas()) {
   if (firstInlineChild == null) {
   firstInlineChild = child;
   }
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java BlockContainer.java ListBlock.java Table.java TableBody.java TableCell.java TableColumn.java TableRow.java

2002-04-23 Thread arved 

arved   02/04/23 15:24:45

  Modified:src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java BlockContainer.java ListBlock.java
Table.java TableBody.java TableCell.java
TableColumn.java TableRow.java
  Log:
  support for background-image (all renderers)
  author: Michael Gratton
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.41.2.4  +2 -5  xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.41.2.3
  retrieving revision 1.41.2.4
  diff -u -r1.41.2.3 -r1.41.2.4
  --- Block.java9 Jan 2002 11:32:57 -   1.41.2.3
  +++ Block.java23 Apr 2002 22:24:44 -  1.41.2.4
  @@ -1,5 +1,5 @@
   /*
  - * $Id: Block.java,v 1.41.2.3 2002/01/09 11:32:57 keiron Exp $
  + * $Id: Block.java,v 1.41.2.4 2002/04/23 22:24:44 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -53,7 +53,6 @@
   int spaceAfter;
   int textIndent;
   int keepWithNext;
  -ColorType backgroundColor;
   int blockWidows;
   int blockOrphans;
   
  @@ -154,8 +153,6 @@
   this.properties.get("text-indent").getLength().mvalue();
   this.keepWithNext =
   this.properties.get("keep-with-next").getEnum();
  -this.backgroundColor =
  -this.properties.get("background-color").getColorType();
   
   this.blockWidows =
   this.properties.get("widows").getNumber().intValue();
  @@ -245,7 +242,7 @@
   
   blockArea.setParent(area);// BasicLink needs it
   blockArea.setPage(area.getPage());
  -blockArea.setBackgroundColor(backgroundColor);
  +blockArea.setBackground(propMgr.getBackgroundProps());
   blockArea.setBorderAndPadding(propMgr.getBorderAndPadding());
   blockArea.setHyphenation(propMgr.getHyphenationProps());
   blockArea.start();
  
  
  
  1.11.2.1  +2 -6  xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java
  
  Index: BlockContainer.java
  ===
  RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/BlockContainer.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- BlockContainer.java   6 Aug 2001 09:12:59 -   1.11
  +++ BlockContainer.java   23 Apr 2002 22:24:44 -  1.11.2.1
  @@ -1,5 +1,5 @@
   /*
  - * $Id: BlockContainer.java,v 1.11 2001/08/06 09:12:59 keiron Exp $
  + * $Id: BlockContainer.java,v 1.11.2.1 2002/04/23 22:24:44 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -21,7 +21,6 @@
   
   public class BlockContainer extends FObj {
   
  -ColorType backgroundColor;
   int position;
   
   int top;
  @@ -87,9 +86,6 @@
   
   this.marker = 0;
   
  -this.backgroundColor =
  -this.properties.get("background-color").getColorType();
  -
   this.position = this.properties.get("position").getEnum();
   this.top = this.properties.get("top").getLength().mvalue();
   this.bottom = this.properties.get("bottom").getLength().mvalue();
  @@ -119,7 +115,7 @@
 position);
   
   areaContainer.setPage(area.getPage());
  -areaContainer.setBackgroundColor(backgroundColor);
  +areaContainer.setBackground(propMgr.getBackgroundProps());
   areaContainer.setBorderAndPadding(propMgr.getBorderAndPadding());
   areaContainer.start();
   
  
  
  
  1.21.2.1  +2 -5  xml-fop/src/org/apache/fop/fo/flow/ListBlock.java
  
  Index: ListBlock.java
  ===
  RCS file: /x1/home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListBlock.java,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- ListBlock.java20 Aug 2001 11:19:23 -  1.21
  +++ ListBlock.java23 Apr 2002 22:24:44 -  1.21.2.1
  @@ -1,5 +1,5 @@
   /*
  - * $Id: ListBlock.java,v 1.21 2001/08/20 11:19:23 keiron Exp $
  + * $Id: ListBlock.java,v 1.21.2.1 2002/04/23 22:24:44 arved Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -43,7 +43,6 @@
   int spaceBefore;
   int spaceAfter;
   int spaceBetwe

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java

2002-02-25 Thread klease 

klease  02/02/25 13:28:01

  Modified:src/org/apache/fop/fo FONode.java InlineCharIterator.java
   src/org/apache/fop/fo/flow Block.java
  Log:
  Use CharUtilities instead of CharClass
  
  Revision  ChangesPath
  1.25  +3 -2  xml-fop/src/org/apache/fop/fo/FONode.java
  
  Index: FONode.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- FONode.java   21 Nov 2001 22:13:36 -  1.24
  +++ FONode.java   25 Feb 2002 21:28:01 -  1.25
  @@ -1,5 +1,5 @@
   /*
  - * $Id: FONode.java,v 1.24 2001/11/21 22:13:36 klease Exp $
  + * $Id: FONode.java,v 1.25 2002/02/25 21:28:01 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -11,6 +11,7 @@
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.apps.StreamRenderer;
   import org.apache.fop.layout.Area;
  +import org.apache.fop.util.CharUtilities;
   
   import org.apache.log.Logger;
   
  @@ -121,7 +122,7 @@
   }
   
   public CharIterator charIterator() {
  - return new OneCharIterator(CharClass.CODE_EOT);
  + return new OneCharIterator(CharUtilities.CODE_EOT);
   }
   
   }
  
  
  
  1.2   +3 -2  xml-fop/src/org/apache/fop/fo/InlineCharIterator.java
  
  Index: InlineCharIterator.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/InlineCharIterator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InlineCharIterator.java   21 Nov 2001 22:13:36 -  1.1
  +++ InlineCharIterator.java   25 Feb 2002 21:28:01 -  1.2
  @@ -1,6 +1,7 @@
   package org.apache.fop.fo;
   
   import org.apache.fop.layout.BorderAndPadding;
  +import org.apache.fop.util.CharUtilities;
   import java.util.Iterator;
   import java.util.ListIterator;
   import java.util.NoSuchElementException;
  @@ -36,7 +37,7 @@
   public char nextChar() throws NoSuchElementException {
if (bStartBoundary) {
bStartBoundary=false;
  - return CharClass.CODE_EOT;
  + return CharUtilities.CODE_EOT;
}
try {
return super.nextChar();
  @@ -46,7 +47,7 @@
// Check end boundary char
if (bEndBoundary) {
bEndBoundary=false;
  - return CharClass.CODE_EOT;
  + return CharUtilities.CODE_EOT;
}
else throw e;
}
  
  
  
  1.49  +10 -8 xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- Block.java21 Nov 2001 22:13:36 -  1.48
  +++ Block.java25 Feb 2002 21:28:01 -  1.49
  @@ -1,5 +1,5 @@
   /*
  - * $Id: Block.java,v 1.48 2001/11/21 22:13:36 klease Exp $
  + * $Id: Block.java,v 1.49 2002/02/25 21:28:01 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -15,6 +15,7 @@
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.layoutmgr.LayoutManager;
   import org.apache.fop.layoutmgr.BlockLayoutManager;
  +import org.apache.fop.util.CharUtilities;
   
   import org.xml.sax.Attributes;
   
  @@ -406,8 +407,8 @@
LFchecker lfCheck = new LFchecker(charIter);
   
while (charIter.hasNext()) {
  - switch (CharClass.classOf(charIter.nextChar())) {
  - case CharClass.XMLWHITESPACE:
  + switch (CharUtilities.classOf(charIter.nextChar())) {
  + case CharUtilities.XMLWHITESPACE:
/* Some kind of whitespace character, except linefeed. */
boolean bIgnore=false;

  @@ -440,7 +441,7 @@
}
break;
   
  - case CharClass.LINEFEED:
  + case CharUtilities.LINEFEED:
/* A linefeed */
lfCheck.reset();
bPrevWasLF=true; // for following whitespace
  @@ -468,14 +469,14 @@
}
break;
   
  - case CharClass.EOT:
  + case CharUtilities.EOT:
//   A "boundary" objects such as non-character inline
// or nested block object was encountered.
// If any whitespace run in progress, finish it.
// FALL THROUGH
   
  - case CharC

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Inline.java

2001-12-13 Thread keiron 

keiron  01/12/13 01:25:22

  Modified:docs/examples/fo Tag: fop-0_20_2-maintain textdeko.fo
   src/org/apache/fop/fo Tag: fop-0_20_2-maintain
FObjMixed.java PropertyManager.java
   src/org/apache/fop/fo/flow Tag: fop-0_20_2-maintain
Block.java Inline.java
  Log:
  adds text-decoration support for blocks
  Submitted by: Christian Geisert <[EMAIL PROTECTED]>
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.3.4.2   +8 -2  xml-fop/docs/examples/fo/textdeko.fo
  
  Index: textdeko.fo
  ===
  RCS file: /home/cvs/xml-fop/docs/examples/fo/textdeko.fo,v
  retrieving revision 1.3.4.1
  retrieving revision 1.3.4.2
  diff -u -r1.3.4.1 -r1.3.4.2
  --- textdeko.fo   2001/12/06 21:28:18 1.3.4.1
  +++ textdeko.fo   2001/12/13 09:25:21 1.3.4.2
  @@ -77,7 +77,7 @@
   line-height="15pt"
   space-after.optimum="10pt"
   text-align="start">
  -This is simple test of the text-decorationunderline.
  +This is simple test of the text-decoration 'underline'.
 
 
   
 
  -  The following text decorations are defined in the CR:
  +  The following text decorations are defined in the REC:
 
   
 
  @@ -244,6 +244,12 @@
   space-after.optimum="10pt"
   text-align="start">
   What about underlining of whitespace only ?
  +  
  +
  +
  +  
  +  A whole block should work now.
  +  And again some more Text to get at least two lines.
 
   
   
  
  
  
  No   revision
  
  
  No   revision
  
  
  1.12.2.1  +13 -2 xml-fop/src/org/apache/fop/fo/FObjMixed.java
  
  Index: FObjMixed.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FObjMixed.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- FObjMixed.java2001/08/01 22:12:52 1.12
  +++ FObjMixed.java2001/12/13 09:25:21 1.12.2.1
  @@ -1,5 +1,5 @@
   /*
  - * $Id: FObjMixed.java,v 1.12 2001/08/01 22:12:52 gears Exp $
  + * $Id: FObjMixed.java,v 1.12.2.1 2001/12/13 09:25:21 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -8,6 +8,7 @@
   package org.apache.fop.fo;
   
   import org.apache.fop.layout.Area;
  +import org.apache.fop.layout.TextState;
   import org.apache.fop.apps.FOPException;
   
   /**
  @@ -16,6 +17,9 @@
*/
   public class FObjMixed extends FObj {
   
  +// Textdecoration
  +protected TextState ts;
  +
   public static class Maker extends FObj.Maker {
   public FObj make(FObj parent,
PropertyList propertyList) throws FOPException {
  @@ -33,7 +37,14 @@
   }
   
   protected void addCharacters(char data[], int start, int length) {
  -addChild(new FOText(data, start, length, this));
  +// addChild(new FOText(data, start, length, this));
  +FOText ft = new FOText(data, start, length, this);
  +ft.setLogger(log);
  +ft.setUnderlined(ts.getUnderlined());
  +ft.setOverlined(ts.getOverlined());
  +ft.setLineThrough(ts.getLineThrough());
  +addChild(ft);
  +
   }
   
   public Status layout(Area area) throws FOPException {
  
  
  
  1.7.2.1   +28 -1 xml-fop/src/org/apache/fop/fo/PropertyManager.java
  
  Index: PropertyManager.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/PropertyManager.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- PropertyManager.java  2001/08/06 09:12:58 1.7
  +++ PropertyManager.java  2001/12/13 09:25:22 1.7.2.1
  @@ -1,5 +1,5 @@
   /*
  - * $Id: PropertyManager.java,v 1.7 2001/08/06 09:12:58 keiron Exp $
  + * $Id: PropertyManager.java,v 1.7.2.1 2001/12/13 09:25:22 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -26,6 +26,8 @@
   import java.text.FieldPosition;
   import org.apache.fop.layout.Area;
   import org.apache.fop.layout.ColumnArea;
  +import org.apache.fop.layout.TextState;
  +import org.apache.fop.fo.properties.TextDecoration;
   
   public class PropertyManager {
   
  @@ -247,4 +249,29 @@
   AbsolutePositionProps props = new AbsolutePositionProps();
   return props;
   }
  +
  +public TextState getTextDecoration() throws FOPException {
  +TextState ts = new TextSt

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java Flow.java

2001-11-09 Thread klease 

klease  01/11/09 14:08:49

  Modified:src/org/apache/fop/fo/flow Block.java Flow.java
  Log:
  Start hooking in the layoutmanager
  
  Revision  ChangesPath
  1.44  +8 -1  xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- Block.java2001/11/09 11:32:37 1.43
  +++ Block.java2001/11/09 22:08:49 1.44
  @@ -1,5 +1,5 @@
   /*
  - * $Id: Block.java,v 1.43 2001/11/09 11:32:37 keiron Exp $
  + * $Id: Block.java,v 1.44 2001/11/09 22:08:49 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -13,6 +13,8 @@
   import org.apache.fop.layout.*;
   import org.apache.fop.datatypes.*;
   import org.apache.fop.apps.FOPException;
  +import org.apache.fop.layoutmgr.LayoutManager;
  +//import org.apache.fop.layoutmgr.BlockLayoutManager;
   
   import org.xml.sax.Attributes;
   
  @@ -348,6 +350,11 @@
   
   public int getSpan() {
   return this.span;
  +}
  +
  +public LayoutManager getLayoutManager() {
  + //return new BlockLayoutManager(this);
  + return null;
   }
   
   }
  
  
  
  1.27  +10 -2 xml-fop/src/org/apache/fop/fo/flow/Flow.java
  
  Index: Flow.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Flow.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Flow.java 2001/11/09 11:32:37 1.26
  +++ Flow.java 2001/11/09 22:08:49 1.27
  @@ -1,5 +1,5 @@
   /*
  - * $Id: Flow.java,v 1.26 2001/11/09 11:32:37 keiron Exp $
  + * $Id: Flow.java,v 1.27 2001/11/09 22:08:49 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
  @@ -14,6 +14,8 @@
   import org.apache.fop.layout.Area;
   import org.apache.fop.layout.BodyAreaContainer;
   import org.apache.fop.apps.FOPException;
  +import org.apache.fop.layoutmgr.LayoutManager;
  +import org.apache.fop.layoutmgr.FlowLayoutManager;
   
   // Java
   import java.util.Hashtable;
  @@ -70,6 +72,7 @@
   // 001228, Number 406), confusion in spec section 6.4.5 about
   // multiplicity of fo:flow in XSL 1.0 is cleared up - one (1)
   // fo:flow per fo:page-sequence only.
  +
   /*if (pageSequence.isFlowSet()) {
   if (this.name.equals("fo:flow")) {
   throw new FOPException("Only a single fo:flow permitted"
  @@ -81,7 +84,8 @@
   }
   */
   setFlowName(getProperty("flow-name").getString());
  -pageSequence.addFlow(this);
  + // Now done in addChild of page-sequence
  +//pageSequence.addFlow(this);
   }
   
   protected void setFlowName(String name) throws FOPException {
  @@ -220,6 +224,10 @@
   
   public boolean generatesReferenceAreas() {
   return true;
  +}
  +
  +public LayoutManager getLayoutManager() {
  + return new FlowLayoutManager(this);
   }
   
   }
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java

2001-07-16 Thread arved 

arved   01/07/16 03:37:58

  Modified:src/org/apache/fop/fo/flow Block.java
  Log:
  AHS: initial marker support
  
  Revision  ChangesPath
  1.35  +13 -1 xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Block.java2001/07/13 02:30:33 1.34
  +++ Block.java2001/07/16 10:37:57 1.35
  @@ -1,4 +1,4 @@
  -/*-- $Id: Block.java,v 1.34 2001/07/13 02:30:33 arved Exp $-- */
  +/*-- $Id: Block.java,v 1.35 2001/07/16 10:37:57 arved Exp $-- */
   /*
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
  @@ -159,6 +159,17 @@
this.blockArea = new 
BlockArea(propMgr.getFontState(area.getFontInfo()), area.getAllocationWidth(),
area.spaceLeft(), 
startIndent, endIndent, textIndent,
align, alignLast, 
lineHeight);
  + this.blockArea.generatedBy = this;
  + this.areasGenerated++;
  + if (this.areasGenerated == 1)
  + this.blockArea.isFirst = true;
  + // for normal areas this should be the only pair
  + this.blockArea.addLineagePair(this, 
this.areasGenerated);
  + 
  + // markers
  + if (this.hasMarkers())
  + this.blockArea.addMarkers(this.getMarkers());
  + 
this.blockArea.setParent(area); // BasicLink needs it
blockArea.setPage(area.getPage());
blockArea.setBackgroundColor(backgroundColor);
  @@ -248,6 +259,7 @@
}
   
//MessageHandler.error(" b:OK" + marker + " ");
  + this.blockArea.isLast = true;
return new Status(Status.OK);
}
   
  
  
  

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

cvs commit: xml-fop/src/org/apache/fop/fo/flow Block.java

2001-07-12 Thread arved 

arved   01/07/12 19:30:37

  Modified:src/org/apache/fop/fo/flow Block.java
  Log:
  AHS: addressing break boundary conditions
  
  Revision  ChangesPath
  1.34  +21 -73xml-fop/src/org/apache/fop/fo/flow/Block.java
  
  Index: Block.java
  ===
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- Block.java2001/03/05 04:39:56 1.33
  +++ Block.java2001/07/13 02:30:33 1.34
  @@ -1,52 +1,8 @@
  -/*-- $Id: Block.java,v 1.33 2001/03/05 04:39:56 keiron Exp $ --
  -
  - 
  - The Apache Software License, Version 1.1
  - 
  -
  - Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
  -
  - Redistribution and use in source and binary forms, with or without modifica-
  - tion, are permitted provided that the following conditions are met:
  -
  - 1. Redistributions of  source code must  retain the above copyright  notice,
  - this list of conditions and the following disclaimer.
  -
  - 2. Redistributions in binary form must reproduce the above copyright notice,
  - this list of conditions and the following disclaimer in the 
documentation
  - and/or other materials provided with the distribution.
  -
  - 3. The end-user documentation included with the redistribution, if any, must
  - include  the following  acknowledgment:  "This product includes  
software
  - developed  by the  Apache Software Foundation  
(http://www.apache.org/)."
  - Alternately, this  acknowledgment may  appear in the software itself,  
if
  - and wherever such third-party acknowledgments normally appear.
  -
  - 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
  - endorse  or promote  products derived  from this  software without  
prior
  - written permission. For written permission, please contact
  - [EMAIL PROTECTED]
  -
  - 5. Products  derived from this software may not  be called "Apache", nor may
  - "Apache" appear  in their name,  without prior written permission  of 
the
  - Apache Software Foundation.
  -
  - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  - APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  - INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  - DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  - ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  - (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  -
  - This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation and was  originally created by
  - James Tauber <[EMAIL PROTECTED]>. For more  information on the Apache
  - Software Foundation, please see .
  -
  +/*-- $Id: Block.java,v 1.34 2001/07/13 02:30:33 arved Exp $-- */
  +/*
  + * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  + * For details on use and redistribution please refer to the
  + * LICENSE file included with these sources.
*/
   
   package org.apache.fop.fo.flow;
  @@ -147,10 +103,14 @@

area.getIDReferences().createID(id);
   
this.marker = 0;
  - int breakStatus;
  -  if ((breakStatus = propMgr.checkBreakBefore()) != Status.OK) {
  -return new Status(breakStatus);
  -  }
  + 
  + // no break if first in area tree, or 
leading in context
  + // area
  + int breakBeforeStatus = 
propMgr.checkBreakBefore(area);
  + if (breakBeforeStatus != Status.OK) {
  + return new 
Status(breakBeforeStatus);
  + }
  +   
int numChildren = this.children.size();
for (int i = 0; i < nu