From ce35e8826d085d71ba7718c3e2f015638d22b57d Mon Sep 17 00:00:00 2001 From: Herberts Date: Thu, 8 Sep 2022 23:42:14 +0300 Subject: [PATCH] Add consistency to resolving of style and width between different modes. Make sure when font-face declared fonts are used, they are resolved like programmatically declared fonts. --- .../java/com/openhtmltopdf/svgsupport/PDFTranscoder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openhtmltopdf-svg-support/src/main/java/com/openhtmltopdf/svgsupport/PDFTranscoder.java b/openhtmltopdf-svg-support/src/main/java/com/openhtmltopdf/svgsupport/PDFTranscoder.java index 8cbab8f3a..03bc97b98 100644 --- a/openhtmltopdf-svg-support/src/main/java/com/openhtmltopdf/svgsupport/PDFTranscoder.java +++ b/openhtmltopdf-svg-support/src/main/java/com/openhtmltopdf/svgsupport/PDFTranscoder.java @@ -115,10 +115,11 @@ public GVTFontFamily getDefault() { private Float getStyle(IdentValue fontStyle) { if (fontStyle == IdentValue.ITALIC || - fontStyle == IdentValue.OBLIQUE) + fontStyle == IdentValue.OBLIQUE) { return TextAttribute.POSTURE_OBLIQUE; - - return null; + } + + return 0f; } private Float getStyle(FontStyle style) { @@ -171,7 +172,7 @@ private Float getWeight(IdentValue weight) { } else if (weight == IdentValue.FONT_WEIGHT_300) { return TextAttribute.WEIGHT_LIGHT; } else if (weight == IdentValue.FONT_WEIGHT_400) { - return TextAttribute.WEIGHT_MEDIUM; + return TextAttribute.WEIGHT_REGULAR; } else if (weight == IdentValue.FONT_WEIGHT_500) { return TextAttribute.WEIGHT_SEMIBOLD; } else if (weight == IdentValue.FONT_WEIGHT_600) {