You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2008/07/25 12:56:32 UTC
svn commit: r679758 [18/34] - in
/xmlgraphics/fop/branches/Temp_AFPGOCAResources: ./
examples/embedding/java/embedding/ examples/embedding/java/embedding/events/
examples/embedding/java/embedding/intermediate/
examples/embedding/java/embedding/model/ e...
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -34,14 +34,14 @@
/**
- * LayoutManager handling the common tasks for the fo:instream-foreign-object
+ * LayoutManager handling the common tasks for the fo:instream-foreign-object
* and fo:external-graphics formatting objects
*/
public abstract class AbstractGraphicsLayoutManager extends LeafNodeLayoutManager {
-
+
/**
* Constructor.
- *
+ *
* @param node
* the formatting object that creates this area
*/
@@ -67,17 +67,17 @@
Rectangle placement = imageLayout.getPlacement();
CommonBorderPaddingBackground borderProps = fobj.getCommonBorderPaddingBackground();
-
+
//Determine extra BPD from borders and padding
int beforeBPD = borderProps.getPadding(CommonBorderPaddingBackground.BEFORE, false, this);
beforeBPD += borderProps.getBorderWidth(CommonBorderPaddingBackground.BEFORE, false);
-
+
placement.y += beforeBPD;
-
+
//Determine extra IPD from borders and padding
int startIPD = borderProps.getPadding(CommonBorderPaddingBackground.START, false, this);
startIPD += borderProps.getBorderWidth(CommonBorderPaddingBackground.START, false);
-
+
placement.x += startIPD;
Area viewportArea = getChildArea();
@@ -101,7 +101,7 @@
return vp;
}
-
+
/** {@inheritDoc} */
public List getNextKnuthElements(LayoutContext context,
int alignment) {
@@ -109,7 +109,7 @@
setCurrentArea(areaCurrent);
return super.getNextKnuthElements(context, alignment);
}
-
+
/** {@inheritDoc} */
protected AlignmentContext makeAlignmentContext(LayoutContext context) {
final AbstractGraphics fobj = (AbstractGraphics)this.fobj;
@@ -129,11 +129,11 @@
* @return the appropriate area
*/
protected abstract Area getChildArea();
-
+
// --------- Property Resolution related functions --------- //
-
+
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public int getBaseLength(int lengthBase, FObj fobj) {
switch (lengthBase) {
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AbstractPageNumberCitationLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -43,10 +43,10 @@
protected AbstractPageNumberCitation fobj;
/** Font for the page-number-citation */
protected Font font;
-
+
/** Indicates whether the page referred to by the citation has been resolved yet */
protected boolean resolved = false;
-
+
/**
* Constructor
*
@@ -57,7 +57,7 @@
super(node);
fobj = node;
}
-
+
/** {@inheritDoc} */
public void initialize() {
FontInfo fi = fobj.getFOEventHandler().getFontInfo();
@@ -86,10 +86,10 @@
curArea = getPageNumberCitationInlineArea();
return curArea;
}
-
+
/**
* {@inheritDoc}
- * , LayoutContext)
+ * , LayoutContext)
*/
public void addAreas(PositionIterator posIter, LayoutContext context) {
super.addAreas(posIter, context);
@@ -97,7 +97,7 @@
getPSLM().addUnresolvedArea(fobj.getRefId(), (Resolvable) curArea);
}
}
-
+
/**
* If id can be resolved then simply return a word, otherwise
* return a resolvable area
@@ -124,12 +124,12 @@
text.setIPD(width);
}
updateTextAreaTraits(text);
-
+
return text;
}
-
+
/**
- * Updates the traits for the generated text area.
+ * Updates the traits for the generated text area.
* @param text the text area
*/
protected void updateTextAreaTraits(TextArea text) {
@@ -140,7 +140,7 @@
text.addTrait(Trait.COLOR, fobj.getColor());
TraitSetter.addTextDecoration(text, fobj.getTextDecoration());
}
-
+
/**
* @param str string to be measured
* @return width (in millipoints ??) of the string
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -47,9 +47,9 @@
private ScaledBaselineTable scaledBaselineTable = null;
private ScaledBaselineTable actualBaselineTable = null;
private AlignmentContext parentAlignmentContext = null;
-
+
/**
- * Creates a new instance of AlignmentContext
+ * Creates a new instance of AlignmentContext
* for graphics areas.
* @param height the total height of the area
* @param alignmentAdjust the alignment-adjust property
@@ -64,7 +64,7 @@
, Length baselineShift
, int dominantBaseline
, AlignmentContext parentAlignmentContext) {
-
+
this.areaHeight = height;
this.lineHeight = height;
this.xHeight = height;
@@ -95,18 +95,18 @@
break;
}
actualBaselineTable = ScaledBaselineTableFactory.makeGraphicsScaledBaselineTable(
- height,
- dominantBaselineIdentifier,
+ height,
+ dominantBaselineIdentifier,
scaledBaselineTable.getWritingMode());
if (newScaledBaselineTableRequired) {
scaledBaselineTable = ScaledBaselineTableFactory.makeGraphicsScaledBaselineTable(
- height,
- dominantBaselineIdentifier,
+ height,
+ dominantBaselineIdentifier,
scaledBaselineTable.getWritingMode());
}
setAlignmentAdjust(alignmentAdjust);
}
-
+
/**
* Creates a new instance of AlignmentContext
* @param font the font
@@ -153,17 +153,17 @@
dominantBaselineIdentifier = dominantBaseline;
break;
}
- actualBaselineTable = ScaledBaselineTableFactory.makeFontScaledBaselineTable(font,
- dominantBaselineIdentifier,
+ actualBaselineTable = ScaledBaselineTableFactory.makeFontScaledBaselineTable(font,
+ dominantBaselineIdentifier,
scaledBaselineTable.getWritingMode());
if (newScaledBaselineTableRequired) {
- scaledBaselineTable = ScaledBaselineTableFactory.makeFontScaledBaselineTable(font,
- dominantBaselineIdentifier,
+ scaledBaselineTable = ScaledBaselineTableFactory.makeFontScaledBaselineTable(font,
+ dominantBaselineIdentifier,
scaledBaselineTable.getWritingMode());
}
setAlignmentAdjust(alignmentAdjust);
}
-
+
/**
* Creates a new instance of AlignmentContext based simply
* on the font and the writing mode.
@@ -176,14 +176,14 @@
this.lineHeight = lineHeight;
this.xHeight = font.getXHeight();
this.parentAlignmentContext = null;
- this.scaledBaselineTable
+ this.scaledBaselineTable
= ScaledBaselineTableFactory.makeFontScaledBaselineTable(font, writingMode);
this.actualBaselineTable = scaledBaselineTable;
this.alignmentBaselineIdentifier = getDominantBaselineIdentifier();
this.alignmentPoint = font.getAscender();
this.baselineShiftValue = 0;
}
-
+
/**
* Returns the alignment point for this context.
* This is the point on the start edge of the area this context
@@ -251,7 +251,7 @@
int beforeEdge = actualBaselineTable.getBaseline(EN_BEFORE_EDGE);
switch (alignmentAdjust.getEnum()) {
case EN_AUTO:
- alignmentPoint = beforeEdge
+ alignmentPoint = beforeEdge
- actualBaselineTable.getBaseline(alignmentBaselineIdentifier);
break;
case EN_BASELINE:
@@ -267,7 +267,7 @@
case EN_ALPHABETIC:
case EN_HANGING:
case EN_MATHEMATICAL:
- alignmentPoint = beforeEdge
+ alignmentPoint = beforeEdge
- actualBaselineTable.getBaseline(alignmentAdjust.getEnum());
break;
default:
@@ -294,7 +294,7 @@
public int getDominantBaselineIdentifier() {
return scaledBaselineTable.getDominantBaselineIdentifier();
}
-
+
/**
* Return the writing mode.
* @return the writing mode
@@ -302,7 +302,7 @@
public int getWritingMode() {
return scaledBaselineTable.getWritingMode();
}
-
+
/**
* Calculates the baseline shift value based on the baseline-shift
* property value.
@@ -392,11 +392,11 @@
public int getTotalAlignmentBaselineOffset(int alignmentBaselineId) {
int offset = baselineShiftValue;
if (parentAlignmentContext != null) {
- offset = parentAlignmentContext.getTotalBaselineOffset()
+ offset = parentAlignmentContext.getTotalBaselineOffset()
+ parentAlignmentContext.getScaledBaselineTable()
.getBaseline(alignmentBaselineId)
+ baselineShiftValue;
- }
+ }
return offset;
}
@@ -432,7 +432,7 @@
public int getHeight() {
return areaHeight;
}
-
+
/**
* Return the line height of the context.
* @return the height
@@ -440,7 +440,7 @@
public int getLineHeight() {
return lineHeight;
}
-
+
/**
* The altitude of the context that is the height above the
* alignment point.
@@ -458,7 +458,7 @@
public int getDepth() {
return getHeight() - alignmentPoint;
}
-
+
/**
* The x height of the context.
* @return the x height
@@ -466,7 +466,7 @@
public int getXHeight() {
return this.xHeight;
}
-
+
/**
* Resizes the line as specified. Assumes that the new alignment point
* is on the dominant baseline, that is this function should be called for
@@ -480,7 +480,7 @@
scaledBaselineTable.setBeforeAndAfterBaselines(alignmentPoint
, alignmentPoint - areaHeight);
}
-
+
/**
* Returns the offset from the before-edge of the parent to
* this context.
@@ -495,7 +495,7 @@
}
return offset;
}
-
+
/**
* Returns an indication if we still use the initial baseline table.
* The initial baseline table is the table generated by the Line LM.
@@ -506,11 +506,11 @@
|| (scaledBaselineTable == parentAlignmentContext.getScaledBaselineTable()
&& parentAlignmentContext.usesInitialBaselineTable());
}
-
+
private boolean isHorizontalWritingMode() {
return (getWritingMode() == EN_LR_TB || getWritingMode() == EN_RL_TB);
}
-
+
/** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(64);
@@ -521,5 +521,5 @@
sb.append(" bs=" + baselineShiftValue);
return sb.toString();
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -44,12 +44,12 @@
private int dominantBaselineOffset;
private int beforeEdgeOffset;
private int afterEdgeOffset;
-
+
private static final float HANGING_BASELINE_FACTOR = 0.8f;
private static final float MATHEMATICAL_BASELINE_FACTOR = 0.5f;
/**
- *
+ *
* Creates a new instance of BasicScaledBaselineTable for the given
* altitude, depth, xHeight, baseline and writingmode.
* @param altitude the height of the box or the font ascender
@@ -72,7 +72,7 @@
this.beforeEdgeOffset = altitude - dominantBaselineOffset;
this.afterEdgeOffset = depth - dominantBaselineOffset;
}
-
+
/**
* Return the dominant baseline for this baseline table.
* @return the dominant baseline
@@ -80,7 +80,7 @@
public int getDominantBaselineIdentifier() {
return this.dominantBaselineIdentifier;
}
-
+
/**
* Return the writing mode for this baseline table.
* @return the writing mode
@@ -132,11 +132,11 @@
}
return offset;
}
-
+
private boolean isHorizontalWritingMode() {
return writingMode == EN_LR_TB || writingMode == EN_RL_TB;
}
-
+
/**
* Return the baseline offset measured from the font's default
* baseline for the given baseline.
@@ -171,9 +171,9 @@
}
return offset;
}
-
+
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void setBeforeAndAfterBaselines(int beforeBaseline, int afterBaseline) {
beforeEdgeOffset = beforeBaseline;
@@ -184,7 +184,7 @@
* {@inheritDoc}
*/
public ScaledBaselineTable deriveScaledBaselineTable(int baselineIdentifier) {
- BasicScaledBaselineTable bac
+ BasicScaledBaselineTable bac
= new BasicScaledBaselineTable(altitude, depth, xHeight
, baselineIdentifier, this.writingMode);
return bac;
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -57,10 +57,10 @@
public CharacterLayoutManager(Character node) {
super(node);
}
-
+
/** {@inheritDoc} */
public void initialize() {
- Character fobj = (Character)this.fobj;
+ Character fobj = (Character)this.fobj;
font = FontSelector.selectFontForCharacter(fobj, this);
SpaceVal ls = SpaceVal.makeLetterSpacing(fobj.getLetterSpacing());
letterSpaceIPD = ls.getSpace();
@@ -101,7 +101,7 @@
}
Character fobj = (Character)this.fobj;
-
+
ipd = new MinOptMax(font.getCharWidth(fobj.getCharacter()));
curArea.setIPD(ipd.opt);
@@ -120,7 +120,7 @@
, context.getAlignmentContext());
addKnuthElementsForBorderPaddingStart(seq);
-
+
// create the AreaInfo object to store the computed values
areaInfo = new AreaInfo((short) 0, ipd, false, alignmentContext);
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -176,7 +176,7 @@
return holder;
}
- /**
+ /**
* {@inheritDoc}
**/
public void addChildArea(Area childArea) {
@@ -315,13 +315,13 @@
int alignment) {
return null;
}
-
+
public PageSequenceLayoutManager getPSLM() {
return parentLM.getPSLM();
}
// --------- Property Resolution related functions --------- //
-
+
/**
* Returns the IPD of the content area
* @return the IPD of the content area
@@ -329,7 +329,7 @@
public int getContentAreaIPD() {
return holder.getIPD();
}
-
+
/**
* Returns the BPD of the content area
* @return the BPD of the content area
@@ -337,7 +337,7 @@
public int getContentAreaBPD() {
return holder.getBPD();
}
-
+
/**
* {@inheritDoc}
*/
@@ -351,7 +351,7 @@
public boolean getGeneratesBlockArea() {
return getGeneratesLineArea() || holder instanceof Block;
}
-
+
/**
* {@inheritDoc}
*/
@@ -365,6 +365,6 @@
public Position notifyPos(Position pos) {
return pos;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -28,10 +28,10 @@
* LayoutManager for the fo:external-graphic formatting object
*/
public class ExternalGraphicLayoutManager extends AbstractGraphicsLayoutManager {
-
+
/**
* Constructor.
- *
+ *
* @param node
* the fo:external-graphic formatting object that creates the
* area
@@ -44,6 +44,6 @@
protected Area getChildArea() {
return new Image(((ExternalGraphic) fobj).getSrc());
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -60,7 +60,7 @@
super(node);
footnote = node;
}
-
+
/** {@inheritDoc} */
public void initialize() {
// create an InlineStackingLM handling the fo:inline child of fo:footnote
@@ -120,7 +120,7 @@
}
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public List getChangedKnuthElements(List oldList,
int alignment) {
@@ -131,7 +131,7 @@
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public void addAreas(PositionIterator posIter, LayoutContext context) {
// "Unwrap" the NonLeafPositions stored in posIter and put
@@ -144,11 +144,11 @@
positionList.add(pos.getPosition());
}
}
-
- // FootnoteLM does not create any area,
+
+ // FootnoteLM does not create any area,
// so the citationLM child will add directly to the FootnoteLM parent area
citationLM.setParent(getParent());
-
+
// make the citationLM add its areas
LayoutContext childContext = new LayoutContext(context);
StackingIter childPosIter = new StackingIter(positionList.listIterator());
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.layoutmgr.inline;
/**
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/ImageLayout.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -35,10 +35,10 @@
* Helper class which calculates the size and position in the viewport of an image.
*/
public class ImageLayout implements Constants {
-
+
/** logging instance */
protected static Log log = LogFactory.getLog(ImageLayout.class);
-
+
//Input
private GraphicsProperties props;
private PercentBaseContext percentBaseContext;
@@ -48,7 +48,7 @@
private Rectangle placement;
private Dimension viewportSize = new Dimension(-1, -1);
private boolean clip;
-
+
/**
* Main constructor
* @param props the properties for the image
@@ -60,7 +60,7 @@
this.props = props;
this.percentBaseContext = percentBaseContext;
this.intrinsicSize = intrinsicSize;
-
+
doLayout();
}
@@ -72,7 +72,7 @@
int bpd = -1;
int ipd = -1;
-
+
len = props.getBlockProgressionDimension().getOptimum(percentBaseContext).getLength();
if (len.getEnum() != EN_AUTO) {
bpd = len.getValue(percentBaseContext);
@@ -155,7 +155,7 @@
} else {
constrainedIntrinsicSize = intrinsicSize;
}
-
+
//Derive content extents where not explicit
Dimension adjustedDim = adjustContentSize(cwidth, cheight, constrainedIntrinsicSize);
cwidth = adjustedDim.width;
@@ -190,10 +190,10 @@
this.viewportSize.setSize(ipd, bpd);
this.placement = new Rectangle(xoffset, yoffset, cwidth, cheight);
}
-
+
private int constrainExtent(int extent, LengthRangeProperty range, Length contextExtent) {
- boolean mayScaleUp = (contextExtent.getEnum() != EN_SCALE_DOWN_TO_FIT);
- boolean mayScaleDown = (contextExtent.getEnum() != EN_SCALE_UP_TO_FIT);
+ boolean mayScaleUp = (contextExtent.getEnum() != EN_SCALE_DOWN_TO_FIT);
+ boolean mayScaleDown = (contextExtent.getEnum() != EN_SCALE_UP_TO_FIT);
Length len;
len = range.getMaximum(percentBaseContext).getLength();
if (len.getEnum() != EN_AUTO) {
@@ -211,7 +211,7 @@
}
return extent;
}
-
+
private Dimension constrain(Dimension size) {
Dimension adjusted = new Dimension(size);
int effWidth = constrainExtent(size.width,
@@ -235,7 +235,7 @@
}
return adjusted;
}
-
+
private Dimension adjustContentSize(
final int cwidth, final int cheight,
Dimension defaultSize) {
@@ -249,14 +249,14 @@
if (defaultSize.height == 0) {
dim.width = 0;
} else {
- dim.width = (int)(defaultSize.width * (double)cheight
+ dim.width = (int)(defaultSize.width * (double)cheight
/ defaultSize.height);
}
} else if (cheight == -1) {
if (defaultSize.width == 0) {
dim.height = 0;
} else {
- dim.height = (int)(defaultSize.height * (double)cwidth
+ dim.height = (int)(defaultSize.height * (double)cwidth
/ defaultSize.width);
}
} else {
@@ -278,7 +278,7 @@
}
return dim;
}
-
+
/**
* Given the ipd and the content width calculates the
* required x offset based on the text-align property
@@ -336,7 +336,7 @@
public Rectangle getPlacement() {
return this.placement;
}
-
+
/**
* Returns the size of the image's viewport.
* @return the viewport size (in millipoints)
@@ -344,7 +344,7 @@
public Dimension getViewportSize() {
return this.viewportSize;
}
-
+
/**
* Returns the size of the image's intrinsic (natural) size.
* @return the intrinsic size (in millipoints)
@@ -352,7 +352,7 @@
public Dimension getIntrinsicSize() {
return this.intrinsicSize;
}
-
+
/**
* Indicates whether the image is clipped.
* @return true if the image shall be clipped
@@ -360,5 +360,5 @@
public boolean isClipped() {
return this.clip;
}
-
+
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -92,7 +92,7 @@
protected SpaceProperty lineHeight;
/** The keep-together property */
//private KeepProperty keepTogether;
-
+
private AlignmentContext alignmentContext = null;
/**
@@ -106,26 +106,26 @@
public InlineLayoutManager(InlineLevel node) {
super(node);
}
-
+
private Inline getInlineFO() {
return (Inline) fobj;
}
-
+
/** {@inheritDoc} */
public void initialize() {
InlineLevel fobj = (InlineLevel) this.fobj;
int padding = 0;
-
+
FontInfo fi = fobj.getFOEventHandler().getFontInfo();
CommonFont commonFont = fobj.getCommonFont();
FontTriplet[] fontkeys = commonFont.getFontState(fi);
font = fi.getFontInstance(fontkeys[0], commonFont.fontSize.getValue(this));
-
+
lineHeight = fobj.getLineHeight();
borderProps = fobj.getCommonBorderPaddingBackground();
inlineProps = fobj.getCommonMarginInline();
-
+
if (fobj instanceof Inline) {
alignmentAdjust = ((Inline)fobj).getAlignmentAdjust();
alignmentBaseline = ((Inline)fobj).getAlignmentBaseline();
@@ -152,13 +152,13 @@
protected MinOptMax getExtraIPD(boolean isNotFirst, boolean isNotLast) {
int borderAndPadding = 0;
if (borderProps != null) {
- borderAndPadding
+ borderAndPadding
= borderProps.getPadding(CommonBorderPaddingBackground.START, isNotFirst, this);
- borderAndPadding
+ borderAndPadding
+= borderProps.getBorderWidth(CommonBorderPaddingBackground.START, isNotFirst);
- borderAndPadding
+ borderAndPadding
+= borderProps.getPadding(CommonBorderPaddingBackground.END, isNotLast, this);
- borderAndPadding
+ borderAndPadding
+= borderProps.getBorderWidth(CommonBorderPaddingBackground.END, isNotLast);
}
return new MinOptMax(borderAndPadding);
@@ -189,11 +189,11 @@
protected SpaceProperty getSpaceEnd() {
return inlineProps != null ? inlineProps.spaceEnd : null;
}
-
- /**
- * Create and initialize an <code>InlineArea</code>
- *
- * @param hasInlineParent true if the parent is an inline
+
+ /**
+ * Create and initialize an <code>InlineArea</code>
+ *
+ * @param hasInlineParent true if the parent is an inline
* @return the area
*/
protected InlineArea createArea(boolean hasInlineParent) {
@@ -209,7 +209,7 @@
}
return area;
}
-
+
/** {@inheritDoc} */
protected void setTraits(boolean isNotFirst, boolean isNotLast) {
if (borderProps != null) {
@@ -232,7 +232,7 @@
return ((BlockLevelLayoutManager) lm).mustKeepTogether();
} else if (lm instanceof InlineLayoutManager) {
return ((InlineLayoutManager) lm).mustKeepTogether();
- } else {
+ } else {
return mustKeepTogether(lm.getParent());
}
}
@@ -249,12 +249,12 @@
KnuthSequence lastSequence = null;
SpaceSpecifier leadingSpace = context.getLeadingSpace();
-
+
if (fobj instanceof Title) {
alignmentContext = new AlignmentContext(font,
lineHeight.getOptimum(this).getLength().getValue(this),
context.getWritingMode());
-
+
} else {
alignmentContext = new AlignmentContext(font
, lineHeight.getOptimum(this).getLength().getValue(this)
@@ -264,7 +264,7 @@
, dominantBaseline
, context.getAlignmentContext());
}
-
+
childLC = new LayoutContext(context);
childLC.setAlignmentContext(alignmentContext);
@@ -300,9 +300,9 @@
+ borderProps.getBorderEndWidth(true)
);
}
-
+
while ((curLM = getChildLM()) != null) {
-
+
if (!(curLM instanceof InlineLevelLayoutManager)) {
// A block LM
// Leave room for start/end border and padding
@@ -314,7 +314,7 @@
- borderProps.getBorderEndWidth(hasNextChildLM()));
}
}
-
+
// get KnuthElements from curLM
returnedList = curLM.getNextKnuthElements(childLC, alignment);
if (returnList.isEmpty() && childLC.isKeepWithPreviousPending()) {
@@ -326,7 +326,7 @@
// just iterate once more to see if there is another child
continue;
}
-
+
if (curLM instanceof InlineLevelLayoutManager) {
context.clearKeepWithNextPending();
// "wrap" the Position stored in each element of returnedList
@@ -375,31 +375,31 @@
lastSequence = (KnuthSequence) ListUtil.getLast(returnList);
lastChildLM = curLM;
}
-
+
if (lastSequence != null) {
addKnuthElementsForBorderPaddingEnd(lastSequence);
}
setFinished(true);
log.trace(trace);
-
+
if (returnList.isEmpty()) {
/*
- * if the FO itself is empty, but has an id specified
+ * if the FO itself is empty, but has an id specified
* or associated fo:markers, then we still need a dummy
* sequence to register its position in the area tree
*/
if (fobj.hasId() || fobj.hasMarkers()) {
InlineKnuthSequence emptySeq = new InlineKnuthSequence();
emptySeq.add(new KnuthInlineBox(
- 0,
- alignmentContext,
- notifyPos(getAuxiliaryPosition()),
+ 0,
+ alignmentContext,
+ notifyPos(getAuxiliaryPosition()),
true));
returnList.add(emptySeq);
}
}
-
+
return returnList.isEmpty() ? null : returnList;
}
@@ -414,7 +414,7 @@
*/
public void addAreas(PositionIterator parentIter,
LayoutContext context) {
-
+
addId();
setChildContext(new LayoutContext(context)); // Store current value
@@ -454,11 +454,11 @@
}*/
addMarkersToPage(
- true,
- !areaCreated,
+ true,
+ !areaCreated,
lastPos == null || isLast(lastPos));
-
- InlineArea parent = createArea(lastLM == null
+
+ InlineArea parent = createArea(lastLM == null
|| lastLM instanceof InlineLevelLayoutManager);
parent.setBPD(alignmentContext.getHeight());
if (parent instanceof InlineParent) {
@@ -472,7 +472,7 @@
}
}
setCurrentArea(parent);
-
+
StackingIter childPosIter
= new StackingIter(positionList.listIterator());
@@ -487,7 +487,7 @@
prevLM = childLM;
}
-
+
/* If this LM has a trailing fence, resolve trailing space
* specs from descendants. Otherwise, propagate any trailing
* space specs to the parent LM via the layout context. If
@@ -496,7 +496,7 @@
* must be the last area for the current LM too.
*/
boolean isLast = (getContext().isLastArea() && prevLM == lastChildLM);
-
+
if (hasTrailingFence(isLast)) {
addSpace(getCurrentArea(),
getContext().getTrailingSpace().resolve(false),
@@ -510,17 +510,17 @@
if (context.getTrailingSpace() != null && getSpaceEnd() != null) {
context.getTrailingSpace().addSpace(new SpaceVal(getSpaceEnd(), this));
}
-
+
// Not sure if lastPos can legally be null or if that masks a different problem.
// But it seems to fix bug 38053.
setTraits(areaCreated, lastPos == null || !isLast(lastPos));
parentLM.addChildArea(getCurrentArea());
addMarkersToPage(
- false,
- !areaCreated,
+ false,
+ !areaCreated,
lastPos == null || isLast(lastPos));
-
+
context.setFlags(LayoutContext.LAST_AREA, isLast);
areaCreated = true;
checkEndOfLayout(lastPos);
@@ -545,7 +545,7 @@
addKnuthElementsForBorderPaddingEnd(returnedList);
return returnedList;
}
-
+
/**
* Creates Knuth elements for start border padding and adds them to the return list.
* @param returnList return list to add the additional elements to
@@ -604,5 +604,5 @@
//}
return this.auxiliaryPosition;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java Fri Jul 25 03:55:49 2008
@@ -33,7 +33,7 @@
* Provider class for the event producer.
*/
class Provider {
-
+
/**
* Returns an event producer.
* @param broadcaster the event broadcaster to use
@@ -52,7 +52,7 @@
* @event.severity ERROR
*/
void leaderWithoutContent(Object source, Locator loc);
-
+
/**
* A line overflows.
* @param source the event source
@@ -62,5 +62,5 @@
* @event.severity WARN
*/
void lineOverflows(Object source, int line, int overflowLength, Locator loc);
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -16,7 +16,7 @@
*/
/* $Id$ */
-
+
package org.apache.fop.layoutmgr.inline;
import java.util.List;
@@ -30,7 +30,7 @@
public interface InlineLevelLayoutManager extends LayoutManager {
/**
- * Tell the LM to modify its data, adding a letter space
+ * Tell the LM to modify its data, adding a letter space
* to the word fragment represented by the given elements,
* and returning the corrected elements
*
@@ -40,7 +40,7 @@
List addALetterSpaceTo(List oldList);
/**
- * Tell the LM to modify its data, removing the word space
+ * Tell the LM to modify its data, removing the word space
* represented by the given elements
*
* @param oldList the elements representing the word space
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -43,7 +43,7 @@
* which stack children in the inline direction, such as Inline or
* Line. It should not be instantiated directly.
*/
-public abstract class InlineStackingLayoutManager extends AbstractLayoutManager
+public abstract class InlineStackingLayoutManager extends AbstractLayoutManager
implements InlineLevelLayoutManager {
@@ -103,7 +103,7 @@
}
/**
- * Returns the extra IPD needed for any leading or trailing fences for the
+ * Returns the extra IPD needed for any leading or trailing fences for the
* current area.
* @param bNotFirst true if not the first area for this layout manager
* @param bNotLast true if not the last area for this layout manager
@@ -139,7 +139,7 @@
protected SpaceProperty getSpaceStart() {
return null;
}
-
+
/**
* Get the space at the end of the inline area.
* @return the space property describing the space
@@ -246,7 +246,7 @@
// The last element may not have a layout manager (its position == null);
// this may happen if it is a padding box; see bug 39571.
- InlineLevelLayoutManager LM =
+ InlineLevelLayoutManager LM =
(InlineLevelLayoutManager) element.getLayoutManager();
if (LM != null) {
oldList = LM.addALetterSpaceTo(oldList);
@@ -362,7 +362,7 @@
}
/**
- * {@inheritDoc}
+ * {@inheritDoc}
*/
public List getChangedKnuthElements(List oldList, int alignment) {
// "unwrap" the Positions stored in the elements
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -28,10 +28,10 @@
* LayoutManager for the fo:instream-foreign-object formatting object
*/
public class InstreamForeignObjectLM extends AbstractGraphicsLayoutManager {
-
+
/**
* Constructor.
- *
+ *
* @param node
* the formatting object that creates this area
*/
@@ -48,6 +48,6 @@
return new ForeignObject(doc, ns);
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -25,7 +25,7 @@
import org.apache.fop.layoutmgr.Position;
public class KnuthInlineBox extends KnuthBox {
-
+
private FootnoteBodyLayoutManager footnoteBodyLM = null;
private AlignmentContext alignmentContext = null;
@@ -69,8 +69,8 @@
public boolean isAnchor() {
return (footnoteBodyLM != null);
}
-
-
+
+
/** {@inheritDoc} */
public String toString() {
StringBuffer sb = new StringBuffer(super.toString());
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -51,10 +51,10 @@
public class LeaderLayoutManager extends LeafNodeLayoutManager {
private Leader fobj;
private Font font = null;
-
+
private List contentList = null;
private ContentLayoutManager clm = null;
-
+
private int contentAreaIPD = 0;
/**
@@ -66,7 +66,7 @@
super(node);
fobj = node;
}
-
+
/** {@inheritDoc} */
public void initialize() {
FontInfo fi = fobj.getFOEventHandler().getFontInfo();
@@ -117,7 +117,7 @@
if (fobj.getLeaderPattern() == EN_RULE) {
if (fobj.getRuleStyle() != EN_NONE) {
- org.apache.fop.area.inline.Leader leader
+ org.apache.fop.area.inline.Leader leader
= new org.apache.fop.area.inline.Leader();
leader.setRuleStyle(fobj.getRuleStyle());
leader.setRuleThickness(fobj.getRuleThickness().getValue(this));
@@ -167,7 +167,7 @@
// child FOs are assigned to the InlineStackingLM
fobjIter = null;
-
+
// get breaks then add areas to FilledArea
FilledArea fa = new FilledArea();
@@ -262,7 +262,7 @@
curArea.setAdjustingInfo(ipd.max - ipd.opt, ipd.opt - ipd.min, 0);
addKnuthElementsForBorderPaddingStart(seq);
-
+
// node is a fo:Leader
seq.add(new KnuthInlineBox(0, alignmentContext,
new LeafPosition(this, -1), true));
@@ -272,20 +272,20 @@
seq.add
(new KnuthGlue(areaInfo.ipdArea.opt,
areaInfo.ipdArea.max - areaInfo.ipdArea.opt,
- areaInfo.ipdArea.opt - areaInfo.ipdArea.min,
+ areaInfo.ipdArea.opt - areaInfo.ipdArea.min,
new LeafPosition(this, 0), false));
} else {
seq.add
(new KnuthGlue(areaInfo.ipdArea.opt,
0,
- 0,
+ 0,
new LeafPosition(this, 0), false));
}
seq.add(new KnuthInlineBox(0, alignmentContext,
new LeafPosition(this, -1), true));
addKnuthElementsForBorderPaddingEnd(seq);
-
+
LinkedList returnList = new LinkedList();
returnList.add(seq);
setFinished(true);
@@ -314,7 +314,7 @@
List returnList = new LinkedList();
addKnuthElementsForBorderPaddingStart(returnList);
-
+
returnList.add(new KnuthInlineBox(0, areaInfo.alignmentContext,
new LeafPosition(this, -1), true));
returnList.add(new KnuthPenalty(0, KnuthElement.INFINITE, false,
@@ -323,20 +323,20 @@
returnList.add
(new KnuthGlue(areaInfo.ipdArea.opt,
areaInfo.ipdArea.max - areaInfo.ipdArea.opt,
- areaInfo.ipdArea.opt - areaInfo.ipdArea.min,
+ areaInfo.ipdArea.opt - areaInfo.ipdArea.min,
new LeafPosition(this, 0), false));
} else {
returnList.add
(new KnuthGlue(areaInfo.ipdArea.opt,
0,
- 0,
+ 0,
new LeafPosition(this, 0), false));
}
returnList.add(new KnuthInlineBox(0, areaInfo.alignmentContext,
new LeafPosition(this, -1), true));
addKnuthElementsForBorderPaddingEnd(returnList);
-
+
setFinished(true);
return returnList;
}
@@ -353,9 +353,9 @@
public int getContentAreaIPD() {
return contentAreaIPD;
}
-
+
private void setContentAreaIPD(int contentAreaIPD) {
this.contentAreaIPD = contentAreaIPD;
}
-
+
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java?rev=679758&r1=679757&r2=679758&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java Fri Jul 25 03:55:49 2008
@@ -5,9 +5,9 @@
* 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.
@@ -48,7 +48,7 @@
* This class can be extended to handle the creation and adding of the
* inline area.
*/
-public abstract class LeafNodeLayoutManager extends AbstractLayoutManager
+public abstract class LeafNodeLayoutManager extends AbstractLayoutManager
implements InlineLevelLayoutManager {
/**
@@ -64,7 +64,7 @@
protected CommonBorderPaddingBackground commonBorderPaddingBackground = null;
/** The alignment context applying to this area */
protected AlignmentContext alignmentContext = null;
-
+
/** Flag to indicate if something was changed as part of the getChangeKnuthElements sequence */
protected boolean isSomethingChanged = false;
/** Our area info for the Knuth elements */
@@ -86,7 +86,7 @@
bHyphenated = bHyph;
this.alignmentContext = alignmentContext;
}
-
+
}
@@ -201,7 +201,7 @@
protected InlineArea getEffectiveArea() {
return curArea;
}
-
+
/**
* Offset this area.
* Offset the inline area in the bpd direction when adding the
@@ -247,18 +247,18 @@
area.setIPD(width);
area.setAdjustment(width - areaInfo.ipdArea.opt);
}
-
+
/** {@inheritDoc} */
public List getNextKnuthElements(LayoutContext context, int alignment) {
curArea = get(context);
-
+
if (curArea == null) {
setFinished(true);
return null;
}
alignmentContext = makeAlignmentContext(context);
-
+
MinOptMax ipd = getAllocationIPD(context.getRefIPD());
// create the AreaInfo object to store the computed values
@@ -269,12 +269,12 @@
KnuthSequence seq = new InlineKnuthSequence();
addKnuthElementsForBorderPaddingStart(seq);
-
+
seq.add(new KnuthInlineBox(areaInfo.ipdArea.opt, alignmentContext,
notifyPos(new LeafPosition(this, 0)), false));
addKnuthElementsForBorderPaddingEnd(seq);
-
+
LinkedList returnList = new LinkedList();
returnList.add(seq);
@@ -322,18 +322,18 @@
LinkedList returnList = new LinkedList();
addKnuthElementsForBorderPaddingStart(returnList);
-
+
// fobj is a fo:ExternalGraphic, fo:InstreamForeignObject,
// fo:PageNumber or fo:PageNumberCitation
- returnList.add(new KnuthInlineBox(areaInfo.ipdArea.opt, areaInfo.alignmentContext,
+ returnList.add(new KnuthInlineBox(areaInfo.ipdArea.opt, areaInfo.alignmentContext,
notifyPos(new LeafPosition(this, 0)), true));
addKnuthElementsForBorderPaddingEnd(returnList);
-
+
setFinished(true);
return returnList;
}
-
+
/**
* Creates Knuth elements for start border padding and adds them to the return list.
* @param returnList return list to add the additional elements to
@@ -345,7 +345,7 @@
+ commonBorderPaddingBackground.getPaddingStart(false, this);
if (ipStart > 0) {
// Add a non breakable glue
- returnList.add(new KnuthPenalty(0, KnuthPenalty.INFINITE,
+ returnList.add(new KnuthPenalty(0, KnuthPenalty.INFINITE,
false, new LeafPosition(this, -1), true));
returnList.add(new KnuthGlue(ipStart, 0, 0, new LeafPosition(this, -1), true));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org