Skip to content

wcag/ChunkParser: scale Type3 glyph advances by /FontMatrix, not hardcoded 1/1000 #732

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
augustovillar wants to merge 1 commit into from
Closed

wcag/ChunkParser: scale Type3 glyph advances by /FontMatrix, not hardcoded 1/1000 #732

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
15 changes: 14 additions & 1 deletion wcag-validation/src/main/java/org/verapdf/gf/model/factory/chunks/ChunkParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import org.verapdf.pd.font.PDFontDescriptor;
import org.verapdf.pd.images.PDXForm;
import org.verapdf.pd.images.PDXObject;
import org.verapdf.pd.font.PDFont;
import org.verapdf.pd.font.type3.PDType3Font;
import org.verapdf.pd.optionalcontent.PDOCMDDictionary;
import org.verapdf.pd.optionalcontent.PDOptionalContentProperties;
import org.verapdf.tools.StaticResources;
Expand Down Expand Up @@ -856,6 +858,7 @@ private TextPieces parseTextShowArgument(COSBase argument) {
private void parseString(COSString string, TextPieces textPieces) {
byte[] bytes = string.get();
try (InputStream inputStream = new ByteArrayInputStream(bytes)) {
double glyphSpaceToTextSpace = getGlyphWidthToTextSpaceScale(graphicsState.getTextState().getTextFont());
while (inputStream.available() > 0) {
int code = graphicsState.getTextState().getTextFont().readCode(inputStream);
Double width = graphicsState.getTextState().getTextFont().getWidth(code);
Expand All @@ -868,7 +871,7 @@ private void parseString(COSString string, TextPieces textPieces) {
graphicsState.getTextState().getWordSpacing() : 0)) *
graphicsState.getTextState().getHorizontalScaling();
width = width *
graphicsState.getTextState().getTextFontSize() / 1000 *
graphicsState.getTextState().getTextFontSize() * glyphSpaceToTextSpace *
graphicsState.getTextState().getHorizontalScaling();
String value = graphicsState.getTextState().getTextFont().toUnicode(code);
String result = value;
Expand All @@ -887,6 +890,16 @@ private void parseString(COSString string, TextPieces textPieces) {
}
}

private static double getGlyphWidthToTextSpaceScale(PDFont font) {
if (font instanceof PDType3Font) {
double[] fontMatrix = ((PDType3Font) font).getFontMatrix();
if (fontMatrix != null && fontMatrix.length >= 1 && fontMatrix[0] != 0.0) {
return fontMatrix[0];
}
}
return 1.0 / 1000.0;
}

private TextChunk createTextChunk(List<COSBase> arguments, String operatorType, int operatorIndex) {
org.verapdf.pd.font.PDFont font = graphicsState.getTextState().getTextFont();
COSBase argument = TextChunksHelper.getArgument(arguments, operatorType);
Expand Down