Index: src/java/org/apache/fop/fo/PropertyList.java =================================================================== --- src/java/org/apache/fop/fo/PropertyList.java (revision 372971) +++ src/java/org/apache/fop/fo/PropertyList.java (working copy) @@ -245,24 +245,38 @@ * @throws FOPException If an error occurs while building the PropertyList */ public void addAttributesToList(Attributes attributes) { - /* - * If font-size is set on this FO, must set it first, since - * other attributes specified in terms of "ems" depend on it. - */ - /** @todo When we do "shorthand" properties, must handle the - * "font" property as well to see if font-size is set. - */ - String attributeName = "font-size"; - String attributeValue = attributes.getValue(attributeName); + /* + * If column-number/number-columns-spanned are specified, then we + * need them before all others (possible from-table-column() on any + * other property further in the list... + */ + String attributeName = "column-number"; + String attributeValue = attributes.getValue(attributeName); + convertAttributeToProperty(attributes, attributeName, + attributeValue); + attributeName = "number-columns-spanned"; + attributeValue = attributes.getValue(attributeName); + convertAttributeToProperty(attributes, attributeName, + attributeValue); + + /* + * If font-size is set on this FO, must set it first, since + * other attributes specified in terms of "ems" depend on it. + */ + /** @todo When we do "shorthand" properties, must handle the + * "font" property as well to see if font-size is set. + */ + attributeName = "font-size"; + attributeValue = attributes.getValue(attributeName); + convertAttributeToProperty(attributes, attributeName, + attributeValue); + + for (int i = 0; i < attributes.getLength(); i++) { + attributeName = attributes.getQName(i); + attributeValue = attributes.getValue(i); convertAttributeToProperty(attributes, attributeName, attributeValue); - - for (int i = 0; i < attributes.getLength(); i++) { - attributeName = attributes.getQName(i); - attributeValue = attributes.getValue(i); - convertAttributeToProperty(attributes, attributeName, - attributeValue); - } + } } /** Index: src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java =================================================================== --- src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java (revision 372971) +++ src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java (working copy) @@ -18,6 +18,14 @@ package org.apache.fop.fo.expr; +import java.util.List; +import org.apache.fop.fo.Constants; +import org.apache.fop.fo.FObj; +import org.apache.fop.fo.FOPropertyMapping; +import org.apache.fop.fo.flow.Table; +import org.apache.fop.fo.flow.TableFObj; +import org.apache.fop.fo.flow.TableCell; +import org.apache.fop.fo.flow.TableColumn; import org.apache.fop.fo.properties.Property; /** @@ -52,13 +60,73 @@ */ public Property eval(Property[] args, PropertyInfo pInfo) throws PropertyException { - /* uncomment when implementing - String propName = args[0].getString(); - if (propName == null) { - throw new PropertyException("Incorrect parameter to from-table-column function"); + + FObj fo = pInfo.getPropertyList().getFObj(); + + /* obtain property Id for the property for which the function is being + * evaluated */ + int propId = 0; + if (args.length == 0) { + propId = pInfo.getPropertyMaker().getPropId(); + } else { + String propName = args[0].getString(); + propId = FOPropertyMapping.getPropertyId(propName); } - */ - throw new PropertyException("The from-table-column() function is not implemented, yet!"); + + /* make sure we have a correct property id ... */ + if (propId != -1) { + /* obtain column number for which the function is being evaluated: */ + int columnNumber = -1; + int span = 0; + if (fo.getNameId() != Constants.FO_TABLE_CELL) { + // climb up to the nearest cell + do { + fo = (FObj) fo.getParent(); + } while (fo.getNameId() != Constants.FO_TABLE_CELL + && fo.getNameId() != Constants.FO_PAGE_SEQUENCE); + if (fo.getNameId() == Constants.FO_TABLE_CELL) { + //column-number is available on the cell + columnNumber = ((TableCell) fo).getColumnNumber(); + span = ((TableCell) fo).getNumberColumnsSpanned(); + } else { + //means no table-cell was found... + throw new PropertyException("from-table-column() may only be used on " + + "fo:table-cell or its descendants."); + } + } else { + //column-number is only accurately available through the propertyList + columnNumber = pInfo.getPropertyList().get(Constants.PR_COLUMN_NUMBER) + .getNumeric().getValue(); + span = pInfo.getPropertyList().get(Constants.PR_NUMBER_COLUMNS_SPANNED) + .getNumeric().getValue(); + } + + /* return the property from the column */ + Table t = ((TableFObj) fo).getTable(); + List cols = t.getColumns(); + if (cols == null) { + //no columns defined => no match: return default value + return pInfo.getPropertyList().get(propId, false, true); + } else { + if (t.isColumnNumberUsed(columnNumber)) { + //easiest case: exact match + return ((TableColumn) cols.get(columnNumber - 1)).getProperty(propId); + } else { + //no exact match: try all spans... + while (--span > 0 && !t.isColumnNumberUsed(++columnNumber)) { + //nop: just increment/decrement + } + if (t.isColumnNumberUsed(columnNumber)) { + return ((TableColumn) cols.get(columnNumber - 1)).getProperty(propId); + } else { + //no match: return default value + return pInfo.getPropertyList().get(propId, false, true); + } + } + } + } else { + throw new PropertyException("Incorrect parameter to from-table-column() function"); + } } } Index: src/java/org/apache/fop/fo/flow/TableColumn.java =================================================================== --- src/java/org/apache/fop/fo/flow/TableColumn.java (revision 372971) +++ src/java/org/apache/fop/fo/flow/TableColumn.java (working copy) @@ -26,9 +26,11 @@ import org.apache.fop.datatypes.Numeric; import org.apache.fop.fo.FONode; import org.apache.fop.fo.PropertyList; +import org.apache.fop.fo.StaticPropertyList; import org.apache.fop.fo.ValidationException; import org.apache.fop.fo.expr.PropertyException; import org.apache.fop.fo.properties.CommonBorderPaddingBackground; +import org.apache.fop.fo.properties.Property; /** * Class modelling the fo:table-column object. @@ -44,6 +46,7 @@ // End of property values private boolean defaultColumn; + private StaticPropertyList pList = null; /** * @param parent FONode that is the parent of this object @@ -86,6 +89,7 @@ throw new PropertyException("number-columns-spanned must be 1 or bigger, " + "but got " + numberColumnsSpanned.getValue()); } + this.pList = new StaticPropertyList(this, pList); } /** @@ -183,6 +187,17 @@ sb.append(" column-width=").append(getColumnWidth()); return sb.toString(); } + + /** + * Retrieve a property value through its Id; used by from-table-column() function + * + * @param propId the id for the property to retrieve + * @return the requested Property + * @throws PropertyException + */ + public Property getProperty(int propId) throws PropertyException { + return this.pList.getInherited(propId); + } } Index: src/java/org/apache/fop/fo/flow/Table.java =================================================================== --- src/java/org/apache/fop/fo/flow/Table.java (revision 372971) +++ src/java/org/apache/fop/fo/flow/Table.java (working copy) @@ -71,8 +71,8 @@ /** collection of columns in this table */ protected List columns = null; - private BitSet usedColumnIndices = new BitSet(); private int columnIndex = 1; + private BitSet usedColumnIndices = new BitSet(); private TableBody tableHeader = null; private TableBody tableFooter = null; @@ -212,8 +212,6 @@ missingChildElementError( "(marker*,table-column*,table-header?,table-footer?,table-body+)"); } - //release reference - usedColumnIndices = null; getFOEventHandler().endTable(this); } @@ -259,11 +257,7 @@ //in case column is repeated: //for the time being, add the same column //(colRepeat - 1) times to the columns list - //TODO: need to force the column-number - //TODO: need to make sure START/END BorderInfo - // are completely independent instances (clones?) - // = necessary for border-collapse="collapse" - // if collapsing is handled in FOTree + //TODO: need to force the column-number (?) for (int i = colRepeat - 1; --i >= 0;) { columns.add(col); } @@ -277,6 +271,7 @@ columnIndex++; } } + /** @return true of table-layout="auto" */ public boolean isAutoLayout() { return (tableLayout != EN_FIXED); @@ -426,6 +421,16 @@ } /** + * Checks if a certain column-number is already occupied + * + * @param colNr the column-number to check + * @return true if column-number is already in use + */ + public boolean isColumnNumberUsed(int colNr) { + return usedColumnIndices.get(colNr - 1); + } + + /** * Sets the current column index of the given Table * (used by TableColumn.bind() in case the column-number * was explicitly specified) @@ -435,14 +440,5 @@ public void setCurrentColumnIndex(int newIndex) { columnIndex = newIndex; } - - /** - * Checks if a certain column-number is already occupied - * - * @param colNr the column-number to check - * @return true if column-number is already in use - */ - protected boolean isColumnNumberUsed(int colNr) { - return usedColumnIndices.get(colNr - 1); - } + } Index: src/java/org/apache/fop/fo/flow/TableFObj.java =================================================================== --- src/java/org/apache/fop/fo/flow/TableFObj.java (revision 372971) +++ src/java/org/apache/fop/fo/flow/TableFObj.java (working copy) @@ -144,7 +144,7 @@ * @param colNr the column-number to check * @return true if column-number is already in use */ - protected boolean isColumnNumberUsed(int colNr) { + public boolean isColumnNumberUsed(int colNr) { return false; } @@ -155,7 +155,7 @@ * @return the base table instance * */ - protected Table getTable() { + public Table getTable() { if (this.getNameId() == FO_TABLE) { //node is a Table //=> return itself Index: src/java/org/apache/fop/fo/flow/TableBody.java =================================================================== --- src/java/org/apache/fop/fo/flow/TableBody.java (revision 372971) +++ src/java/org/apache/fop/fo/flow/TableBody.java (working copy) @@ -404,7 +404,7 @@ * @param colNr the column-number to check * @return true if column-number is already occupied */ - protected boolean isColumnNumberUsed(int colNr) { + public boolean isColumnNumberUsed(int colNr) { return usedColumnIndices.get(colNr - 1); } } Index: src/java/org/apache/fop/fo/flow/TableRow.java =================================================================== --- src/java/org/apache/fop/fo/flow/TableRow.java (revision 372971) +++ src/java/org/apache/fop/fo/flow/TableRow.java (working copy) @@ -316,7 +316,7 @@ * @param colNr the column-number to check * @return true if column-number is already occupied */ - protected boolean isColumnNumberUsed(int colNr) { + public boolean isColumnNumberUsed(int colNr) { return usedColumnIndices.get(colNr - 1); } } Index: src/java/org/apache/fop/fo/flow/TableCell.java =================================================================== --- src/java/org/apache/fop/fo/flow/TableCell.java (revision 372971) +++ src/java/org/apache/fop/fo/flow/TableCell.java (working copy) @@ -129,28 +129,6 @@ startsRow = pList.get(PR_STARTS_ROW).getEnum(); width = pList.get(PR_WIDTH).getLength(); super.bind(pList); - - //check if any of the column-numbers occupied by this cell - //are already in use in the current row... - int i = -1; - int columnIndex = columnNumber.getValue(); - while (++i < getNumberColumnsSpanned()) { - //if table has explicit columns and the column-number isn't - //assigned to any column, increment further until the next - //column is encountered - if (getTable().columns != null) { - while (columnIndex <= getTable().columns.size() - && !getTable().isColumnNumberUsed(columnIndex)) { - columnIndex++; - } - } - //if column-number is already in use by another cell - //in the current row => error! - if (((TableFObj) parent).isColumnNumberUsed(columnIndex)) { - throw new FOPException("fo:table-cell overlaps in column " - + columnIndex, locator); - } - } } /** Index: src/java/org/apache/fop/fo/properties/ColumnNumberPropertyMaker.java =================================================================== --- src/java/org/apache/fop/fo/properties/ColumnNumberPropertyMaker.java (revision 372971) +++ src/java/org/apache/fop/fo/properties/ColumnNumberPropertyMaker.java (working copy) @@ -18,6 +18,7 @@ package org.apache.fop.fo.properties; +import org.apache.fop.apps.FOPException; import org.apache.fop.fo.Constants; import org.apache.fop.fo.FObj; import org.apache.fop.fo.PropertyList; @@ -85,19 +86,44 @@ throws PropertyException { Property p = super.get(0, propertyList, tryInherit, tryDefault); - FObj fo = propertyList.getFObj(); + TableFObj fo = (TableFObj) propertyList.getFObj(); TableFObj parent = (TableFObj) propertyList.getParentFObj(); + int columnIndex = p.getNumeric().getValue(); - if (p.getNumeric().getValue() <= 0) { - int columnIndex = parent.getCurrentColumnIndex(); + if (columnIndex <= 0) { fo.getLogger().warn("Specified negative or zero value for " + "column-number on " + fo.getName() + ": " - + p.getNumeric().getValue() + " forced to " - + columnIndex); - return new NumberProperty(columnIndex); + + columnIndex + " forced to " + + parent.getCurrentColumnIndex()); + return new NumberProperty(parent.getCurrentColumnIndex()); } //TODO: check for non-integer value and round + if (fo.getNameId() == Constants.FO_TABLE_CELL) { + //check if any of the column-numbers occupied by this cell + //are already in use in the current row... + int i = -1; + int colspan = propertyList.get(Constants.PR_NUMBER_COLUMNS_SPANNED) + .getNumeric().getValue(); + while (++i < colspan) { + //if table has explicit columns and the column-number isn't + //assigned to any column, increment further until the next + //column is encountered + if (fo.getTable().getColumns() != null) { + while (columnIndex <= fo.getTable().getColumns().size() + && !fo.getTable().isColumnNumberUsed(columnIndex)) { + columnIndex++; + } + } + //if column-number is already in use by another cell + //in the current row => error! + if (parent.isColumnNumberUsed(columnIndex + i)) { + throw new PropertyException("fo:table-cell overlaps in column " + + (columnIndex + i)); + } + } + } + //if column-number was explicitly specified, force the parent's current //column index to the specified value, so that the updated index will //be the correct initial value for the next cell (see Rec 7.26.8) Index: test/fotree/testcases/properties_omitted_propertyname.fo =================================================================== --- test/fotree/testcases/properties_omitted_propertyname.fo (revision 372971) +++ test/fotree/testcases/properties_omitted_propertyname.fo (working copy) @@ -61,7 +61,36 @@ - + + + + + + + + + Start-aligned + + + + + + + End-aligned + + + + + + Center-aligned + + + + +