Skip to content

UNICODE font justification support #83

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

Closed
backslash47 wants to merge 1 commit into from
Closed

UNICODE font justification support #83

Show file tree
Hide file tree
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
30 changes: 25 additions & 5 deletions openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxOutputDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,17 +542,37 @@ public void drawStringFast(String s, float x, float y, JustificationInfo info, F
_cp.setTextMatrix((float) mx[0], b, c, (float) mx[3], (float) mx[4], (float) mx[5]);

if (info != null ) {
// The JustificationInfo numbers need to be normalized using the current document DPI
_cp.setTextSpacing(info.getNonSpaceAdjust() / _dotsPerPoint);
_cp.setSpaceSpacing(info.getSpaceAdjust() / _dotsPerPoint);
// Justification must be done through TJ rendering because Tw param is not working for UNICODE fonts
Object[] array = makeJustificationArray(s, info);
_cp.drawArray(array);
} else {
_cp.setTextSpacing(0.0f);
_cp.setSpaceSpacing(0.0f);
_cp.drawString(s);
}

_cp.drawString(s);

_cp.endText();
}

private Object[] makeJustificationArray(String s, JustificationInfo info) {
List data = new ArrayList();

int len = s.length();
for (int i = 0; i < len; i++) {
char c = s.charAt(i);
data.add(Character.toString(c));
if (i != len - 1) {
float offset;
if (c == ' ' || c == '\u00a0' || c == '\u3000') {
offset = info.getSpaceAdjust();
} else {
offset = info.getNonSpaceAdjust();
}
data.add((-offset / _dotsPerPoint) * 1000 / (_font.getSize2D() / _dotsPerPoint));
}
}
return data.toArray();
}

public static class FontRun {
String str;
Expand Down
26 changes: 26 additions & 0 deletions openhtmltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfContentStreamAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,32 @@ public void drawString(String s) {
}
}

public void drawArray(Object[] array) {
try {
cs.appendRawCommands("[");

boolean lastWasNumber = false;
for (Object obj : array) {
if (obj instanceof String) {
drawString((String) obj);
lastWasNumber = false;
} else {
if (lastWasNumber) {
cs.appendRawCommands(' ');
} else {
lastWasNumber = true;
}

cs.appendRawCommands((Float) obj);
}
}
cs.appendRawCommands("]TJ");
cs.appendRawCommands('\n');
} catch (IOException e) {
logAndThrow("drawArray", e);
}
}

public void drawImage(PDImageXObject xobject, float x, float y, float w,
float h) {
try {
Expand Down