From 6f432f7b599ad6d9aea88fabc43546f2eac01ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Mon, 7 Aug 2023 18:14:51 +0200 Subject: [PATCH] fix font setup in document command --- .../pdfbox/layout/element/Document.java | 1 - .../scripting/command/DocumentCommand.java | 22 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Document.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Document.java index beef5a4..a034b5d 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Document.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/Document.java @@ -239,7 +239,6 @@ public class Document implements Element, Closeable, RenderListener { return PDType0Font.load(pdDocument, openTypeFont, true); } - public Font getFont(String name) { return fonts.get(name); } diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/DocumentCommand.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/DocumentCommand.java index aa1f46e..133d934 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/DocumentCommand.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/element/scripting/command/DocumentCommand.java @@ -71,18 +71,16 @@ public class DocumentCommand implements Command { } else { document.setModificationDate(instant); } - if (settings.containsSetting("font")) { - String[] fonts = settings.getAsArray("font"); - for (String font : fonts) { - switch (font) { - case "helvetica" -> document.registerFont("helvetica", BaseFont.HELVETICA); - case "times" -> document.registerFont("times", BaseFont.TIMES); - case "courier" -> document.registerFont("courier", BaseFont.COURIER); - case "notosans" -> document.registerNotoSansFont(); - case "notosanscjksc" -> document.registerNotoSansCJKSCFont(); - case "opensans" -> document.registerOpenSansFont(); - case "sourcesans" -> document.registerSourceSansFont(); - } + String[] fonts = settings.getAsArray("font"); + for (String font : fonts) { + switch (font) { + case "helvetica" -> document.registerFont("helvetica", BaseFont.HELVETICA); + case "times" -> document.registerFont("times", BaseFont.TIMES); + case "courier" -> document.registerFont("courier", BaseFont.COURIER); + case "notosans" -> document.registerNotoSansFont(); + case "notosanscjksc" -> document.registerNotoSansCJKSCFont(); + case "opensans" -> document.registerOpenSansFont(); + case "sourcesans" -> document.registerSourceSansFont(); } } state.getElements().push(document);