You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/11/27 23:33:14 UTC
svn commit: r1883883 - in /poi:
site/src/documentation/content/xdocs/components/slideshow/
trunk/src/ooxml/java/org/apache/poi/xslf/util/
trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/
trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/ tr...
Author: kiwiwings
Date: Fri Nov 27 23:33:14 2020
New Revision: 1883883
URL: http://svn.apache.org/viewvc?rev=1883883&view=rev
Log:
#64716 - wmf display error
provide font mapping with PPTX2PNG
fix record enums references
fix alignment of asian fonts
Modified:
poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java
poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java
Modified: poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml?rev=1883883&r1=1883882&r2=1883883&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml (original)
+++ poi/site/src/documentation/content/xdocs/components/slideshow/ppt-wmf-emf-renderer.xml Fri Nov 27 23:33:14 2020
@@ -57,6 +57,11 @@
often found in math formulas
-charset <cs> sets the default charset to be used, defaults to Windows-1252
-emfHeaderBounds force the usage of the emf header bounds to calculate the bounding box
+
+ -fontdir <dir> (PDF only) font directories separated by ";" - use $HOME for current users home dir
+ defaults to the usual plattform directories
+ -fontTtf <regex> (PDF only) regex to match the .ttf filenames
+ -fontMap <map> ";"-separated list of font mappings <typeface from>:<typeface to>
]]>
</source>
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java?rev=1883883&r1=1883882&r2=1883883&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java Fri Nov 27 23:33:14 2020
@@ -28,9 +28,12 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
+import java.util.Arrays;
import java.util.Locale;
+import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import org.apache.poi.common.usermodel.GenericRecord;
import org.apache.poi.poifs.filesystem.FileMagic;
@@ -77,7 +80,8 @@ public final class PPTX2PNG {
" -emfHeaderBounds force the usage of the emf header bounds to calculate the bounding box\n" +
" -fontdir <dir> (PDF only) font directories separated by \";\" - use $HOME for current users home dir\n" +
" defaults to the usual plattform directories\n" +
- " -fontTtf <regex> (PDF only) regex to match the .ttf filenames";
+ " -fontTtf <regex> (PDF only) regex to match the .ttf filenames\n" +
+ " -fontMap <map> \";\"-separated list of font mappings <typeface from>:<typeface to>";
System.out.println(msg);
// no System.exit here, as we also run in junit tests!
@@ -109,6 +113,7 @@ public final class PPTX2PNG {
private boolean emfHeaderBounds = false;
private String fontDir = null;
private String fontTtf = null;
+ private String fontMap = null;
private PPTX2PNG() {
}
@@ -213,6 +218,14 @@ public final class PPTX2PNG {
fontTtf = null;
}
break;
+ case "-fontmap":
+ if (opt != null) {
+ fontMap = opt;
+ i++;
+ } else {
+ fontMap = null;
+ }
+ break;
default:
file = new File(args[i]);
break;
@@ -303,6 +316,12 @@ public final class PPTX2PNG {
graphics.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
graphics.setRenderingHint(Drawable.DEFAULT_CHARSET, getDefaultCharset());
graphics.setRenderingHint(Drawable.EMF_FORCE_HEADER_BOUNDS, emfHeaderBounds);
+ if (fontMap != null) {
+ Map<String,String> fmap = Arrays.stream(fontMap.split(";"))
+ .map(s -> s.split(":"))
+ .collect(Collectors.toMap(s -> s[0], s -> s[1]));
+ graphics.setRenderingHint(Drawable.FONT_MAP, fmap);
+ }
graphics.scale(scale / lenSide, scale / lenSide);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java?rev=1883883&r1=1883882&r2=1883883&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java Fri Nov 27 23:33:14 2020
@@ -450,13 +450,13 @@ public final class HemfPlusDraw {
AffineTransform txSaved = ctx.getTransform();
AffineTransform tx = (AffineTransform)txSaved.clone();
- HwmfTernaryRasterOp oldOp = prop.getRasterOp();
+ HwmfTernaryRasterOp oldOp = prop.getRasterOp3();
HwmfBkMode oldBk = prop.getBkMode();
try {
tx.concatenate(trans);
ctx.setTransform(tx);
- prop.setRasterOp(HwmfTernaryRasterOp.SRCCOPY);
+ prop.setRasterOp3(HwmfTernaryRasterOp.SRCCOPY);
prop.setBkMode(HwmfBkMode.TRANSPARENT);
// transformation from srcRect to destRect was already applied,
@@ -464,7 +464,7 @@ public final class HemfPlusDraw {
ctx.drawImage(ir, srcRect, srcRect);
} finally {
prop.setBkMode(oldBk);
- prop.setRasterOp(oldOp);
+ prop.setRasterOp3(oldOp);
ctx.setTransform(txSaved);
}
}
@@ -539,7 +539,7 @@ public final class HemfPlusDraw {
ctx.applyPlusObjectTableEntry(getObjectId());
HemfDrawProperties prop = ctx.getProperties();
- prop.setRasterOp(HwmfTernaryRasterOp.SRCCOPY);
+ prop.setRasterOp3(HwmfTernaryRasterOp.SRCCOPY);
prop.setBkMode(HwmfBkMode.TRANSPARENT);
ctx.drawImage(prop.getEmfPlusImage(), srcRect, rectData);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java?rev=1883883&r1=1883882&r2=1883883&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java Fri Nov 27 23:33:14 2020
@@ -68,7 +68,7 @@ public class HwmfDrawProperties {
private HwmfTextVerticalAlignment textVAlignLatin;
private HwmfTextAlignment textAlignAsian;
private HwmfTextVerticalAlignment textVAlignAsian;
- private HwmfTernaryRasterOp rasterOp;
+ private HwmfTernaryRasterOp rasterOp3;
protected Shape clip;
protected final AffineTransform transform = new AffineTransform();
@@ -92,7 +92,7 @@ public class HwmfDrawProperties {
textVAlignLatin = HwmfTextVerticalAlignment.TOP;
textAlignAsian = HwmfTextAlignment.RIGHT;
textVAlignAsian = HwmfTextVerticalAlignment.TOP;
- rasterOp = HwmfTernaryRasterOp.PATCOPY;
+ rasterOp3 = HwmfTernaryRasterOp.PATCOPY;
clip = null;
font = new HwmfFont();
font.initDefaults();
@@ -128,7 +128,7 @@ public class HwmfDrawProperties {
this.textVAlignLatin = other.textVAlignLatin;
this.textAlignAsian = other.textAlignAsian;
this.textVAlignAsian = other.textVAlignAsian;
- this.rasterOp = other.rasterOp;
+ this.rasterOp3 = other.rasterOp3;
this.transform.setTransform(other.transform);
this.clip = other.clip;
}
@@ -388,12 +388,12 @@ public class HwmfDrawProperties {
return getPolyfillMode().awtFlag;
}
- public HwmfTernaryRasterOp getRasterOp() {
- return rasterOp;
+ public HwmfTernaryRasterOp getRasterOp3() {
+ return rasterOp3;
}
- public void setRasterOp(HwmfTernaryRasterOp rasterOp) {
- this.rasterOp = rasterOp;
+ public void setRasterOp3(HwmfTernaryRasterOp rasterOp3) {
+ this.rasterOp3 = rasterOp3;
}
public AffineTransform getTransform() {
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java?rev=1883883&r1=1883882&r2=1883883&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java Fri Nov 27 23:33:14 2020
@@ -48,6 +48,7 @@ import java.util.BitSet;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
@@ -461,7 +462,8 @@ public class HwmfGraphics implements Hwm
return;
}
- String textString = trimText(font, isUnicode, text, length);
+ final Charset charset = getCharset(font, isUnicode);
+ String textString = trimText(charset, text, length);
if (textString.isEmpty()) {
return;
}
@@ -481,7 +483,12 @@ public class HwmfGraphics implements Hwm
final double angle = Math.toRadians(-font.getEscapement()/10.);
- final Point2D dst = getRotatedOffset(angle, frc, as);
+ // TODO: find out when to use asian align
+ boolean useAsianAlign = (opts == null) &&
+ textString.codePoints().anyMatch(Character::isIdeographic) &&
+ charset.displayName(Locale.ROOT). startsWith("GB");
+
+ final Point2D dst = getRotatedOffset(angle, frc, as, useAsianAlign);
final Shape clipShape = graphicsCtx.getClip();
try {
@@ -640,8 +647,7 @@ public class HwmfGraphics implements Hwm
charsetProvider = provider;
}
- private String trimText(HwmfFont font, boolean isUnicode, byte[] text, int length) {
- final Charset charset = getCharset(font, isUnicode);
+ private String trimText(Charset charset, byte[] text, int length) {
int trimLen;
for (trimLen=0; trimLen<text.length; trimLen+=2) {
@@ -660,7 +666,8 @@ public class HwmfGraphics implements Hwm
return textString.substring(0, Math.min(textString.length(), length));
}
- private void updateHorizontalAlign(AffineTransform tx, TextLayout layout) {
+ private void updateHorizontalAlign(AffineTransform tx, TextLayout layout, boolean useAsianAlign) {
+ // TODO: using prop.getTextAlignAsian doesn't look good ...
switch (prop.getTextAlignLatin()) {
default:
case LEFT:
@@ -674,9 +681,9 @@ public class HwmfGraphics implements Hwm
}
}
- private void updateVerticalAlign(AffineTransform tx, TextLayout layout) {
+ private void updateVerticalAlign(AffineTransform tx, TextLayout layout, boolean useAsianAlign) {
// TODO: check min/max orientation
- switch (prop.getTextVAlignLatin()) {
+ switch (useAsianAlign ? prop.getTextVAlignAsian() : prop.getTextVAlignLatin()) {
case TOP:
tx.translate(0, layout.getAscent());
break;
@@ -710,11 +717,11 @@ public class HwmfGraphics implements Hwm
graphicsCtx.setTransform(at);
}
- private Point2D getRotatedOffset(double angle, FontRenderContext frc, AttributedString as) {
+ private Point2D getRotatedOffset(double angle, FontRenderContext frc, AttributedString as, boolean useAsianAlign) {
final TextLayout layout = new TextLayout(as.getIterator(), frc);
final AffineTransform tx = new AffineTransform();
- updateHorizontalAlign(tx, layout);
- updateVerticalAlign(tx, layout);
+ updateHorizontalAlign(tx, layout, useAsianAlign);
+ updateVerticalAlign(tx, layout, useAsianAlign);
tx.rotate(angle);
Point2D src = new Point2D.Double();
@@ -736,7 +743,7 @@ public class HwmfGraphics implements Hwm
// are not supported, as we would need to extract the destination image area from the underlying buffered image
// and therefore would make it mandatory that the graphics context must be from a buffered image
// furthermore I doubt the purpose of bitwise image operations on non-black/white images
- switch (prop.getRasterOp()) {
+ switch (prop.getRasterOp3()) {
case D:
// keep destination, i.e. do nothing
break;
@@ -785,7 +792,7 @@ public class HwmfGraphics implements Hwm
// of the referenced image and can be also negative
Composite old = graphicsCtx.getComposite();
int newComp;
- switch (prop.getRasterOp()) {
+ switch (prop.getRasterOp3()) {
default:
case SRCCOPY:
newComp = AlphaComposite.SRC_OVER;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java?rev=1883883&r1=1883882&r2=1883883&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java Fri Nov 27 23:33:14 2020
@@ -476,7 +476,7 @@ public final class HwmfDraw {
@Override
public HwmfRecordType getWmfRecordType() {
- return HwmfRecordType.frameRegion;
+ return HwmfRecordType.rectangle;
}
@Override
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java?rev=1883883&r1=1883882&r2=1883883&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java Fri Nov 27 23:33:14 2020
@@ -611,7 +611,7 @@ public class HwmfFill {
@Override
public void draw(HwmfGraphics ctx) {
HwmfDrawProperties prop = ctx.getProperties();
- prop.setRasterOp(rasterOperation);
+ prop.setRasterOp3(rasterOperation);
if (bitmap.isValid()) {
BufferedImage bi = bitmap.getImage(prop.getPenColor().getColor(), prop.getBackgroundColor().getColor(),
prop.getBkMode() == HwmfBkMode.TRANSPARENT);
@@ -912,7 +912,7 @@ public class HwmfFill {
@Override
public void draw(HwmfGraphics ctx) {
HwmfDrawProperties prop = ctx.getProperties();
- prop.setRasterOp(rasterOperation);
+ prop.setRasterOp3(rasterOperation);
// TODO: implement second operation based on playback device context
if (target != null) {
HwmfBkMode oldMode = prop.getBkMode();
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java?rev=1883883&r1=1883882&r2=1883883&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java Fri Nov 27 23:33:14 2020
@@ -146,7 +146,7 @@ public class HwmfText {
@Override
public HwmfRecordType getWmfRecordType() {
- return HwmfRecordType.setBkColor;
+ return HwmfRecordType.setTextJustification;
}
@Override
@@ -236,7 +236,7 @@ public class HwmfText {
@Override
public Map<String, Supplier<?>> getGenericProperties() {
return GenericRecordUtil.getGenericProperties(
- "text", () -> getText(StandardCharsets.US_ASCII),
+ "text", () -> getText(charsetProvider.get()),
"reference", () -> reference
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org