You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ga...@apache.org on 2013/02/05 20:40:09 UTC
svn commit: r1442711 - in /xmlgraphics/fop/trunk:
src/java/org/apache/fop/render/ps/FOPProcSet.java
src/java/org/apache/fop/render/ps/PSPainter.java status.xml
Author: gadams
Date: Tue Feb 5 19:40:09 2013
New Revision: 1442711
URL: http://svn.apache.org/viewvc?rev=1442711&view=rev
Log:
FOP-2206: Add support for CS placement and escapement data in PS renderer.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/FOPProcSet.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/FOPProcSet.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/FOPProcSet.java?rev=1442711&r1=1442710&r2=1442711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/FOPProcSet.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/FOPProcSet.java Tue Feb 5 19:40:09 2013
@@ -59,7 +59,12 @@ public final class FOPProcSet extends PS
gen.writeln(" {");
gen.writeln(" dup type /stringtype eq");
gen.writeln(" { show }"); //normal text show
- gen.writeln(" { neg 1000 div 0 rmoveto }"); //negative X movement
+ gen.writeln(" {");
+ gen.writeln(" dup type /arraytype eq");
+ gen.writeln(" { aload pop neg 1000 div exch 1000 div rmoveto }");
+ gen.writeln(" { neg 1000 div 0 rmoveto }");
+ gen.writeln(" ifelse");
+ gen.writeln(" }");
gen.writeln(" ifelse");
gen.writeln(" } forall");
gen.writeln("} bd");
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java?rev=1442711&r1=1442710&r2=1442711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSPainter.java Tue Feb 5 19:40:09 2013
@@ -52,7 +52,6 @@ import org.apache.fop.render.intermediat
import org.apache.fop.render.intermediate.GraphicsPainter;
import org.apache.fop.render.intermediate.IFException;
import org.apache.fop.render.intermediate.IFState;
-import org.apache.fop.render.intermediate.IFUtil;
import org.apache.fop.traits.BorderProps;
import org.apache.fop.traits.RuleStyle;
import org.apache.fop.util.CharUtilities;
@@ -378,6 +377,10 @@ public class PSPainter extends AbstractI
useFont(fontKey, sizeMillipoints);
+ if (dp != null && dp[0] != null) {
+ x += dp[0][0];
+ y -= dp[0][1];
+ }
generator.writeln("1 0 0 -1 " + formatMptAsPt(generator, x)
+ " " + formatMptAsPt(generator, y) + " Tm");
@@ -428,28 +431,34 @@ public class PSPainter extends AbstractI
int lineStart = 0;
StringBuffer accText = new StringBuffer(initialSize);
StringBuffer sb = new StringBuffer(initialSize);
- int[] dx = IFUtil.convertDPToDX ( dp );
- int dxl = (dx != null ? dx.length : 0);
for (int i = start; i < end; i++) {
char orgChar = text.charAt(i);
char ch;
int cw;
- int glyphAdjust = 0;
+ int xGlyphAdjust = 0;
+ int yGlyphAdjust = 0;
if (CharUtilities.isFixedWidthSpace(orgChar)) {
//Fixed width space are rendered as spaces so copy/paste works in a reader
ch = font.mapChar(CharUtilities.SPACE);
cw = font.getCharWidth(orgChar);
- glyphAdjust = font.getCharWidth(ch) - cw;
+ xGlyphAdjust = font.getCharWidth(ch) - cw;
} else {
if ((wordSpacing != 0) && CharUtilities.isAdjustableSpace(orgChar)) {
- glyphAdjust -= wordSpacing;
+ xGlyphAdjust -= wordSpacing;
}
ch = font.mapChar(orgChar);
- cw = font.getCharWidth(orgChar);
+ cw = font.getCharWidth(orgChar); // this is never used?
}
- if (dx != null && i < dxl - 1) {
- glyphAdjust -= dx[i + 1];
+ if (dp != null && i < dp.length && dp[i] != null) {
+ // get x advancement adjust
+ xGlyphAdjust -= dp[i][2] - dp[i][0];
+ yGlyphAdjust += dp[i][3] - dp[i][1];
+ }
+ if (dp != null && i < dp.length - 1 && dp[i + 1] != null) {
+ // get x placement adjust for next glyph
+ xGlyphAdjust -= dp[i + 1][0];
+ yGlyphAdjust += dp[i + 1][1];
}
if (multiByte) {
accText.append(HexEncoder.encode(ch));
@@ -457,7 +466,7 @@ public class PSPainter extends AbstractI
char codepoint = (char)(ch % 256);
PSGenerator.escapeChar(codepoint, accText); //add character to accumulated text
}
- if (glyphAdjust != 0) {
+ if (xGlyphAdjust != 0 || yGlyphAdjust != 0) {
needTJ = true;
if (sb.length() == 0) {
sb.append('['); //Need to start TJ
@@ -471,7 +480,13 @@ public class PSPainter extends AbstractI
sb.append(' ');
accText.setLength(0); //reset accumulated text
}
- sb.append(Integer.toString(glyphAdjust)).append(' ');
+ if (yGlyphAdjust == 0) {
+ sb.append(Integer.toString(xGlyphAdjust)).append(' ');
+ } else {
+ sb.append('[');
+ sb.append(Integer.toString(yGlyphAdjust)).append(' ');
+ sb.append(Integer.toString(xGlyphAdjust)).append(']').append(' ');
+ }
}
}
if (needTJ) {
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1442711&r1=1442710&r2=1442711&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Feb 5 19:40:09 2013
@@ -59,6 +59,9 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Renderers" dev="GA" type="add" fixes-bug="FOP-2206" due-to="Luis Bernardo">
+ Add support for CS placement and escapement data in PS renderer.
+ </action>
<action context="Code" dev="PS" type="fix" fixes-bug="FOP-2203" due-to="Will May">
XML syntax error in XSD.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org