xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@locus.apache.org
Subject cvs commit: xml-fop/src/org/apache/fop/layout BlockArea.java LineArea.java
Date Wed, 08 Nov 2000 23:47:51 GMT
gears       00/11/08 15:47:49

  Modified:    src/org/apache/fop/layout BlockArea.java LineArea.java
  Log:
  This applies Dorothea Wiarda's patch to prevent "character dropping" when
  a new LineArea is created in BlockArea.AddText.
  
  Revision  Changes    Path
  1.14      +5 -3      xml-fop/src/org/apache/fop/layout/BlockArea.java
  
  Index: BlockArea.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/BlockArea.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BlockArea.java	2000/10/19 17:00:12	1.13
  +++ BlockArea.java	2000/11/08 23:47:42	1.14
  @@ -1,4 +1,4 @@
  -/*-- $Id: BlockArea.java,v 1.13 2000/10/19 17:00:12 gears Exp $ -- 
  +/*-- $Id: BlockArea.java,v 1.14 2000/11/08 23:47:42 gears Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -167,9 +167,11 @@
   	while (ts != -1) {
   	    this.currentLineArea.align(this.align);
   	    this.addLineArea(this.currentLineArea);
  +            
   	    this.currentLineArea = new
   		LineArea(fontState, lineHeight, halfLeading,
  -			 allocationWidth, startIndent, endIndent);  
  +			 allocationWidth, startIndent, endIndent,
  +                         currentLineArea);  
   	    if (currentHeight + currentLineArea.getHeight() >
   		this.maxHeight) {
   		return ts;
  @@ -199,7 +201,7 @@
   	currentLineArea = new LineArea(fontState, lineHeight,
   				       halfLeading, allocationWidth,
   				       startIndent + textIndent,
  -				       endIndent);
  +				       endIndent,null);
       }
   
       public int getEndIndent() {
  
  
  
  1.19      +9 -2      xml-fop/src/org/apache/fop/layout/LineArea.java
  
  Index: LineArea.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/LineArea.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- LineArea.java	2000/10/19 17:00:13	1.18
  +++ LineArea.java	2000/11/08 23:47:44	1.19
  @@ -1,4 +1,4 @@
  -/*-- $Id: LineArea.java,v 1.18 2000/10/19 17:00:13 gears Exp $ -- 
  +/*-- $Id: LineArea.java,v 1.19 2000/11/08 23:47:44 gears Exp $ -- 
   
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -125,7 +125,7 @@
   
       public LineArea(FontState fontState, int lineHeight, int
   		    halfLeading, int allocationWidth, int startIndent,
  -		    int endIndent) { 
  +		    int endIndent,LineArea prevLineArea) { 
   	super(fontState);        
   	
   	this.currentFontState = fontState;
  @@ -145,6 +145,13 @@
   	this.startIndent = startIndent;
   	this.endIndent = endIndent;
   	
  +        if(prevLineArea != null){
  +	    Enumeration e=prevLineArea.pendingAreas.elements();
  +            while( e.hasMoreElements() ){
  +		pendingAreas.addElement(e.nextElement());
  +	    }
  +            pendingWidth=prevLineArea.getPendingWidth();         
  +	}
       }
       
       public void render(Renderer renderer) {
  
  
  

Mime
View raw message