Author: spepping
Date: Wed Sep 8 18:10:47 2010
New Revision: 995176
URL: http://svn.apache.org/viewvc?rev=995176&view=rev
Log:
Merged changes from trunk up to revision 995168
Added:
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/region-body_column-count_span_4.xml
- copied unchanged from r995168,
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/region-body_column-count_span_4.xml
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/ (props changed)
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/PageViewport.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/datatypes/Numeric.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/KeepProperty.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/Page.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageBreaker.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageProvider.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/tools/anttasks/Fop.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/traits/MinOptMax.java
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/util/ColorExt.java
(props changed)
xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
xmlgraphics/fop/branches/Temp_ComplexScripts/xmlgraphics-fop-pom-template.pom
Propchange: xmlgraphics/fop/branches/Temp_ComplexScripts/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 8 18:10:47 2010
@@ -1,4 +1,4 @@
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign:603620-746655
/xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
/xmlgraphics/fop/branches/fop-1_0:959975-964707
-/xmlgraphics/fop/trunk:981451-990588
+/xmlgraphics/fop/trunk:981451-995168
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/DataStream.java
Wed Sep 8 18:10:47 2010
@@ -359,9 +359,9 @@ public class DataStream {
* @param charSet is the AFP Character Set to use with the text
* @throws UnsupportedEncodingException thrown if character encoding is
not supported
*/
- public void createText
- ( final AFPTextDataInfo textDataInfo, final int letterSpacing, final
int wordSpacing,
- final Font font, final CharacterSet charSet) throws
UnsupportedEncodingException {
+ public void createText(final AFPTextDataInfo textDataInfo, final int
letterSpacing,
+ final int wordSpacing, final Font font, final CharacterSet charSet)
+ throws UnsupportedEncodingException {
int rotation = paintingState.getRotation();
if (rotation != 0) {
textDataInfo.setRotation(rotation);
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/afp/modca/ObjectContainer.java
Wed Sep 8 18:10:47 2010
@@ -113,7 +113,7 @@ public class ObjectContainer extends Abs
}
/**
- * Sets the data for the the object container
+ * Sets the data for the object container
*
* @param data a byte array
*/
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/PageViewport.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/PageViewport.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/PageViewport.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/area/PageViewport.java
Wed Sep 8 18:10:47 2010
@@ -95,8 +95,10 @@ public class PageViewport extends AreaTr
* @param pageNumber the page number
* @param pageStr String representation of the page number
* @param blank true if this is a blank page
+ * @param spanAll true if the first span area spans all columns
*/
- public PageViewport(SimplePageMaster spm, int pageNumber, String pageStr,
boolean blank) {
+ public PageViewport(SimplePageMaster spm, int pageNumber, String pageStr,
+ boolean blank, boolean spanAll) {
this.simplePageMasterName = spm.getMasterName();
setExtensionAttachments(spm.getExtensionAttachments());
setForeignAttributes(spm.getForeignAttributes());
@@ -107,7 +109,18 @@ public class PageViewport extends AreaTr
this.pageNumberString = pageStr;
this.viewArea = new Rectangle(0, 0, pageWidth, pageHeight);
this.page = new Page(spm);
- createSpan(false);
+ createSpan(spanAll);
+ }
+
+ /**
+ * Create a page viewport.
+ * @param spm SimplePageMaster indicating the page and region dimensions
+ * @param pageNumber the page number
+ * @param pageStr String representation of the page number
+ * @param blank true if this is a blank page
+ */
+ public PageViewport(SimplePageMaster spm, int pageNumber, String pageStr,
boolean blank) {
+ this(spm, pageNumber, pageStr, blank, false);
}
/**
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/datatypes/Numeric.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/datatypes/Numeric.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/datatypes/Numeric.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/datatypes/Numeric.java
Wed Sep 8 18:10:47 2010
@@ -29,15 +29,15 @@ import org.apache.fop.fo.expr.PropertyEx
* Numerics can be either absolute or relative. Relative numerics
* must be resolved against base value before the value can be used.
* <p>
- * To support relative numerics internally in the expresion parser and
- * during evaulation one additional methods exists: isAbsolute() which
+ * To support relative numerics internally in the expression parser and
+ * during evaluation one additional methods exists: isAbsolute() which
* return true for absolute numerics and false for relative numerics.
*/
public interface Numeric {
/**
* Return the value of this Numeric
* @return the computed value.
- * @throws PropertyException if a propert exception occurs
+ * @throws PropertyException if a property exception occurs
*/
double getNumericValue() throws PropertyException;
@@ -45,7 +45,7 @@ public interface Numeric {
* Return the value of this Numeric
* @param context The context for the length calculation (for percentage
based lengths)
* @return the computed value.
- * @throws PropertyException if a propert exception occurs
+ * @throws PropertyException if a property exception occurs
*/
double getNumericValue(PercentBaseContext context) throws
PropertyException;
@@ -78,9 +78,9 @@ public interface Numeric {
int getValue(PercentBaseContext context);
/**
- * Return the resolved value. This method will becalled during evaluation
+ * Return the resolved value. This method will be called during evaluation
* of the expression tree and relative numerics can then return a
- * resolved absolute Numeric. Absolute numerics can just return themself.
+ * resolved absolute Numeric. Absolute numerics can just return themselves.
*
* @return A resolved value.
* @throws PropertyException
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/expr/NumericOp.java
Wed Sep 8 18:10:47 2010
@@ -19,8 +19,8 @@
package org.apache.fop.fo.expr;
-import org.apache.fop.datatypes.PercentBaseContext;
import org.apache.fop.datatypes.Numeric;
+import org.apache.fop.datatypes.PercentBaseContext;
/**
* This class contains static methods to evaluate operations on Numeric
@@ -43,8 +43,7 @@ public final class NumericOp {
* @throws PropertyException If the dimension of the operand is different
* from the dimension of this Numeric.
*/
- public static Numeric addition(Numeric op1, Numeric op2)
- throws PropertyException {
+ public static Numeric addition(Numeric op1, Numeric op2) throws
PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return addition2(op1, op2, null);
} else {
@@ -80,8 +79,7 @@ public final class NumericOp {
* @throws PropertyException If the dimension of the operand is different
* from the dimension of this Numeric.
*/
- public static Numeric subtraction(Numeric op1, Numeric op2)
- throws PropertyException {
+ public static Numeric subtraction(Numeric op1, Numeric op2) throws
PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return subtraction2(op1, op2, null);
} else {
@@ -100,7 +98,7 @@ public final class NumericOp {
* from the dimension of this Numeric.
*/
public static Numeric subtraction2(Numeric op1, Numeric op2,
PercentBaseContext context)
- throws PropertyException {
+ throws PropertyException {
if (op1.getDimension() != op2.getDimension()) {
throw new PropertyException("Can't subtract Numerics of different
dimensions");
}
@@ -117,8 +115,7 @@ public final class NumericOp {
* @throws PropertyException If the dimension of the operand is different
* from the dimension of this Numeric.
*/
- public static Numeric multiply(Numeric op1, Numeric op2)
- throws PropertyException {
+ public static Numeric multiply(Numeric op1, Numeric op2) throws
PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return multiply2(op1, op2, null);
} else {
@@ -137,7 +134,7 @@ public final class NumericOp {
* from the dimension of this Numeric.
*/
public static Numeric multiply2(Numeric op1, Numeric op2,
PercentBaseContext context)
- throws PropertyException {
+ throws PropertyException {
return numeric(op1.getNumericValue(context) *
op2.getNumericValue(context),
op1.getDimension() + op2.getDimension());
}
@@ -171,7 +168,7 @@ public final class NumericOp {
* from the dimension of this Numeric.
*/
public static Numeric divide2(Numeric op1, Numeric op2, PercentBaseContext
context)
- throws PropertyException {
+ throws PropertyException {
return numeric(op1.getNumericValue(context) /
op2.getNumericValue(context),
op1.getDimension() - op2.getDimension());
}
@@ -183,8 +180,7 @@ public final class NumericOp {
* @return A new Numeric object representing the absolute value.
* @throws PropertyException if a property exception occurs
*/
- public static Numeric modulo(Numeric op1, Numeric op2)
- throws PropertyException {
+ public static Numeric modulo(Numeric op1, Numeric op2) throws
PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return modulo2(op1, op2, null);
} else {
@@ -202,7 +198,7 @@ public final class NumericOp {
* from the dimension of this Numeric.
*/
public static Numeric modulo2(Numeric op1, Numeric op2, PercentBaseContext
context)
- throws PropertyException {
+ throws PropertyException {
return numeric(op1.getNumericValue(context)
% op2.getNumericValue(context), op1.getDimension());
}
@@ -213,8 +209,7 @@ public final class NumericOp {
* @return a new Numeric object representing the absolute value of the
operand.
* @throws PropertyException if a property exception occurs
*/
- public static Numeric abs(Numeric op)
- throws PropertyException {
+ public static Numeric abs(Numeric op) throws PropertyException {
if (op.isAbsolute()) {
return abs2(op, null);
} else {
@@ -230,8 +225,7 @@ public final class NumericOp {
* @throws PropertyException If the dimension of the operand is different
* from the dimension of this Numeric.
*/
- public static Numeric abs2(Numeric op, PercentBaseContext context)
- throws PropertyException {
+ public static Numeric abs2(Numeric op, PercentBaseContext context) throws
PropertyException {
return numeric(Math.abs(op.getNumericValue(context)),
op.getDimension());
}
@@ -241,8 +235,7 @@ public final class NumericOp {
* @return a new Numeric object representing the negation of the operand.
* @throws PropertyException if a property exception occurs
*/
- public static Numeric negate(Numeric op)
- throws PropertyException {
+ public static Numeric negate(Numeric op) throws PropertyException {
if (op.isAbsolute()) {
return negate2(op, null);
} else {
@@ -259,8 +252,7 @@ public final class NumericOp {
* @throws PropertyException If the dimension of the operand is different
* from the dimension of this Numeric.
*/
- public static Numeric negate2(Numeric op, PercentBaseContext context)
- throws PropertyException {
+ public static Numeric negate2(Numeric op, PercentBaseContext context)
throws PropertyException {
return numeric(-op.getNumericValue(context), op.getDimension());
}
@@ -271,8 +263,7 @@ public final class NumericOp {
* @return a Numeric which is the maximum of the two operands.
* @throws PropertyException if the dimensions or value types of the
operands are different.
*/
- public static Numeric max(Numeric op1, Numeric op2)
- throws PropertyException {
+ public static Numeric max(Numeric op1, Numeric op2) throws
PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return max2(op1, op2, null);
} else {
@@ -290,7 +281,7 @@ public final class NumericOp {
* from the dimension of this Numeric.
*/
public static Numeric max2(Numeric op1, Numeric op2, PercentBaseContext
context)
- throws PropertyException {
+ throws PropertyException {
if (op1.getDimension() != op2.getDimension()) {
throw new PropertyException("Arguments to max() must have same
dimensions");
}
@@ -304,8 +295,7 @@ public final class NumericOp {
* @return a Numeric which is the minimum of the two operands.
* @throws PropertyException if the dimensions or value types of the
operands are different.
*/
- public static Numeric min(Numeric op1, Numeric op2)
- throws PropertyException {
+ public static Numeric min(Numeric op1, Numeric op2) throws
PropertyException {
if (op1.isAbsolute() && op2.isAbsolute()) {
return min2(op1, op2, null);
} else {
@@ -323,7 +313,7 @@ public final class NumericOp {
* from the dimension of this Numeric.
*/
public static Numeric min2(Numeric op1, Numeric op2, PercentBaseContext
context)
- throws PropertyException {
+ throws PropertyException {
if (op1.getDimension() != op2.getDimension()) {
throw new PropertyException("Arguments to min() must have same
dimensions");
}
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/flow/table/TableFObj.java
Wed Sep 8 18:10:47 2010
@@ -217,11 +217,10 @@ public abstract class TableFObj extends
*/
i = 1;
}
- TableEventProducer eventProducer
- =
TableEventProducer.Provider.get(fo.getUserAgent().getEventBroadcaster());
- eventProducer.forceNextColumnNumber
- (this, propertyList.getFObj().getName(),
- val, i, propertyList.getFObj().getLocator());
+ TableEventProducer eventProducer =
TableEventProducer.Provider.get(
+ fo.getUserAgent().getEventBroadcaster());
+ eventProducer.forceNextColumnNumber(this,
propertyList.getFObj().getName(),
+ val, i, propertyList.getFObj().getLocator());
}
return NumberProperty.getInstance(i);
}
@@ -231,9 +230,8 @@ public abstract class TableFObj extends
}
/** {...@inheritdoc} */
- public void processNode
- (String elementName, Locator locator, Attributes attlist, PropertyList
pList)
- throws FOPException {
+ public void processNode(String elementName, Locator locator, Attributes
attlist,
+ PropertyList pList) throws FOPException {
super.processNode(elementName, locator, attlist, pList);
Table table = getTable();
if (!inMarker() && !table.isSeparateBorderModel()) {
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/pagination/Root.java
Wed Sep 8 18:10:47 2010
@@ -212,7 +212,7 @@ public class Root extends FObj {
* @throws IllegalArgumentException for negative additional page counts
*/
public void notifyPageSequenceFinished(int lastPageNumber, int
additionalPages)
- throws IllegalArgumentException {
+ throws IllegalArgumentException {
if (additionalPages >= 0) {
totalPagesGenerated += additionalPages;
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthand.java
Wed Sep 8 18:10:47 2010
@@ -58,7 +58,7 @@ public class BackgroundPositionShorthand
* to "50%".
*/
public Property make(PropertyList propertyList, String value, FObj fo)
- throws PropertyException {
+ throws PropertyException {
Property p = super.make(propertyList, value, fo);
if (p.getList().size() == 1) {
/* only background-position-horizontal specified
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
Wed Sep 8 18:10:47 2010
@@ -54,9 +54,8 @@ public class BorderWidthPropertyMaker ex
* {...@inheritdoc}
*/
- public Property get(int subpropId, PropertyList propertyList,
- boolean bTryInherit, boolean bTryDefault)
- throws PropertyException {
+ public Property get(int subpropId, PropertyList propertyList, boolean
bTryInherit,
+ boolean bTryDefault) throws PropertyException {
Property p = super.get(subpropId, propertyList,
bTryInherit, bTryDefault);
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ColorProperty.java
Wed Sep 8 18:10:47 2010
@@ -99,7 +99,7 @@ public final class ColorProperty extends
* @see ColorUtil#parseColorString(FOUserAgent, String)
*/
public static ColorProperty getInstance(FOUserAgent foUserAgent, String
value)
- throws PropertyException {
+ throws PropertyException {
ColorProperty instance = new ColorProperty(
ColorUtil.parseColorString(
foUserAgent, value));
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonHyphenation.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CommonHyphenation.java
Wed Sep 8 18:10:47 2010
@@ -92,7 +92,7 @@ public final class CommonHyphenation {
* @throws PropertyException if a a property exception occurs
*/
public static CommonHyphenation getInstance(PropertyList propertyList)
- throws PropertyException {
+ throws PropertyException {
StringProperty language
= (StringProperty) propertyList.get(Constants.PR_LANGUAGE);
StringProperty country
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
Wed Sep 8 18:10:47 2010
@@ -139,9 +139,8 @@ public class CompoundPropertyMaker exten
* @return the property
* @throws PropertyException if a property exception occurs
*/
- public Property get(int subpropertyId, PropertyList propertyList,
- boolean tryInherit, boolean tryDefault)
- throws PropertyException {
+ public Property get(int subpropertyId, PropertyList propertyList, boolean
tryInherit,
+ boolean tryDefault) throws PropertyException {
Property p = super.get(subpropertyId, propertyList, tryInherit,
tryDefault);
if (subpropertyId != 0 && p != null) {
p = getSubprop(p, subpropertyId);
@@ -254,7 +253,7 @@ public class CompoundPropertyMaker exten
* @throws PropertyException ...
*/
protected Property makeCompound(PropertyList propertyList, FObj parentFO)
- throws PropertyException {
+ throws PropertyException {
Property p = makeNewProperty();
CompoundDatatype data = (CompoundDatatype) p.getObject();
for (int i = 0; i < Constants.COMPOUND_COUNT; i++) {
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java
Wed Sep 8 18:10:47 2010
@@ -52,7 +52,7 @@ public final class FontFamilyProperty ex
* {...@inheritdoc}
*/
public Property make(PropertyList propertyList, String value, FObj fo)
- throws PropertyException {
+ throws PropertyException {
if ("inherit".equals(value)) {
return super.make(propertyList, value, fo);
} else {
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java
Wed Sep 8 18:10:47 2010
@@ -51,7 +51,7 @@ public class FontSizePropertyMaker
* it is immediately replaced by the resolved {...@link FixedLength}.
*/
public Property make(PropertyList propertyList, String value, FObj fo)
- throws PropertyException {
+ throws PropertyException {
Property p = super.make(propertyList, value, fo);
if (p instanceof PercentLength) {
Property pp = propertyList.getFromParent(this.propId);
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/KeepProperty.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/KeepProperty.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/KeepProperty.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/KeepProperty.java
Wed Sep 8 18:10:47 2010
@@ -62,7 +62,7 @@ public final class KeepProperty extends
* {...@inheritdoc}
*/
public Property convertProperty(Property p, PropertyList propertyList,
FObj fo)
- throws PropertyException {
+ throws PropertyException {
if (p instanceof KeepProperty) {
return p;
}
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java
Wed Sep 8 18:10:47 2010
@@ -44,7 +44,7 @@ public class PageDimensionMaker extends
* Return the default or user-defined fallback in case the value
* was specified as "auto"
* @param subpropId The subproperty id of the property being retrieved.
- * Is 0 when retriving a base property.
+ * Is 0 when retrieving a base property.
* @param propertyList The PropertyList object being built for this FO.
* @param tryInherit true if inherited properties should be examined.
* @param tryDefault true if the default value should be returned.
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
Wed Sep 8 18:10:47 2010
@@ -23,7 +23,7 @@ import org.apache.fop.fo.FObj;
import org.apache.fop.fo.PropertyList;
/**
- * A special property for representing an as yet implemented implemented
property.
+ * A special property for representing an as yet unimplemented property.
*/
public class ToBeImplementedProperty extends Property {
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/Page.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/Page.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/Page.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/Page.java
Wed Sep 8 18:10:47 2010
@@ -41,10 +41,12 @@ public class Page {
* @param pageNumber the page number (as an int)
* @param pageNumberStr the page number (as a String)
* @param blank true if this is a blank page
+ * @param spanAll true if the first span area spans all columns
*/
- public Page(SimplePageMaster spm, int pageNumber, String pageNumberStr,
boolean blank) {
+ public Page(SimplePageMaster spm, int pageNumber, String pageNumberStr,
+ boolean blank, boolean spanAll) {
this.spm = spm;
- this.pageViewport = new PageViewport(spm, pageNumber, pageNumberStr,
blank);
+ this.pageViewport = new PageViewport(spm, pageNumber, pageNumberStr,
blank, spanAll);
}
/**
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageBreaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageBreaker.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageBreaker.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageBreaker.java
Wed Sep 8 18:10:47 2010
@@ -45,6 +45,7 @@ public class PageBreaker extends Abstrac
private boolean needColumnBalancing;
private PageProvider pageProvider;
private Block separatorArea;
+ private boolean spanAllActive;
/**
* The FlowLayoutManager object, which processes
@@ -148,8 +149,9 @@ public class PageBreaker extends Abstrac
}
firstPart = false;
pageBreakHandled = true;
+
pageProvider.setStartOfNextElementList(pslm.getCurrentPageNum(),
- pslm.getCurrentPV().getCurrentSpan().getCurrentFlowIndex());
+ pslm.getCurrentPV().getCurrentSpan().getCurrentFlowIndex(),
this.spanAllActive);
return super.getNextBlockList(childLC, nextSequenceStartsOn,
positionAtIPDChange,
restartLM, firstElements);
}
@@ -342,8 +344,9 @@ public class PageBreaker extends Abstrac
pageBreakHandled = true;
//Update so the available BPD is reported correctly
int currentPageNum = pslm.getCurrentPageNum();
+
pageProvider.setStartOfNextElementList(currentPageNum,
- pslm.getCurrentPV().getCurrentSpan().getCurrentFlowIndex());
+ pslm.getCurrentPV().getCurrentSpan().getCurrentFlowIndex(),
this.spanAllActive);
//Make sure we only add the areas we haven't added already
effectiveList.ignoreAtStart = newStartPos;
@@ -387,7 +390,7 @@ public class PageBreaker extends Abstrac
boolean fitsOnePage
= optimalPageCount <= pslm.getCurrentPV()
-
.getBodyRegion().getMainReference().getCurrentSpan().getColumnCount();
+
.getBodyRegion().getMainReference().getCurrentSpan().getColumnCount();
if (needColumnBalancing) {
if (!fitsOnePage) {
@@ -435,7 +438,8 @@ public class PageBreaker extends Abstrac
handleBreakTrait(breakClass);
}
pageProvider.setStartOfNextElementList(pslm.getCurrentPageNum(),
-
pslm.getCurrentPV().getCurrentSpan().getCurrentFlowIndex());
+ pslm.getCurrentPV().getCurrentSpan().getCurrentFlowIndex(),
+ this.spanAllActive);
}
pageBreakHandled = false;
// add static areas and resolve any new id areas
@@ -503,9 +507,11 @@ public class PageBreaker extends Abstrac
case Constants.EN_ALL:
//break due to span change in multi-column layout
curPage.getPageViewport().createSpan(true);
+ this.spanAllActive = true;
return;
case Constants.EN_NONE:
curPage.getPageViewport().createSpan(false);
+ this.spanAllActive = false;
return;
case Constants.EN_COLUMN:
case Constants.EN_AUTO:
@@ -554,7 +560,7 @@ public class PageBreaker extends Abstrac
*/
private boolean needBlankPageBeforeNew(int breakVal) {
if (breakVal == Constants.EN_PAGE
- || (pslm.getCurrentPage().getPageViewport().getPage().isEmpty())) {
+ ||
(pslm.getCurrentPage().getPageViewport().getPage().isEmpty())) {
// any page is OK or we already have an empty page
return false;
} else {
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageProvider.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageProvider.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageProvider.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/PageProvider.java
Wed Sep 8 18:10:47 2010
@@ -51,6 +51,7 @@ public class PageProvider implements Con
private int startPageOfPageSequence;
private int startPageOfCurrentElementList;
private int startColumnOfCurrentElementList;
+ private boolean spanAllForCurrentElementList;
private List cachedPages = new java.util.ArrayList();
private int lastPageIndex = -1;
@@ -88,12 +89,17 @@ public class PageProvider implements Con
* on so it can later retrieve PageViewports relative to this first page.
* @param startPage the number of the first page for the element list.
* @param startColumn the starting column number for the element list.
+ * @param spanAll true if the current element list is for a
column-spanning section
*/
- public void setStartOfNextElementList(int startPage, int startColumn) {
- log.debug("start of the next element list is:"
- + " page=" + startPage + " col=" + startColumn);
+ public void setStartOfNextElementList(int startPage, int startColumn,
boolean spanAll) {
+ if (log.isDebugEnabled()) {
+ log.debug("start of the next element list is:"
+ + " page=" + startPage + " col=" + startColumn
+ + (spanAll ? ", column-spanning" : ""));
+ }
this.startPageOfCurrentElementList = startPage -
startPageOfPageSequence + 1;
this.startColumnOfCurrentElementList = startColumn;
+ this.spanAllForCurrentElementList = spanAll;
//Reset Cache
this.lastRequestedIndex = -1;
this.lastReportedBPD = -1;
@@ -290,7 +296,7 @@ public class PageProvider implements Con
if (log.isTraceEnabled()) {
log.trace("Caching " + index);
}
- cacheNextPage(index, isBlank, isLastPage);
+ cacheNextPage(index, isBlank, isLastPage,
this.spanAllForCurrentElementList);
}
Page page = (Page)cachedPages.get(intIndex);
boolean replace = false;
@@ -306,7 +312,7 @@ public class PageProvider implements Con
}
if (replace) {
discardCacheStartingWith(intIndex);
- page = cacheNextPage(index, isBlank, isLastPage);
+ page = cacheNextPage(index, isBlank, isLastPage,
this.spanAllForCurrentElementList);
}
return page;
}
@@ -320,7 +326,7 @@ public class PageProvider implements Con
}
}
- private Page cacheNextPage(int index, boolean isBlank, boolean isLastPage)
{
+ private Page cacheNextPage(int index, boolean isBlank, boolean isLastPage,
boolean spanAll) {
String pageNumberString = pageSeq.makeFormattedPageNumber(index);
boolean isFirstPage = (startPageOfPageSequence == index);
SimplePageMaster spm = pageSeq.getNextSimplePageMaster(
@@ -335,7 +341,7 @@ public class PageProvider implements Con
eventProducer.flowNotMappingToRegionBody(this,
pageSeq.getMainFlow().getFlowName(), spm.getMasterName(),
spm.getLocator());
}
- Page page = new Page(spm, index, pageNumberString, isBlank);
+ Page page = new Page(spm, index, pageNumberString, isBlank, spanAll);
//Set unique key obtained from the AreaTreeHandler
page.getPageViewport().setKey(areaTreeHandler.generatePageViewportKey());
page.getPageViewport().setForeignAttributes(spm.getForeignAttributes());
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Wed Sep 8 18:10:47 2010
@@ -552,4 +552,11 @@ public class TableLayoutManager extends
}
}
+ /** {...@inheritdoc} */
+ public void reset() {
+ super.reset();
+ curBlockArea = null;
+ tableUnit = 0.0;
+ }
+
}
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/tools/anttasks/Fop.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/tools/anttasks/Fop.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/tools/anttasks/Fop.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/tools/anttasks/Fop.java
Wed Sep 8 18:10:47 2010
@@ -20,14 +20,6 @@
package org.apache.fop.tools.anttasks;
// Ant
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.util.GlobPatternMapper;
-
-// Java
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.IOException;
@@ -36,17 +28,23 @@ import java.net.MalformedURLException;
import java.util.List;
import java.util.Vector;
-// FOP
+import org.xml.sax.SAXException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.impl.SimpleLog;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.util.GlobPatternMapper;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.cli.InputHandler;
-import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.commons.logging.Log;
-import org.xml.sax.SAXException;
-
/**
* Wrapper for FOP which allows it to be accessed from within an Ant task.
* Accepts the inputs:
@@ -156,7 +154,7 @@ public class Fop extends Task {
}
/**
- * Sets the XSLT parameters
+ * Sets the XSLT parameters
* @param xsltParams the XSLT parameters
*/
public void setXsltParams(String xsltParams) {
@@ -267,7 +265,7 @@ public class Fop extends Task {
/**
* Set whether exceptions are thrown.
* default is false.
- * @param throwExceptions true if should be thrown
+ * @param throwExceptions true if exceptions should be thrown
*/
public void setThrowexceptions(boolean throwExceptions) {
this.throwExceptions = throwExceptions;
@@ -553,7 +551,7 @@ class FOPTaskStarter {
// OR output file doesn't exist OR
// output file is older than input file
if (task.getForce() || !outf.exists()
- || (task.getXmlFile().lastModified() > outf.lastModified()
+ || (task.getXmlFile().lastModified() >
outf.lastModified()
|| task.getXsltFile().lastModified() >
outf.lastModified())) {
render(task.getXmlFile(), task.getXsltFile(), outf,
outputFormat);
actioncount++;
@@ -639,8 +637,8 @@ class FOPTaskStarter {
}
}
- private void renderInputHandler
- (InputHandler inputHandler, File outFile, String outputFormat) throws
Exception {
+ private void renderInputHandler(InputHandler inputHandler, File outFile,
String outputFormat)
+ throws Exception {
OutputStream out = null;
try {
out = new java.io.FileOutputStream(outFile);
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/traits/MinOptMax.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/traits/MinOptMax.java?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/traits/MinOptMax.java
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/traits/MinOptMax.java
Wed Sep 8 18:10:47 2010
@@ -56,8 +56,7 @@ public final class MinOptMax implements
* @return the corresponding instance
* @throws IllegalArgumentException if <code>min > opt || max < opt</code>.
*/
- public static MinOptMax getInstance(int min, int opt, int max)
- throws IllegalArgumentException {
+ public static MinOptMax getInstance(int min, int opt, int max) throws
IllegalArgumentException {
if (min > opt) {
throw new IllegalArgumentException("min (" + min + ") > opt (" +
opt + ")");
}
@@ -168,8 +167,7 @@ public final class MinOptMax implements
* @throws ArithmeticException if this instance has strictly less shrink
or stretch
* than the operand
*/
- public MinOptMax minus(MinOptMax operand)
- throws ArithmeticException {
+ public MinOptMax minus(MinOptMax operand) throws ArithmeticException {
checkCompatibility(getShrink(), operand.getShrink(), "shrink");
checkCompatibility(getStretch(), operand.getStretch(), "stretch");
return new MinOptMax(min - operand.min, opt - operand.opt, max -
operand.max);
@@ -194,58 +192,54 @@ public final class MinOptMax implements
}
/**
- * Returns an instance with the given value added to the minimal value.
+ * Do not use, backwards compatibility only. Returns an instance with the
+ * given value added to the minimal value.
*
* @param minOperand the minimal value to be added.
* @return an instance with the given value added to the minimal value.
- * @throws IllegalArgumentException if <code>min + minOperand > opt || max
< opt</code>.
+ * @throws IllegalArgumentException if
+ * <code>min + minOperand > opt || max < opt</code>.
*/
- // [GA] remove deprecation - no alternative specified
- // @deprecated Do not use! It's only for backwards compatibility.
- public MinOptMax plusMin(int minOperand)
- throws IllegalArgumentException {
+ public MinOptMax plusMin(int minOperand) throws IllegalArgumentException {
return getInstance(min + minOperand, opt, max);
}
/**
- * Returns an instance with the given value subtracted to the minimal
value.
+ * Do not use, backwards compatibility only. Returns an instance with the
+ * given value subtracted to the minimal value.
*
* @param minOperand the minimal value to be subtracted.
* @return an instance with the given value subtracted to the minimal
value.
- * @throws IllegalArgumentException if <code>min - minOperand > opt || max
< opt</code>.
+ * @throws IllegalArgumentException if
+ * <code>min - minOperand > opt || max < opt</code>.
*/
- // [GA] remove deprecation - no alternative specified
- // @deprecated Do not use! It's only for backwards compatibility.
- public MinOptMax minusMin(int minOperand)
- throws IllegalArgumentException {
+ public MinOptMax minusMin(int minOperand) throws IllegalArgumentException {
return getInstance(min - minOperand, opt, max);
}
/**
- * Returns an instance with the given value added to the maximal value.
+ * Do not use, backwards compatibility only. Returns an instance with the
+ * given value added to the maximal value.
*
* @param maxOperand the maximal value to be added.
* @return an instance with the given value added to the maximal value.
- * @throws IllegalArgumentException if <code>min > opt || max < opt +
maxOperand</code>.
+ * @throws IllegalArgumentException if
+ * <code>min > opt || max < opt + maxOperand</code>.
*/
- // [GA] remove deprecation - no alternative specified
- // @deprecated Do not use! It's only for backwards compatibility.
- public MinOptMax plusMax(int maxOperand)
- throws IllegalArgumentException {
+ public MinOptMax plusMax(int maxOperand) throws IllegalArgumentException {
return getInstance(min, opt, max + maxOperand);
}
/**
- * Returns an instance with the given value subtracted to the maximal
value.
+ * Do not use, backwards compatibility only. Returns an instance with the
+ * given value subtracted to the maximal value.
*
* @param maxOperand the maximal value to be subtracted.
* @return an instance with the given value subtracted to the maximal
value.
- * @throws IllegalArgumentException if <code>min > opt || max < opt -
maxOperand</code>.
+ * @throws IllegalArgumentException if
+ * <code>min > opt || max < opt - maxOperand</code>.
*/
- // [GA] remove deprecation - no alternative specified
- // @deprecated Do not use! It's only for backwards compatibility.
- public MinOptMax minusMax(int maxOperand)
- throws IllegalArgumentException {
+ public MinOptMax minusMax(int maxOperand) throws IllegalArgumentException {
return getInstance(min, opt, max - maxOperand);
}
@@ -256,8 +250,7 @@ public final class MinOptMax implements
* @return the product of this <code>MinOptMax</code> and the given factor
* @throws IllegalArgumentException if the factor is negative
*/
- public MinOptMax mult(int factor)
- throws IllegalArgumentException {
+ public MinOptMax mult(int factor) throws IllegalArgumentException {
if (factor < 0) {
throw new IllegalArgumentException("factor < 0; was: " + factor);
} else if (factor == 1) {
Propchange:
xmlgraphics/fop/branches/Temp_ComplexScripts/src/java/org/apache/fop/util/ColorExt.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 8 18:10:47 2010
@@ -2,4 +2,4 @@
/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/util/ColorExt.java:745924-830281
/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/util/ColorExt.java:603620-746655
/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/util/ColorExt.java:684572,688085,688696
-/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java:981451-990588
+/xmlgraphics/fop/trunk/src/java/org/apache/fop/util/ColorExt.java:981451-995168
Modified: xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_ComplexScripts/status.xml Wed Sep 8 18:10:47
2010
@@ -58,6 +58,9 @@
documents. Example: the fix of marks layering will be such a case when
it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Layout" dev="JM" type="fix" fixes-bug="49885">
+ Fixed retrieval of available BPD for cases spanning columns and
multiple pages with differing page masters.
+ </action>
<action context="Renderers" dev="VH" type="remove">
Removed old Renderer implementations for those output formats that
have a version based on
the new DocumentHandler architecture available (AFP, PCL, PDF, PS).
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
Wed Sep 8 18:10:47 2010
@@ -56,13 +56,19 @@
<fo:table table-layout="fixed" width="100%">
<fo:table-body>
<fo:table-row>
- <fo:table-cell>
- <fo:block>After the table 1</fo:block>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 1.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 1.2</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell>
- <fo:block>After the table 2</fo:block>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 2.1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell border="1pt solid black">
+ <fo:block>Cell 2.2</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
@@ -74,7 +80,12 @@
<checks>
<eval expected="Block before the page break."
xpath="//pageViewport[1]//flow/block[2]//text"/>
<eval expected="Block after the page break."
xpath="//pageViewport[2]//flow/block[1]//text"/>
- <eval expected="After the table 1"
xpath="//pageViewport[2]//flow/block[2]/block[1]//text"/>
- <eval expected="After the table 2"
xpath="//pageViewport[2]//flow/block[2]/block[2]//text"/>
+ <eval expected="400000"
xpath="//pageViewport[2]//flow/block[2]/@ipd"/>
+ <eval expected="199000"
xpath="//pageViewport[2]//flow/block[2]/block[1]/@ipd"/>
+ <eval expected="Cell 1.1"
xpath="//pageViewport[2]//flow/block[2]/block[1]//text"/>
+ <eval expected="199000"
xpath="//pageViewport[2]//flow/block[2]/block[2]/@ipd"/>
+ <eval expected="Cell 1.2"
xpath="//pageViewport[2]//flow/block[2]/block[2]//text"/>
+ <eval expected="Cell 2.1"
xpath="//pageViewport[2]//flow/block[2]/block[3]//text"/>
+ <eval expected="Cell 2.2"
xpath="//pageViewport[2]//flow/block[2]/block[4]//text"/>
</checks>
</testcase>
Modified:
xmlgraphics/fop/branches/Temp_ComplexScripts/xmlgraphics-fop-pom-template.pom
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ComplexScripts/xmlgraphics-fop-pom-template.pom?rev=995176&r1=995175&r2=995176&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ComplexScripts/xmlgraphics-fop-pom-template.pom
(original)
+++
xmlgraphics/fop/branches/Temp_ComplexScripts/xmlgraphics-fop-pom-template.pom
Wed Sep 8 18:10:47 2010
@@ -59,18 +59,23 @@ http://maven.apache.org/maven-v4_0_0.xsd
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
+
<url>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
</organization>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
<dependencies>
<!-- XML Graphics -->
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
