http://blog.gmane.org/gmane.text.xml.fop.cvs hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.text.xml.fop.cvs/8117 Author: adelmelle Date: Sat Jul 5 15:53:58 2008 New Revision: 674245 URL: http://svn.apache.org/viewvc?rev=674245&view=rev Log: Fixed ClassCastException when specifying column-number on something other than a fo:table-column or fo:table-cell... Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java?rev=674245&r1=674244&r2=674245&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java Sat Jul 5 15:53:58 2008 < at >< at > -55,9 +55,10 < at >< at > CollapsingBorderModel collapsingBorderModel; /** - * Main constructor + * Create a TableFObj instance that is a child + * of the given {< at >link FONode} * - * < at >param parent the parent node + * < at >param parent the parent {< at >link FONode} */ public TableFObj(FONode parent) { super(parent); < at >< at > -81,6 +82,8 < at >< at > } /** + * Return the value for the "border-precedence" property + * for the given side. * * < at >param side the side for which to return the border precedence * < at >return the "border-precedence" value for the given side < at >< at > -102,13 +105,13 < at >< at > /** * Convenience method to returns a reference - * to the base Table instance + * to the base {< at >link Table} instance. * * < at >return the base table instance * */ public Table getTable() { - // Will be overridden in Table; for any other Table-node, recursive call to + // Overridden in Table; for any other Table-node, recursive call to // parent.getTable() return ((TableFObj) parent).getTable(); } < at >< at > -119,13 +122,13 < at >< at > public abstract CommonBorderPaddingBackground getCommonBorderPaddingBackground(); /** - * PropertyMaker subclass for the column-number property - * + * {< at >link PropertyMaker} subclass for the column-number property */ public static class ColumnNumberPropertyMaker extends PropertyMaker { /** * Constructor + * * < at >param propId the id of the property for which the maker should * be created */ < at >< at > -144,46 +147,50 < at >< at > /** + * {< at >inheritDoc} * Check the value of the column-number property. - * Return the parent's column index (initial value) in case - * of a negative or zero value - * - * < at >see org.apache.fop.fo.properties.PropertyMaker#make(PropertyList, String, FObj) */ public Property make(PropertyList propertyList, String value, FObj fo) throws PropertyException { + Property p = super.make(propertyList, value, fo); - ColumnNumberManagerHolder parent - = (ColumnNumberManagerHolder) propertyList.getParentFObj(); - ColumnNumberManager columnIndexManager = parent.getColumnNumberManager(); int columnIndex = p.getNumeric().getValue(); int colSpan = propertyList.get(Constants.PR_NUMBER_COLUMNS_SPANNED) .getNumeric().getValue(); - - int lastIndex = columnIndex - 1 + colSpan; - for (int i = columnIndex; i <= lastIndex; ++i) { - if (columnIndexManager.isColumnNumberUsed(i)) { - /* if column-number is already in use by another - * cell/column => error! - */ - TableEventProducer eventProducer = TableEventProducer.Provider.get( - fo.getUserAgent().getEventBroadcaster()); - eventProducer.cellOverlap(this, propertyList.getFObj().getName(), - i, fo.getLocator()); + + // only check whether the column-number is occupied in case it was + // specified on a fo:table-cell or fo:table-column + int foId = propertyList.getFObj().getNameId(); + if (foId == FO_TABLE_COLUMN || foId == FO_TABLE_CELL) { + ColumnNumberManagerHolder parent + = (ColumnNumberManagerHolder) propertyList.getParentFObj(); + ColumnNumberManager columnIndexManager = parent.getColumnNumberManager(); + int lastIndex = columnIndex - 1 + colSpan; + for (int i = columnIndex; i <= lastIndex; ++i) { + if (columnIndexManager.isColumnNumberUsed(i)) { + /* if column-number is already in use by another + * cell/column => error! + */ + TableEventProducer eventProducer + = TableEventProducer.Provider.get( + fo.getUserAgent().getEventBroadcaster()); + eventProducer.cellOverlap( + this, propertyList.getFObj().getName(), + i, propertyList.getFObj().getLocator()); + } } } - return p; } - + /** - * If the value is not positive, return a property whose value is the next column number - * * {< at >inheritDoc} + * If the value is not positive, return a property whose value + * is the next column number. */ - public Property convertProperty(Property p, - PropertyList propertyList, FObj fo) + public Property convertProperty(Property p, + PropertyList propertyList, FObj fo) throws PropertyException { if (p instanceof EnumProperty) { return EnumNumber.getInstance(p); < at >< at > -191,15 +198,24 < at >< at > Number val = p.getNumber(); if (val != null) { int i = Math.round(val.floatValue()); + int foId = propertyList.getFObj().getNameId(); if (i <= 0) { - ColumnNumberManagerHolder parent = - (ColumnNumberManagerHolder) propertyList.getParentFObj(); - ColumnNumberManager columnIndexManager = parent.getColumnNumberManager(); - i = columnIndexManager.getCurrentColumnNumber(); + if (foId == FO_TABLE_CELL || foId == FO_TABLE_COLUMN) { + ColumnNumberManagerHolder parent = + (ColumnNumberManagerHolder) propertyList.getParentFObj(); + ColumnNumberManager columnIndexManager = parent.getColumnNumberManager(); + i = columnIndexManager.getCurrentColumnNumber(); + } else { + /* very exceptional case: + * negative column-number specified on + * a FO that is not a fo:table-cell or fo:table-column + */ + i = 1; + } TableEventProducer eventProducer = TableEventProducer.Provider.get(fo.getUserAgent().getEventBroadcaster()); eventProducer.forceNextColumnNumber(this, propertyList.getFObj().getName(), - val, i, fo.getLocator()); + val, i, propertyList.getFObj().getLocator()); } return NumberProperty.getInstance(i); } < at >< at > -233,26 +249,26 < at >< at > /** * Creates a BorderSpecification from the border set on the given side. If no border * is set, a BorderSpecification with border-style none is created. - * + * * < at >param side one of CommonBorderPaddingBackground.BEFORE|AFTER|START|END */ private void createBorder(int side) { BorderSpecification borderSpec = new BorderSpecification( getCommonBorderPaddingBackground().getBorderInfo(side), getNameId()); switch (side) { - case CommonBorderPaddingBackground.BEFORE: - borderBefore = new ConditionalBorder(borderSpec, collapsingBorderModel); - break; - case CommonBorderPaddingBackground.AFTER: - borderAfter = new ConditionalBorder(borderSpec, collapsingBorderModel); - break; - case CommonBorderPaddingBackground.START: - borderStart = borderSpec; - break; - case CommonBorderPaddingBackground.END: - borderEnd = borderSpec; - break; - default: assert false; + case CommonBorderPaddingBackground.BEFORE: + borderBefore = new ConditionalBorder(borderSpec, collapsingBorderModel); + break; + case CommonBorderPaddingBackground.AFTER: + borderAfter = new ConditionalBorder(borderSpec, collapsingBorderModel); + break; + case CommonBorderPaddingBackground.START: + borderStart = borderSpec; + break; + case CommonBorderPaddingBackground.END: + borderEnd = borderSpec; + break; + default: assert false; } } } adelmelle< at >apache.org 2008-07-05T22:53:59 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8116 Author: acumiskey Date: Fri Jul 4 08:57:51 2008 New Revision: 674077 URL: http://svn.apache.org/viewvc?rev=674077&view=rev Log: Encapsulates text data. Added: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java (with props) Added: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java?rev=674077&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java (added) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java Fri Jul 4 08:57:51 2008 < at >< at > -0,0 +1,170 < at >< at > +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id$ */ + +package org.apache.fop.render.afp; + +import java.awt.Color; + +/** + * Contains text data information + */ +public class AFPTextDataInfo { + private int fontReference; + private int x; + private int y; + private Color color; + private int variableSpaceCharacterIncrement; + private int interCharacterAdjustment; + private byte[] data; + private int orientation; + + /** + * < at >return the font reference + */ + public int getFontReference() { + return fontReference; + } + + /** + * Sets the font reference + * < at >param fontReference the font reference + */ + protected void setFontReference(int fontReference) { + this.fontReference = fontReference; + } + + /** + * < at >return the x coordinate + */ + public int getX() { + return x; + } + + /** + * Sets the X coordinate + * < at >param x the X coordinate + */ + protected void setX(int x) { + this.x = x; + } + + /** + * < at >return the y coordinate + */ + public int getY() { + return y; + } + + /** + * Sets the Y coordinate + * < at >param y the Y coordinate + */ + protected void setY(int y) { + this.y = y; + } + + /** + * < at >return the color + */ + public Color getColor() { + return color; + } + + /** + * Sets the color + * < at >param color the color + */ + protected void setColor(Color color) { + this.color = color; + } + + /** + * < at >return the variable space character increment + */ + public int getVariableSpaceCharacterIncrement() { + return variableSpaceCharacterIncrement; + } + + /** + * Sets the variable space character increment + * < at >param variableSpaceCharacterIncrement the variable space character increment + */ + protected void setVariableSpaceCharacterIncrement( + int variableSpaceCharacterIncrement) { + this.variableSpaceCharacterIncrement = variableSpaceCharacterIncrement; + } + + /** + * < at >return the inter character adjustment + */ + public int getInterCharacterAdjustment() { + return interCharacterAdjustment; + } + + /** + * Sets the inter character adjustment + * < at >param interCharacterAdjustment the inter character adjustment + */ + protected void setInterCharacterAdjustment(int interCharacterAdjustment) { + this.interCharacterAdjustment = interCharacterAdjustment; + } + + /** + * < at >return the text data + */ + public byte[] getData() { + return data; + } + + /** + * Sets the text data + * < at >param data the text orientation + */ + protected void setData(byte[] data) { + this.data = data; + } + + /** + * Sets the text orientation + * < at >param orientation the text orientation + */ + public void setOrientation(int orientation) { + this.orientation = orientation; + } + + /** + * < at >return the text orientation + */ + public int getOrientation() { + return this.orientation; + } + + /** {< at >inheritDoc} */ + public String toString() { + return "AFPTextDataInfo{fontReference=" + fontReference + + ", x=" + x + + ", y=" + y + + ", color=" + color + + ", vsci=" + variableSpaceCharacterIncrement + + ", ica=" + interCharacterAdjustment + + ", orientation=" + orientation + + ", data=" + data + + "}"; + } +} \ No newline at end of file Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextDataInfo.java ------------------------------------------------------------------------------ svn:keywords = Revision Id acumiskey< at >apache.org 2008-07-04T15:57:51 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8115 Author: acumiskey Date: Fri Jul 4 07:14:58 2008 New Revision: 674066 URL: http://svn.apache.org/viewvc?rev=674066&view=rev Log: Merged revisions 674065 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r674065 | acumiskey | 2008-07-04 15:12:37 +0100 (Fri, 04 Jul 2008) | 2 lines Replaced conditional with a switch and capitalized method javadoc description. ........ Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Jul 4 07:14:58 2008 < at >< at > -1 +1 < at >< at > -/xmlgraphics/fop/trunk:1-674060 +/xmlgraphics/fop/trunk:1-674065 Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java?rev=674066&r1=674065&r2=674066&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Page.java Fri Jul 4 07:14:58 2008 < at >< at > -209,27 +209,28 < at >< at > /** * Get the region from this page. * - * < at >param areaclass the region area class + * < at >param areaClass the region area class * < at >return the region viewport or null if none */ - public RegionViewport getRegionViewport(int areaclass) { - if (areaclass == Constants.FO_REGION_BEFORE) { + public RegionViewport getRegionViewport(int areaClass) { + switch (areaClass) { + case Constants.FO_REGION_BEFORE: return regionBefore; - } else if (areaclass == Constants.FO_REGION_START) { + case Constants.FO_REGION_START: return regionStart; - } else if (areaclass == Constants.FO_REGION_BODY) { - return regionBody; - } else if (areaclass == Constants.FO_REGION_END) { + case Constants.FO_REGION_BODY: + return regionBody; + case Constants.FO_REGION_END: return regionEnd; - } else if (areaclass == Constants.FO_REGION_AFTER) { + case Constants.FO_REGION_AFTER: return regionAfter; + default: + throw new IllegalArgumentException("No such area class with ID = " + areaClass); } - throw new IllegalArgumentException("No such area class with ID = " - + areaclass); } /** - * indicates whether any FOs have been added to the body region + * Indicates whether any FOs have been added to the body region * * < at >return whether any FOs have been added to the body region */ acumiskey< at >apache.org 2008-07-04T14:14:59 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8114 Author: acumiskey Date: Fri Jul 4 07:12:37 2008 New Revision: 674065 URL: http://svn.apache.org/viewvc?rev=674065&view=rev Log: Replaced conditional with a switch and capitalized method javadoc description. Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java?rev=674065&r1=674064&r2=674065&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Page.java Fri Jul 4 07:12:37 2008 < at >< at > -209,27 +209,28 < at >< at > /** * Get the region from this page. * - * < at >param areaclass the region area class + * < at >param areaClass the region area class * < at >return the region viewport or null if none */ - public RegionViewport getRegionViewport(int areaclass) { - if (areaclass == Constants.FO_REGION_BEFORE) { + public RegionViewport getRegionViewport(int areaClass) { + switch (areaClass) { + case Constants.FO_REGION_BEFORE: return regionBefore; - } else if (areaclass == Constants.FO_REGION_START) { + case Constants.FO_REGION_START: return regionStart; - } else if (areaclass == Constants.FO_REGION_BODY) { - return regionBody; - } else if (areaclass == Constants.FO_REGION_END) { + case Constants.FO_REGION_BODY: + return regionBody; + case Constants.FO_REGION_END: return regionEnd; - } else if (areaclass == Constants.FO_REGION_AFTER) { + case Constants.FO_REGION_AFTER: return regionAfter; + default: + throw new IllegalArgumentException("No such area class with ID = " + areaClass); } - throw new IllegalArgumentException("No such area class with ID = " - + areaclass); } /** - * indicates whether any FOs have been added to the body region + * Indicates whether any FOs have been added to the body region * * < at >return whether any FOs have been added to the body region */ acumiskey< at >apache.org 2008-07-04T14:12:38 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8113 Author: acumiskey Date: Fri Jul 4 07:10:11 2008 New Revision: 674064 URL: http://svn.apache.org/viewvc?rev=674064&view=rev Log: Removed 'this'. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java?rev=674064&r1=674063&r2=674064&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPTextHandler.java Fri Jul 4 07:10:11 2008 < at >< at > -79,7 +79,7 < at >< at > } if (overrideFont != null) { FontInfo fontInfo = getFontInfo(); - AFPPageFonts pageFonts = this.afpState.getPageFonts(); + AFPPageFonts pageFonts = afpState.getPageFonts(); String internalFontName = overrideFont.getFontName(); int fontSize = overrideFont.getFontSize(); if (afpState.setFontName(internalFontName) || afpState.setFontSize(fontSize)) { acumiskey< at >apache.org 2008-07-04T14:10:11 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8112 Author: acumiskey Date: Fri Jul 4 07:05:40 2008 New Revision: 674062 URL: http://svn.apache.org/viewvc?rev=674062&view=rev Log: Merged revisions 674056 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r674056 | acumiskey | 2008-07-04 14:57:57 +0100 (Fri, 04 Jul 2008) | 3 lines * Some minor optimizations in AbstractRenderer. * Renamed getBooleanTrait() to getTraitAsBoolean() in Area. ........ Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Jul 4 07:05:40 2008 < at >< at > -1 +1 < at >< at > -/xmlgraphics/fop/trunk:1-674043 +/xmlgraphics/fop/trunk:1-674060 Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java?rev=674062&r1=674061&r2=674062&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java Fri Jul 4 07:05:40 2008 < at >< at > -417,10 +417,11 < at >< at > /** * Get a boolean trait from this area. + * * < at >param oTraitCode the trait key * < at >return the trait value */ - public boolean getBooleanTrait(Object oTraitCode) { + public boolean getTraitAsBoolean(Object oTraitCode) { final Object obj = getTrait(oTraitCode); if (obj instanceof Boolean) { return ((Boolean)obj).booleanValue(); Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java?rev=674062&r1=674061&r2=674062&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java Fri Jul 4 07:05:40 2008 < at >< at > -182,22 +182,22 < at >< at > *< at >return true if the inline area is underlined. */ public boolean hasUnderline() { - return getBooleanTrait(Trait.UNDERLINE); + return getTraitAsBoolean(Trait.UNDERLINE); } /** < at >return true if the inline area is overlined. */ public boolean hasOverline() { - return getBooleanTrait(Trait.OVERLINE); + return getTraitAsBoolean(Trait.OVERLINE); } /** < at >return true if the inline area has a line through. */ public boolean hasLineThrough() { - return getBooleanTrait(Trait.LINETHROUGH); + return getTraitAsBoolean(Trait.LINETHROUGH); } /** < at >return true if the inline area is blinking. */ public boolean isBlinking() { - return getBooleanTrait(Trait.BLINK); + return getTraitAsBoolean(Trait.BLINK); } /** Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java?rev=674062&r1=674061&r2=674062&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractRenderer.java Fri Jul 4 07:05:40 2008 < at >< at > -246,15 +246,25 < at >< at > last here. */ RegionViewport viewport; viewport = page.getRegionViewport(FO_REGION_BEFORE); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_START); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_END); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_AFTER); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_BODY); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } } /** < at >< at > -266,27 +276,25 < at >< at > * < at >param port The region viewport to be rendered */ protected void renderRegionViewport(RegionViewport port) { - if (port != null) { - Rectangle2D view = port.getViewArea(); - // The CTM will transform coordinates relative to - // this region-reference area into page coords, so - // set origin for the region to 0,0. - currentBPPosition = 0; - currentIPPosition = 0; - - RegionReference regionReference = port.getRegionReference(); - handleRegionTraits(port); - - // shouldn't the viewport have the CTM - startVParea(regionReference.getCTM(), port.isClip() ? view : null); - // do after starting viewport area - if (regionReference.getRegionClass() == FO_REGION_BODY) { - renderBodyRegion((BodyRegion) regionReference); - } else { - renderRegion(regionReference); - } - endVParea(); + Rectangle2D view = port.getViewArea(); + // The CTM will transform coordinates relative to + // this region-reference area into page coords, so + // set origin for the region to 0,0. + currentBPPosition = 0; + currentIPPosition = 0; + + RegionReference regionReference = port.getRegionReference(); + handleRegionTraits(port); + + // shouldn't the viewport have the CTM + startVParea(regionReference.getCTM(), port.isClip() ? view : null); + // do after starting viewport area + if (regionReference.getRegionClass() == FO_REGION_BODY) { + renderBodyRegion((BodyRegion) regionReference); + } else { + renderRegion(regionReference); } + endVParea(); } /** < at >< at > -320,8 +328,7 < at >< at > * < at >param region The region reference area */ protected void renderRegion(RegionReference region) { - List blocks = region.getBlocks(); - renderBlocks(null, blocks); + renderBlocks(null, region.getBlocks()); } /** < at >< at > -502,7 +509,7 < at >< at > int saveBP = currentBPPosition; // Calculate the position of the content rectangle. - if (parent != null && !Boolean.TRUE.equals(parent.getTrait(Trait.IS_VIEWPORT_AREA))) { + if (parent != null && !parent.getTraitAsBoolean(Trait.IS_VIEWPORT_AREA)) { currentBPPosition += parent.getBorderAndPaddingWidthBefore(); /* This is unnecessary now as we're going to use the *-indent traits currentIPPosition += parent.getBorderAndPaddingWidthStart(); < at >< at > -558,7 +565,7 < at >< at > // simply move position currentBPPosition += block.getAllocBPD(); } - } else if (Boolean.TRUE.equals(block.getTrait(Trait.IS_REFERENCE_AREA))) { + } else if (block.getTraitAsBoolean(Trait.IS_REFERENCE_AREA)) { renderReferenceArea(block); } else { // save position and offset < at >< at > -864,4 +871,5 < at >< at > matrix[5] = matrix[5] * 1000; return new AffineTransform(matrix); } + } acumiskey< at >apache.org 2008-07-04T14:05:41 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8111 Author: acumiskey Date: Fri Jul 4 06:57:57 2008 New Revision: 674056 URL: http://svn.apache.org/viewvc?rev=674056&view=rev Log: * Some minor optimizations in AbstractRenderer. * Renamed getBooleanTrait() to getTraitAsBoolean() in Area. Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java?rev=674056&r1=674055&r2=674056&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/Area.java Fri Jul 4 06:57:57 2008 < at >< at > -415,10 +415,11 < at >< at > /** * Get a boolean trait from this area. + * * < at >param oTraitCode the trait key * < at >return the trait value */ - public boolean getBooleanTrait(Object oTraitCode) { + public boolean getTraitAsBoolean(Object oTraitCode) { final Object obj = getTrait(oTraitCode); if (obj instanceof Boolean) { return ((Boolean)obj).booleanValue(); Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java?rev=674056&r1=674055&r2=674056&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/inline/InlineArea.java Fri Jul 4 06:57:57 2008 < at >< at > -182,22 +182,22 < at >< at > *< at >return true if the inline area is underlined. */ public boolean hasUnderline() { - return getBooleanTrait(Trait.UNDERLINE); + return getTraitAsBoolean(Trait.UNDERLINE); } /** < at >return true if the inline area is overlined. */ public boolean hasOverline() { - return getBooleanTrait(Trait.OVERLINE); + return getTraitAsBoolean(Trait.OVERLINE); } /** < at >return true if the inline area has a line through. */ public boolean hasLineThrough() { - return getBooleanTrait(Trait.LINETHROUGH); + return getTraitAsBoolean(Trait.LINETHROUGH); } /** < at >return true if the inline area is blinking. */ public boolean isBlinking() { - return getBooleanTrait(Trait.BLINK); + return getTraitAsBoolean(Trait.BLINK); } /** Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=674056&r1=674055&r2=674056&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java Fri Jul 4 06:57:57 2008 < at >< at > -246,15 +246,25 < at >< at > last here. */ RegionViewport viewport; viewport = page.getRegionViewport(FO_REGION_BEFORE); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_START); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_END); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_AFTER); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } viewport = page.getRegionViewport(FO_REGION_BODY); - renderRegionViewport(viewport); + if (viewport != null) { + renderRegionViewport(viewport); + } } /** < at >< at > -266,27 +276,25 < at >< at > * < at >param port The region viewport to be rendered */ protected void renderRegionViewport(RegionViewport port) { - if (port != null) { - Rectangle2D view = port.getViewArea(); - // The CTM will transform coordinates relative to - // this region-reference area into page coords, so - // set origin for the region to 0,0. - currentBPPosition = 0; - currentIPPosition = 0; - - RegionReference regionReference = port.getRegionReference(); - handleRegionTraits(port); - - // shouldn't the viewport have the CTM - startVParea(regionReference.getCTM(), port.isClip() ? view : null); - // do after starting viewport area - if (regionReference.getRegionClass() == FO_REGION_BODY) { - renderBodyRegion((BodyRegion) regionReference); - } else { - renderRegion(regionReference); - } - endVParea(); + Rectangle2D view = port.getViewArea(); + // The CTM will transform coordinates relative to + // this region-reference area into page coords, so + // set origin for the region to 0,0. + currentBPPosition = 0; + currentIPPosition = 0; + + RegionReference regionReference = port.getRegionReference(); + handleRegionTraits(port); + + // shouldn't the viewport have the CTM + startVParea(regionReference.getCTM(), port.isClip() ? view : null); + // do after starting viewport area + if (regionReference.getRegionClass() == FO_REGION_BODY) { + renderBodyRegion((BodyRegion) regionReference); + } else { + renderRegion(regionReference); } + endVParea(); } /** < at >< at > -320,8 +328,7 < at >< at > * < at >param region The region reference area */ protected void renderRegion(RegionReference region) { - List blocks = region.getBlocks(); - renderBlocks(null, blocks); + renderBlocks(null, region.getBlocks()); } /** < at >< at > -502,7 +509,7 < at >< at > int saveBP = currentBPPosition; // Calculate the position of the content rectangle. - if (parent != null && !Boolean.TRUE.equals(parent.getTrait(Trait.IS_VIEWPORT_AREA))) { + if (parent != null && !parent.getTraitAsBoolean(Trait.IS_VIEWPORT_AREA)) { currentBPPosition += parent.getBorderAndPaddingWidthBefore(); /* This is unnecessary now as we're going to use the *-indent traits currentIPPosition += parent.getBorderAndPaddingWidthStart(); < at >< at > -558,7 +565,7 < at >< at > // simply move position currentBPPosition += block.getAllocBPD(); } - } else if (Boolean.TRUE.equals(block.getTrait(Trait.IS_REFERENCE_AREA))) { + } else if (block.getTraitAsBoolean(Trait.IS_REFERENCE_AREA)) { renderReferenceArea(block); } else { // save position and offset < at >< at > -864,4 +871,5 < at >< at > matrix[5] = matrix[5] * 1000; return new AffineTransform(matrix); } + } acumiskey< at >apache.org 2008-07-04T13:57:58 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8110 Author: acumiskey Date: Fri Jul 4 06:21:43 2008 New Revision: 674045 URL: http://svn.apache.org/viewvc?rev=674045&view=rev Log: Merged revisions 672833,674039,674043 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r672833 | adelmelle | 2008-06-30 18:34:41 +0100 (Mon, 30 Jun 2008) | 2 lines Added check for the case where column-number is specified on something other than a fo:table-cell or fo:table-column (strictly not an error) ........ r674039 | acumiskey | 2008-07-04 14:13:29 +0100 (Fri, 04 Jul 2008) | 2 lines Minor readability improvement. ........ r674043 | acumiskey | 2008-07-04 14:17:06 +0100 (Fri, 04 Jul 2008) | 3 lines The pdf StringBuffer is only used on these two lines and doesn't seem to do anything... Very strange... :-S ........ Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Fri Jul 4 06:21:43 2008 < at >< at > -1 +1 < at >< at > -/xmlgraphics/fop/trunk:1-672776 +/xmlgraphics/fop/trunk:1-674043 Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=674045&r1=674044&r2=674045&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFRenderer.java Fri Jul 4 06:21:43 2008 < at >< at > -1415,7 +1415,6 < at >< at > updateColor(ct, true); beginTextObject(); - StringBuffer pdf = new StringBuffer(); String fontName = getInternalFontNameForArea(text); int size = ((Integer) text.getTrait(Trait.FONT_SIZE)).intValue(); < at >< at > -1434,8 +1433,6 < at >< at > textutil.writeTextMatrix(new AffineTransform(1, 0, 0, -1, rx / 1000f, bl / 1000f)); - currentStream.add(pdf.toString()); - super.renderText(text); textutil.writeTJ(); Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo?rev=674045&r1=674044&r2=674045&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/fotree/testcases/column-number_cells_rows.fo Fri Jul 4 06:21:43 2008 < at >< at > -181,6 +181,10 < at >< at > </fo:table-row> </fo:table-body> </fo:table> + <fo:block column-number="4"> + <test:assert property="column-number" expected="4" /> + Test column-number when specified on fo:block + </fo:block> </fo:flow> </fo:page-sequence> </fo:root> acumiskey< at >apache.org 2008-07-04T13:21:43 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8109 Author: acumiskey Date: Fri Jul 4 06:17:06 2008 New Revision: 674043 URL: http://svn.apache.org/viewvc?rev=674043&view=rev Log: The pdf StringBuffer is only used on these two lines and doesn't seem to do anything... Very strange... :-S Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java?rev=674043&r1=674042&r2=674043&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRenderer.java Fri Jul 4 06:17:06 2008 < at >< at > -1415,7 +1415,6 < at >< at > updateColor(ct, true); beginTextObject(); - StringBuffer pdf = new StringBuffer(); String fontName = getInternalFontNameForArea(text); int size = ((Integer) text.getTrait(Trait.FONT_SIZE)).intValue(); < at >< at > -1434,8 +1433,6 < at >< at > textutil.writeTextMatrix(new AffineTransform(1, 0, 0, -1, rx / 1000f, bl / 1000f)); - currentStream.add(pdf.toString()); - super.renderText(text); textutil.writeTJ(); acumiskey< at >apache.org 2008-07-04T13:17:07 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8108 Author: acumiskey Date: Fri Jul 4 06:13:29 2008 New Revision: 674039 URL: http://svn.apache.org/viewvc?rev=674039&view=rev Log: Minor readability improvement. Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=674039&r1=674038&r2=674039&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Fri Jul 4 06:13:29 2008 < at >< at > -539,7 +539,9 < at >< at > protected void drawBorderLine(float x1, float y1, float x2, float y2, boolean horz, boolean startOrBefore, int style, Color col) { Graphics2D g2d = state.getGraph(); - drawBorderLine(new Rectangle2D.Float(x1, y1, x2 - x1, y2 - y1), + float width = x2 - x1; + float height = y2 - y1; + drawBorderLine(new Rectangle2D.Float(x1, y1, width, height), horz, startOrBefore, style, col, g2d); } acumiskey< at >apache.org 2008-07-04T13:13:30 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8107 Author: adelmelle Date: Thu Jul 3 11:25:01 2008 New Revision: 673750 URL: http://svn.apache.org/viewvc?rev=673750&view=rev Log: Fix for Bugzilla 45295 (already committed to the trunk with r672010, r672495 and r672496) Added: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml (with props) Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Modified: xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=673750&r1=673749&r2=673750&view=diff ============================================================================== --- xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java (original) +++ xmlgraphics/fop/branches/fop-0_95/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Thu Jul 3 11:25:01 2008 < at >< at > -21,6 +21,7 < at >< at > import java.awt.Color; +import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.apache.fop.apps.FOPException; < at >< at > -101,9 +102,9 < at >< at > } /** {< at >inheritDoc} */ - protected void startOfNode() throws FOPException { - super.startOfNode(); - if (refId.equals("")) { + public void processNode(String elementName, Locator locator, Attributes attlist, PropertyList pList) throws FOPException { + super.processNode(elementName, locator, attlist, pList); + if (!inMarker() && (refId == null || "".equals(refId))) { missingPropertyError("ref-id"); } } Added: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml?rev=673750&view=auto ============================================================================== --- xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml (added) +++ xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml Thu Jul 3 11:25:01 2008 < at >< at > -0,0 +1,95 < at >< at > +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- $Id$ --> +<testcase> + <info> + <p> + This test checks for resolution of forward references in + fo:markers, as reported in Bugzilla 45295. + </p> + </info> + <fo> + <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> + <fo:layout-master-set> + <fo:simple-page-master master-name="first" + margin-right="1.5cm" + margin-left="1.5cm" + margin-bottom="2cm" + margin-top="1cm" + page-width="21cm" + page-height="29.7cm"> + <fo:region-body margin-top="1cm"/> + <fo:region-before extent="1cm"/> + <fo:region-after extent="1.5cm"/> + </fo:simple-page-master> + </fo:layout-master-set> + <fo:page-sequence master-reference="first" initial-page-number="1"> + <fo:static-content flow-name="xsl-region-before"> + <fo:block-container height="1cm" width="15cm" top="0cm" left="0cm" position="absolute"> + <fo:block> + <fo:retrieve-marker retrieve-class-name="message" + retrieve-boundary="page" + retrieve-position="first-starting-within-page"/> + </fo:block> + </fo:block-container> + <fo:block-container height="1cm" width="15cm" top="0cm" left="0cm" position="absolute"> + <fo:block> + <fo:retrieve-marker retrieve-class-name="term" + retrieve-boundary="page" + retrieve-position="last-ending-within-page"/> + </fo:block> + </fo:block-container> + </fo:static-content> + <fo:static-content flow-name="xsl-region-after"> + <fo:block text-align="start" font-size="10pt" font-family="serif" line-height="1em + 2pt"> + Page (<fo:page-number/> / <fo:page-number-citation ref-id="end-of-document"/>) + </fo:block> + </fo:static-content> + <fo:flow flow-name="xsl-region-body"> + <fo:block> + <fo:marker marker-class-name="message"> + <fo:block> + WARNING: Page sequence contains: <fo:page-number-citation id="pnc1" ref-id="end-of-document"/> pages. + </fo:block> + </fo:marker> + </fo:block> + <fo:block text-align="start" font-size="12pt" font-family="sans-serif"> + This page sequence has more than one page so you will see the message only at the top of the first page. + </fo:block> + <fo:block break-before="page" text-align="start" font-size="12pt" font-family="sans-serif"> + Some text. + </fo:block> + <fo:block break-before="page" text-align="start" font-size="12pt" font-family="sans-serif"> + Some text. + </fo:block> + <fo:block break-before="page" text-align="start" font-size="12pt" font-family="sans-serif"> + Some more text on last page. + </fo:block> + <fo:block id="end-of-document"> + <fo:marker marker-class-name="term"> + [marker content] + </fo:marker> + </fo:block> + </fo:flow> + </fo:page-sequence> + </fo:root> + </fo> + <checks> + <true xpath="//text[< at >prod-id='pnc1'][1]/word = '4'" /> + </checks> +</testcase> Propchange: xmlgraphics/fop/branches/fop-0_95/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml ------------------------------------------------------------------------------ svn:keywords = Id adelmelle< at >apache.org 2008-07-03T18:25:02 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8106 Author: acumiskey Date: Wed Jul 2 06:39:13 2008 New Revision: 673390 URL: http://svn.apache.org/viewvc?rev=673390&view=rev Log: Removed commented method. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=673390&r1=673389&r2=673390&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java Wed Jul 2 06:39:13 2008 < at >< at > -474,22 +474,6 < at >< at > } } -// /** -// * Returns the position transform. -// * < at >param bp The block parent -// * < at >return the position transform -// */ -// protected AffineTransform getPositionTransform(BlockParent bp) { -// AffineTransform transform = new AffineTransform(); -// transform.translate(bp.getXOffset(), bp.getYOffset()); -// -// //"left/"top" (bv.getX/YOffset()) specify the position of the content rectangle -// transform.translate( -// -bp.getBorderAndPaddingWidthStart(), -// -bp.getBorderAndPaddingWidthBefore()); -// return transform; -// } - private static final QName FOX_TRANSFORM = new QName(ExtensionElementMapping.URI, "fox:transform"); acumiskey< at >apache.org 2008-07-02T13:39:13 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8105 Author: acumiskey Date: Wed Jul 2 05:07:02 2008 New Revision: 673372 URL: http://svn.apache.org/viewvc?rev=673372&view=rev Log: Minor cleanup. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=673372&r1=673371&r2=673372&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Wed Jul 2 05:07:02 2008 < at >< at > -144,9 +144,7 < at >< at > public Java2DRenderer() { } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ public void setUserAgent(FOUserAgent foUserAgent) { super.setUserAgent(foUserAgent); userAgent.setRendererOverride(this); // for document regeneration < at >< at > -162,9 +160,7 < at >< at > return userAgent; } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ public void setupFontInfo(FontInfo inFontInfo) { //Don't call super.setupFontInfo() here! Java2D needs a special font setup // create a temp Image to test font metrics on < at >< at > -437,16 +433,12 < at >< at > state.transform(new AffineTransform(CTMHelper.toPDFArray(ctm))); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void endVParea() { restoreGraphicsState(); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected List breakOutOfStateStack() { log.debug("Block.FIXED --> break out"); List breakOutList; < at >< at > -459,10 +451,7 < at >< at > return breakOutList; } - /** - * {< at >inheritDoc} - * java.util.List) - */ + /** {< at >inheritDoc} */ protected void restoreStateStackAfterBreakOut(List breakOutList) { log.debug("Block.FIXED --> restoring context after break-out"); < at >< at > -474,16 +463,12 < at >< at > } } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void updateColor(Color col, boolean fill) { state.updateColor(col); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void clip() { if (currentPath == null) { throw new IllegalStateException("No current path available!"); < at >< at > -492,16 +477,12 < at >< at > currentPath = null; } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void closePath() { currentPath.closePath(); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void lineTo(float x, float y) { if (currentPath == null) { currentPath = new GeneralPath(); < at >< at > -509,9 +490,7 < at >< at > currentPath.lineTo(x, y); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void moveTo(float x, float y) { if (currentPath == null) { currentPath = new GeneralPath(); < at >< at > -519,27 +498,23 < at >< at > currentPath.moveTo(x, y); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void clipRect(float x, float y, float width, float height) { state.updateClip(new Rectangle2D.Float(x, y, width, height)); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void fillRect(float x, float y, float width, float height) { state.getGraph().fill(new Rectangle2D.Float(x, y, width, height)); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void drawBorderLine(float x1, float y1, float x2, float y2, boolean horz, boolean startOrBefore, int style, Color col) { Graphics2D g2d = state.getGraph(); - drawBorderLine(new Rectangle2D.Float(x1, y1, x2 - x1, y2 - y1), + float width = x2 - x1; + float height = y2 - y1; + drawBorderLine(new Rectangle2D.Float(x1, y1, width, height), horz, startOrBefore, style, col, g2d); } < at >< at > -704,9 +679,7 < at >< at > } } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ public void renderText(TextArea text) { renderInlineAreaBackAndBorders(text); < at >< at > -888,18 +861,14 < at >< at > super.renderLeader(area); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ public void renderImage(Image image, Rectangle2D pos) { // endTextObject(); String url = image.getURL(); drawImage(url, pos); } - /** - * {< at >inheritDoc} - */ + /** {< at >inheritDoc} */ protected void drawImage(String uri, Rectangle2D pos, Map foreignAttributes) { int x = currentIPPosition + (int)Math.round(pos.getX()); acumiskey< at >apache.org 2008-07-02T12:07:03 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8104 Author: spepping Date: Mon Jun 30 13:11:41 2008 New Revision: 672892 URL: http://svn.apache.org/viewvc?rev=672892&view=rev Log: Undoing change committed in r670735, because the modified features are valid Java6 features Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java?rev=672892&r1=672891&r2=672892&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java (original) +++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/breaking/ActiveLayouts.java Mon Jun 30 13:11:41 2008 < at >< at > -67,6 +67,7 < at >< at > private Set<V> nextSet; + < at >Override public boolean hasNext() { while (keyIter.hasNext()) { nextSet = keyIter.next().getValue(); < at >< at > -77,10 +78,12 < at >< at > return false; } + < at >Override public Iterator<V> next() { return nextSet.iterator(); } + < at >Override public void remove() { throw new UnsupportedOperationException("Not implemented"); } < at >< at > -150,15 +153,18 < at >< at > L currentLayout; + < at >Override public boolean hasNext() { return backingIter.hasNext(); } + < at >Override public L next() { currentLayout = backingIter.next(); return currentLayout; } + < at >Override public void remove() { backingIter.remove(); other.removeValue(getKey(currentLayout), currentLayout); < at >< at > -168,6 +174,7 < at >< at > } /** {< at >inheritDoc} */ + < at >Override public void remove() { throw new UnsupportedOperationException("Not implemented"); } < at >< at > -194,6 +201,7 < at >< at > } /** {< at >inheritDoc} */ + < at >Override public Iterator<L> iterator() { return layouts.iterator(); } Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java?rev=672892&r1=672891&r2=672892&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java (original) +++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/prototype/java/src/org/apache/fop/prototype/knuth/KnuthElement.java Mon Jun 30 13:11:41 2008 < at >< at > -57,7 +57,7 < at >< at > /** {< at >inheritDoc} */ < at >Override public String toString() { - if (content.equals("")) { + if (content.isEmpty()) { return ""; } else { return " \"" + content + "\""; spepping< at >apache.org 2008-06-30T20:11:41 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8103 Author: adelmelle Date: Mon Jun 30 10:34:41 2008 New Revision: 672833 URL: http://svn.apache.org/viewvc?rev=672833&view=rev Log: Added check for the case where column-number is specified on something other than a fo:table-cell or fo:table-column (strictly not an error) Modified: xmlgraphics/fop/trunk/test/fotree/testcases/column-number_cells_rows.fo Modified: xmlgraphics/fop/trunk/test/fotree/testcases/column-number_cells_rows.fo URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/fotree/testcases/column-number_cells_rows.fo?rev=672833&r1=672832&r2=672833&view=diff ============================================================================== --- xmlgraphics/fop/trunk/test/fotree/testcases/column-number_cells_rows.fo (original) +++ xmlgraphics/fop/trunk/test/fotree/testcases/column-number_cells_rows.fo Mon Jun 30 10:34:41 2008 < at >< at > -181,6 +181,10 < at >< at > </fo:table-row> </fo:table-body> </fo:table> + <fo:block column-number="4"> + <test:assert property="column-number" expected="4" /> + Test column-number when specified on fo:block + </fo:block> </fo:flow> </fo:page-sequence> </fo:root> adelmelle< at >apache.org 2008-06-30T17:34:41 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8102 Author: acumiskey Date: Mon Jun 30 08:53:46 2008 New Revision: 672800 URL: http://svn.apache.org/viewvc?rev=672800&view=rev Log: Duplicate operation removed. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/awt/AWTRenderer.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/awt/AWTRenderer.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/awt/AWTRenderer.java?rev=672800&r1=672799&r2=672800&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/awt/AWTRenderer.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/awt/AWTRenderer.java Mon Jun 30 08:53:46 2008 < at >< at > -149,14 +149,11 < at >< at > Rectangle2D bounds = getPageViewport(pageNum).getViewArea(); pageWidth = (int) Math.round(bounds.getWidth() / 1000f); pageHeight = (int) Math.round(bounds.getHeight() / 1000f); - double scaleX = scaleFactor + double scale = scaleFactor * (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) / userAgent.getTargetPixelUnitToMillimeter(); - double scaleY = scaleFactor - * (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) - / userAgent.getTargetPixelUnitToMillimeter(); - int bitmapWidth = (int) ((pageWidth * scaleX) + 0.5); - int bitmapHeight = (int) ((pageHeight * scaleY) + 0.5); + int bitmapWidth = (int) ((pageWidth * scale) + 0.5); + int bitmapHeight = (int) ((pageHeight * scale) + 0.5); return new Dimension(bitmapWidth, bitmapHeight); } acumiskey< at >apache.org 2008-06-30T15:53:47 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8101 Author: acumiskey Date: Mon Jun 30 07:11:56 2008 New Revision: 672777 URL: http://svn.apache.org/viewvc?rev=672777&view=rev Log: Merged revisions 672495-672496,672499,672537,672539,672564-672565,672617-672618,672670 via svnmerge from https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk ........ r672495 | adelmelle | 2008-06-28 12:22:58 +0100 (Sat, 28 Jun 2008) | 1 line Removed unnecessary override ........ r672496 | adelmelle | 2008-06-28 12:24:20 +0100 (Sat, 28 Jun 2008) | 1 line Added testcase for r672010 ........ r672499 | adelmelle | 2008-06-28 13:11:40 +0100 (Sat, 28 Jun 2008) | 3 lines Added basic-checks.xml: file currently only contains one default check. Modified testcase2checks.xsl: the added basic-checks.xml will be inserted before the checks particular to the testcase. ........ r672537 | acumiskey | 2008-06-28 17:05:08 +0100 (Sat, 28 Jun 2008) | 1 line Corrected minor spelling mistake in javadoc ........ r672539 | acumiskey | 2008-06-28 17:08:13 +0100 (Sat, 28 Jun 2008) | 1 line Corrected minor spelling mistake in javadoc ........ r672564 | adelmelle | 2008-06-28 19:39:39 +0100 (Sat, 28 Jun 2008) | 1 line Corrected basic checks: check for empty document, as well as empty areaTree... ........ r672565 | adelmelle | 2008-06-28 19:45:16 +0100 (Sat, 28 Jun 2008) | 1 line Removed instream-foreign-object in marker; still threw a NPE ........ r672617 | adelmelle | 2008-06-29 11:52:30 +0100 (Sun, 29 Jun 2008) | 1 line Added disabled testcase for instream-foreign-object in a marker ........ r672618 | adelmelle | 2008-06-29 11:58:31 +0100 (Sun, 29 Jun 2008) | 2 lines Correct svn props ........ r672670 | adelmelle | 2008-06-29 20:53:17 +0100 (Sun, 29 Jun 2008) | 1 line Cleanup/re-ordering, and addition of XSL 1.1 FO_ and PR_ constants ........ Added: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/basic-checks.xml - copied unchanged from r672670, xmlgraphics/fop/trunk/test/layoutengine/basic-checks.xml xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/marker_instream-foreign-object.xml - copied unchanged from r672670, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_instream-foreign-object.xml xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml - copied unchanged from r672670, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/marker_page-number-citation_bugzilla45295.xml Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed) xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventExceptionManager.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventListener.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/testcase2checks.xsl Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Jun 30 07:11:56 2008 < at >< at > -1 +1 < at >< at > -/xmlgraphics/fop/trunk:1-672234 +/xmlgraphics/fop/trunk:1-672776 Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventExceptionManager.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventExceptionManager.java?rev=672777&r1=672776&r2=672777&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventExceptionManager.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventExceptionManager.java Mon Jun 30 07:11:56 2008 < at >< at > -25,7 +25,7 < at >< at > import org.apache.xmlgraphics.util.Service; /** - * This class is reponsible for converting events into exceptions. + * This class is responsible for converting events into exceptions. */ public class EventExceptionManager { Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventListener.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventListener.java?rev=672777&r1=672776&r2=672777&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventListener.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventListener.java Mon Jun 30 07:11:56 2008 < at >< at > -28,7 +28,7 < at >< at > * This method is called for each event that is generated. With the event's ID it is possible * to react to certain events. Events can also simply be recorded and presented to a user. * It is possible to throw an (unchecked) exception if the processing needs to be aborted - * because some special event occured. This way the client can configure the behaviour of + * because some special event occurred. This way the client can configure the behaviour of * the observed application. * < at >param event the event */ Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java?rev=672777&r1=672776&r2=672777&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/Constants.java Mon Jun 30 07:11:56 2008 < at >< at > -24,9 +24,9 < at >< at > * There are sets of constants describing: * <ul> * <li>Input and output formats</li> - * <li>Formatting objects</li> - * <li>Formatting properties</li> - * <li>Enumerated values used in formatting properties</li> + * <li>Formatting objects (<em>FO_XXX</em>)</li> + * <li>Formatting properties (<em>PR_XXX</em>)</li> + * <li>Enumerated values used in formatting properties (<em>EN_XXX</em>)</li> * </ul> */ public interface Constants { < at >< at > -45,124 +45,162 < at >< at > int FO_BLOCK = 3; /** FO element constant */ int FO_BLOCK_CONTAINER = 4; + /** FO element constant - XSL 1.1 */ + int FO_BOOKMARK_TREE = 5; + /** FO element constant - XSL 1.1 */ + int FO_BOOKMARK = 6; + /** FO element constant - XSL 1.1 */ + int FO_BOOKMARK_TITLE = 7; + /** FO element constant - XSL 1.1 */ + int FO_CHANGE_BAR_BEGIN = 8; + /** FO element constant - XSL 1.1 */ + int FO_CHANGE_BAR_END = 9; /** FO element constant */ - int FO_CHARACTER = 5; + int FO_CHARACTER = 10; /** FO element constant */ - int FO_COLOR_PROFILE = 6; + int FO_COLOR_PROFILE = 11; /** FO element constant */ - int FO_CONDITIONAL_PAGE_MASTER_REFERENCE = 7; + int FO_CONDITIONAL_PAGE_MASTER_REFERENCE = 12; /** FO element constant */ - int FO_DECLARATIONS = 8; + int FO_DECLARATIONS = 13; /** FO element constant */ - int FO_EXTERNAL_GRAPHIC = 9; + int FO_EXTERNAL_GRAPHIC = 14; /** FO element constant */ - int FO_FLOAT = 10; + int FO_FLOAT = 15; /** FO element constant */ - int FO_FLOW = 11; + int FO_FLOW = 16; + /** FO element constant - XSL 1.1 */ + int FO_FLOW_ASSIGNMENT = 17; + /** FO element constant - XSL 1.1 */ + int FO_FLOW_MAP = 18; + /** FO element constant - XSL 1.1 */ + int FO_FLOW_NAME_SPECIFIER = 19; + /** FO element constant - XSL 1.1 */ + int FO_FLOW_SOURCE_LIST = 20; + /** FO element constant - XSL 1.1 */ + int FO_FLOW_TARGET_LIST = 21; + /** FO element constant - XSL 1.1 */ + int FO_FOLIO_PREFIX = 22; + /** FO element constant - XSL 1.1 */ + int FO_FOLIO_SUFFIX = 23; /** FO element constant */ - int FO_FOOTNOTE = 12; + int FO_FOOTNOTE = 24; /** FO element constant */ - int FO_FOOTNOTE_BODY = 13; + int FO_FOOTNOTE_BODY = 25; + /** FO element constant - XSL 1.1 */ + int FO_INDEX_KEY_REFERENCE = 26; + /** FO element constant - XSL 1.1 */ + int FO_INDEX_PAGE_NUMBER_PREFIX = 27; + /** FO element constant - XSL 1.1 */ + int FO_INDEX_PAGE_NUMBER_SUFFIX = 28; + /** FO element constant - XSL 1.1 */ + int FO_INDEX_PAGE_CITATION_LIST = 29; + /** FO element constant - XSL 1.1 */ + int FO_INDEX_PAGE_CITATION_LIST_SEPARATOR = 30; + /** FO element constant - XSL 1.1 */ + int FO_INDEX_PAGE_CITATION_RANGE_SEPARATOR = 31; + /** FO element constant - XSL 1.1 */ + int FO_INDEX_RANGE_BEGIN = 32; + /** FO element constant - XSL 1.1 */ + int FO_INDEX_RANGE_END = 33; /** FO element constant */ - int FO_INITIAL_PROPERTY_SET = 14; + int FO_INITIAL_PROPERTY_SET = 34; /** FO element constant */ - int FO_INLINE = 15; + int FO_INLINE = 35; /** FO element constant */ - int FO_INLINE_CONTAINER = 16; + int FO_INLINE_CONTAINER = 36; /** FO element constant */ - int FO_INSTREAM_FOREIGN_OBJECT = 17; + int FO_INSTREAM_FOREIGN_OBJECT = 37; /** FO element constant */ - int FO_LAYOUT_MASTER_SET = 18; + int FO_LAYOUT_MASTER_SET = 38; /** FO element constant */ - int FO_LEADER = 19; + int FO_LEADER = 39; /** FO element constant */ - int FO_LIST_BLOCK = 20; + int FO_LIST_BLOCK = 40; /** FO element constant */ - int FO_LIST_ITEM = 21; + int FO_LIST_ITEM = 41; /** FO element constant */ - int FO_LIST_ITEM_BODY = 22; + int FO_LIST_ITEM_BODY = 42; /** FO element constant */ - int FO_LIST_ITEM_LABEL = 23; + int FO_LIST_ITEM_LABEL = 43; /** FO element constant */ - int FO_MARKER = 24; + int FO_MARKER = 44; /** FO element constant */ - int FO_MULTI_CASE = 25; + int FO_MULTI_CASE = 45; /** FO element constant */ - int FO_MULTI_PROPERTIES = 26; + int FO_MULTI_PROPERTIES = 46; /** FO element constant */ - int FO_MULTI_PROPERTY_SET = 27; + int FO_MULTI_PROPERTY_SET = 47; /** FO element constant */ - int FO_MULTI_SWITCH = 28; + int FO_MULTI_SWITCH = 48; /** FO element constant */ - int FO_MULTI_TOGGLE = 29; + int FO_MULTI_TOGGLE = 49; /** FO element constant */ - int FO_PAGE_NUMBER = 30; + int FO_PAGE_NUMBER = 50; /** FO element constant */ - int FO_PAGE_NUMBER_CITATION = 31; + int FO_PAGE_NUMBER_CITATION = 51; + /** FO element constant - XSL 1.1 */ + int FO_PAGE_NUMBER_CITATION_LAST = 52; /** FO element constant */ - int FO_PAGE_SEQUENCE = 32; + int FO_PAGE_SEQUENCE = 53; /** FO element constant */ - int FO_PAGE_SEQUENCE_MASTER = 33; + int FO_PAGE_SEQUENCE_MASTER = 54; + /** FO element constant - XSL 1.1 */ + int FO_PAGE_SEQUENCE_WRAPPER = 55; /** FO element constant */ - int FO_REGION_AFTER = 34; + int FO_REGION_AFTER = 56; /** FO element constant */ - int FO_REGION_BEFORE = 35; + int FO_REGION_BEFORE = 57; /** FO element constant */ - int FO_REGION_BODY = 36; + int FO_REGION_BODY = 58; /** FO element constant */ - int FO_REGION_END = 37; + int FO_REGION_END = 59; + /** FO element constant - XSL 1.1 */ + int FO_REGION_NAME_SPECIFIER = 60; /** FO element constant */ - int FO_REGION_START = 38; + int FO_REGION_START = 61; /** FO element constant */ - int FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES = 39; + int FO_REPEATABLE_PAGE_MASTER_ALTERNATIVES = 62; /** FO element constant */ - int FO_REPEATABLE_PAGE_MASTER_REFERENCE = 40; + int FO_REPEATABLE_PAGE_MASTER_REFERENCE = 63; /** FO element constant */ - int FO_RETRIEVE_MARKER = 41; + int FO_RETRIEVE_MARKER = 64; + /** FO element constant - XSL 1.1 */ + int FO_RETRIEVE_TABLE_MARKER = 65; /** FO element constant */ - int FO_ROOT = 42; + int FO_ROOT = 66; + /** FO element constant - XSL 1.1 */ + int FO_SCALING_VALUE_CITATION = 67; /** FO element constant */ - int FO_SIMPLE_PAGE_MASTER = 43; + int FO_SIMPLE_PAGE_MASTER = 68; /** FO element constant */ - int FO_SINGLE_PAGE_MASTER_REFERENCE = 44; + int FO_SINGLE_PAGE_MASTER_REFERENCE = 69; /** FO element constant */ - int FO_STATIC_CONTENT = 45; + int FO_STATIC_CONTENT = 70; /** FO element constant */ - int FO_TABLE = 46; + int FO_TABLE = 71; /** FO element constant */ - int FO_TABLE_AND_CAPTION = 47; + int FO_TABLE_AND_CAPTION = 72; /** FO element constant */ - int FO_TABLE_BODY = 48; + int FO_TABLE_BODY = 73; /** FO element constant */ - int FO_TABLE_CAPTION = 49; + int FO_TABLE_CAPTION = 74; /** FO element constant */ - int FO_TABLE_CELL = 50; + int FO_TABLE_CELL = 75; /** FO element constant */ - int FO_TABLE_COLUMN = 51; + int FO_TABLE_COLUMN = 76; /** FO element constant */ - int FO_TABLE_FOOTER = 52; + int FO_TABLE_FOOTER = 77; /** FO element constant */ - int FO_TABLE_HEADER = 53; + int FO_TABLE_HEADER = 78; /** FO element constant */ - int FO_TABLE_ROW = 54; + int FO_TABLE_ROW = 79; /** FO element constant */ - int FO_TITLE = 55; + int FO_TITLE = 80; /** FO element constant */ - int FO_WRAPPER = 56; - /** FO element constant - XSL 1.1 */ - int FO_BOOKMARK_TREE = 57; - /** FO element constant - XSL 1.1 */ - int FO_BOOKMARK = 58; - /** FO element constant - XSL 1.1 */ - int FO_BOOKMARK_TITLE = 59; - /** FO element constant - XSL 1.1 */ - int FO_PAGE_SEQUENCE_WRAPPER = 60; - /** FO element constant - XSL 1.1 */ - int FO_PAGE_NUMBER_CITATION_LAST = 61; - /** FO element constant - XSL 1.1 */ - int FO_RETRIEVE_TABLE_MARKER = 62; + int FO_WRAPPER = 81; /** Number of FO element constants defined */ - int FRM_OBJ_COUNT = 62; + int FRM_OBJ_COUNT = 81; // Masks /** < at >< at > -308,394 +346,428 < at >< at > int PR_CASE_NAME = 61; /** Property constant */ int PR_CASE_TITLE = 62; + /** Property constant - XSL 1.1 */ + int PR_CHANGE_BAR_CLASS = 63; + /** Property constant - XSL 1.1 */ + int PR_CHANGE_BAR_COLOR = 64; + /** Property constant - XSL 1.1 */ + int PR_CHANGE_BAR_OFFSET = 65; + /** Property constant - XSL 1.1 */ + int PR_CHANGE_BAR_PLACEMENT = 66; + /** Property constant - XSL 1.1 */ + int PR_CHANGE_BAR_STYLE = 67; + /** Property constant - XSL 1.1 */ + int PR_CHANGE_BAR_WIDTH = 68; /** Property constant */ - int PR_CHARACTER = 63; + int PR_CHARACTER = 69; /** Property constant */ - int PR_CLEAR = 64; + int PR_CLEAR = 70; /** Property constant */ - int PR_CLIP = 65; + int PR_CLIP = 71; /** Property constant */ - int PR_COLOR = 66; + int PR_COLOR = 72; /** Property constant */ - int PR_COLOR_PROFILE_NAME = 67; + int PR_COLOR_PROFILE_NAME = 73; /** Property constant */ - int PR_COLUMN_COUNT = 68; + int PR_COLUMN_COUNT = 74; /** Property constant */ - int PR_COLUMN_GAP = 69; + int PR_COLUMN_GAP = 75; /** Property constant */ - int PR_COLUMN_NUMBER = 70; + int PR_COLUMN_NUMBER = 76; /** Property constant */ - int PR_COLUMN_WIDTH = 71; + int PR_COLUMN_WIDTH = 77; /** Property constant */ - int PR_CONTENT_HEIGHT = 72; + int PR_CONTENT_HEIGHT = 78; /** Property constant */ - int PR_CONTENT_TYPE = 73; + int PR_CONTENT_TYPE = 79; /** Property constant */ - int PR_CONTENT_WIDTH = 74; + int PR_CONTENT_WIDTH = 80; /** Property constant */ - int PR_COUNTRY = 75; + int PR_COUNTRY = 81; /** Property constant */ - int PR_CUE = 76; + int PR_CUE = 82; /** Property constant */ - int PR_CUE_AFTER = 77; + int PR_CUE_AFTER = 83; /** Property constant */ - int PR_CUE_BEFORE = 78; + int PR_CUE_BEFORE = 84; /** Property constant */ - int PR_DESTINATION_PLACEMENT_OFFSET = 79; + int PR_DESTINATION_PLACEMENT_OFFSET = 85; /** Property constant */ - int PR_DIRECTION = 80; + int PR_DIRECTION = 86; /** Property constant */ - int PR_DISPLAY_ALIGN = 81; + int PR_DISPLAY_ALIGN = 87; /** Property constant */ - int PR_DOMINANT_BASELINE = 82; + int PR_DOMINANT_BASELINE = 88; /** Property constant */ - int PR_ELEVATION = 83; + int PR_ELEVATION = 89; /** Property constant */ - int PR_EMPTY_CELLS = 84; + int PR_EMPTY_CELLS = 90; /** Property constant */ - int PR_END_INDENT = 85; + int PR_END_INDENT = 91; /** Property constant */ - int PR_ENDS_ROW = 86; + int PR_ENDS_ROW = 92; /** Property constant */ - int PR_EXTENT = 87; + int PR_EXTENT = 93; /** Property constant */ - int PR_EXTERNAL_DESTINATION = 88; + int PR_EXTERNAL_DESTINATION = 94; /** Property constant */ - int PR_FLOAT = 89; + int PR_FLOAT = 95; + /** Property constant -- XSL 1.1 */ + int PR_FLOW_MAP_NAME = 96; + /** Property constant -- XSL 1.1 */ + int PR_FLOW_MAP_REFERENCE = 97; /** Property constant */ - int PR_FLOW_NAME = 90; + int PR_FLOW_NAME = 98; + /** Property constant -- XSL 1.1 */ + int PR_FLOW_NAME_REFERENCE = 99; /** Property constant */ - int PR_FONT = 91; + int PR_FONT = 100; /** Property constant */ - int PR_FONT_FAMILY = 92; + int PR_FONT_FAMILY = 101; /** Property constant */ - int PR_FONT_SELECTION_STRATEGY = 93; + int PR_FONT_SELECTION_STRATEGY = 102; /** Property constant */ - int PR_FONT_SIZE = 94; + int PR_FONT_SIZE = 103; /** Property constant */ - int PR_FONT_SIZE_ADJUST = 95; + int PR_FONT_SIZE_ADJUST = 104; /** Property constant */ - int PR_FONT_STRETCH = 96; + int PR_FONT_STRETCH = 105; /** Property constant */ - int PR_FONT_STYLE = 97; + int PR_FONT_STYLE = 106; /** Property constant */ - int PR_FONT_VARIANT = 98; + int PR_FONT_VARIANT = 107; /** Property constant */ - int PR_FONT_WEIGHT = 99; + int PR_FONT_WEIGHT = 108; /** Property constant */ - int PR_FORCE_PAGE_COUNT = 100; + int PR_FORCE_PAGE_COUNT = 109; /** Property constant */ - int PR_FORMAT = 101; + int PR_FORMAT = 110; /** Property constant */ - int PR_GLYPH_ORIENTATION_HORIZONTAL = 102; + int PR_GLYPH_ORIENTATION_HORIZONTAL = 111; /** Property constant */ - int PR_GLYPH_ORIENTATION_VERTICAL = 103; + int PR_GLYPH_ORIENTATION_VERTICAL = 112; /** Property constant */ - int PR_GROUPING_SEPARATOR = 104; + int PR_GROUPING_SEPARATOR = 113; /** Property constant */ - int PR_GROUPING_SIZE = 105; + int PR_GROUPING_SIZE = 114; /** Property constant */ - int PR_HEIGHT = 106; + int PR_HEIGHT = 115; /** Property constant */ - int PR_HYPHENATE = 107; + int PR_HYPHENATE = 116; /** Property constant */ - int PR_HYPHENATION_CHARACTER = 108; + int PR_HYPHENATION_CHARACTER = 117; /** Property constant */ - int PR_HYPHENATION_KEEP = 109; + int PR_HYPHENATION_KEEP = 118; /** Property constant */ - int PR_HYPHENATION_LADDER_COUNT = 110; + int PR_HYPHENATION_LADDER_COUNT = 119; /** Property constant */ - int PR_HYPHENATION_PUSH_CHARACTER_COUNT = 111; + int PR_HYPHENATION_PUSH_CHARACTER_COUNT = 120; /** Property constant */ - int PR_HYPHENATION_REMAIN_CHARACTER_COUNT = 112; + int PR_HYPHENATION_REMAIN_CHARACTER_COUNT = 121; /** Property constant */ - int PR_ID = 113; + int PR_ID = 122; /** Property constant */ - int PR_INDICATE_DESTINATION = 114; + int PR_INDICATE_DESTINATION = 123; + /** Property constant - XSL 1.1 */ + int PR_INDEX_CLASS = 124; + /** Property constant - XSL 1.1 */ + int PR_INDEX_KEY = 125; /** Property constant */ - int PR_INITIAL_PAGE_NUMBER = 115; + int PR_INITIAL_PAGE_NUMBER = 126; /** Property constant */ - int PR_INLINE_PROGRESSION_DIMENSION = 116; + int PR_INLINE_PROGRESSION_DIMENSION = 127; /** Property constant */ - int PR_INTERNAL_DESTINATION = 117; + int PR_INTERNAL_DESTINATION = 128; + /** Property constant - XSL 1.1 */ + int PR_INTRINSIC_SCALE_VALUE = 129; /** Property constant */ - int PR_KEEP_TOGETHER = 118; + int PR_INTRUSION_DISPLACE = 130; /** Property constant */ - int PR_KEEP_WITH_NEXT = 119; + int PR_KEEP_TOGETHER = 131; /** Property constant */ - int PR_KEEP_WITH_PREVIOUS = 120; + int PR_KEEP_WITH_NEXT = 132; /** Property constant */ - int PR_LANGUAGE = 121; + int PR_KEEP_WITH_PREVIOUS = 133; /** Property constant */ - int PR_LAST_LINE_END_INDENT = 122; + int PR_LANGUAGE = 134; /** Property constant */ - int PR_LEADER_ALIGNMENT = 123; + int PR_LAST_LINE_END_INDENT = 135; /** Property constant */ - int PR_LEADER_LENGTH = 124; + int PR_LEADER_ALIGNMENT = 136; /** Property constant */ - int PR_LEADER_PATTERN = 125; + int PR_LEADER_LENGTH = 137; /** Property constant */ - int PR_LEADER_PATTERN_WIDTH = 126; + int PR_LEADER_PATTERN = 138; /** Property constant */ - int PR_LEFT = 127; + int PR_LEADER_PATTERN_WIDTH = 139; /** Property constant */ - int PR_LETTER_SPACING = 128; + int PR_LEFT = 140; /** Property constant */ - int PR_LETTER_VALUE = 129; + int PR_LETTER_SPACING = 141; /** Property constant */ - int PR_LINEFEED_TREATMENT = 130; + int PR_LETTER_VALUE = 142; /** Property constant */ - int PR_LINE_HEIGHT = 131; + int PR_LINEFEED_TREATMENT = 143; /** Property constant */ - int PR_LINE_HEIGHT_SHIFT_ADJUSTMENT = 132; + int PR_LINE_HEIGHT = 144; /** Property constant */ - int PR_LINE_STACKING_STRATEGY = 133; + int PR_LINE_HEIGHT_SHIFT_ADJUSTMENT = 145; /** Property constant */ - int PR_MARGIN = 134; + int PR_LINE_STACKING_STRATEGY = 146; /** Property constant */ - int PR_MARGIN_BOTTOM = 135; + int PR_MARGIN = 147; /** Property constant */ - int PR_MARGIN_LEFT = 136; + int PR_MARGIN_BOTTOM = 148; /** Property constant */ - int PR_MARGIN_RIGHT = 137; + int PR_MARGIN_LEFT = 149; /** Property constant */ - int PR_MARGIN_TOP = 138; + int PR_MARGIN_RIGHT = 150; /** Property constant */ - int PR_MARKER_CLASS_NAME = 139; + int PR_MARGIN_TOP = 151; /** Property constant */ - int PR_MASTER_NAME = 140; + int PR_MARKER_CLASS_NAME = 152; /** Property constant */ - int PR_MASTER_REFERENCE = 141; + int PR_MASTER_NAME = 153; /** Property constant */ - int PR_MAX_HEIGHT = 142; + int PR_MASTER_REFERENCE = 154; /** Property constant */ - int PR_MAXIMUM_REPEATS = 143; + int PR_MAX_HEIGHT = 155; /** Property constant */ - int PR_MAX_WIDTH = 144; + int PR_MAXIMUM_REPEATS = 156; /** Property constant */ - int PR_MEDIA_USAGE = 145; + int PR_MAX_WIDTH = 157; + /** Property constant - XSL 1.1 */ + int PR_MERGE_PAGES_ACROSS_INDEX_KEY_REFERENCES = 158; + /** Property constant - XSL 1.1 */ + int PR_MERGE_RANGES_ACROSS_INDEX_KEY_REFERENCES = 159; + /** Property constant - XSL 1.1 */ + int PR_MERGE_SEQUENTIAL_PAGE_NUMBERS = 160; /** Property constant */ - int PR_MIN_HEIGHT = 146; + int PR_MEDIA_USAGE = 161; /** Property constant */ - int PR_MIN_WIDTH = 147; + int PR_MIN_HEIGHT = 162; /** Property constant */ - int PR_NUMBER_COLUMNS_REPEATED = 148; + int PR_MIN_WIDTH = 163; /** Property constant */ - int PR_NUMBER_COLUMNS_SPANNED = 149; + int PR_NUMBER_COLUMNS_REPEATED = 164; /** Property constant */ - int PR_NUMBER_ROWS_SPANNED = 150; + int PR_NUMBER_COLUMNS_SPANNED = 165; /** Property constant */ - int PR_ODD_OR_EVEN = 151; + int PR_NUMBER_ROWS_SPANNED = 166; /** Property constant */ - int PR_ORPHANS = 152; + int PR_ODD_OR_EVEN = 167; /** Property constant */ - int PR_OVERFLOW = 153; + int PR_ORPHANS = 168; /** Property constant */ - int PR_PADDING = 154; + int PR_OVERFLOW = 169; /** Property constant */ - int PR_PADDING_AFTER = 155; + int PR_PADDING = 170; /** Property constant */ - int PR_PADDING_BEFORE = 156; + int PR_PADDING_AFTER = 171; /** Property constant */ - int PR_PADDING_BOTTOM = 157; + int PR_PADDING_BEFORE = 172; /** Property constant */ - int PR_PADDING_END = 158; + int PR_PADDING_BOTTOM = 173; /** Property constant */ - int PR_PADDING_LEFT = 159; + int PR_PADDING_END = 174; /** Property constant */ - int PR_PADDING_RIGHT = 160; + int PR_PADDING_LEFT = 175; /** Property constant */ - int PR_PADDING_START = 161; + int PR_PADDING_RIGHT = 176; /** Property constant */ - int PR_PADDING_TOP = 162; + int PR_PADDING_START = 177; /** Property constant */ - int PR_PAGE_BREAK_AFTER = 163; + int PR_PADDING_TOP = 178; /** Property constant */ - int PR_PAGE_BREAK_BEFORE = 164; + int PR_PAGE_BREAK_AFTER = 179; /** Property constant */ - int PR_PAGE_BREAK_INSIDE = 165; + int PR_PAGE_BREAK_BEFORE = 180; /** Property constant */ - int PR_PAGE_HEIGHT = 166; + int PR_PAGE_BREAK_INSIDE = 181; + /** Property constant - XSL 1.1 */ + int PR_PAGE_CITATION_STRATEGY = 182; /** Property constant */ - int PR_PAGE_POSITION = 167; + int PR_PAGE_HEIGHT = 183; + /** Property constant - XSL 1.1 */ + int PR_PAGE_NUMBER_TREATMENT = 184; /** Property constant */ - int PR_PAGE_WIDTH = 168; + int PR_PAGE_POSITION = 185; /** Property constant */ - int PR_PAUSE = 169; + int PR_PAGE_WIDTH = 186; /** Property constant */ - int PR_PAUSE_AFTER = 170; + int PR_PAUSE = 187; /** Property constant */ - int PR_PAUSE_BEFORE = 171; + int PR_PAUSE_AFTER = 188; /** Property constant */ - int PR_PITCH = 172; + int PR_PAUSE_BEFORE = 189; /** Property constant */ - int PR_PITCH_RANGE = 173; + int PR_PITCH = 190; /** Property constant */ - int PR_PLAY_DURING = 174; + int PR_PITCH_RANGE = 191; /** Property constant */ - int PR_POSITION = 175; + int PR_PLAY_DURING = 192; /** Property constant */ - int PR_PRECEDENCE = 176; + int PR_POSITION = 193; /** Property constant */ - int PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS = 177; + int PR_PRECEDENCE = 194; /** Property constant */ - int PR_PROVISIONAL_LABEL_SEPARATION = 178; + int PR_PROVISIONAL_DISTANCE_BETWEEN_STARTS = 195; /** Property constant */ - int PR_REFERENCE_ORIENTATION = 179; + int PR_PROVISIONAL_LABEL_SEPARATION = 196; /** Property constant */ - int PR_REF_ID = 180; + int PR_REFERENCE_ORIENTATION = 197; /** Property constant */ - int PR_REGION_NAME = 181; + int PR_REF_ID = 198; /** Property constant */ - int PR_RELATIVE_ALIGN = 182; + int PR_REGION_NAME = 199; + /** Property constant - XSL 1.1 */ + int PR_REGION_NAME_REFERENCE = 200; + /** Property constant - XSL 1.1 */ + int PR_REF_INDEX_KEY = 201; /** Property constant */ - int PR_RELATIVE_POSITION = 183; + int PR_RELATIVE_ALIGN = 202; /** Property constant */ - int PR_RENDERING_INTENT = 184; + int PR_RELATIVE_POSITION = 203; /** Property constant */ - int PR_RETRIEVE_BOUNDARY = 185; + int PR_RENDERING_INTENT = 204; /** Property constant */ - int PR_RETRIEVE_CLASS_NAME = 186; + int PR_RETRIEVE_BOUNDARY = 205; + /** Property constant - XSL 1.1 */ + int PR_RETRIEVE_BOUNDARY_WITHIN_TABLE = 206; /** Property constant */ - int PR_RETRIEVE_POSITION = 187; + int PR_RETRIEVE_CLASS_NAME = 207; /** Property constant */ - int PR_RICHNESS = 188; + int PR_RETRIEVE_POSITION = 208; + /** Property constant - XSL 1.1 */ + int PR_RETRIEVE_POSITION_WITHIN_TABLE = 209; /** Property constant */ - int PR_RIGHT = 189; + int PR_RICHNESS = 210; /** Property constant */ - int PR_ROLE = 190; + int PR_RIGHT = 211; /** Property constant */ - int PR_RULE_STYLE = 191; + int PR_ROLE = 212; /** Property constant */ - int PR_RULE_THICKNESS = 192; + int PR_RULE_STYLE = 213; /** Property constant */ - int PR_SCALING = 193; + int PR_RULE_THICKNESS = 214; /** Property constant */ - int PR_SCALING_METHOD = 194; + int PR_SCALING = 215; /** Property constant */ - int PR_SCORE_SPACES = 195; + int PR_SCALING_METHOD = 216; /** Property constant */ - int PR_SCRIPT = 196; + int PR_SCORE_SPACES = 217; /** Property constant */ - int PR_SHOW_DESTINATION = 197; + int PR_SCRIPT = 218; /** Property constant */ - int PR_SIZE = 198; + int PR_SHOW_DESTINATION = 219; /** Property constant */ - int PR_SOURCE_DOCUMENT = 199; + int PR_SIZE = 220; /** Property constant */ - int PR_SPACE_AFTER = 200; + int PR_SOURCE_DOCUMENT = 221; /** Property constant */ - int PR_SPACE_BEFORE = 201; + int PR_SPACE_AFTER = 222; /** Property constant */ - int PR_SPACE_END = 202; + int PR_SPACE_BEFORE = 223; /** Property constant */ - int PR_SPACE_START = 203; + int PR_SPACE_END = 224; /** Property constant */ - int PR_SPAN = 204; + int PR_SPACE_START = 225; /** Property constant */ - int PR_SPEAK = 205; + int PR_SPAN = 226; /** Property constant */ - int PR_SPEAK_HEADER = 206; + int PR_SPEAK = 227; /** Property constant */ - int PR_SPEAK_NUMERAL = 207; + int PR_SPEAK_HEADER = 228; /** Property constant */ - int PR_SPEAK_PUNCTUATION = 208; + int PR_SPEAK_NUMERAL = 229; /** Property constant */ - int PR_SPEECH_RATE = 209; + int PR_SPEAK_PUNCTUATION = 230; /** Property constant */ - int PR_SRC = 210; + int PR_SPEECH_RATE = 231; /** Property constant */ - int PR_START_INDENT = 211; + int PR_SRC = 232; /** Property constant */ - int PR_STARTING_STATE = 212; + int PR_START_INDENT = 233; /** Property constant */ - int PR_STARTS_ROW = 213; + int PR_STARTING_STATE = 234; /** Property constant */ - int PR_STRESS = 214; + int PR_STARTS_ROW = 235; /** Property constant */ - int PR_SUPPRESS_AT_LINE_BREAK = 215; + int PR_STRESS = 236; /** Property constant */ - int PR_SWITCH_TO = 216; + int PR_SUPPRESS_AT_LINE_BREAK = 237; /** Property constant */ - int PR_TABLE_LAYOUT = 217; + int PR_SWITCH_TO = 238; /** Property constant */ - int PR_TABLE_OMIT_FOOTER_AT_BREAK = 218; + int PR_TABLE_LAYOUT = 239; /** Property constant */ - int PR_TABLE_OMIT_HEADER_AT_BREAK = 219; + int PR_TABLE_OMIT_FOOTER_AT_BREAK = 240; /** Property constant */ - int PR_TARGET_PRESENTATION_CONTEXT = 220; + int PR_TABLE_OMIT_HEADER_AT_BREAK = 241; /** Property constant */ - int PR_TARGET_PROCESSING_CONTEXT = 221; + int PR_TARGET_PRESENTATION_CONTEXT = 242; /** Property constant */ - int PR_TARGET_STYLESHEET = 222; + int PR_TARGET_PROCESSING_CONTEXT = 243; /** Property constant */ - int PR_TEXT_ALIGN = 223; + int PR_TARGET_STYLESHEET = 244; /** Property constant */ - int PR_TEXT_ALIGN_LAST = 224; + int PR_TEXT_ALIGN = 245; /** Property constant */ - int PR_TEXT_ALTITUDE = 225; + int PR_TEXT_ALIGN_LAST = 246; /** Property constant */ - int PR_TEXT_DECORATION = 226; + int PR_TEXT_ALTITUDE = 247; /** Property constant */ - int PR_TEXT_DEPTH = 227; + int PR_TEXT_DECORATION = 248; /** Property constant */ - int PR_TEXT_INDENT = 228; + int PR_TEXT_DEPTH = 249; /** Property constant */ - int PR_TEXT_SHADOW = 229; + int PR_TEXT_INDENT = 250; /** Property constant */ - int PR_TEXT_TRANSFORM = 230; + int PR_TEXT_SHADOW = 251; /** Property constant */ - int PR_TOP = 231; + int PR_TEXT_TRANSFORM = 252; /** Property constant */ - int PR_TREAT_AS_WORD_SPACE = 232; + int PR_TOP = 253; /** Property constant */ - int PR_UNICODE_BIDI = 233; + int PR_TREAT_AS_WORD_SPACE = 254; /** Property constant */ - int PR_VERTICAL_ALIGN = 234; + int PR_UNICODE_BIDI = 255; /** Property constant */ - int PR_VISIBILITY = 235; + int PR_VERTICAL_ALIGN = 256; /** Property constant */ - int PR_VOICE_FAMILY = 236; + int PR_VISIBILITY = 257; /** Property constant */ - int PR_VOLUME = 237; + int PR_VOICE_FAMILY = 258; /** Property constant */ - int PR_WHITE_SPACE = 238; + int PR_VOLUME = 259; /** Property constant */ - int PR_WHITE_SPACE_COLLAPSE = 239; + int PR_WHITE_SPACE = 260; /** Property constant */ - int PR_WHITE_SPACE_TREATMENT = 240; + int PR_WHITE_SPACE_COLLAPSE = 261; /** Property constant */ - int PR_WIDOWS = 241; + int PR_WHITE_SPACE_TREATMENT = 262; /** Property constant */ - int PR_WIDTH = 242; + int PR_WIDOWS = 263; /** Property constant */ - int PR_WORD_SPACING = 243; + int PR_WIDTH = 264; /** Property constant */ - int PR_WRAP_OPTION = 244; + int PR_WORD_SPACING = 265; /** Property constant */ - int PR_WRITING_MODE = 245; + int PR_WRAP_OPTION = 266; /** Property constant */ - int PR_XML_LANG = 246; + int PR_WRITING_MODE = 267; /** Property constant */ - int PR_Z_INDEX = 247; + int PR_XML_LANG = 268; /** Property constant */ - int PR_INTRUSION_DISPLACE = 248; - /** Property constant - XSL 1.1 */ - int PR_INDEX_CLASS = 249; - /** Property constant - XSL 1.1 */ - int PR_INDEX_KEY = 250; + int PR_Z_INDEX = 269; /** Property constant - FOP proprietary: Custom extension for line alignment */ - int PR_X_BLOCK_PROGRESSION_UNIT = 251; + int PR_X_BLOCK_PROGRESSION_UNIT = 270; /** Property constant - FOP proprietary: limit for widow content in lists and tables */ - int PR_X_WIDOW_CONTENT_LIMIT = 252; + int PR_X_WIDOW_CONTENT_LIMIT = 271; /** Property constant - FOP proprietary: limit for orphan content in lists and tables */ - int PR_X_ORPHAN_CONTENT_LIMIT = 253; - /** Property constant */ - int PR_RETRIEVE_POSITION_WITHIN_TABLE = 254; - /** Property constant */ - int PR_RETRIEVE_BOUNDARY_WITHIN_TABLE = 255; + int PR_X_ORPHAN_CONTENT_LIMIT = 272; /** Number of property constants defined */ - int PROPERTY_COUNT = 255; + int PROPERTY_COUNT = 272; // compound property constants < at >< at > -1113,6 +1185,16 < at >< at > int EN_TABLE = 194; /** Enumeration constant -- for fo:retrieve-table-marker */ int EN_TABLE_FRAGMENT = 195; + /** Enumeration constant -- XSL 1.1 */ + int EN_MERGE = 196; + /** Enumeration constant -- XSL 1.1 */ + int EN_LEAVE_SEPARATE = 197; + /** Enumeration constant -- XSL 1.1 */ + int EN_LINK = 198; + /** Enumeration constant -- XSL 1.1 */ + int EN_NO_LINK = 199; + /** Enumeration constant -- XSL 1.1 */ + int EN_ALTERNATE = 200; /** Number of enumeration constants defined */ - int ENUM_COUNT = 195; + int ENUM_COUNT = 200; } Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=672777&r1=672776&r2=672777&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java Mon Jun 30 07:11:56 2008 < at >< at > -112,11 +112,6 < at >< at > } } - /** {< at >inheritDoc} */ - protected void startOfNode() throws FOPException { - super.startOfNode(); - } - /** * {< at >inheritDoc} * <br>XSL Content Model: empty Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml?rev=672777&r1=672776&r2=672777&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/disabled-testcases.xml Mon Jun 30 07:11:56 2008 < at >< at > -223,4 +223,9 < at >< at > relaxed validation must be switched on, otherwise there is a validation exception.</description> </testcase> + <testcase> + <name>Instream foreign objects in markers</name> + <file>marker_instream-foreign-object.xml</file> + <description>Foreign objects in markers do not work.</description> + </testcase> </disabled-testcases> Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/testcase2checks.xsl URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/testcase2checks.xsl?rev=672777&r1=672776&r2=672777&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/testcase2checks.xsl (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/testcase2checks.xsl Mon Jun 30 07:11:56 2008 < at >< at > -19,15 +19,19 < at >< at > <!-- This stylesheet extracts the checks from the testcase so the list of checks can be built in Java code. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <xsl:template match="testcase"> - <checks> - <xsl:apply-templates select="checks/*" mode="copy"/> - </checks> - </xsl:template> +<xsl:variable name="basic-checks" select="document('basic-checks.xml')/checks/*" /> + +<xsl:template match="testcase"> + <xsl:apply-templates select="checks" /> +</xsl:template> + +<xsl:template match="checks"> + <checks> + <xsl:copy-of select="$basic-checks" /> + <xsl:copy-of select="*" /> + </checks> +</xsl:template> + +<xsl:template match="text()" /> - <xsl:template match="node()|< at >*" mode="copy"> - <xsl:copy> - <xsl:apply-templates select="< at >*|node()" mode="copy"/> - </xsl:copy> - </xsl:template> </xsl:stylesheet> acumiskey< at >apache.org 2008-06-30T14:11:57 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8100 Author: acumiskey Date: Mon Jun 30 07:04:41 2008 New Revision: 672776 URL: http://svn.apache.org/viewvc?rev=672776&view=rev Log: Added toString(). Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/RegionReference.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/RegionReference.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/RegionReference.java?rev=672776&r1=672775&r2=672776&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/RegionReference.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/RegionReference.java Mon Jun 30 07:04:41 2008 < at >< at > -160,4 +160,13 < at >< at > return rr; } + /** {< at >inheritDoc} */ + public String toString() { + StringBuffer sb = new StringBuffer(super.toString()); + sb.append(" {regionName=").append(regionName); + sb.append(", regionClass=").append(regionClass); + sb.append(", ctm=").append(ctm); + sb.append("}"); + return sb.toString(); + } } acumiskey< at >apache.org 2008-06-30T14:04:41 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8099 Author: acumiskey Date: Mon Jun 30 07:04:05 2008 New Revision: 672775 URL: http://svn.apache.org/viewvc?rev=672775&view=rev Log: Small Javadoc corrections and parameter variable rename. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/FilledArea.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/FilledArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/FilledArea.java?rev=672775&r1=672774&r2=672775&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/FilledArea.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/FilledArea.java Mon Jun 30 07:04:05 2008 < at >< at > -70,10 +70,10 < at >< at > /** * Set the unit width for the areas to fill the full width. * - * < at >param w the unit width + * < at >param width the unit width */ - public void setUnitWidth(int w) { - unitWidth = w; + public void setUnitWidth(int width) { + this.unitWidth = width; } /** < at >< at > -82,7 +82,7 < at >< at > * < at >return the unit width */ public int getUnitWidth() { - return unitWidth; + return this.unitWidth; } /** < at >< at > -117,7 +117,7 < at >< at > } /** - * recursively apply the variation factor to all descendant areas + * Recursively apply the variation factor to all descendant areas * < at >param variationFactor the variation factor that must be applied to adjustments * < at >param lineStretch the total stretch of the line * < at >param lineShrink the total shrink of the line acumiskey< at >apache.org 2008-06-30T14:04:05 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8098 Author: acumiskey Date: Mon Jun 30 07:02:18 2008 New Revision: 672774 URL: http://svn.apache.org/viewvc?rev=672774&view=rev Log: Added some spacing. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java?rev=672774&r1=672773&r2=672774&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Area.java Mon Jun 30 07:02:18 2008 < at >< at > -119,8 +119,10 < at >< at > public static final int CLASS_MAX = CLASS_SIDE_FLOAT + 1; private int areaClass = CLASS_NORMAL; + /** the area's inline-progression-dimension */ protected int ipd; + /** the area's block-progression-dimension */ protected int bpd; acumiskey< at >apache.org 2008-06-30T14:02:18 http://permalink.gmane.org/gmane.text.xml.fop.cvs/8097 Author: acumiskey Date: Mon Jun 30 07:00:58 2008 New Revision: 672772 URL: http://svn.apache.org/viewvc?rev=672772&view=rev Log: Small formatting correction. Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java?rev=672772&r1=672771&r2=672772&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java (original) +++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/inline/InlineArea.java Mon Jun 30 07:00:58 2008 < at >< at > -221,7 +221,7 < at >< at > notifyIPDVariation(ipdVariation); } - /** + /** * notify the parent area about the ipd variation of this area * or of a descendant area * < at >param ipdVariation the difference between new and old ipd acumiskey< at >apache.org 2008-06-30T14:00:59 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.text.xml.fop.cvs