Author: spepping
Date: Fri Feb 15 11:56:11 2008
New Revision: 628152
URL: http://svn.apache.org/viewvc?rev=628152&view=rev
Log:
I was bitten by my own bugfix in trunk, which was seamlessly inserted
into this branch, but does not work here. The breaking of my testfile
for this feature, inline_border_padding_block_nested_3.xml, alerted me.
Modified:
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
Modified:
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=628152&r1=628151&r2=628152&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
(original)
+++
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
Fri Feb 15 11:56:11 2008
@@ -548,14 +548,6 @@
*/
protected void addKnuthElementsForBorderPaddingStart(List returnList) {
//Border and Padding (start)
- /**
- * If the returnlist is a BlockKnuthSequence, the border and padding
should be added
- * to the first paragraph inside it, but it is too late to do that now.
- * At least, avoid adding it to the bpd sequence.
- */
- if (returnList instanceof BlockKnuthSequence) {
- return;
- }
CommonBorderPaddingBackground borderAndPadding =
fobj.getCommonBorderPaddingBackground();
if (borderAndPadding != null) {
int ipStart = borderAndPadding.getBorderStartWidth(false)
@@ -563,7 +555,6 @@
if (ipStart > 0) {
KnuthBox bap = new KnuthBox(ipStart, getAuxiliaryPosition(),
true);
if (returnList instanceof KnuthSequence) {
- // if (false) {
KnuthSequence seq = (KnuthSequence) returnList;
seq.addKnuthElementForBorderPaddingStart(bap);
} else {
@@ -579,14 +570,6 @@
*/
protected void addKnuthElementsForBorderPaddingEnd(List returnList) {
//Border and Padding (after)
- /**
- * If the returnlist is a BlockKnuthSequence, the border and padding
should be added
- * to the last paragraph inside it, but it is too late to do that now.
- * At least, avoid adding it to the bpd sequence.
- */
- if (returnList instanceof BlockKnuthSequence) {
- return;
- }
CommonBorderPaddingBackground borderAndPadding =
fobj.getCommonBorderPaddingBackground();
if (borderAndPadding != null) {
int ipEnd = borderAndPadding.getBorderEndWidth(false)
@@ -594,7 +577,6 @@
if (ipEnd > 0) {
KnuthBox bap = new KnuthBox(ipEnd, getAuxiliaryPosition(),
true);
if (returnList instanceof KnuthSequence) {
- // if (false) {
KnuthSequence seq = (KnuthSequence) returnList;
seq.addKnuthElementForBorderPaddingEnd(bap);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
