[FOray-commit] SF.net SVN: foray: [7654] trunk/foray/foray-areatree/src/java/org/foray/area
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
|
From: <vic...@us...> - 2006-06-16 22:49:47
|
Revision: 7654 Author: victormote Date: 2006-06-16 15:49:37 -0700 (Fri, 16 Jun 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=7654&view=rev Log Message: ----------- Have each inline area notify its parent line area when it is added to the line. Modified Paths: -------------- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ExternalGraphicArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -55,6 +55,7 @@ setProgressionDimension(width); // Adjust the bpd of the parent line-area. parentArea.setMinimumProgressionDimension(viewportBPD()); + this.ancestorLineArea().lineContentChanged(); } public Graphic getGraphic() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/ForeignObjectArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -58,6 +58,7 @@ if (foreign instanceof SVGElement) { new SVGArea((SVGElement) foreign, this, retrieveMarker); } + this.ancestorLineArea().lineContentChanged(); } public boolean traitIsReferenceArea() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -80,6 +80,7 @@ */ private void init(int initialProgressionDimension) { setProgressionDimension(initialProgressionDimension); + this.ancestorLineArea().lineContentChanged(); } /** Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/LineArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -981,4 +981,12 @@ visitor.render(this); } + /** + * Tell the LineArea that its content has changed, so that it can make any + * adjustments it thinks are necessary. + */ + public void lineContentChanged() { + this.verticalAlign(); + } + } Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -52,6 +52,7 @@ */ private void init(int width) { setProgressionDimension(width); + this.ancestorLineArea().lineContentChanged(); } public String resolve() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/PageNumberCitationArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -50,6 +50,7 @@ */ private void init(int width) { setProgressionDimension(width); + this.ancestorLineArea().lineContentChanged(); } public String resolve() { Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java =================================================================== --- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-16 22:33:49 UTC (rev 7653) +++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java 2006-06-16 22:49:37 UTC (rev 7654) @@ -135,6 +135,7 @@ this.hasDiscretionaryHyphen = hasDiscretionaryHyphen; this.hasFauxSmallCaps = hasFauxSmallCaps; setProgressionDimension(progressionDimensionUsed); + this.ancestorLineArea().lineContentChanged(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |