GH-182 further refinement for text selection regressions.

pcorless · Apr 27, 2021 · 6c90fae · 6c90fae
1 parent b9acbd2
commit 6c90fae
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 11 deletions.
diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/SimpleFont.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/SimpleFont.java
@@ -140,8 +140,10 @@ protected void parseWidth() {
  font = font.deriveFont(newWidth, firstchar, missingWidth, ascent, descent, bbox, null);
  }
  // currently not using afm, instead using font's width table, seems more reliable
- else if (afm != null) {
+ else if (afm != null && !isFontSubstitution) {
  font = font.deriveFont(afm.getWidths(), firstchar, missingWidth, ascent, descent, bbox, null);
+ } else if (bbox != null) {
+ font = font.deriveFont(new float[0], firstchar, missingWidth, ascent, descent, bbox, null);
  }
  }
 

diff --git a/.../core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontTrueType.java b/.../core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontTrueType.java
@@ -184,7 +184,9 @@ public FontFile deriveFont(float[] widths, int firstCh, float missingWidth, floa
  font.firstCh = firstCh;
  font.ascent = ascent;
  font.descent = descent;
- font.widths = widths;
+ if (widths != null && widths.length > 0) {
+ font.widths = widths;
+ }
  font.cMap = diff;
  font.bbox = bbox;
  font.maxCharBounds = null;

diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType0.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType0.java
@@ -166,7 +166,9 @@ public FontFile deriveFont(float[] widths, int firstCh, float missingWidth, floa
  font.firstCh = firstCh;
  font.ascent = ascent;
  font.descent = descent;
- font.widths = widths;
+ if (widths != null && widths.length > 0) {
+ font.widths = widths;
+ }
  font.cMap = diff != null ? diff : font.cMap;
  font.bbox = bbox;
  font.maxCharBounds = null;

diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType1.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType1.java
@@ -111,7 +111,9 @@ public FontFile deriveFont(float[] widths, int firstCh, float missingWidth, floa
  font.firstCh = firstCh;
  font.ascent = ascent;
  font.descent = descent;
- font.widths = widths;
+ if (widths != null && widths.length > 0) {
+ font.widths = widths;
+ }
  font.cMap = diff != null ? diff : font.cMap;
  font.bbox = bbox;
  return font;

diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType1C.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType1C.java
@@ -52,8 +52,8 @@ public Point2D getAdvance(char ech) {
 
  @Override
  protected String codeToName(String estr) {
- // might be able to blow this out out some point, but we're in the weeds at this point, not
- // a lot of good examples.
+ // This isn't quite right yet. But if we are using the standard encoding as set in the TypeFont class
+ // use the font's internal encoding.
  if (org.icepdf.core.pobjects.fonts.zfont.Encoding.STANDARD_ENCODING_NAME.equals(encoding.getName())) {
  return cffType1Font.getEncoding().getName(estr.charAt(0));
  } else {
@@ -95,7 +95,9 @@ public FontFile deriveFont(float[] widths, int firstCh, float missingWidth, floa
  font.firstCh = firstCh;
  font.ascent = ascent;
  font.descent = descent;
- font.widths = widths;
+ if (widths != null && widths.length > 0) {
+ font.widths = widths;
+ }
  font.cMap = diff != null ? diff : font.cMap;
  font.bbox = bbox;
  font.maxCharBounds = null;

diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType2.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType2.java
@@ -153,6 +153,9 @@ public FontFile deriveFont(float[] widths, int firstCh, float missingWidth, floa
  font.descent = descent;
  font.cMap = diff;
  font.bbox = bbox;
+ if (widths != null && widths.length > 0) {
+ font.widths = widths;
+ }
  font.maxCharBounds = null;
  return font;
  }

diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType3.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType3.java
@@ -104,7 +104,9 @@ public FontFile deriveFont(Encoding encoding, CMap toUnicode) {
  public FontFile deriveFont(float[] widths, int firstCh, float missingWidth, float ascent, float descent, Rectangle2D bbox, char[] diff) {
  ZFontType3 font = (ZFontType3) deriveFont(this.size);
  font.encoding = encoding;
- font.widths = widths;
+ if (widths != null && widths.length > 0) {
+ font.widths = widths;
+ }
  font.firstCh = firstCh;
  font.missingWidth = missingWidth;
  font.ascent = ascent;

diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZSimpleFont.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZSimpleFont.java
@@ -235,7 +235,7 @@ public double getAscent() {
  if (maxCharBounds == null) {
  maxCharBounds = getMaxCharBounds();
  }
- return -maxCharBounds.getY();
+ return maxCharBounds.getY();
  }
 
  }

diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/graphics/TextSprite.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/graphics/TextSprite.java
@@ -133,11 +133,11 @@ public GlyphText addText(String cid, String unicode, float x, float y, float wid
  Rectangle2D.Float glyphBounds;
  // negative layout
  if (width < 0.0f || font.getSize() < 0) {
- glyphBounds = new Rectangle2D.Float(x + width, y - (descent), w, h);
+ glyphBounds = new Rectangle2D.Float(x + width, y - descent, w, h);
  }
  // inverted layout
  else if (font.getFontTransform() != null && font.getFontTransform().getScaleY() < 0) {
- glyphBounds = new Rectangle2D.Float(x, y - height - descent, w, h);
+ glyphBounds = new Rectangle2D.Float(x, y - height, w, h);
  }
  // standard layout.
  else {