Author: acumiskey
Date: Wed Oct 22 07:12:18 2008
New Revision: 707084
URL: http://svn.apache.org/viewvc?rev=707084&view=rev
Log:
Merged revisions 706319,706570,707083 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r706319 | jeremias | 2008-10-20 16:11:08 +0100 (Mon, 20 Oct 2008) | 2 lines
Bugzilla #45956:
Minimal support for leader-pattern="rule" for PCL output.
........
r706570 | jeremias | 2008-10-21 11:13:27 +0100 (Tue, 21 Oct 2008) | 1 line
Reluctantly added a note about how to clear the image cache.
........
r707083 | acumiskey | 2008-10-22 15:05:56 +0100 (Wed, 22 Oct 2008) | 2 lines
Been hanging around here unused since 2002 and no longer relevant as far as I
can tell.
........
Removed:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/cocoon.diff
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 22 07:12:18 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
+/xmlgraphics/fop/trunk:693433-698670,699739,704008-704909,705529-706135,706272-706276,706319-707083
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Oct 22 07:12:18 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-706277
+/xmlgraphics/fop/trunk:1-707083
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml?rev=707084&r1=707083&r2=707084&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/0.95/graphics.xml
Wed Oct 22 07:12:18 2008
@@ -554,10 +554,14 @@
changing dummy parameter on the URI to avoid caching.
</p>
<p>
- The image cache has been improved considerably in the redesigned code.
Therefore, a
- resetCache() method like in earlier versions of FOP has become
unnecessary. If you
+ The image cache has been improved considerably in the redesigned code.
Therefore,
+ resetting the image cache should be a thing of the past. If you
still experience OutOfMemoryErrors, please notify us.
</p>
+ <p>
+ If all else fails, the image cache can be cleared like this:
+ <code>fopFactory.getImageManager().getCache().clearCache();</code>
+ </p>
</section>
</body>
</document>
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml?rev=707084&r1=707083&r2=707084&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/graphics.xml
Wed Oct 22 07:12:18 2008
@@ -554,10 +554,14 @@
changing dummy parameter on the URI to avoid caching.
</p>
<p>
- The image cache has been improved considerably in the redesigned code.
Therefore, a
- resetCache() method like in earlier versions of FOP has become
unnecessary. If you
+ The image cache has been improved considerably in the redesigned code.
Therefore,
+ resetting the image cache should be a thing of the past. If you
still experience OutOfMemoryErrors, please notify us.
</p>
+ <p>
+ If all else fails, the image cache can be cleared like this:
+ <code>fopFactory.getImageManager().getCache().clearCache();</code>
+ </p>
</section>
</body>
</document>
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java?rev=707084&r1=707083&r2=707084&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
Wed Oct 22 07:12:18 2008
@@ -59,6 +59,7 @@
import org.apache.xmlgraphics.java2d.GraphicContext;
import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
import org.apache.xmlgraphics.util.QName;
+import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.MimeConstants;
@@ -74,6 +75,7 @@
import org.apache.fop.area.inline.ForeignObject;
import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.SpaceArea;
import org.apache.fop.area.inline.TextArea;
import org.apache.fop.area.inline.Viewport;
@@ -97,7 +99,6 @@
import org.apache.fop.render.java2d.Java2DRenderer;
import org.apache.fop.render.pcl.extensions.PCLElementMapping;
import org.apache.fop.traits.BorderProps;
-import org.apache.xmlgraphics.util.UnitConv;
/* Note:
* There are some commonalities with AbstractPathOrientedRenderer but it's not
possible
@@ -1658,6 +1659,37 @@
}
}
+ /** [EMAIL PROTECTED] */
+ public void renderLeader(Leader area) {
+ renderInlineAreaBackAndBorders(area);
+
+ saveGraphicsState();
+ int style = area.getRuleStyle();
+ float startx = (currentIPPosition +
area.getBorderAndPaddingWidthStart()) / 1000f;
+ float starty = (currentBPPosition + area.getOffset()) / 1000f;
+ float endx = (currentIPPosition + area.getBorderAndPaddingWidthStart()
+ + area.getIPD()) / 1000f;
+ float ruleThickness = area.getRuleThickness() / 1000f;
+ Color col = (Color)area.getTrait(Trait.COLOR);
+
+ switch (style) {
+ case EN_SOLID:
+ case EN_DASHED: //TODO Improve me and following (this is just a
quick-fix ATM)
+ case EN_DOUBLE:
+ case EN_DOTTED:
+ case EN_GROOVE:
+ case EN_RIDGE:
+ updateFillColor(col);
+ fillRect(startx, starty, endx - startx, ruleThickness);
+ break;
+ default:
+ throw new UnsupportedOperationException("rule style not
supported");
+ }
+
+ restoreGraphicsState();
+ super.renderLeader(area);
+ }
+
/**
* Controls whether all text should be generated as bitmaps or only text
for which there's
* no native font.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
