Merge remote-tracking branch 'librepdf/master'

LibrePDF · Nov 25, 2024 · 1701f38 · 1701f38
2 parents eb5e2c2 + d89bf2d
commit 1701f38
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 1 deletion.
diff --git a/LICENSE.md b/LICENSE.md
@@ -2,6 +2,11 @@
 
 ## Licenses of OpenPDF
 
+OpenPDF uses dual licensing: when using the library, you may choose either Mozilla Public License Version 2.0
+or GNU Lesser General Public License 2.1.
+
+The SPDX license identifier for OpenPDF licensing is `MPL-2.0 OR LGPL-2.1+`
+
 ### Mozilla Public License Version 2.0
 
 Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file

diff --git a/README.md b/README.md
@@ -59,6 +59,11 @@ Add this to your pom.xml file to use the latest version of OpenPDF:
 
 ## License
 
+OpenPDF uses dual licensing: when using the library, you may choose either Mozilla Public License Version 2.0
+or GNU Lesser General Public License 2.1.
+
+The SPDX license identifier for OpenPDF licensing is `MPL-2.0 OR LGPL-2.1+`
+
 [GNU Lesser General Public License (LGPL), Version 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1)
 
 > For a short explanation see https://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License

diff --git a/openpdf-fonts-extra/src/main/resources/META-INF/LICENSES.md b/openpdf-fonts-extra/src/main/resources/META-INF/LICENSES.md
@@ -2,6 +2,11 @@
 
 ## Licenses of OpenPDF
 
+OpenPDF uses dual licensing: when using the library, you may choose either Mozilla Public License Version 2.0
+or GNU Lesser General Public License 2.1.
+
+The SPDX license identifier for OpenPDF licensing is `MPL-2.0 OR LGPL-2.1+`
+
 ### Mozilla Public License Version 2.0
 
 Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file

diff --git a/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java b/openpdf/src/main/java/com/lowagie/text/pdf/LayoutProcessor.java
@@ -270,6 +270,8 @@ public static boolean supportsFont(BaseFont baseFont) {
 
     /**
      * Loads the AWT font needed for layout
+     * <p>
+     * If baseFont is not instanceof TrueTypeFontUnicode *no* font is loaded.
      *
      * @param baseFont OpenPdf base font
      * @param filename of the font file
@@ -279,7 +281,9 @@ public static void loadFont(BaseFont baseFont, String filename) {
         if (!enabled || awtFontMap.get(baseFont) != null) {
             return;
         }
-
+        if (!(baseFont instanceof TrueTypeFontUnicode)) {
+            return;
+        }
         java.awt.Font awtFont;
         InputStream inputStream = null;
         try {

diff --git a/openpdf/src/main/resources/META-INF/LICENSES.md b/openpdf/src/main/resources/META-INF/LICENSES.md
@@ -2,6 +2,11 @@
 
 ## Licenses of OpenPDF
 
+OpenPDF uses dual licensing: when using the library, you may choose either Mozilla Public License Version 2.0
+or GNU Lesser General Public License 2.1.
+
+The SPDX license identifier for OpenPDF licensing is `MPL-2.0 OR LGPL-2.1+`
+
 ### Mozilla Public License Version 2.0
 
 Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file

diff --git a/pdf-swing/src/main/resources/META-INF/LICENSES.md b/pdf-swing/src/main/resources/META-INF/LICENSES.md
@@ -2,6 +2,11 @@
 
 ## Licenses of OpenPDF
 
+OpenPDF uses dual licensing: when using the library, you may choose either Mozilla Public License Version 2.0
+or GNU Lesser General Public License 2.1.
+
+The SPDX license identifier for OpenPDF licensing is `MPL-2.0 OR LGPL-2.1+`
+
 ### Mozilla Public License Version 2.0
 
 Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file

diff --git a/pdf-toolbox/src/main/resources/META-INF/LICENSES.md b/pdf-toolbox/src/main/resources/META-INF/LICENSES.md
@@ -2,6 +2,11 @@
 
 ## Licenses of OpenPDF
 
+OpenPDF uses dual licensing: when using the library, you may choose either Mozilla Public License Version 2.0
+or GNU Lesser General Public License 2.1.
+
+The SPDX license identifier for OpenPDF licensing is `MPL-2.0 OR LGPL-2.1+`
+
 ### Mozilla Public License Version 2.0
 
 Please see https://www.mozilla.org/en-US/MPL/2.0/ or the attached file