Skip to content

Honor X positions in glyph vectors #1618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dadza wants to merge 1 commit into
base: 1.3-java8
Choose a base branch
from
Open

Honor X positions in glyph vectors #1618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 34 additions & 3 deletions openpdf/src/main/java/com/lowagie/text/pdf/PdfContentByte.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ public class PdfContentByte {
*/
public static final int TEXT_RENDER_MODE_CLIP = 7;
static final float MIN_FONT_SIZE = 0.0001f;
private static final double GLYPH_POSITION_TOLERANCE = 0.1;
private static final float[] unitRect = {0, 0, 0, 1, 1, 0, 1, 1};
private static final Map<PdfName, String> abrev = new HashMap<>();
// membervariables
Expand Down Expand Up @@ -1746,9 +1747,39 @@ public void showText(GlyphVector glyphVector, int beginIndex, int endIndex) {
throw new NullPointerException(
MessageLocalization.getComposedMessage("font.and.size.must.be.set.before.writing.any.text"));
}
byte[] b = state.fontDetails.convertToBytes(glyphVector, beginIndex, endIndex);
escapeString(b, content);
content.append("Tj").append_i(separator);
boolean neededAdjustment = false;
double expectedPos = glyphVector.getGlyphPosition(beginIndex).getX();
int segmentStart = beginIndex;
for (int i = beginIndex; i < endIndex; i++) {
int glyphCode = glyphVector.getGlyphCode(i);
if (glyphCode == 0xFFFE || glyphCode == 0xFFFF) {
continue;
}

double actualPos = glyphVector.getGlyphPosition(i).getX();
double delta = actualPos - expectedPos;
if (Math.abs(delta) > GLYPH_POSITION_TOLERANCE && i > segmentStart) {
if (!neededAdjustment) {
neededAdjustment = true;
content.append("[");
}
byte[] segmentBytes = state.fontDetails.convertToBytes(glyphVector, segmentStart, i);
escapeString(segmentBytes, content);
content.append(-(delta * 1000 / state.size));
segmentStart = i;
}
expectedPos = actualPos + glyphVector.getGlyphMetrics(i).getAdvanceX();
}

if (!neededAdjustment) {
byte[] b = state.fontDetails.convertToBytes(glyphVector, beginIndex, endIndex);
escapeString(b, content);
content.append("Tj").append_i(separator);
} else {
byte[] remaining = state.fontDetails.convertToBytes(glyphVector, segmentStart, endIndex);
escapeString(remaining, content);
content.append("]TJ").append_i(separator);
}
}

/**
Expand Down
Loading