You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by jo...@locus.apache.org on 2000/06/21 03:23:11 UTC

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

jordan      00/06/20 18:23:10

  Modified:    src/org/apache/fop/fo/flow Block.java SimpleLink.java
  Log:
  Added internal-link functionality
  
  Revision  Changes    Path
  1.12      +310 -291  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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Block.java	2000/06/18 21:05:07	1.11
  +++ Block.java	2000/06/21 01:23:10	1.12
  @@ -1,292 +1,311 @@
  -/*-- $Id: Block.java,v 1.11 2000/06/18 21:05:07 fotis 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
  -    apache@apache.org.
  - 
  - 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 <jt...@jtauber.com>. For more  information on the Apache 
  - Software Foundation, please see <http://www.apache.org/>.
  - 
  - */
  -
  -package org.apache.fop.fo.flow;
  -
  -// FOP
  -import org.apache.fop.fo.*;
  -import org.apache.fop.fo.properties.*;
  -import org.apache.fop.layout.*;
  -import org.apache.fop.datatypes.*;
  -import org.apache.fop.apps.FOPException;
  -
  -public class Block extends FObjMixed {
  -	
  -    public static class Maker extends FObj.Maker {
  -	public FObj make(FObj parent, PropertyList propertyList)
  -	    throws FOPException {
  -	    return new Block(parent, propertyList);
  -	}
  -    }
  -
  -    public static FObj.Maker maker() {
  -	return new Block.Maker();
  -    }
  -
  -    FontState fs;
  -    int align;
  -    int alignLast;
  -    int breakBefore;
  -    int breakAfter;
  -    int lineHeight;
  -    int startIndent;
  -    int endIndent;
  -    int spaceBefore;
  -    int spaceAfter;
  -    int textIndent;
  -    int keepWithNext;
  -    ColorType backgroundColor;
  -    int paddingTop;
  -    int paddingBottom;
  -    int paddingLeft;
  -    int paddingRight;
  -    
  -    ColorType borderColor;
  -    int borderWidth;
  -    int borderStyle;
  -    
  -    BlockArea blockArea;
  -
  -    // this may be helpful on other FOs too
  -    boolean anythingLaidOut = false;
  -
  -    public Block(FObj parent, PropertyList propertyList) {
  -	super(parent, propertyList);
  -	this.name = "fo:block";
  -    }
  -
  -    public Status layout(Area area) throws FOPException {
  -	// System.err.print(" b:LAY[" + marker + "] ");
  -
  -	if (this.marker == BREAK_AFTER) {
  -	    return new Status(Status.OK);
  -	}
  -
  -	if (this.marker == START) {
  -	    String fontFamily =
  -		this.properties.get("font-family").getString(); 
  -	    String fontStyle =
  -		this.properties.get("font-style").getString(); 
  -	    String fontWeight =
  -		this.properties.get("font-weight").getString(); 
  -	    int fontSize =
  -		this.properties.get("font-size").getLength().mvalue(); 
  -	    
  -	    this.fs = new FontState(area.getFontInfo(), fontFamily, 
  -				    fontStyle, fontWeight, fontSize);  
  -	    this.align = this.properties.get("text-align").getEnum(); 
  -	    this.alignLast =
  -		this.properties.get("text-align-last").getEnum(); 
  -	    this.breakBefore =
  -		this.properties.get("break-before").getEnum(); 
  -	    this.breakAfter =
  -		this.properties.get("break-after").getEnum(); 
  -	    this.lineHeight =
  -		this.properties.get("line-height").getLength().mvalue(); 
  -	    this.startIndent =
  -		this.properties.get("start-indent").getLength().mvalue(); 
  -	    this.endIndent =
  -		this.properties.get("end-indent").getLength().mvalue(); 
  -	    this.spaceBefore =
  -		this.properties.get("space-before.optimum").getLength().mvalue();  
  -	    this.spaceAfter =
  -		this.properties.get("space-after.optimum").getLength().mvalue(); 
  -	    this.textIndent =
  -		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.paddingTop =
  -		this.properties.get("padding").getLength().mvalue();
  -            this.paddingLeft = this.paddingTop;
  -            this.paddingRight = this.paddingTop;
  -            this.paddingBottom = this.paddingTop;
  -            if (this.paddingTop == 0) {
  -	      this.paddingTop =
  -		  this.properties.get("padding-top").getLength().mvalue();
  -	      this.paddingLeft =
  -		  this.properties.get("padding-left").getLength().mvalue();
  -	      this.paddingBottom =
  -		  this.properties.get("padding-bottom").getLength().mvalue();
  -	      this.paddingRight =
  -		  this.properties.get("padding-right").getLength().mvalue();
  -            }
  -	    this.borderColor =
  -		this.properties.get("border-color").getColorType();
  -	    this.borderWidth =
  -		this.properties.get("border-width").getLength().mvalue();
  -	    this.borderStyle =
  -		this.properties.get("border-style").getEnum();
  -            
  -	    if (area instanceof BlockArea) {
  -		area.end();
  -	    }
  -	    if (this.isInLabel) {
  -		startIndent += bodyIndent;
  -		endIndent += (area.getAllocationWidth()
  -			      - distanceBetweenStarts - startIndent)
  -		    + labelSeparation;
  -	    }
  -
  -	    if (this.isInListBody) {
  -		startIndent += bodyIndent + distanceBetweenStarts;
  -	    }
  -
  -	    this.marker = 0;
  -
  -	    if (breakBefore == BreakBefore.PAGE) {
  -		return new Status(Status.FORCE_PAGE_BREAK);
  -	    }
  -
  -	    if (breakBefore == BreakBefore.ODD_PAGE) {
  -		return new Status(Status.FORCE_PAGE_BREAK_ODD);
  -	    }
  -	
  -	    if (breakBefore == BreakBefore.EVEN_PAGE) {
  -		return new Status(Status.FORCE_PAGE_BREAK_EVEN);
  -	    }
  -	}
  -
  -	if ((spaceBefore != 0) && (this.marker ==0)) {
  -	    area.addDisplaySpace(spaceBefore);
  -	}
  -
  -	if (anythingLaidOut) {
  -	    this.textIndent = 0;
  -	}
  -
  -	this.blockArea =
  -	    new BlockArea(fs, area.getAllocationWidth(), 
  -			  area.spaceLeft(), 
  -                          startIndent, 
  -                          endIndent,
  -			  textIndent, align, alignLast, lineHeight);
  -	blockArea.setPage(area.getPage());
  -	blockArea.setBackgroundColor(backgroundColor);
  -	blockArea.setPadding(paddingTop, paddingLeft, paddingBottom,
  -			     paddingRight);
  -        blockArea.setBorderStyle(borderStyle, borderStyle, borderStyle, borderStyle); 
  -        blockArea.setBorderWidth(borderWidth, borderWidth, borderWidth, borderWidth); 
  -        blockArea.setBorderColor(borderColor, borderColor, borderColor, borderColor); 
  -	blockArea.start();
  +/*-- $Id: Block.java,v 1.12 2000/06/21 01:23:10 jordan 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
  +    apache@apache.org.
  + 
  + 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 <jt...@jtauber.com>. For more  information on the Apache 
  + Software Foundation, please see <http://www.apache.org/>.
  + 
  + */
  +
  +package org.apache.fop.fo.flow;
  +
  +// FOP
  +import org.apache.fop.fo.*;
  +import org.apache.fop.fo.properties.*;
  +import org.apache.fop.layout.*;
  +import org.apache.fop.datatypes.*;
  +import org.apache.fop.apps.FOPException;
  +
  +public class Block extends FObjMixed {
  +	
  +    public static class Maker extends FObj.Maker {
  +	public FObj make(FObj parent, PropertyList propertyList)
  +	    throws FOPException {
  +	    return new Block(parent, propertyList);
  +	}
  +    }
  +
  +    public static FObj.Maker maker() {
  +	return new Block.Maker();
  +    }
  +
  +    final static int ID_PADDING = 5000; // space to add before id y position
  +    FontState fs;
  +    int align;
  +    int alignLast;
  +    int breakBefore;
  +    int breakAfter;
  +    int lineHeight;
  +    int startIndent;
  +    int endIndent;
  +    int spaceBefore;
  +    int spaceAfter;
  +    int textIndent;
  +    int keepWithNext;
  +    ColorType backgroundColor;
  +    int paddingTop;
  +    int paddingBottom;
  +    int paddingLeft;
  +    int paddingRight;
  +    
  +    ColorType borderColor;
  +    int borderWidth;
  +    int borderStyle;
  +    
  +    BlockArea blockArea;
  +
  +    // this may be helpful on other FOs too
  +    boolean anythingLaidOut = false;
  +
  +    public Block(FObj parent, PropertyList propertyList) {
  +	super(parent, propertyList);
  +	this.name = "fo:block";
  +    }
  +
  +    public Status layout(Area area) throws FOPException {
  +	// System.err.print(" b:LAY[" + marker + "] ");
  +
  +	if (this.marker == BREAK_AFTER) {
  +	    return new Status(Status.OK);
  +	}
  +
  +	if (this.marker == START) {
  +	    String fontFamily =
  +		this.properties.get("font-family").getString(); 
  +	    String fontStyle =
  +		this.properties.get("font-style").getString(); 
  +	    String fontWeight =
  +		this.properties.get("font-weight").getString(); 
  +	    int fontSize =
  +		this.properties.get("font-size").getLength().mvalue(); 
  +	    
  +	    this.fs = new FontState(area.getFontInfo(), fontFamily, 
  +				    fontStyle, fontWeight, fontSize);  
  +	    this.align = this.properties.get("text-align").getEnum(); 
  +	    this.alignLast =
  +		this.properties.get("text-align-last").getEnum(); 
  +	    this.breakBefore =
  +		this.properties.get("break-before").getEnum(); 
  +	    this.breakAfter =
  +		this.properties.get("break-after").getEnum(); 
  +	    this.lineHeight =
  +		this.properties.get("line-height").getLength().mvalue(); 
  +	    this.startIndent =
  +		this.properties.get("start-indent").getLength().mvalue(); 
  +	    this.endIndent =
  +		this.properties.get("end-indent").getLength().mvalue(); 
  +	    this.spaceBefore =
  +		this.properties.get("space-before.optimum").getLength().mvalue();  
  +	    this.spaceAfter =
  +		this.properties.get("space-after.optimum").getLength().mvalue(); 
  +	    this.textIndent =
  +		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.paddingTop =
  +		this.properties.get("padding").getLength().mvalue();
  +            this.paddingLeft = this.paddingTop;
  +            this.paddingRight = this.paddingTop;
  +            this.paddingBottom = this.paddingTop;
  +            if (this.paddingTop == 0) {
  +	      this.paddingTop =
  +		  this.properties.get("padding-top").getLength().mvalue();
  +	      this.paddingLeft =
  +		  this.properties.get("padding-left").getLength().mvalue();
  +	      this.paddingBottom =
  +		  this.properties.get("padding-bottom").getLength().mvalue();
  +	      this.paddingRight =
  +		  this.properties.get("padding-right").getLength().mvalue();
  +            }
  +	    this.borderColor =
  +		this.properties.get("border-color").getColorType();
  +	    this.borderWidth =
  +		this.properties.get("border-width").getLength().mvalue();
  +	    this.borderStyle =
  +		this.properties.get("border-style").getEnum();
  +            
  +	    if (area instanceof BlockArea) {
  +		area.end();
  +	    }
  +	    if (this.isInLabel) {
  +		startIndent += bodyIndent;
  +		endIndent += (area.getAllocationWidth()
  +			      - distanceBetweenStarts - startIndent)
  +		    + labelSeparation;
  +	    }
  +
  +	    if (this.isInListBody) {
  +		startIndent += bodyIndent + distanceBetweenStarts;
  +	    }
  +
  +	    this.marker = 0;
  +
  +	    if (breakBefore == BreakBefore.PAGE) {
  +		return new Status(Status.FORCE_PAGE_BREAK);
  +	    }
  +
  +	    if (breakBefore == BreakBefore.ODD_PAGE) {
  +		return new Status(Status.FORCE_PAGE_BREAK_ODD);
  +	    }
  +	
  +	    if (breakBefore == BreakBefore.EVEN_PAGE) {
  +		return new Status(Status.FORCE_PAGE_BREAK_EVEN);
  +	    }
  +	}
  +
  +	if ((spaceBefore != 0) && (this.marker ==0)) {
  +	    area.addDisplaySpace(spaceBefore);
  +	}
  +
  +	if (anythingLaidOut) {
  +	    this.textIndent = 0;
  +	}        
  +        
  +        if ( marker==0 ) {
  +            // set up IDReferences            
  +            IDReferences idReferences = area.getIDReferences();            
  +            String id = this.properties.get("id").getString(); 
  +            if ( id!=null && !id.equals("") ) {
  +                if ( idReferences.doesIDExist(id) ) {
  +                    throw new FOPException("The id \""+id+"\" already exists in this document");
  +                }
  +                else {                    
  +                    idReferences.createNewId(id);
  +                    idReferences.removeFromIdValidationList(id);                                                           
  +                    idReferences.setYPosition(id,area.getPage().getBody().getYPosition() - area.getAbsoluteHeight()+ID_PADDING);                    
  +                    area.getPage().addToIDList(id);                                    
  +                }
  +            }
  +        }
  +        
  +        this.blockArea =
  +	    new BlockArea(fs, area.getAllocationWidth(), 
  +			  area.spaceLeft(), 
  +                          startIndent, 
  +                          endIndent,
  +			  textIndent, align, alignLast, lineHeight);
  +	blockArea.setPage(area.getPage());
  +	blockArea.setBackgroundColor(backgroundColor);
  +	blockArea.setPadding(paddingTop, paddingLeft, paddingBottom,
  +			     paddingRight);
  +        blockArea.setBorderStyle(borderStyle, borderStyle, borderStyle, borderStyle); 
  +        blockArea.setBorderWidth(borderWidth, borderWidth, borderWidth, borderWidth); 
  +        blockArea.setBorderColor(borderColor, borderColor, borderColor, borderColor); 
  +	blockArea.start();
   	layoutStart(area);  // performs
  -
  -        blockArea.setAbsoluteHeight(area.getAbsoluteHeight()); 
  -
  -        blockArea.setTableCellXOffset(area.getTableCellXOffset());
  -	int numChildren = this.children.size();
  -	for (int i = this.marker; i < numChildren; i++) {
  -	    FONode fo = (FONode) children.elementAt(i);
  -	    if (this.isInListBody) {
  -		fo.setIsInListBody();
  -		fo.setDistanceBetweenStarts(this.distanceBetweenStarts);
  -		fo.setBodyIndent(this.bodyIndent);
  -	    }
  -	    Status status;
  -	    if ((status = fo.layout(blockArea)).isIncomplete()) {
  -		this.marker = i;
  -		if ((i != 0) && (status.getCode() == Status.AREA_FULL_NONE)) {
  -		    status = new Status(Status.AREA_FULL_SOME);
  -		}
  -		//blockArea.end();
  -		area.addChild(blockArea);
  -		area.increaseHeight(blockArea.getHeight());
  -                area.setAbsoluteHeight(blockArea.getAbsoluteHeight());
  -		anythingLaidOut = true;
  -		return status;
  -	    }
  -	    anythingLaidOut = true;
  -	}
  -
  -	blockArea.end();
  -	area.addChild(blockArea);
  -
  -	/* should this be combined into above? */
  -	area.increaseHeight(blockArea.getHeight());
  -       
  -        area.setAbsoluteHeight(blockArea.getAbsoluteHeight());       
  -
  -	if (spaceAfter != 0) {
  -	    area.addDisplaySpace(spaceAfter);
  -	}
  -
  -	if (area instanceof BlockArea) {
  -	    area.start();
  -	}
  -
  -	if (breakAfter == BreakAfter.PAGE) {
  -	    this.marker = BREAK_AFTER;
  -	    return new Status(Status.FORCE_PAGE_BREAK);
  -	}
  -
  -	if (breakAfter == BreakAfter.ODD_PAGE) {
  -	    this.marker = BREAK_AFTER;
  -	    return new Status(Status.FORCE_PAGE_BREAK_ODD);
  -	}
  -	
  -	if (breakAfter == BreakAfter.EVEN_PAGE) {
  -	    this.marker = BREAK_AFTER;
  -	    return new Status(Status.FORCE_PAGE_BREAK_EVEN);
  -	}
  -
  -	if (keepWithNext == KeepWithNext.TRUE) {
  -	    return new Status(Status.KEEP_WITH_NEXT);
  -	}
  -
  -	//System.err.print(" b:OK" + marker + " ");
  -	return new Status(Status.OK);
  -    }
  -
  -    public int getAreaHeight() {
  -	return blockArea.getHeight();
  -    }
  -}
  +
  +        blockArea.setAbsoluteHeight(area.getAbsoluteHeight()); 
  +        blockArea.setIDReferences(area.getIDReferences());
  +
  +        blockArea.setTableCellXOffset(area.getTableCellXOffset());
  +	int numChildren = this.children.size();
  +	for (int i = this.marker; i < numChildren; i++) {
  +	    FONode fo = (FONode) children.elementAt(i);
  +	    if (this.isInListBody) {
  +		fo.setIsInListBody();
  +		fo.setDistanceBetweenStarts(this.distanceBetweenStarts);
  +		fo.setBodyIndent(this.bodyIndent);
  +	    }
  +	    Status status;
  +	    if ((status = fo.layout(blockArea)).isIncomplete()) {
  +		this.marker = i;
  +		if ((i != 0) && (status.getCode() == Status.AREA_FULL_NONE)) {
  +		    status = new Status(Status.AREA_FULL_SOME);
  +		}
  +		//blockArea.end();
  +		area.addChild(blockArea);
  +		area.increaseHeight(blockArea.getHeight());
  +                area.setAbsoluteHeight(blockArea.getAbsoluteHeight());
  +		anythingLaidOut = true;
  +		return status;
  +	    }
  +	    anythingLaidOut = true;
  +	}
  +
  +	blockArea.end();
  +	area.addChild(blockArea);
  +
  +	/* should this be combined into above? */
  +	area.increaseHeight(blockArea.getHeight());
  +       
  +        area.setAbsoluteHeight(blockArea.getAbsoluteHeight());       
  +
  +	if (spaceAfter != 0) {
  +	    area.addDisplaySpace(spaceAfter);
  +	}
  +
  +	if (area instanceof BlockArea) {
  +	    area.start();
  +	}
  +
  +	if (breakAfter == BreakAfter.PAGE) {
  +	    this.marker = BREAK_AFTER;
  +	    return new Status(Status.FORCE_PAGE_BREAK);
  +	}
  +
  +	if (breakAfter == BreakAfter.ODD_PAGE) {
  +	    this.marker = BREAK_AFTER;
  +	    return new Status(Status.FORCE_PAGE_BREAK_ODD);
  +	}
  +	
  +	if (breakAfter == BreakAfter.EVEN_PAGE) {
  +	    this.marker = BREAK_AFTER;
  +	    return new Status(Status.FORCE_PAGE_BREAK_EVEN);
  +	}
  +
  +	if (keepWithNext == KeepWithNext.TRUE) {
  +	    return new Status(Status.KEEP_WITH_NEXT);
  +	}
  +
  +	//System.err.print(" b:OK" + marker + " ");
  +	return new Status(Status.OK);
  +    }
  +
  +    public int getAreaHeight() {
  +	return blockArea.getHeight();
  +    }
  +}
  
  
  
  1.4       +146 -134  xml-fop/src/org/apache/fop/fo/flow/SimpleLink.java
  
  Index: SimpleLink.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/SimpleLink.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SimpleLink.java	2000/06/14 01:59:51	1.3
  +++ SimpleLink.java	2000/06/21 01:23:10	1.4
  @@ -1,134 +1,146 @@
  -/*-- $Id: SimpleLink.java,v 1.3 2000/06/14 01:59:51 arved 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
  -    apache@apache.org.
  - 
  - 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 <jt...@jtauber.com>. For more  information on the Apache 
  - Software Foundation, please see <http://www.apache.org/>.
  - 
  - */
  -
  -/* this class contributed by Arved Sandstrom with minor modifications
  -   by James Tauber */
  -
  -package org.apache.fop.fo.flow;
  -
  -// FOP
  -import org.apache.fop.fo.*;
  -import org.apache.fop.apps.FOPException;
  -import org.apache.fop.fo.properties.*;
  -import org.apache.fop.layout.*;
  -import org.apache.fop.datatypes.ColorType;
  -
  -// Java
  -import java.util.Enumeration;
  -import java.awt.Rectangle;
  -
  -public class SimpleLink extends FObjMixed {
  -
  -    public static class Maker extends FObj.Maker {
  -	public FObj make(FObj parent, PropertyList propertyList)
  -	    throws FOPException { 
  -	    return new SimpleLink(parent, propertyList);
  -	}
  -    }
  -
  -    public static FObj.Maker maker() {
  -	return new SimpleLink.Maker();
  -    }
  -    
  -    public SimpleLink(FObj parent, PropertyList propertyList)
  -	throws FOPException {
  -	super(parent, propertyList);
  -	this.name = "fo:simple-link";
  -		
  -	if (parent.getName().equals("fo:flow")) {
  -	    throw new FOPException("simple-link can't be directly"
  -				   + " under flow"); 
  -	}
  -    }
  -
  -    public Status layout(Area area) throws FOPException {
  -	
  -	String externalDest =
  -	    this.properties.get("external-destination").getString();
  -	
  -	if (this.marker == START) {
  -	    this.marker = 0;
  -	}
  -	
  -	// new LinkedArea to gather up inlines
  -	LinkSet ls = new LinkSet(externalDest, area);
  -		
  -	Page p = area.getPage();
  -
  -	// assumption - AS
  -	// should be able to retrieve this from somewhere - JT
  -	AreaContainer ac = p.getBody();
  -		
  -	int numChildren = this.children.size();
  -	for (int i = this.marker; i < numChildren; i++) {
  -	    FONode fo = (FONode) children.elementAt(i);
  -	    fo.setLinkSet(ls);
  -	    
  -	    Status status;
  -	    if ((status = fo.layout(area)).isIncomplete()) {
  -		this.marker = i;
  -		return status;
  -	    }
  -	}
  -		
  -	ls.applyAreaContainerOffsets(ac, area);
  -		
  -	// pass on command line
  -	String mergeLinks = System.getProperty( "links.merge" );
  -	if ((null != mergeLinks) && !mergeLinks.equalsIgnoreCase("no")) {
  -	    ls.mergeLinks();
  -	}
  -		
  -	p.addLinkSet(ls);
  -
  -	return new Status(Status.OK);
  -    }
  -}
  +/*-- $Id: SimpleLink.java,v 1.4 2000/06/21 01:23:10 jordan 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
  +    apache@apache.org.
  + 
  + 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 <jt...@jtauber.com>. For more  information on the Apache 
  + Software Foundation, please see <http://www.apache.org/>.
  + 
  + */
  +
  +/* this class contributed by Arved Sandstrom with minor modifications
  +   by James Tauber */
  +
  +package org.apache.fop.fo.flow;
  +
  +// FOP
  +import org.apache.fop.fo.*;
  +import org.apache.fop.apps.FOPException;
  +import org.apache.fop.fo.properties.*;
  +import org.apache.fop.layout.*;
  +import org.apache.fop.datatypes.ColorType;
  +
  +// Java
  +import java.util.Enumeration;
  +import java.awt.Rectangle;
  +
  +public class SimpleLink extends FObjMixed {
  +
  +    public static class Maker extends FObj.Maker {
  +	public FObj make(FObj parent, PropertyList propertyList)
  +	    throws FOPException { 
  +	    return new SimpleLink(parent, propertyList);
  +	}
  +    }
  +
  +    public static FObj.Maker maker() {
  +	return new SimpleLink.Maker();
  +    }
  +    
  +    public SimpleLink(FObj parent, PropertyList propertyList)
  +	throws FOPException {
  +	super(parent, propertyList);
  +	this.name = "fo:simple-link";
  +		
  +	if (parent.getName().equals("fo:flow")) {
  +	    throw new FOPException("simple-link can't be directly"
  +				   + " under flow"); 
  +	}
  +    }
  +
  +    public Status layout(Area area) throws FOPException {
  +        String destination;
  +        int linkType;
  +        
  +        if ( !(destination = this.properties.get("internal-destination").getString()).equals(""))
  +        {             
  +            linkType=LinkSet.INTERNAL;
  +        }
  +        else if ( !(destination = this.properties.get("external-destination").getString()).equals("") )	
  +        { 
  +            linkType=LinkSet.EXTERNAL;
  +        }
  +        else
  +        {
  +            throw new FOPException("internal-destination or external-destination must be specified in simple-link");
  +        }
  +
  +	if (this.marker == START) {
  +	    this.marker = 0;
  +	}
  +	
  +	// new LinkedArea to gather up inlines
  +        LinkSet ls = new LinkSet(destination, area, linkType);
  +		
  +	Page p = area.getPage();
  +
  +	// assumption - AS
  +	// should be able to retrieve this from somewhere - JT
  +	AreaContainer ac = p.getBody();
  +		
  +	int numChildren = this.children.size();
  +	for (int i = this.marker; i < numChildren; i++) {
  +	    FONode fo = (FONode) children.elementAt(i);
  +	    fo.setLinkSet(ls);
  +	    
  +	    Status status;
  +	    if ((status = fo.layout(area)).isIncomplete()) {
  +		this.marker = i;
  +		return status;
  +	    }
  +	}
  +		
  +	ls.applyAreaContainerOffsets(ac, area);
  +		
  +	// pass on command line
  +	String mergeLinks = System.getProperty( "links.merge" );
  +	if ((null != mergeLinks) && !mergeLinks.equalsIgnoreCase("no")) {
  +	    ls.mergeLinks();
  +	}
  +		
  +	p.addLinkSet(ls);
  +
  +	return new Status(Status.OK);
  +    }
  +}