cvs commit: xml-fop/src/java/org/apache/fop/fo/properties LinearCombinationLength.java MixedLength.java
bckfnn 2004/02/26 07:39:15 Removed: src/java/org/apache/fop/fo/properties LinearCombinationLength.java MixedLength.java Log: Made redundant by the expresion tree. PR: 26778 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/traits BlockProps.java
bckfnn 2004/02/26 07:47:03
Modified:src/java/org/apache/fop/fo FOPropertyMapping.java FObj.java
PropertyManager.java
src/java/org/apache/fop/fo/flow ExternalGraphic.java
TableColumn.java
src/java/org/apache/fop/layoutmgr
BlockContainerLayoutManager.java
BlockLayoutManager.java LineLayoutManager.java
PageLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Column.java Row.java
TableLayoutManager.java
src/java/org/apache/fop/render/rtf RTFHandler.java
src/java/org/apache/fop/traits BlockProps.java
Log:
Use the new property expressions. Clients must use Length when retrieving
a length and must delay the call to Length.getValue() until the
baselength has been assigned by the LayoutManagers.
PR: 26778 (second half)
Revision ChangesPath
1.11 +14 -2 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
Index: FOPropertyMapping.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FOPropertyMapping.java4 Feb 2004 12:38:27 - 1.10
+++ FOPropertyMapping.java26 Feb 2004 15:47:02 - 1.11
@@ -304,6 +304,7 @@
genericPadding = new LengthProperty.Maker(0);
genericPadding.setInherited(false);
genericPadding.setDefault(0pt);
+genericPadding.setPercentBase(LengthBase.BLOCK_WIDTH);
genericPadding.addShorthand(s_generics[PR_PADDING]);
// GenericCondBorderWidth
@@ -1189,6 +1190,7 @@
m.setInherited(false);
m.setDefault(0pt);
m.addShorthand(s_generics[PR_MARGIN]);
+m.setPercentBase(LengthBase.BLOCK_WIDTH);
addPropertyMaker(margin-top, m);
// margin-bottom
@@ -1196,6 +1198,7 @@
m.setInherited(false);
m.setDefault(0pt);
m.addShorthand(s_generics[PR_MARGIN]);
+m.setPercentBase(LengthBase.BLOCK_WIDTH);
addPropertyMaker(margin-bottom, m);
// margin-left
@@ -1203,6 +1206,7 @@
m.setInherited(false);
m.setDefault(0pt);
m.addShorthand(s_generics[PR_MARGIN]);
+m.setPercentBase(LengthBase.BLOCK_WIDTH);
addPropertyMaker(margin-left, m);
// margin-right
@@ -1210,6 +1214,7 @@
m.setInherited(false);
m.setDefault(0pt);
m.addShorthand(s_generics[PR_MARGIN]);
+m.setPercentBase(LengthBase.BLOCK_WIDTH);
addPropertyMaker(margin-right, m);
// space-before
@@ -1343,6 +1348,7 @@
// block-progression-dimension
m = new LengthRangeProperty.Maker(PR_BLOCK_PROGRESSION_DIMENSION);
m.setInherited(false);
+m.setPercentBase(LengthBase.BLOCK_HEIGHT);
l = new LengthProperty.Maker(CP_MINIMUM);
l.setDefault(auto);
@@ -1372,6 +1378,7 @@
{PR_MAX_HEIGHT, PR_MAX_HEIGHT, PR_MAX_WIDTH, }
});
pdim.setRelative(true);
+m.setCorresponding(pdim);
addPropertyMaker(block-progression-dimension, m);
// content-height
@@ -1398,6 +1405,7 @@
// inline-progression-dimension
m = new LengthRangeProperty.Maker(PR_INLINE_PROGRESSION_DIMENSION);
m.setInherited(false);
+m.setPercentBase(LengthBase.BLOCK_WIDTH);
l = new LengthProperty.Maker(CP_MINIMUM);
l.setDefault(auto);
@@ -1427,6 +1435,7 @@
{PR_MIN_WIDTH, PR_MIN_WIDTH, PR_MIN_HEIGHT, },
{PR_MAX_WIDTH, PR_MAX_WIDTH, PR_MAX_HEIGHT, }
});
+m.setCorresponding(pdim);
addPropertyMaker(inline-progression-dimension, m);
// max-height
@@ -1471,7 +1480,7 @@
l = new LengthProperty.Maker(PR_WIDTH);
l.setInherited(false);
l.setAutoOk(true);
-l.setPercentBase(LengthBase.CONTAINING_BOX);
+l.setPercentBase(LengthBase.BLOCK_WIDTH);
l.setDefault(auto);
addPropertyMaker(width, l);
}
@@ -1580,6 +1589,7 @@
m = new LengthProperty.Maker(PR_TEXT_INDENT);
m.setInherited(false);
m.setDefault(0pt);
+m.setPercentBase(LengthBase.BLOCK_WIDTH);
addPropertyMaker(text-indent, m);
// white-space-collapse
@@ -,6 +2232,7 @@
m = new LengthProperty.Maker(PR_COLUMN_WIDTH);
m.setInherited(false);
m.setDefault(proportional-column-width(1), true);
+m.setPercentBase(LengthBase.BLOCK_WIDTH);
addPropertyMaker(column
cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java
bckfnn 2004/02/10 09:42:03
Modified:src/java/org/apache/fop/tools TestConverter.java
Log:
Added '-results' options to set the result ouput directory.
Revision ChangesPath
1.9 +4 -1 xml-fop/src/java/org/apache/fop/tools/TestConverter.java
Index: TestConverter.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestConverter.java20 Jan 2004 11:45:48 - 1.8
+++ TestConverter.java10 Feb 2004 17:42:03 - 1.9
@@ -108,6 +108,7 @@
}
TestConverter tc = new TestConverter();
+String results = results;
String testFile = null;
for (int count = 0; count args.length; count++) {
if (args[count].equals(-failOnly)) {
@@ -118,6 +119,8 @@
tc.setDebug(true);
} else if (args[count].equals(-b)) {
tc.setBaseDir(args[++count]);
+} else if (args[count].equals(-results)) {
+results = args[++count];
} else {
testFile = args[count];
}
@@ -126,7 +129,7 @@
System.out.println(test suite file name required);
}
-tc.runTests(testFile, results, null);
+tc.runTests(testFile, results, null);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr BlockContainerLayoutManager.java
bckfnn 2004/02/10 11:25:15
Modified:src/java/org/apache/fop/layoutmgr
BlockContainerLayoutManager.java
Log:
Set correct ipd/bpd of both the viewport and reference area.
Revision ChangesPath
1.13 +35 -11
xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- BlockContainerLayoutManager.java 29 Jan 2004 19:43:04 - 1.12
+++ BlockContainerLayoutManager.java 10 Feb 2004 19:25:15 - 1.13
@@ -87,6 +87,9 @@
private Length width;
private Length height;
+// When viewport should grow with the content.
+private boolean autoHeight = true;
+
/**
* Create a new block container layout manager.
*/
@@ -111,8 +114,8 @@
}
marginProps = pm.getMarginProps();
borderProps = pm.getBorderAndPadding();
-height = pm.getPropertyList().get(PR_HEIGHT).getLength();
-width = pm.getPropertyList().get(PR_WIDTH).getLength();
+height = pm.getPropertyList().get(PR_BLOCK_PROGRESSION_DIMENSION |
CP_OPTIMUM).getLength();
+width = pm.getPropertyList().get(PR_INLINE_PROGRESSION_DIMENSION |
CP_OPTIMUM).getLength();
}
protected int getRotatedIPD() {
@@ -152,8 +155,13 @@
boolean rotated = vals[0] == 0.0;
if (rotated) {
// rotated 90 degrees
-stackLimit = new MinOptMax(100);
-ipd = getRotatedIPD();
+if (relDims.ipd context.getRefIPD()) {
+relDims.ipd = context.getRefIPD();
+}
+stackLimit = new MinOptMax(relDims.ipd);
+if (width.isAuto()) {
+relDims.bpd = context.getStackLimit().opt;
+}
absoluteCTM = new CTM(vals[0], vals[1], vals[2], vals[3], 0, 0);
} else {
if (vals[0] == -1.0) {
@@ -324,25 +332,31 @@
viewportBlockArea.setCTM(absoluteCTM);
viewportBlockArea.setClip(clip);
+autoHeight = false;
} else {
double[] vals = absoluteCTM.toArray();
boolean rotated = vals[0] == 0.0;
if (rotated) {
-viewportBlockArea.setWidth(relDims.bpd);
-viewportBlockArea.setHeight(getRotatedIPD());
+viewportBlockArea.setWidth(relDims.ipd);
+viewportBlockArea.setHeight(relDims.bpd);
viewportBlockArea.setCTM(absoluteCTM);
viewportBlockArea.setClip(clip);
+autoHeight = false;
} else if (vals[0] == -1.0) {
// need to set bpd to actual size for rotation
// and stacking
viewportBlockArea.setWidth(relDims.ipd);
-viewportBlockArea.setWidth(relDims.bpd);
+if (!height.isAuto()) {
+viewportBlockArea.setHeight(relDims.bpd);
+autoHeight = false;
+}
viewportBlockArea.setCTM(absoluteCTM);
viewportBlockArea.setClip(clip);
} else {
viewportBlockArea.setWidth(relDims.ipd);
if (!height.isAuto()) {
viewportBlockArea.setHeight(relDims.bpd);
+autoHeight = false;
}
}
}
@@ -356,8 +370,8 @@
// Set up dimensions
// Must get dimensions from parent area
Area parentArea = parentLM.getParentArea(curBlockArea);
-int referenceIPD = parentArea.getIPD();
-curBlockArea.setIPD(referenceIPD);
+//int referenceIPD = parentArea.getIPD();
+curBlockArea.setIPD(relDims.ipd);
// Get reference IPD from parentArea
setCurrentArea(viewportBlockArea); // ??? for generic operations
}
@@ -371,7 +385,7 @@
*/
public void addChild(Area childArea) {
if (curBlockArea != null) {
-curBlockArea.addBlock((Block) childArea, height.isAuto());
+curBlockArea.addBlock((Block) childArea);
}
}
@@ -385,8 +399,18 @@
* Force current area to be added to parent area.
*/
protected void flush() {
+viewportBlockArea.addBlock(curBlockArea, autoHeight);
+
+// Fake a 0 height for absolute positioned blocks
cvs commit: xml-fop/src/java/org/apache/fop/render/pdf PDFRenderer.java
bckfnn 2004/02/10 11:28:17
Modified:src/java/org/apache/fop/render/pdf PDFRenderer.java
Log:
Draw the borders of a BlockViewport before setting the CTM
transformation. This way the viewport is relative to the current CTM
and the content of the Viewport is relative to the viewport CTM.
Revision ChangesPath
1.33 +19 -18xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- PDFRenderer.java 4 Feb 2004 13:06:36 - 1.32
+++ PDFRenderer.java 10 Feb 2004 19:28:17 - 1.33
@@ -742,26 +742,29 @@
if (bv.getPositioning() == Block.ABSOLUTE) {
-currentIPPosition = 0;
-currentBPPosition = 0;
-
closeText();
-endTextObject();
+CTM tempctm = new CTM(containingIPPosition, containingBPPosition);
+ctm = tempctm.multiply(ctm);
+
+float x = (float)(bv.getXOffset() + containingIPPosition) / 1000f;
+float y = (float)(bv.getYOffset() + containingBPPosition) / 1000f;
+float width = (float)bv.getWidth() / 1000f;
+float height = (float)bv.getHeight() / 1000f;
+
+drawBackAndBorders(bv, x, y, width, height);
+
+endTextObject();
if (bv.getClip()) {
saveGraphicsState();
-float x = (float)(bv.getXOffset() + containingIPPosition) / 1000f;
-float y = (float)(bv.getYOffset() + containingBPPosition) / 1000f;
-float width = (float)bv.getWidth() / 1000f;
-float height = (float)bv.getHeight() / 1000f;
clip(x, y, width, height);
}
-CTM tempctm = new CTM(containingIPPosition, containingBPPosition);
-ctm = tempctm.multiply(ctm);
-
startVParea(ctm);
-handleBlockTraits(bv);
+
+currentIPPosition = 0;
+currentBPPosition = 0;
+
renderBlocks(bv, children);
endVParea();
@@ -777,11 +780,7 @@
} else {
if (ctm != null) {
-currentIPPosition = 0;
-currentBPPosition = 0;
-
closeText();
-endTextObject();
double[] vals = ctm.toArray();
//boolean aclock = vals[2] == 1.0;
@@ -798,7 +797,6 @@
if (bv.getClip()) {
if (ctm == null) {
closeText();
-endTextObject();
}
saveGraphicsState();
float x = (float)bv.getXOffset() / 1000f;
@@ -808,10 +806,13 @@
clip(x, y, width, height);
}
+handleBlockTraits(bv);
if (ctm != null) {
+endTextObject();
startVParea(ctm);
+currentIPPosition = 0;
+currentBPPosition = 0;
}
-handleBlockTraits(bv);
renderBlocks(bv, children);
if (ctm != null) {
endVParea();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo PropertySets.java
bckfnn 2004/02/09 13:30:56 Modified:src/codegen property-sets.xsl src/java/org/apache/fop/fo PropertySets.java Log: Simplefy the huge merge loop and allow compilation with jdk1.3. Revision ChangesPath 1.2 +194 -108 xml-fop/src/codegen/property-sets.xsl http://cvs.apache.org/viewcvs/xml-fop/src/codegen/property-sets.xsl.diff?r1=1.1r2=1.2 1.4 +945 -1136 xml-fop/src/java/org/apache/fop/fo/PropertySets.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/PropertySets.java.diff?r1=1.3r2=1.4 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop status.xml
bckfnn 2004/02/05 09:58:13 Modified:.status.xml Log: Latest changes about property datatypes. Revision ChangesPath 1.35 +4 -0 xml-fop/status.xml Index: status.xml === RCS file: /home/cvs/xml-fop/status.xml,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- status.xml22 Jan 2004 10:54:39 - 1.34 +++ status.xml5 Feb 2004 17:58:13 - 1.35 @@ -105,6 +105,10 @@ changes release version=2004 date=2004 action context=code dev=FB type=update + Rolled property datatypes classes into the property classes and + un-nested the Property.Maker inner-class. +/action +action context=code dev=FB type=update Abandoned code-generated property maker classes. /action /release - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr LineLayoutManager.java
bckfnn 2004/02/05 09:59:31
Modified:src/java/org/apache/fop/layoutmgr LineLayoutManager.java
Log:
Support for text-indent.
Revision ChangesPath
1.12 +7 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
Index: LineLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LineLayoutManager.java17 Jan 2004 19:29:46 - 1.11
+++ LineLayoutManager.java5 Feb 2004 17:59:30 - 1.12
@@ -178,6 +178,10 @@
clearPrevIPD();
int iPrevLineEnd = vecInlineBreaks.size();
+// Adjust available line length by text-indent.
+if (iPrevLineEnd == 0 bTextAlignment == TextAlign.START) {
+availIPD.subtract(new MinOptMax(iTextIndent));
+}
prevBP = null;
while ((curLM = getChildLM()) != null) {
@@ -618,7 +622,9 @@
}
break;
case TextAlign.START:
-//indent = 0;
+if (prevLineEnd == 0) {
+indent = iTextIndent;
+}
break;
case TextAlign.CENTER:
indent = (targetWith - realWidth) / 2;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/pagination RegionBody.java
bckfnn 2004/02/04 04:58:27
Modified:src/java/org/apache/fop/fo/pagination RegionBody.java
Log:
Support for margin shorthands for margin-[left,right].
Revision ChangesPath
1.16 +2 -2 xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java
Index: RegionBody.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RegionBody.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RegionBody.java 2 Feb 2004 16:08:26 - 1.15
+++ RegionBody.java 4 Feb 2004 12:58:27 - 1.16
@@ -113,9 +113,9 @@
String sPropName = margin-
+ parent.propertyList.wmRelToAbs(reldir);
int propId = FOPropertyMapping.getPropertyId(sPropName);
-Property prop = propertyList.getExplicitBaseProp(propId);
+Property prop = propertyList.getExplicitOrShorthand(propId);
if (prop == null) {
-prop = propertyList.getExplicitBaseProp(relPropId);
+prop = propertyList.getExplicitOrShorthand(relPropId);
}
return ((prop != null) ? prop.getLength().getValue() : 0);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/pdf PDFRenderer.java
bckfnn 2004/02/04 05:06:36
Modified:src/java/org/apache/fop/render AbstractRenderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
Log:
Do the regiontraits before changes ctm because the ctm only apply for the
region reference area, not the viewport itself.
Revision ChangesPath
1.21 +2 -2 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractRenderer.java 29 Jan 2004 19:45:48 - 1.20
+++ AbstractRenderer.java 4 Feb 2004 13:06:36 - 1.21
@@ -330,11 +330,11 @@
currentBlockIPPosition = currentIPPosition;
RegionReference region = port.getRegion();
+handleRegionTraits(port);
+
// shouldn't the viewport have the CTM
startVParea(region.getCTM());
-
// do after starting viewport area
-handleRegionTraits(port);
if (region.getRegionClass() == Region.BODY_CODE) {
renderBodyRegion((BodyRegion) region);
} else {
1.32 +4 -3 xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- PDFRenderer.java 3 Feb 2004 22:11:15 - 1.31
+++ PDFRenderer.java 4 Feb 2004 13:06:36 - 1.32
@@ -546,9 +546,9 @@
*/
protected void handleRegionTraits(RegionViewport region) {
currentFontName = ;
-float startx = 0;
-float starty = 0;
Rectangle2D viewArea = region.getViewArea();
+float startx = (float)(viewArea.getX() / 1000f);
+float starty = (float)(viewArea.getY() / 1000f);;
float width = (float)(viewArea.getWidth() / 1000f);
float height = (float)(viewArea.getHeight() / 1000f);
@@ -557,8 +557,9 @@
bpMarginOffset = region.getBorderAndPaddingWidthBefore();
ipMarginOffset = region.getBorderAndPaddingWidthStart();
}
-
+beginTextObject();
drawBackAndBorders(region, startx, starty, width, height);
+endTextObject();
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties AutoLength.java BorderWidthPropertyMaker.java CompoundPropertyMaker.java LengthProperty.java LineHeightPropertyMaker.java ListProperty.java NumberProperty.java
bckfnn 2004/02/04 05:24:53
Modified:src/java/org/apache/fop/fo BoxPropShorthandParser.java
src/java/org/apache/fop/fo/properties AutoLength.java
BorderWidthPropertyMaker.java
CompoundPropertyMaker.java LengthProperty.java
LineHeightPropertyMaker.java ListProperty.java
NumberProperty.java
Log:
Fix javadocs warnings caused by the recent moves of property classes and
makers.
Revision ChangesPath
1.10 +1 -1 xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java
Index: BoxPropShorthandParser.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BoxPropShorthandParser.java 2 Feb 2004 16:08:24 - 1.9
+++ BoxPropShorthandParser.java 4 Feb 2004 13:24:53 - 1.10
@@ -70,7 +70,7 @@
* Set the given property based on the number of values set.
* Example: padding, border-width, border-color, border-style, margin
* @see org.apache.fop.fo.GenericShorthandParser#convertValueForProperty(
- * int, ListProperty, Property.Maker, PropertyList)
+ * int, ListProperty, PropertyMaker, PropertyList)
*/
protected Property convertValueForProperty(int propId,
ListProperty listProperty,
1.2 +2 -2 xml-fop/src/java/org/apache/fop/fo/properties/AutoLength.java
Index: AutoLength.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/AutoLength.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AutoLength.java 2 Feb 2004 16:08:26 - 1.1
+++ AutoLength.java 4 Feb 2004 13:24:53 - 1.2
@@ -69,7 +69,7 @@
//}
/**
- * @see org.apache.fop.fo.Property#getString()
+ * @see org.apache.fop.fo.properties.Property#getString()
*/
public String getString() {
return auto;
1.4 +2 -2
xml-fop/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
Index: BorderWidthPropertyMaker.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BorderWidthPropertyMaker.java 2 Feb 2004 16:08:26 - 1.3
+++ BorderWidthPropertyMaker.java 4 Feb 2004 13:24:53 - 1.4
@@ -81,7 +81,7 @@
/**
* Check the value of the style property and return a length of 0 when
* the style is NONE.
- * @see org.apache.fop.fo.Property.Maker#get(int, PropertyList, boolean,
boolean)
+ * @see org.apache.fop.fo.properties.PropertyMaker#get(int, PropertyList,
boolean, boolean)
*/
public Property get(int subpropId, PropertyList propertyList,
1.3 +2 -2
xml-fop/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java
Index: CompoundPropertyMaker.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompoundPropertyMaker.java2 Feb 2004 16:08:26 - 1.2
+++ CompoundPropertyMaker.java4 Feb 2004 13:24:53 - 1.3
@@ -86,7 +86,7 @@
}
/**
- * @see org.apache.fop.fo.Property.Maker#useGeneric(Property.Maker)
+ * @see org.apache.fop.fo.properties.PropertyMaker#useGeneric(PropertyMaker)
*/
public void useGeneric(PropertyMaker generic) {
super.useGeneric(generic);
1.2 +2 -2
xml-fop/src/java/org/apache/fop/fo/properties/LengthProperty.java
Index: LengthProperty.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/LengthProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LengthProperty.java 2 Feb 2004 16:08:26 - 1.1
+++ LengthProperty.java 4 Feb 2004 13:24:53 - 1.2
@@ -103,7 +103,7 @@
}
/**
- * @see Property.Maker#convertProperty
+ * @see PropertyMaker#convertProperty
*/
public Property convertProperty(Property p,
PropertyList propertyList,
1.4 +3 -3
xml-fop/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java
Index
cvs commit: xml-fop/src/java/org/apache/fop/fo/expr NCnameProperty.java
bckfnn 2004/02/03 08:39:06
Modified:src/java/org/apache/fop/fo/expr NCnameProperty.java
Log:
Support getObject(), used by Property.toString().
Revision ChangesPath
1.4 +7 -0 xml-fop/src/java/org/apache/fop/fo/expr/NCnameProperty.java
Index: NCnameProperty.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/expr/NCnameProperty.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NCnameProperty.java 2 Feb 2004 16:08:25 - 1.3
+++ NCnameProperty.java 3 Feb 2004 16:39:06 - 1.4
@@ -86,6 +86,13 @@
}
/**
+ * @return the name as an Object.
+ */
+public Object getObject() {
+return this.ncName;
+}
+
+/**
* @return ncName for this
*/
public String getNCname() {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties CompoundPropertyMaker.java CorrespondingPropertyMaker.java DimensionPropertyMaker.java IndentPropertyMaker.java LineHeightPropertyMaker.java PropertyMaker.java
bckfnn 2004/02/02 00:27:36 Modified:src/java/org/apache/fop/datatypes ToBeImplementedProperty.java src/java/org/apache/fop/fo BoxPropShorthandParser.java CharacterProperty.java ColorTypeProperty.java CondLengthProperty.java EnumProperty.java FOPropertyMapping.java FObj.java GenericShorthandParser.java KeepProperty.java LengthPairProperty.java LengthProperty.java LengthRangeProperty.java ListProperty.java NumberProperty.java Property.java PropertyList.java ShorthandParser.java SpaceProperty.java StringProperty.java src/java/org/apache/fop/fo/expr PropertyInfo.java Added: src/java/org/apache/fop/fo/properties CompoundPropertyMaker.java CorrespondingPropertyMaker.java DimensionPropertyMaker.java IndentPropertyMaker.java LineHeightPropertyMaker.java PropertyMaker.java Removed: src/java/org/apache/fop/fo CompoundPropertyMaker.java CorrespondingPropertyMaker.java DimensionPropertyMaker.java IndentPropertyMaker.java LineHeightPropertyMaker.java Log: Phase 1 of 26434. - Unnest Property.Maker into fop.fo.properties.PropertyMaker. - Move the handmade makers into package fop.fo.properties. PR: 26434 Revision ChangesPath 1.6 +2 -1 xml-fop/src/java/org/apache/fop/datatypes/ToBeImplementedProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/ToBeImplementedProperty.java.diff?r1=1.5r2=1.6 1.8 +3 -1 xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java.diff?r1=1.7r2=1.8 1.4 +3 -1 xml-fop/src/java/org/apache/fop/fo/CharacterProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/CharacterProperty.java.diff?r1=1.3r2=1.4 1.4 +2 -1 xml-fop/src/java/org/apache/fop/fo/ColorTypeProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/ColorTypeProperty.java.diff?r1=1.3r2=1.4 1.5 +1 -0 xml-fop/src/java/org/apache/fop/fo/CondLengthProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/CondLengthProperty.java.diff?r1=1.4r2=1.5 1.6 +2 -1 xml-fop/src/java/org/apache/fop/fo/EnumProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/EnumProperty.java.diff?r1=1.5r2=1.6 1.4 +50 -45xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java.diff?r1=1.3r2=1.4 1.33 +4 -3 xml-fop/src/java/org/apache/fop/fo/FObj.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FObj.java.diff?r1=1.32r2=1.33 1.7 +4 -2 xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java.diff?r1=1.6r2=1.7 1.5 +1 -0 xml-fop/src/java/org/apache/fop/fo/KeepProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/KeepProperty.java.diff?r1=1.4r2=1.5 1.5 +1 -0 xml-fop/src/java/org/apache/fop/fo/LengthPairProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/LengthPairProperty.java.diff?r1=1.4r2=1.5 1.6 +2 -1 xml-fop/src/java/org/apache/fop/fo/LengthProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/LengthProperty.java.diff?r1=1.5r2=1.6 1.5 +1 -0 xml-fop/src/java/org/apache/fop/fo/LengthRangeProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/LengthRangeProperty.java.diff?r1=1.4r2=1.5 1.5 +3 -1 xml-fop/src/java/org/apache/fop/fo/ListProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/ListProperty.java.diff?r1=1.4r2=1.5 1.5 +2 -1 xml-fop/src/java/org/apache/fop/fo/NumberProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/NumberProperty.java.diff?r1=1.4r2=1.5 1.20 +0 -580xml-fop/src/java/org/apache/fop/fo/Property.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/Property.java.diff?r1=1.19r2=1.20 1.29 +9 -9 xml-fop/src/java/org/apache/fop/fo/PropertyList.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java.diff?r1
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties BorderWidthPropertyMaker.java
bckfnn 2004/02/02 00:38:27
Modified:src/java/org/apache/fop/fo FOPropertyMapping.java
Added: src/java/org/apache/fop/fo/properties
BorderWidthPropertyMaker.java
Removed: src/java/org/apache/fop/fo BorderWidthPropertyMaker.java
Log:
Move the handmade makers into package fop.fo.properties.
PR: 26434
Revision ChangesPath
1.5 +2 -1 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
Index: FOPropertyMapping.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FOPropertyMapping.java2 Feb 2004 08:27:34 - 1.4
+++ FOPropertyMapping.java2 Feb 2004 08:38:27 - 1.5
@@ -56,6 +56,7 @@
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.datatypes.LengthBase;
import org.apache.fop.datatypes.ToBeImplementedProperty;
+import org.apache.fop.fo.properties.BorderWidthPropertyMaker;
import org.apache.fop.fo.properties.CorrespondingPropertyMaker;
import org.apache.fop.fo.properties.DimensionPropertyMaker;
import org.apache.fop.fo.properties.IndentPropertyMaker;
1.1
xml-fop/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java
Index: BorderWidthPropertyMaker.java
===
/*
* $Id: BorderWidthPropertyMaker.java,v 1.1 2004/02/02 08:38:27 bckfnn Exp $
*
*The Apache Software License, Version 1.1
*
*
* Copyright (C) 1999-2004 The Apache Software Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
*this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
*this list of conditions and the following disclaimer in the documentation
*and/or other materials provided with the distribution.
*
* 3. The end-user documentation included with the redistribution, if any, must
*include the following acknowledgment: This product includes software
*developed by the Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgment may appear in the software itself, if
*and wherever such third-party acknowledgments normally appear.
*
* 4. The names FOP and Apache Software Foundation must not be used to
*endorse or promote products derived from this software without prior
*written permission. For written permission, please contact
*[EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache, nor may
*Apache appear in their name, without prior written permission of the
*Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
* DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
* This software consists of voluntary contributions made by many individuals
* on behalf of the Apache Software Foundation and was originally created by
* James Tauber [EMAIL PROTECTED]. For more information on the Apache
* Software Foundation, please see http://www.apache.org/.
*/
package org.apache.fop.fo.properties;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.LengthProperty;
import org.apache.fop.fo.Property;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.fo.LengthProperty.Maker;
/**
* This subclass of LengthProperty.Maker handles the special treatment of
* border width described in 7.7.20.
*/
public class BorderWidthPropertyMaker extends LengthProperty.Maker {
int borderStyleId = 0
cvs commit: xml-fop/src/java/org/apache/fop/traits SpaceVal.java
bckfnn 2004/02/02 07:01:41 Modified:src/java/org/apache/fop/datatypes AutoLength.java ColorType.java FixedLength.java Length.java LinearCombinationLength.java MixedLength.java PercentLength.java TableColLength.java src/java/org/apache/fop/fo ColorTypeProperty.java CondLengthProperty.java EnumProperty.java FOPropertyMapping.java KeepProperty.java LengthPairProperty.java LengthProperty.java LengthRangeProperty.java NumberProperty.java Property.java SpaceProperty.java src/java/org/apache/fop/fo/expr AbsFunction.java BodyStartFunction.java LabelEndFunction.java MaxFunction.java MinFunction.java NumericProperty.java PPColWidthFunction.java PropertyParser.java RGBColorFunction.java src/java/org/apache/fop/fo/flow ExternalGraphic.java Table.java src/java/org/apache/fop/fo/properties BorderWidthPropertyMaker.java CommonBorderAndPadding.java IndentPropertyMaker.java LineHeightPropertyMaker.java src/java/org/apache/fop/render/rtf TableAttributesConverter.java TextAttributesConverter.java src/java/org/apache/fop/traits SpaceVal.java Removed: src/java/org/apache/fop/datatypes CondLength.java Keep.java LengthPair.java LengthRange.java Space.java src/java/org/apache/fop/fo/expr Numeric.java Log: Phase 2 of bug 26434. - Roll the datatypes logic into the property classes. PR: 26434. Revision ChangesPath 1.2 +5 -3 xml-fop/src/java/org/apache/fop/datatypes/AutoLength.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/AutoLength.java.diff?r1=1.1r2=1.2 1.5 +7 -684xml-fop/src/java/org/apache/fop/datatypes/ColorType.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/ColorType.java.diff?r1=1.4r2=1.5 1.4 +5 -4 xml-fop/src/java/org/apache/fop/datatypes/FixedLength.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/FixedLength.java.diff?r1=1.3r2=1.4 1.3 +3 -90 xml-fop/src/java/org/apache/fop/datatypes/Length.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/Length.java.diff?r1=1.2r2=1.3 1.3 +4 -2 xml-fop/src/java/org/apache/fop/datatypes/LinearCombinationLength.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/LinearCombinationLength.java.diff?r1=1.2r2=1.3 1.3 +11 -10xml-fop/src/java/org/apache/fop/datatypes/MixedLength.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/MixedLength.java.diff?r1=1.2r2=1.3 1.3 +5 -4 xml-fop/src/java/org/apache/fop/datatypes/PercentLength.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/PercentLength.java.diff?r1=1.2r2=1.3 1.3 +5 -4 xml-fop/src/java/org/apache/fop/datatypes/TableColLength.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/TableColLength.java.diff?r1=1.2r2=1.3 1.5 +708 -12 xml-fop/src/java/org/apache/fop/fo/ColorTypeProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/ColorTypeProperty.java.diff?r1=1.4r2=1.5 1.6 +68 -14xml-fop/src/java/org/apache/fop/fo/CondLengthProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/CondLengthProperty.java.diff?r1=1.5r2=1.6 1.7 +1 -1 xml-fop/src/java/org/apache/fop/fo/EnumProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/EnumProperty.java.diff?r1=1.6r2=1.7 1.6 +3 -3 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java.diff?r1=1.5r2=1.6 1.6 +90 -10xml-fop/src/java/org/apache/fop/fo/KeepProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/KeepProperty.java.diff?r1=1.5r2=1.6 1.6 +48 -10xml-fop/src/java/org/apache/fop/fo/LengthPairProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/LengthPairProperty.java.diff?r1=1.5r2=1.6 1.7 +94 -23xml-fop/src/java/org/apache/fop/fo/LengthProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/LengthProperty.java.diff?r1=1.6r2=1.7 1.6 +171 -11 xml-fop/src/java/org/apache/fop/fo
cvs commit: xml-fop/src/java/org/apache/fop/fo FOPropertyMapping.java
bckfnn 2004/02/02 07:05:51 Modified:src/java/org/apache/fop/fo FOPropertyMapping.java Log: Removed unused import. Revision ChangesPath 1.7 +1 -2 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java Index: FOPropertyMapping.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- FOPropertyMapping.java2 Feb 2004 15:01:39 - 1.6 +++ FOPropertyMapping.java2 Feb 2004 15:05:51 - 1.7 @@ -56,7 +56,6 @@ import org.apache.fop.datatypes.LengthBase; import org.apache.fop.datatypes.ToBeImplementedProperty; import org.apache.fop.fo.properties.BorderWidthPropertyMaker; -import org.apache.fop.fo.properties.CharacterProperty; import org.apache.fop.fo.properties.CorrespondingPropertyMaker; import org.apache.fop.fo.properties.DimensionPropertyMaker; import org.apache.fop.fo.properties.IndentPropertyMaker; - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/traits SpaceVal.java
bckfnn 2004/02/02 08:08:27 Modified:src/java/org/apache/fop/datatypes CompoundDatatype.java src/java/org/apache/fop/fo BoxPropShorthandParser.java FOPropertyMapping.java FObj.java GenericShorthandParser.java PropertyList.java PropertyManager.java ShorthandParser.java src/java/org/apache/fop/fo/expr AbsFunction.java BodyStartFunction.java CeilingFunction.java FloorFunction.java FopPropValFunction.java FromParentFunction.java FromTableColumnFunction.java Function.java InheritedPropFunction.java LabelEndFunction.java MaxFunction.java MinFunction.java NCnameProperty.java NearestSpecPropFunction.java NumericProperty.java PPColWidthFunction.java PropertyParser.java RGBColorFunction.java RoundFunction.java src/java/org/apache/fop/fo/flow ExternalGraphic.java Leader.java Table.java TableColumn.java TableRow.java src/java/org/apache/fop/fo/pagination RegionBody.java Title.java src/java/org/apache/fop/fo/properties BorderWidthPropertyMaker.java CommonBorderAndPadding.java CompoundPropertyMaker.java CorrespondingPropertyMaker.java DimensionPropertyMaker.java IndentPropertyMaker.java LineHeightPropertyMaker.java PropertyMaker.java src/java/org/apache/fop/render/rtf ListAttributesConverter.java PageAttributesConverter.java RTFHandler.java TableAttributesConverter.java TextAttributesConverter.java src/java/org/apache/fop/traits SpaceVal.java Added: src/java/org/apache/fop/fo/properties AutoLength.java CharacterProperty.java ColorTypeProperty.java CondLengthProperty.java EnumProperty.java FixedLength.java KeepProperty.java LengthPairProperty.java LengthProperty.java LengthRangeProperty.java LinearCombinationLength.java ListProperty.java MixedLength.java NumberProperty.java PercentLength.java Property.java SpaceProperty.java StringProperty.java TableColLength.java ToBeImplementedProperty.java Removed: src/java/org/apache/fop/datatypes AutoLength.java FixedLength.java LinearCombinationLength.java MixedLength.java PercentLength.java TableColLength.java ToBeImplementedProperty.java src/java/org/apache/fop/fo CharacterProperty.java ColorTypeProperty.java CondLengthProperty.java EnumProperty.java KeepProperty.java LengthPairProperty.java LengthProperty.java LengthRangeProperty.java ListProperty.java NumberProperty.java Property.java SpaceProperty.java StringProperty.java Log: Phase 3 (last) of bug 26434. - Move the property classes to fop.fo.properties. PR: 26434 Revision ChangesPath 1.4 +1 -1 xml-fop/src/java/org/apache/fop/datatypes/CompoundDatatype.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/datatypes/CompoundDatatype.java.diff?r1=1.3r2=1.4 1.9 +2 -0 xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java.diff?r1=1.8r2=1.9 1.8 +15 -2 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java.diff?r1=1.7r2=1.8 1.34 +1 -0 xml-fop/src/java/org/apache/fop/fo/FObj.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FObj.java.diff?r1=1.33r2=1.34 1.8 +2 -0 xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java.diff?r1=1.7r2=1.8 1.30 +1 -0 xml-fop/src/java/org/apache/fop/fo/PropertyList.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java.diff?r1=1.29r2=1.30 1.22 +1 -0 xml-fop/src/java/org/apache/fop/fo/PropertyManager.java http://cvs.apache.org/viewcvs/xml-fop
cvs commit: xml-fop/src/java/org/apache/fop/fo Property.java
bckfnn 2004/01/29 05:32:04
Modified:src/java/org/apache/fop/fo Property.java
Log:
Fix a NPE when the last shorthand was not detected.
Revision ChangesPath
1.19 +1 -1 xml-fop/src/java/org/apache/fop/fo/Property.java
Index: Property.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Property.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Property.java 25 Jan 2004 22:34:49 - 1.18
+++ Property.java 29 Jan 2004 13:32:04 - 1.19
@@ -618,7 +618,7 @@
}
ListProperty listprop;
int n = shorthands.length;
-for (int i = 0; i n; i++) {
+for (int i = 0; i n shorthands[i] != null; i++) {
Property.Maker shorthand = shorthands[i];
listprop = (ListProperty)propertyList.getExplicit(shorthand.propId);
if (listprop != null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr TraitSetter.java
bckfnn 2004/01/29 11:36:04
Modified:src/java/org/apache/fop/layoutmgr TraitSetter.java
Log:
Added addMargins() to set the SPACE_* traits.
PR: 25802.
Revision ChangesPath
1.5 +26 -0 xml-fop/src/java/org/apache/fop/layoutmgr/TraitSetter.java
Index: TraitSetter.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/TraitSetter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TraitSetter.java 24 Nov 2003 19:07:35 - 1.4
+++ TraitSetter.java 29 Jan 2004 19:36:04 - 1.5
@@ -55,6 +55,7 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.Trait;
import org.apache.fop.fo.properties.CommonBackground;
+import org.apache.fop.fo.properties.CommonMarginBlock;
/**
* This is a helper class used for setting common traits on areas.
@@ -202,6 +203,31 @@
if (back.getColor() != null || back.getURL() != null) {
curBlock.addTrait(Trait.BACKGROUND, back);
+}
+}
+
+/**
+ * Add space to a block area.
+ * Layout managers that create block areas can use this to add space
+ * outside of the border rectangle to the area.
+ * @param curBlock the current block.
+ * @param marginProps the margin properties.
+ */
+public static void addMargins(Area curBlock,
+ CommonBorderAndPadding bpProps,
+ CommonMarginBlock marginProps) {
+int spaceStart = marginProps.startIndent -
+bpProps.getBorderStartWidth(false) -
+bpProps.getPaddingStart(false);
+if (spaceStart != 0) {
+curBlock.addTrait(Trait.SPACE_START, new Integer(spaceStart));
+}
+
+int spaceEnd = marginProps.endIndent -
+ bpProps.getBorderEndWidth(false) -
+ bpProps.getPaddingEnd(false);
+if (spaceEnd != 0) {
+curBlock.addTrait(Trait.SPACE_END, new Integer(spaceEnd));
}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo/properties CommonBorderAndPadding.java
bckfnn 2004/01/29 11:37:02
Modified:src/java/org/apache/fop/fo/properties
CommonBorderAndPadding.java
Log:
Added getBPPaddingAndBorder() to return the border and padding length in
the BP direction.
PR: 25802.
Revision ChangesPath
1.5 +13 -2
xml-fop/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java
Index: CommonBorderAndPadding.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/CommonBorderAndPadding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CommonBorderAndPadding.java 22 Dec 2003 21:37:44 - 1.4
+++ CommonBorderAndPadding.java 29 Jan 2004 19:37:02 - 1.5
@@ -213,7 +213,18 @@
return padding[side].iLength;
}
}
-
+
+/**
+ * Return all the border and padding height in the block progression
+ * dimension.
+ * @param bDiscard the discard flag.
+ * @return all the padding and border height.
+ */
+public int getBPPaddingAndBorder(boolean bDiscard) {
+return getPaddingBefore(bDiscard) + getPaddingAfter(bDiscard) +
+ getBorderBeforeWidth(bDiscard) + getBorderAfterWidth(bDiscard);
+}
+
public String toString() {
return CommonBordersAndPadding (Before, After, Start, End):\n +
Borders: ( + getBorderBeforeWidth(false) + , +
getBorderAfterWidth(false) + , +
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr BlockContainerLayoutManager.java BlockLayoutManager.java
bckfnn 2004/01/29 11:43:05
Modified:src/java/org/apache/fop/layoutmgr
BlockContainerLayoutManager.java
BlockLayoutManager.java
Log:
Set the SPACE_START and SPACE_END traits and adjust the height to take
border and padding into account.
PR: 25802.
Revision ChangesPath
1.12 +13 -2
xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BlockContainerLayoutManager.java 17 Jan 2004 19:29:46 - 1.11
+++ BlockContainerLayoutManager.java 29 Jan 2004 19:43:04 - 1.12
@@ -58,6 +58,8 @@
import org.apache.fop.area.Block;
import org.apache.fop.fo.PropertyManager;
import org.apache.fop.fo.properties.CommonAbsolutePosition;
+import org.apache.fop.fo.properties.CommonBorderAndPadding;
+import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.PropertyList;
import org.apache.fop.area.CTM;
import org.apache.fop.datatypes.FODimension;
@@ -75,6 +77,8 @@
private List childBreaks = new java.util.ArrayList();
private CommonAbsolutePosition abProps;
+private CommonBorderAndPadding borderProps;
+private CommonMarginBlock marginProps;
private FODimension relDims;
private CTM absoluteCTM;
private boolean clip = false;
@@ -105,6 +109,8 @@
absoluteCTM = CTM.getCTMandRelDims(pm.getAbsRefOrient(),
pm.getWritingMode(), rect, relDims);
}
+marginProps = pm.getMarginProps();
+borderProps = pm.getBorderAndPadding();
height = pm.getPropertyList().get(PR_HEIGHT).getLength();
width = pm.getPropertyList().get(PR_WIDTH).getLength();
}
@@ -123,19 +129,24 @@
return getAbsoluteBreakPoss(context);
}
+int bIndents = borderProps.getBPPaddingAndBorder(false);
+int iIndents = marginProps.startIndent + marginProps.endIndent;
+
int ipd = context.getRefIPD();
int bpd = context.getStackLimit().opt;
if (!width.isAuto()) {
-ipd = width.getValue();
+ipd = width.getValue() + iIndents;
}
if (!height.isAuto()) {
-bpd = height.getValue();
+bpd = height.getValue() + bIndents;
}
Rectangle2D rect = new Rectangle2D.Double(0, 0, ipd, bpd);
relDims = new FODimension(0, 0);
absoluteCTM = CTM.getCTMandRelDims(propManager.getAbsRefOrient(),
propManager.getWritingMode(), rect, relDims);
double[] vals = absoluteCTM.toArray();
+
+ipd -= iIndents;
MinOptMax stackLimit;
boolean rotated = vals[0] == 0.0;
1.12 +9 -3
xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BlockLayoutManager.java 30 Dec 2003 23:11:00 - 1.11
+++ BlockLayoutManager.java 29 Jan 2004 19:43:05 - 1.12
@@ -63,6 +63,7 @@
import org.apache.fop.traits.LayoutProps;
import org.apache.fop.fo.properties.CommonBorderAndPadding;
import org.apache.fop.fo.properties.CommonBackground;
+import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.traits.MinOptMax;
/**
@@ -75,6 +76,7 @@
private LayoutProps layoutProps;
private CommonBorderAndPadding borderProps;
private CommonBackground backgroundProps;
+private CommonMarginBlock marginProps;
/* holds the (one-time use) fo:block space-before
and -after properties. Large fo:blocks are split
@@ -182,6 +184,7 @@
layoutProps = pm.getLayoutProps();
borderProps = pm.getBorderAndPadding();
backgroundProps = pm.getBackgroundProps();
+marginProps = pm.getMarginProps();
foBlockSpaceBefore = layoutProps.spaceBefore.getSpace();
prevFoBlockSpaceAfter = foBlockSpaceAfter;
}
@@ -190,8 +193,8 @@
LayoutProcessor curLM; // currently active LM
int ipd = context.getRefIPD();
-int iIndents = borderProps.getPaddingStart(false)
-+ borderProps.getPaddingEnd(false);
+int iIndents = marginProps.startIndent + marginProps.endIndent;
+int bIndents = borderProps.getBPPaddingAndBorder(false);
ipd -= iIndents;
MinOptMax
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/list ListItemLayoutManager.java
bckfnn 2004/01/29 11:44:23
Modified:src/java/org/apache/fop/layoutmgr/list
ListItemLayoutManager.java
Log:
Hardcoded start-indent to 24pt no longer needed because SPACE_START trait
it set by the start-indent property.
PR: 25802.
Revision ChangesPath
1.6 +1 -4
xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ListItemLayoutManager.java8 Sep 2003 17:00:56 - 1.5
+++ ListItemLayoutManager.java29 Jan 2004 19:44:23 - 1.6
@@ -170,7 +170,7 @@
if (stage == 0) {
childLC.setRefIPD(24000);
} else if (stage == 1) {
-childLC.setRefIPD(context.getRefIPD() - 24000);
+childLC.setRefIPD(context.getRefIPD());
}
stage++;
while (!curLM.isFinished()) {
@@ -259,9 +259,6 @@
breakPosIter = new BreakPossPosIter(cellsbr, 0, cellsbr.size());
while ((childLM = (Item)breakPosIter.getNextChildLM()) != null) {
-if (childLM == body) {
-childLM.setXOffset(24000);
-}
childLM.addAreas(breakPosIter, lc);
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/ps PSRenderer.java
bckfnn 2004/01/29 11:45:48
Modified:src/java/org/apache/fop/render AbstractRenderer.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/ps PSRenderer.java
Log:
Handle SPACE_START trait for block areas.
PR: 25802.
Revision ChangesPath
1.20 +20 -10xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractRenderer.java 17 Jan 2004 19:29:46 - 1.19
+++ AbstractRenderer.java 29 Jan 2004 19:45:48 - 1.20
@@ -374,7 +374,7 @@
protected void renderRegion(RegionReference region) {
List blocks = region.getBlocks();
-renderBlocks(blocks);
+renderBlocks(null, blocks);
}
@@ -406,7 +406,7 @@
protected void renderBeforeFloat(BeforeFloat bf) {
List blocks = bf.getChildAreas();
if (blocks != null) {
-renderBlocks(blocks);
+renderBlocks(null, blocks);
Block sep = bf.getSeparator();
if (sep != null) {
renderBlock(sep);
@@ -426,7 +426,7 @@
if (sep != null) {
renderBlock(sep);
}
-renderBlocks(blocks);
+renderBlocks(null, blocks);
}
}
@@ -471,7 +471,7 @@
// the normal flow reference area contains stacked blocks
List blocks = flow.getChildAreas();
if (blocks != null) {
-renderBlocks(blocks);
+renderBlocks(null, blocks);
}
}
@@ -506,7 +506,7 @@
startVParea(ctm);
handleBlockTraits(bv);
-renderBlocks(children);
+renderBlocks(bv, children);
endVParea();
// clip if necessary
@@ -514,16 +514,26 @@
currentIPPosition = saveIP;
currentBPPosition = saveBP;
} else {
-renderBlocks(children);
+// save position and offset
+int saveIP = currentIPPosition;
+int saveBP = currentBPPosition;
+
+handleBlockTraits(bv);
+renderBlocks(bv, children);
+
+currentIPPosition = saveIP;
+currentBPPosition = saveBP + bv.getHeight();
}
}
/**
* Renders a list of block areas.
*
+ * @param parent the parent block if the parent is a block, otherwise
+ *a null value.
* @param blocks The block areas
*/
-protected void renderBlocks(List blocks) {
+protected void renderBlocks(Block parent, List blocks) {
// the position of the containing block is used for
// absolutely positioned areas
int contBP = currentBPPosition;
@@ -575,7 +585,7 @@
handleBlockTraits(block);
-renderBlocks(children);
+renderBlocks(block, children);
// absolute blocks do not effect the layout
currentBPPosition = saveBP;
@@ -586,7 +596,7 @@
handleBlockTraits(block);
-renderBlocks(children);
+renderBlocks(block, children);
// stacked and relative blocks effect stacking
currentBPPosition = saveBP + block.getHeight();
@@ -649,7 +659,7 @@
int saveBP = currentBPPosition;
List blocks = cont.getBlocks();
-renderBlocks(blocks);
+renderBlocks(null, blocks);
currentIPPosition = saveIP;
currentBlockIPPosition = saveBlockIP;
currentBPPosition = saveBP;
1.30 +51 -20xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- PDFRenderer.java 25 Jan 2004 14:40:14 - 1.29
+++ PDFRenderer.java 29 Jan 2004 19:45:48 - 1.30
@@ -504,15 +504,39 @@
}
/**
- * @see org.apache.fop.render.AbstractRenderer#renderBlock(Block)
+ * @see org.apache.fop.render.AbstractRenderer#renderBlocks(Block, List)
*/
-protected void renderBlock(Block block) {
-int marginOffset = IPMarginOffset;
-super.renderBlock(block);
-// super.renderBlock() may render child blocks (with their own offsets)
-// so need to restore
cvs commit: xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc RtfListStyleNumber.java
bckfnn 2004/01/25 05:59:33
Modified:src/java/org/apache/fop/render/rtf/rtflib/rtfdoc
RtfListStyleNumber.java
Log:
Fix a 'javadoc' warning about missing @see target.
Revision ChangesPath
1.4 +2 -2
xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java
Index: RtfListStyleNumber.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RtfListStyleNumber.java 24 Jan 2004 22:24:14 - 1.3
+++ RtfListStyleNumber.java 25 Jan 2004 13:59:33 - 1.4
@@ -68,7 +68,7 @@
/**
* Gets call before a RtfListItem has to be written.
*
- * @see org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListStyle#writeListPrefix()
+ * @see
org.apache.fop.render.rtf.rtflib.rtfdoc.RtfListStyle#writeListPrefix(RtfListItem)
*/
public void writeListPrefix(RtfListItem item)
throws IOException {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo FOPropertyMapping.java Property.java
bckfnn 2004/01/25 14:34:50
Modified:src/java/org/apache/fop/fo FOPropertyMapping.java
Property.java
Log:
Fix missing shorthands.
PR: 26423
Submitted by: Simon Pepping
Revision ChangesPath
1.3 +2 -2 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java
Index: FOPropertyMapping.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FOPropertyMapping.java22 Jan 2004 09:06:05 - 1.2
+++ FOPropertyMapping.java25 Jan 2004 22:34:49 - 1.3
@@ -412,9 +412,9 @@
*/
public static Property.Maker[] getGenericMappings() {
FOPropertyMapping gp = new FOPropertyMapping();
-gp.createGenerics();
// Create the shorthand first, they are referenced by the real properties.
gp.createShorthandProperties();
+gp.createGenerics();
gp.createAccessibilityProperties();
gp.createAbsolutePositionProperties();
gp.createAuralProperties();
1.18 +1 -1 xml-fop/src/java/org/apache/fop/fo/Property.java
Index: Property.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Property.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Property.java 22 Jan 2004 09:06:05 - 1.17
+++ Property.java 25 Jan 2004 22:34:49 - 1.18
@@ -117,7 +117,7 @@
inherited = generic.inherited;
defaultValue = generic.defaultValue;
percentBase = generic.percentBase;
-if (shorthands != null) {
+if (generic.shorthands != null) {
shorthands = new Property.Maker[generic.shorthands.length];
System.arraycopy(shorthands, 0, generic.shorthands, 0,
shorthands.length);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/xml XMLRenderer.java
bckfnn 2004/01/24 08:09:48
Modified:src/java/org/apache/fop/fo BorderWidthPropertyMaker.java
FOTreeHandler.java
src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/render/mif MIFHandler.java
RefElement.java
src/java/org/apache/fop/render/pdf PDFRenderer.java
src/java/org/apache/fop/render/ps PSRenderer.java
src/java/org/apache/fop/render/rtf RTFHandler.java
src/java/org/apache/fop/render/rtf/rtflib/rtfdoc
RtfListStyleBullet.java RtfListStyleNumber.java
RtfListStyleText.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Fix javadoc warnings caused by unknown @see targets.
Revision ChangesPath
1.3 +2 -2 xml-fop/src/java/org/apache/fop/fo/BorderWidthPropertyMaker.java
Index: BorderWidthPropertyMaker.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/BorderWidthPropertyMaker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BorderWidthPropertyMaker.java 23 Jan 2004 21:39:59 - 1.2
+++ BorderWidthPropertyMaker.java 24 Jan 2004 16:09:47 - 1.3
@@ -79,7 +79,7 @@
/**
* Check the value of the style property and return a length of 0 when
* the style is NONE.
- * @see org.apache.fo.Property.Maker#get(int, PropertyList, boolean, boolean)
+ * @see org.apache.fop.fo.Property.Maker#get(int, PropertyList, boolean,
boolean)
*/
public Property get(int subpropId, PropertyList propertyList,
1.13 +5 -5 xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java
Index: FOTreeHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeHandler.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FOTreeHandler.java10 Jan 2004 19:43:58 - 1.12
+++ FOTreeHandler.java24 Jan 2004 16:09:47 - 1.13
@@ -448,25 +448,25 @@
}
/**
- * @see org.apache.fop.fo.FOInputHandler#startFootnote()
+ * @see org.apache.fop.fo.FOInputHandler#startFootnote(Footnote)
*/
public void startFootnote(Footnote footnote) {
}
/**
- * @see org.apache.fop.fo.FOInputHandler#endFootnote()
+ * @see org.apache.fop.fo.FOInputHandler#endFootnote(Footnote)
*/
public void endFootnote(Footnote footnote) {
}
/**
- * @see org.apache.fop.fo.FOInputHandler#startFootnoteBody()
+ * @see org.apache.fop.fo.FOInputHandler#startFootnoteBody(FootnoteBody)
*/
public void startFootnoteBody(FootnoteBody body) {
}
/**
- * @see org.apache.fop.fo.FOInputHandler#endFootnoteBody()
+ * @see org.apache.fop.fo.FOInputHandler#endFootnoteBody(FootnoteBody)
*/
public void endFootnoteBody(FootnoteBody body) {
}
1.19 +1 -1 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- AWTRenderer.java 17 Jan 2004 19:29:46 - 1.18
+++ AWTRenderer.java 24 Jan 2004 16:09:47 - 1.19
@@ -457,7 +457,7 @@
}
/**
- * @see org.apache.fop.render.Renderer#renderText(Text)
+ * @see org.apache.fop.render.Renderer#renderText(TextArea)
*/
public void renderText(TextArea text) {
System.out.println(In render text: + text.getTextArea());
1.6 +5 -5 xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java
Index: MIFHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/mif/MIFHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MIFHandler.java 14 Jan 2004 00:00:38 - 1.5
+++ MIFHandler.java 24 Jan 2004 16:09:47 - 1.6
@@ -432,25 +432,25 @@
}
/**
- * @see org.apache.fop.fo.FOInputHandler#startFootnote()
+ * @see org.apache.fop.fo.FOInputHandler#startFootnote(Footnote)
*/
public void startFootnote(Footnote footnote) {
}
/**
- * @see org.apache.fop.fo.FOInputHandler#endFootnote()
+ * @see org.apache.fop.fo.FOInputHandler#endFootnote(Footnote)
*/
public void endFootnote(Footnote
cvs commit: xml-fop/src/java/org/apache/fop/fo BorderWidthPropertyMaker.java BoxPropShorthandParser.java CompoundPropertyMaker.java GenericShorthandParser.java IndentPropertyMaker.java LineHeightPropertyMaker.java
bckfnn 2004/01/23 13:39:59
Modified:src/java/org/apache/fop/fo BorderWidthPropertyMaker.java
BoxPropShorthandParser.java
CompoundPropertyMaker.java
GenericShorthandParser.java
IndentPropertyMaker.java
LineHeightPropertyMaker.java
Log:
Fix javadoc warnings.
Revision ChangesPath
1.2 +2 -2 xml-fop/src/java/org/apache/fop/fo/BorderWidthPropertyMaker.java
Index: BorderWidthPropertyMaker.java
===
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/BorderWidthPropertyMaker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BorderWidthPropertyMaker.java 22 Jan 2004 09:06:05 - 1.1
+++ BorderWidthPropertyMaker.java 23 Jan 2004 21:39:59 - 1.2
@@ -79,7 +79,7 @@
/**
* Check the value of the style property and return a length of 0 when
* the style is NONE.
- * @see org.apacge.fo.Property.Maker.get(int, PropertyList, boolean, boolean)
+ * @see org.apache.fo.Property.Maker#get(int, PropertyList, boolean, boolean)
*/
public Property get(int subpropId, PropertyList propertyList,
1.7 +2 -2 xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java
Index: BoxPropShorthandParser.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BoxPropShorthandParser.java 22 Jan 2004 09:06:05 - 1.6
+++ BoxPropShorthandParser.java 23 Jan 2004 21:39:59 - 1.7
@@ -65,8 +65,8 @@
* Stores 1 to 4 values of same type.
* Set the given property based on the number of values set.
* Example: padding, border-width, border-color, border-style, margin
- * @see org.apache.fop.fo.GenericShorthandParser#convertValueForProperty(String,
- * Property.Maker, PropertyList)
+ * @see org.apache.fop.fo.GenericShorthandParser#convertValueForProperty(
+ * int, ListProperty, Property.Maker, PropertyList)
*/
protected Property convertValueForProperty(int propId,
ListProperty listProperty,
1.2 +3 -3 xml-fop/src/java/org/apache/fop/fo/CompoundPropertyMaker.java
Index: CompoundPropertyMaker.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/CompoundPropertyMaker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CompoundPropertyMaker.java22 Jan 2004 09:06:05 - 1.1
+++ CompoundPropertyMaker.java23 Jan 2004 21:39:59 - 1.2
@@ -83,7 +83,7 @@
}
/**
- * @see org.apache.fop.fo.Property#useGeneric(Property.Maker)
+ * @see org.apache.fop.fo.Property.Maker#useGeneric(Property.Maker)
*/
public void useGeneric(Property.Maker generic) {
super.useGeneric(generic);
@@ -295,4 +295,4 @@
}
return p;
}
-}
\ No newline at end of file
+}
1.6 +1 -2 xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java
Index: GenericShorthandParser.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GenericShorthandParser.java 22 Jan 2004 09:06:05 - 1.5
+++ GenericShorthandParser.java 23 Jan 2004 21:39:59 - 1.6
@@ -55,8 +55,7 @@
public class GenericShorthandParser implements ShorthandParser {
/**
- * Constructor. The listprop to operate on must b set with setList().
- * @see #setList(ListProperty)
+ * Constructor.
*/
public GenericShorthandParser() {
}
1.2 +2 -2 xml-fop/src/java/org/apache/fop/fo/IndentPropertyMaker.java
Index: IndentPropertyMaker.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/IndentPropertyMaker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IndentPropertyMaker.java 22 Jan 2004 09:06:05 - 1.1
+++ IndentPropertyMaker.java 23 Jan 2004 21:39:59 - 1.2
@@ -96,7 +96,7 @@
/**
* Calculate the corresponding value for start-indent and end-indent.
- * @see CorrespondingPropertyMaker.compute(PropertyList)
+ * @see CorrespondingPropertyMaker#compute(PropertyList)
*/
public Property
cvs commit: xml-fop/src/java/org/apache/fop/fo BorderWidthPropertyMaker.java CompoundPropertyMaker.java CorrespondingPropertyMaker.java DimensionPropertyMaker.java IndentPropertyMaker.java LineHeightPropertyMaker.java BoxPropShorthandParser.java CondLengthProperty.java EnumProperty.java FOPropertyMapping.java GenericShorthandParser.java KeepProperty.java LengthPairProperty.java LengthProperty.java LengthRangeProperty.java Property.java PropertyList.java ShorthandParser.java SpaceProperty.java
bckfnn 2004/01/22 01:06:05 Modified:.build.xml src/java/org/apache/fop/fo BoxPropShorthandParser.java CondLengthProperty.java EnumProperty.java FOPropertyMapping.java GenericShorthandParser.java KeepProperty.java LengthPairProperty.java LengthProperty.java LengthRangeProperty.java Property.java PropertyList.java ShorthandParser.java SpaceProperty.java Added: src/java/org/apache/fop/fo BorderWidthPropertyMaker.java CompoundPropertyMaker.java CorrespondingPropertyMaker.java DimensionPropertyMaker.java IndentPropertyMaker.java LineHeightPropertyMaker.java Log: Abandon codegenerated property makers and use bean-like makers instead. - ShorthandParsers are made stateless. - Makers for compound properties inherts from new CompoundPropertyMaker class and overrides makeNewProperty. - FOPropertyMapping is no longer generated but is handcoded. - get() and findProperty() methods are moved from PropertyList to the property makers. PR: 25873 Revision ChangesPath 1.100 +1 -19 xml-fop/build.xml http://cvs.apache.org/viewcvs/xml-fop/build.xml.diff?r1=1.99r2=1.100 1.6 +8 -7 xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/BoxPropShorthandParser.java.diff?r1=1.5r2=1.6 1.4 +22 -2 xml-fop/src/java/org/apache/fop/fo/CondLengthProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/CondLengthProperty.java.diff?r1=1.3r2=1.4 1.5 +2 -2 xml-fop/src/java/org/apache/fop/fo/EnumProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/EnumProperty.java.diff?r1=1.4r2=1.5 1.2 +2472 -634 xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/FOPropertyMapping.java.diff?r1=1.1r2=1.2 1.5 +12 -22xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/GenericShorthandParser.java.diff?r1=1.4r2=1.5 1.4 +21 -1 xml-fop/src/java/org/apache/fop/fo/KeepProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/KeepProperty.java.diff?r1=1.3r2=1.4 1.4 +21 -1 xml-fop/src/java/org/apache/fop/fo/LengthPairProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/LengthPairProperty.java.diff?r1=1.3r2=1.4 1.5 +14 -1 xml-fop/src/java/org/apache/fop/fo/LengthProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/LengthProperty.java.diff?r1=1.4r2=1.5 1.4 +21 -1 xml-fop/src/java/org/apache/fop/fo/LengthRangeProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/LengthRangeProperty.java.diff?r1=1.3r2=1.4 1.17 +331 -161 xml-fop/src/java/org/apache/fop/fo/Property.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/Property.java.diff?r1=1.16r2=1.17 1.28 +16 -107 xml-fop/src/java/org/apache/fop/fo/PropertyList.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/PropertyList.java.diff?r1=1.27r2=1.28 1.5 +1 -0 xml-fop/src/java/org/apache/fop/fo/ShorthandParser.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/ShorthandParser.java.diff?r1=1.4r2=1.5 1.4 +22 -2 xml-fop/src/java/org/apache/fop/fo/SpaceProperty.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/SpaceProperty.java.diff?r1=1.3r2=1.4 1.1 xml-fop/src/java/org/apache/fop/fo/BorderWidthPropertyMaker.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/BorderWidthPropertyMaker.java?rev=1.1 1.1 xml-fop/src/java/org/apache/fop/fo/CompoundPropertyMaker.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/CompoundPropertyMaker.java?rev=1.1 1.1 xml-fop/src/java/org/apache/fop/fo/CorrespondingPropertyMaker.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/CorrespondingPropertyMaker.java?rev=1.1 1.1 xml-fop/src/java/org/apache/fop/fo/DimensionPropertyMaker.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/DimensionPropertyMaker.java?rev=1.1 1.1 xml-fop/src/java/org/apache/fop/fo/IndentPropertyMaker.java http://cvs.apache.org/viewcvs/xml-fop/src/java/org/apache/fop/fo/IndentPropertyMaker.java?rev=1.1 1.1
cvs commit: xml-fop status.xml
bckfnn 2004/01/22 02:54:39 Modified:.status.xml Log: Update changes on code-generated property makers. Revision ChangesPath 1.34 +5 -0 xml-fop/status.xml Index: status.xml === RCS file: /home/cvs/xml-fop/status.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- status.xml2 Jun 2003 20:24:02 - 1.33 +++ status.xml22 Jan 2004 10:54:39 - 1.34 @@ -103,6 +103,11 @@ /todo changes + release version=2004 date=2004 +action context=code dev=FB type=update + Abandoned code-generated property maker classes. +/action + /release release version=2003 date=2003 action context=code dev=JM type=fix due-to=CTB/McGraw-Hill Fix for bad font encodings in the PS renderer (Fonts get reencoded as - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fo LineHeightPropertyMaker.java
bckfnn 2004/01/22 02:56:11 Modified:src/java/org/apache/fop/fo LineHeightPropertyMaker.java Log: Fix typo in comments. Revision ChangesPath 1.2 +3 -3 xml-fop/src/java/org/apache/fop/fo/LineHeightPropertyMaker.java Index: LineHeightPropertyMaker.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/LineHeightPropertyMaker.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- LineHeightPropertyMaker.java 22 Jan 2004 09:06:05 - 1.1 +++ LineHeightPropertyMaker.java 22 Jan 2004 10:56:11 - 1.2 @@ -55,7 +55,7 @@ /** * A maker which calculates the line-height property. - * This property maker is special because line-heighe inherot the specified + * This property maker is special because line-height inherit the specified * value, instead of the computed value. * So when a line-height is create based on a attribute, the specified value * is stored in the property and in compute() the stored specified value of @@ -118,4 +118,4 @@ } return super.convertPropertyDatatype(p, propertyList, fo); } -} \ No newline at end of file +} - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/render/pdf CTMHelper.java
bckfnn 2004/01/21 10:50:45 Modified:src/java/org/apache/fop/render/pdf CTMHelper.java Log: Use PDFNumber.doubleOut to format the floats in a transformation matrix. This avoids scientific notation which is not supporter by pdf. PR: 25880 Revision ChangesPath 1.2 +7 -3 xml-fop/src/java/org/apache/fop/render/pdf/CTMHelper.java Index: CTMHelper.java === RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/CTMHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CTMHelper.java11 Mar 2003 13:05:13 - 1.1 +++ CTMHelper.java21 Jan 2004 18:50:45 - 1.2 @@ -51,6 +51,7 @@ package org.apache.fop.render.pdf; import org.apache.fop.area.CTM; +import org.apache.fop.pdf.PDFNumber; /** * CTMHelper converts FOP transformation matrixis to those @@ -84,9 +85,12 @@ final double matrix[] = toPDFArray(sourceMatrix); -return matrix[0] + + matrix[1] + - + matrix[2] + + matrix[3] + - + matrix[4] + + matrix[5]; +return PDFNumber.doubleOut(matrix[0], 8) + + + PDFNumber.doubleOut(matrix[1], 8) + + + PDFNumber.doubleOut(matrix[2], 8) + + + PDFNumber.doubleOut(matrix[3], 8) + + + PDFNumber.doubleOut(matrix[4], 8) + + + PDFNumber.doubleOut(matrix[5], 8); } /** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop build.xml
bckfnn 2004/01/21 11:36:40
Modified:.build.xml
Log:
Match the version string is apps.Version.
PR: 25691
Revision ChangesPath
1.99 +1 -1 xml-fop/build.xml
Index: build.xml
===
RCS file: /home/cvs/xml-fop/build.xml,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- build.xml 20 Jan 2004 01:33:57 - 1.98
+++ build.xml 21 Jan 2004 19:36:39 - 1.99
@@ -615,7 +615,7 @@
!-- === --
target name=test depends=package description=Runs the test suite
echo message=Testing build in jar file ${build.dir}/${name}.jar against
reference/
-property name=ref-version value=FOP 1.0dev/
+property name=ref-version value=1.0dev/
path id=testtask-classpath
path refid=libs-build-classpath/
pathelement location=${build.dir}/classes/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/tools TestConverter.java
bckfnn 2004/01/20 03:45:49
Modified:src/java/org/apache/fop/tools TestConverter.java
Log:
Fix a NPE caused by avalonization of logging.
Support for 'results' attribute on 'test' element, used by NIST suite.
Explicit close the output file, otherwise the file has a length of 0
when the files are compared (on windows).
Added -d option to enable debug output.
PR: 25691
Revision ChangesPath
1.8 +39 -9 xml-fop/src/java/org/apache/fop/tools/TestConverter.java
Index: TestConverter.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestConverter.java15 Sep 2003 18:29:15 - 1.7
+++ TestConverter.java20 Jan 2004 11:45:48 - 1.8
@@ -52,6 +52,7 @@
import java.io.File;
import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Map;
import javax.xml.parsers.DocumentBuilder;
@@ -106,7 +107,6 @@
System.out.println(test suite file name required);
}
TestConverter tc = new TestConverter();
-tc.enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_ERROR));
String testFile = null;
for (int count = 0; count args.length; count++) {
@@ -114,8 +114,10 @@
tc.setFailOnly(true);
} else if (args[count].equals(-pdf)) {
tc.setOutputPDF(true);
+} else if (args[count].equals(-d)) {
+tc.setDebug(true);
} else if (args[count].equals(-b)) {
-tc.setBaseDir(args[count + 1]);
+tc.setBaseDir(args[++count]);
} else {
testFile = args[count];
}
@@ -128,6 +130,13 @@
}
/**
+ * Construct a new TestConverter
+ */
+public TestConverter() {
+enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_ERROR));
+}
+
+/**
* Controls whether to generate PDF or XML.
* @param pdf If True, PDF is generated, Area Tree XML otherwise.
*/
@@ -153,6 +162,16 @@
}
/**
+ * Controls whether to generate PDF or XML.
+ * @param pdf If True, PDF is generated, Area Tree XML otherwise.
+ */
+public void setDebug(boolean debug) {
+if (debug) {
+enableLogging(new ConsoleLogger(ConsoleLogger.LEVEL_DEBUG));
+}
+}
+
+/**
* Run the Tests.
* This runs the tests specified in the xml file fname.
* The document is read as a dom and each testcase is covered.
@@ -264,6 +283,11 @@
getLogger().debug(converting xml: + xml + and xsl:
+ xsl + to area tree);
+String res = xml;
+Node resNode = test.getAttributes().getNamedItem(results);
+if (resNode != null) {
+res = resNode.getNodeValue();
+}
try {
File xmlFile = new File(baseDir + / + xml);
String baseURL = null;
@@ -283,8 +307,8 @@
}
Driver driver = new Driver();
-setupLogger(driver, fop);
FOUserAgent userAgent = new FOUserAgent();
+setupLogger(userAgent, fop);
userAgent.setBaseURL(baseURL);
driver.setUserAgent(userAgent);
if (outputPDF) {
@@ -299,15 +323,21 @@
driver.getRenderer().setOptions(rendererOptions);
driver.getRenderer().setProducer(Testsuite Converter);
-String outname = xmlFile.getName();
-if (outname.endsWith(.xml)) {
+String outname = res;
+if (outname.endsWith(.xml) || outname.endsWith(.pdf)) {
outname = outname.substring(0, outname.length() - 4);
}
-driver.setOutputStream(new java.io.BufferedOutputStream(
- new java.io.FileOutputStream(new
File(destdir,
- outname + (outputPDF ? .pdf :
.at.xml);
-getLogger().debug(ddir: + destdir + on: + outname + .pdf);
+File outputFile = new File(destdir,
+ outname + (outputPDF ? .pdf : .at.xml));
+
+outputFile.getParentFile().mkdirs();
+OutputStream outStream = new java.io.BufferedOutputStream(
+ new java.io.FileOutputStream(outputFile));
+driver.setOutputStream(outStream);
+getLogger().debug(ddir: + destdir + on: +
+ outputFile.getName());
driver.render(inputHandler);
+outStream.close();
// check difference
