Author: acumiskey
Date: Mon Oct 27 05:00:08 2008
New Revision: 708153
URL: http://svn.apache.org/viewvc?rev=708153&view=rev
Log:
Merged revisions 707631,708012 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r707631 | jeremias | 2008-10-24 14:42:59 +0100 (Fri, 24 Oct 2008) | 2 lines
Fixed a problem where the BPD or a block area could be wrong if there is a
nested, absolutely positioned area (for example a block-container).
This was most probably introduced by rev 618992.
........
r708012 | adelmelle | 2008-10-26 16:32:16 +0000 (Sun, 26 Oct 2008) | 5 lines
Bugzilla 45113:
Added PDF /Launch action, which is used in case of references to URIs using
the file:// protocol.
Thanks to Alexander Stamenov (astamenov.AT.gmail.com) for the input!
........
Added:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFLaunch.java
- copied unchanged from r708012,
xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFLaunch.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/layoutengine/standard-testcases/block-container_area-bpd.xml
- copied unchanged from r708012,
xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/block-container_area-bpd.xml
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Block.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/Font.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontCollection.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontEventListener.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontInfo.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontMetrics.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontTriplet.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontType.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/SingleByteEncoding.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/Typeface.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPAbstractImageFactory.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPDataObjectInfoProvider.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageRawStreamFactory.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageRenderedFactory.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRawCCITTFaxFactory.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/GraphicsConfiguration.java
(props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 27 05:00:08 2008
@@ -1,2 +1,2 @@
/xmlgraphics/fop/branches/fop-0_95:684572,688085,688696
-/xmlgraphics/fop/trunk:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627
+/xmlgraphics/fop/trunk:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083,707627,707631-708012
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 27 05:00:08 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-707628
+/xmlgraphics/fop/trunk:1-708150
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Block.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Block.java?rev=708153&r1=708152&r2=708153&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Block.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/area/Block.java
Mon Oct 27 05:00:08 2008
@@ -79,7 +79,7 @@
* @param autoHeight increase the height of the block.
*/
public void addBlock(Block block, boolean autoHeight) {
- if (autoHeight && allowBPDUpdate) {
+ if (autoHeight && allowBPDUpdate && block.isStacked()) {
bpd += block.getAllocBPD();
}
addChildArea(block);
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/Font.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontCollection.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontEventListener.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontInfo.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontMetrics.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontTriplet.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/FontType.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/SingleByteEncoding.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/Typeface.java
('svn:mergeinfo' removed)
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java?rev=708153&r1=708152&r2=708153&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Mon Oct 27 05:00:08 2008
@@ -26,6 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.fo.flow.ListItem;
@@ -537,14 +538,6 @@
label.addAreas(labelIter, lc);
}
- // reset the area bpd after adding the label areas and before adding
the body areas
- int savedBPD = 0;
- if (labelFirstIndex <= labelLastIndex
- && bodyFirstIndex <= bodyLastIndex) {
- savedBPD = curBlockArea.getBPD();
- curBlockArea.setBPD(0);
- }
-
// add body areas
if (bodyFirstIndex <= bodyLastIndex) {
KnuthPossPosIter bodyIter = new KnuthPossPosIter(bodyList,
@@ -559,9 +552,13 @@
}
// after adding body areas, set the maximum area bpd
- if (curBlockArea.getBPD() < savedBPD) {
- curBlockArea.setBPD(savedBPD);
+ int childCount = curBlockArea.getChildAreas().size();
+ assert childCount >= 1 && childCount <= 2;
+ int itemBPD =
((Block)curBlockArea.getChildAreas().get(0)).getAllocBPD();
+ if (childCount == 2) {
+ itemBPD = Math.max(itemBPD,
((Block)curBlockArea.getChildAreas().get(1)).getAllocBPD());
}
+ curBlockArea.setBPD(itemBPD);
addMarkersToPage(false, isFirst(firstPos), isLast(lastPos));
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFDocument.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFDocument.java?rev=708153&r1=708152&r2=708153&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFDocument.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFDocument.java
Mon Oct 27 05:00:08 2008
@@ -224,6 +224,11 @@
protected List gotos = new java.util.ArrayList();
/**
+ * List of PDFLaunch objects.
+ */
+ protected List launches = new java.util.ArrayList();
+
+ /**
* The PDFDests object for the name dictionary.
* Note: This object is not a list.
*/
@@ -486,6 +491,9 @@
if (obj instanceof PDFPage) {
this.pages.notifyKidRegistered((PDFPage)obj);
}
+ if (obj instanceof PDFLaunch) {
+ this.launches.add(obj);
+ }
if (obj instanceof PDFLink) {
this.links.add(obj);
}
@@ -657,6 +665,15 @@
}
/**
+ * Finds a launch.
+ * @param compare reference object to use as search template
+ * @return the launch if found, null otherwise
+ */
+ protected PDFLaunch findLaunch(PDFLaunch compare) {
+ return (PDFLaunch) findPDFObject(launches, compare);
+ }
+
+ /**
* Looks for an existing GState to use
* @param wanted requested features
* @param current currently active features
@@ -703,7 +720,6 @@
*/
public void setColorSpace(int theColorspace) {
this.colorspace.setColorSpace(theColorspace);
- return;
}
/**
@@ -1019,12 +1035,6 @@
by the table's length */
this.position += outputXref(stream);
- // Determine existance of encryption dictionary
- String encryptEntry = "";
- if (this.encryption != null) {
- encryptEntry = this.encryption.getTrailerEntry();
- }
-
/* construct the trailer */
String pdf =
"trailer\n"
@@ -1037,10 +1047,13 @@
+ "\n"
+ "/Info "
+ this.info.referencePDF()
- + "\n"
- + getIDEntry()
- + "\n"
- + encryptEntry
+ + "\n";
+ if (this.encryption != null) {
+ pdf += this.encryption.getTrailerEntry();
+ } else {
+ pdf += getIDEntry();
+ }
+ pdf += "\n"
+ ">>\n"
+ "startxref\n"
+ this.xref
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFFactory.java?rev=708153&r1=708152&r2=708153&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFFactory.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/pdf/PDFFactory.java
Mon Oct 27 05:00:08 2008
@@ -1011,6 +1011,10 @@
// HTTP URL?
if (targetLo.startsWith("http://";)) {
return new PDFUri(target);
+ // Non PDF files. Try to /Launch them.
+ } else if (targetLo.startsWith("file://")) {
+ target = target.substring("file://".length());
+ return getLaunchAction(target);
// Bare PDF file name?
} else if (targetLo.endsWith(".pdf")) {
return getGoToPDFAction(target, null, -1, newWindow);
@@ -1105,6 +1109,37 @@
}
/**
+ * Creates and returns a launch pdf document action using
+ * <code>file</code> to create a file spcifiaciton for
+ * the document/file to be opened with an external application.
+ *
+ * @param file the pdf file name
+ * @return the pdf launch object
+ */
+ private PDFLaunch getLaunchAction(String file) {
+ getDocument().getProfile().verifyActionAllowed();
+
+ PDFFileSpec fileSpec = new PDFFileSpec(file);
+ PDFFileSpec oldSpec = getDocument().findFileSpec(fileSpec);
+
+ if (oldSpec == null) {
+ getDocument().registerObject(fileSpec);
+ } else {
+ fileSpec = oldSpec;
+ }
+ PDFLaunch launch = new PDFLaunch(fileSpec);
+ PDFLaunch oldLaunch = getDocument().findLaunch(launch);
+
+ if (oldLaunch == null) {
+ getDocument().registerObject(launch);
+ } else {
+ launch = oldLaunch;
+ }
+
+ return launch;
+ }
+
+ /**
* Make an outline object and add it to the given parent
*
* @param parent the parent PDFOutline object (may be null)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPAbstractImageFactory.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPDataObjectInfoProvider.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageGraphics2DFactory.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageRawStreamFactory.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageRenderedFactory.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRawCCITTFaxFactory.java
('svn:mergeinfo' removed)
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/svg/GraphicsConfiguration.java
('svn:mergeinfo' removed)
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml?rev=708153&r1=708152&r2=708153&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/status.xml Mon Oct 27
05:00:08 2008
@@ -53,6 +53,15 @@
<changes>
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="AD" type="add" fixes-bug="45113"
due-to="Alexander Stamenov">
+ Added PDF /Launch action: references to URIs using the file://
protocol will now generate
+ a /Launch action as opposed to a more general /URI (which doesn't
yield the expected result
+ for this protocol).
+ </action>
+ <action context="Layout" dev="JM" type="fix">
+ Fixed a problem where the BPD or a block area could be wrong if there
is a nested,
+ absolutely positioned area (for example a block-container).
+ </action>
<action context="Layout" dev="AD" type="fix" fixes-bug="40798">
Bugzilla 40798: A conditional-page-master-reference with
page-position="last" qualifies
for a first page, if it is also the last. Additionally: also added
support for
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
