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 ar...@locus.apache.org on 2000/03/10 03:52:53 UTC
cvs commit: xml-fop/src/org/apache/fop/layout BlockArea.java
arved 00/03/09 18:52:53
Modified: src/org/apache/fop/layout BlockArea.java
Log:
uses LinkSet align()
Revision Changes Path
1.8 +10 -1 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BlockArea.java 2000/03/07 09:47:34 1.7
+++ BlockArea.java 2000/03/10 02:52:52 1.8
@@ -1,4 +1,4 @@
-/*-- $Id: BlockArea.java,v 1.7 2000/03/07 09:47:34 fotis Exp $ --
+/*-- $Id: BlockArea.java,v 1.8 2000/03/10 02:52:52 arved Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -77,6 +77,7 @@
protected int alignLastLine;
protected LineArea currentLineArea;
+ protected LinkSet currentLinkSet;
/* have any line areas been used? */
protected boolean hasLines = false;
@@ -134,6 +135,7 @@
this.currentLineArea.changeWhiteSpaceTreatment(whiteSpaceTreatment);
if (ls != null) {
+ this.currentLinkSet = ls;
ls.setYOffset(currentHeight);
}
@@ -142,6 +144,9 @@
while (ts != -1) {
this.currentLineArea.align(this.align);
+ if (ls != null) {
+ ls.align(this.align, this.currentLineArea.getStartIndent());
+ }
this.addLineArea(this.currentLineArea);
this.currentLineArea = new
LineArea(fontState, lineHeight, halfLeading,
@@ -168,6 +173,10 @@
this.currentLineArea.addPending();
this.currentLineArea.align(this.alignLastLine);
this.addLineArea(this.currentLineArea);
+ if (this.currentLinkSet != null) {
+ this.currentLinkSet.align(this.alignLastLine,
+ this.currentLineArea.getStartIndent());
+ }
}
}