You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/08/13 08:13:40 UTC
svn commit: r1892299 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox: multipdf/ pdfwriter/
pdmodel/font/ pdmodel/graphics/optionalcontent/ pdmodel/interactive/form/
Author: lehmi
Date: Fri Aug 13 08:13:39 2021
New Revision: 1892299
URL: http://svn.apache.org/viewvc?rev=1892299&view=rev
Log:
PDFBOX-5214: replace static standard14font with a newly created one
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSDocumentCompressionTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEncoding.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java?rev=1892299&r1=1892298&r2=1892299&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/OverlayTest.java Fri Aug 13 08:13:39 2021
@@ -31,6 +31,7 @@ import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -117,7 +118,7 @@ class OverlayTest
{
float fontHeight = 12;
float y = page.getMediaBox().getHeight() - fontHeight * 2;
- PDFont font = PDType1Font.HELVETICA;
+ PDFont font = new PDType1Font(FontName.HELVETICA);
cs.setFont(font, fontHeight);
cs.beginText();
cs.setLeading(fontHeight * 2 + 1);
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java?rev=1892299&r1=1892298&r2=1892299&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java Fri Aug 13 08:13:39 2021
@@ -36,6 +36,7 @@ import org.apache.pdfbox.pdmodel.PDPageC
import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
@@ -135,13 +136,13 @@ class TestLayerUtility
try (PDPageContentStream contentStream = new PDPageContentStream(doc, page, AppendMode.OVERWRITE, false))
{
//Setup page content stream and paint background/title
- PDFont font = PDType1Font.HELVETICA_BOLD;
+ PDFont font = new PDType1Font(FontName.HELVETICA_BOLD);
contentStream.beginText();
contentStream.newLineAtOffset(50, 720);
contentStream.setFont(font, 14);
contentStream.showText("Simple test document with text.");
contentStream.endText();
- font = PDType1Font.HELVETICA;
+ font = new PDType1Font(FontName.HELVETICA);
contentStream.beginText();
int fontSize = 12;
contentStream.setFont(font, fontSize);
@@ -177,7 +178,7 @@ class TestLayerUtility
try (PDPageContentStream contentStream = new PDPageContentStream(doc, page, AppendMode.OVERWRITE, false))
{
//Setup page content stream and paint background/title
- PDFont font = PDType1Font.HELVETICA_BOLD;
+ PDFont font = new PDType1Font(FontName.HELVETICA_BOLD);
contentStream.setNonStrokingColor(Color.LIGHT_GRAY);
contentStream.beginText();
float fontSize = 96;
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSDocumentCompressionTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSDocumentCompressionTest.java?rev=1892299&r1=1892298&r2=1892299&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSDocumentCompressionTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfwriter/COSDocumentCompressionTest.java Fri Aug 13 08:13:39 2021
@@ -26,6 +26,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
import org.junit.jupiter.api.Test;
@@ -222,7 +223,7 @@ class COSDocumentCompressionTest
{
contentStream.beginText();
contentStream.newLineAtOffset(20, 80);
- contentStream.setFont(PDType1Font.HELVETICA, 12);
+ contentStream.setFont(new PDType1Font(FontName.HELVETICA), 12);
contentStream.showText("Test");
contentStream.endText();
}
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java?rev=1892299&r1=1892298&r2=1892299&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/PDFontTest.java Fri Aug 13 08:13:39 2021
@@ -43,6 +43,7 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
import org.apache.pdfbox.pdmodel.font.encoding.WinAnsiEncoding;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.pdfbox.text.PDFTextStripper;
@@ -203,12 +204,13 @@ class PDFontTest
@Test
void testPDFox4318() throws IOException
{
+ PDType1Font helveticaBold = new PDType1Font(FontName.HELVETICA_BOLD);
assertThrows(IllegalArgumentException.class,
- () -> PDType1Font.HELVETICA_BOLD.encode("\u0080"),
+ () -> helveticaBold.encode("\u0080"),
"should have thrown IllegalArgumentException");
- PDType1Font.HELVETICA_BOLD.encode("â¬");
+ helveticaBold.encode("â¬");
assertThrows(IllegalArgumentException.class,
- () -> PDType1Font.HELVETICA_BOLD.encode("\u0080"),
+ () -> helveticaBold.encode("\u0080"),
"should have thrown IllegalArgumentException");
}
@@ -389,7 +391,7 @@ class PDFontTest
{
PDPage page = new PDPage();
doc.addPage(page);
- PDFont font1 = PDType1Font.HELVETICA;
+ PDFont font1 = new PDType1Font(FontName.HELVETICA);
PDFont font2 = PDType0Font.load(doc, PDFontTest.class.getResourceAsStream(
"/org/apache/pdfbox/resources/ttf/LiberationSans-Regular.ttf"));
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEncoding.java?rev=1892299&r1=1892298&r2=1892299&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEncoding.java Fri Aug 13 08:13:39 2021
@@ -31,6 +31,7 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
import org.apache.pdfbox.pdmodel.font.encoding.DictionaryEncoding;
import org.apache.pdfbox.pdmodel.font.encoding.MacRomanEncoding;
import org.apache.pdfbox.pdmodel.font.encoding.WinAnsiEncoding;
@@ -86,7 +87,7 @@ class TestFontEncoding
PDPage page = new PDPage();
doc.addPage(page);
PDPageContentStream cs = new PDPageContentStream(doc, page);
- cs.setFont(PDType1Font.HELVETICA, 20);
+ cs.setFont(new PDType1Font(FontName.HELVETICA), 20);
cs.beginText();
cs.newLineAtOffset(100, 700);
// first tilde is "asciitilde" (from the keyboard), 2nd tilde is "tilde"
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java?rev=1892299&r1=1892298&r2=1892299&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optionalcontent/TestOptionalContentGroups.java Fri Aug 13 08:13:39 2021
@@ -49,6 +49,7 @@ import org.apache.pdfbox.pdmodel.PageMod
import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties.BaseState;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.apache.pdfbox.text.PDFMarkedContentExtractor;
@@ -115,14 +116,14 @@ class TestOptionalContentGroups
//Setup page content stream and paint background/title
try (PDPageContentStream contentStream = new PDPageContentStream(doc, page, AppendMode.OVERWRITE, false))
{
- PDFont font = PDType1Font.HELVETICA_BOLD;
+ PDFont font = new PDType1Font(FontName.HELVETICA_BOLD);
contentStream.beginMarkedContent(COSName.OC, background);
contentStream.beginText();
contentStream.setFont(font, 14);
contentStream.newLineAtOffset(80, 700);
contentStream.showText("PDF 1.5: Optional Content Groups");
contentStream.endText();
- font = PDType1Font.HELVETICA;
+ font = new PDType1Font(FontName.HELVETICA);
contentStream.beginText();
contentStream.setFont(font, 12);
contentStream.newLineAtOffset(80, 680);
@@ -281,14 +282,14 @@ class TestOptionalContentGroups
//Setup page content stream and paint background/title
try (PDPageContentStream contentStream = new PDPageContentStream(doc, page, AppendMode.OVERWRITE, false))
{
- PDFont font = PDType1Font.HELVETICA_BOLD;
+ PDFont font = new PDType1Font(FontName.HELVETICA_BOLD);
contentStream.beginMarkedContent(COSName.OC, visible);
contentStream.beginText();
contentStream.setFont(font, 14);
contentStream.newLineAtOffset(80, 700);
contentStream.showText("PDF 1.5: Optional Content Groups");
contentStream.endText();
- font = PDType1Font.HELVETICA;
+ font = new PDType1Font(FontName.HELVETICA);
contentStream.beginText();
contentStream.setFont(font, 12);
contentStream.newLineAtOffset(80, 680);
@@ -367,7 +368,7 @@ class TestOptionalContentGroups
//Setup page content stream and paint background/title
try (PDPageContentStream contentStream = new PDPageContentStream(doc, page, AppendMode.OVERWRITE, false))
{
- PDFont font = PDType1Font.HELVETICA_BOLD;
+ PDFont font = new PDType1Font(FontName.HELVETICA_BOLD);
contentStream.beginMarkedContent(COSName.OC, background);
contentStream.beginText();
contentStream.setFont(font, 14);
@@ -376,7 +377,7 @@ class TestOptionalContentGroups
contentStream.endText();
contentStream.endMarkedContent();
- font = PDType1Font.HELVETICA;
+ font = new PDType1Font(FontName.HELVETICA);
//Paint enabled layer
contentStream.beginMarkedContent(COSName.OC, enabled);
@@ -429,7 +430,7 @@ class TestOptionalContentGroups
try (PDPageContentStream contentStream = new PDPageContentStream(doc, page, AppendMode.OVERWRITE, false))
{
- PDFont font = PDType1Font.HELVETICA;
+ PDFont font = new PDType1Font(FontName.HELVETICA);
contentStream.setNonStrokingColor(Color.RED);
contentStream.beginText();
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java?rev=1892299&r1=1892298&r2=1892299&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/TestListBox.java Fri Aug 13 08:13:39 2021
@@ -35,6 +35,7 @@ import org.apache.pdfbox.pdmodel.PDResou
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts.FontName;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -74,9 +75,9 @@ class TestListBox
// Adobe Acrobat uses Helvetica as a default font and
// stores that under the name '/Helv' in the resources dictionary
- PDFont font = PDType1Font.HELVETICA;
+ PDFont font = new PDType1Font(FontName.HELVETICA);
PDResources resources = new PDResources();
- resources.put(COSName.getPDFName("Helv"), font);
+ resources.put(COSName.HELV, font);
// Add and set the resources and default appearance at the form level
form.setDefaultResources(resources);