You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2024/05/05 04:00:39 UTC

svn commit: r1917506 - in /pdfbox/trunk/pdfbox/src: main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java test/resources/org/apache/pdfbox/ttf/PDFBOX-5812.pdf-1.png

Author: tilman
Date: Sun May  5 04:00:39 2024
New Revision: 1917506

URL: http://svn.apache.org/viewvc?rev=1917506&view=rev
Log:
PDFBOX-5812: use codepoints instead of chars, as suggested by Toshiaki Ito

Added:
    pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/ttf/PDFBOX-5812.pdf-1.png   (with props)
Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java?rev=1917506&r1=1917505&r2=1917506&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDAbstractContentStream.java Sun May  5 04:00:39 2024
@@ -1636,18 +1636,18 @@ abstract class PDAbstractContentStream i
 
     private List<Integer> applyGSUBRules(GsubWorker gsubWorker, ByteArrayOutputStream out, PDType0Font font, String word) throws IOException
     {
-        char[] charArray = word.toCharArray();
-        List<Integer> originalGlyphIds = new ArrayList<>(charArray.length);
+        int[] codePointArray = word.codePoints().toArray();
+        List<Integer> originalGlyphIds = new ArrayList<>(word.codePointCount(0, word.length()));
         CmapLookup cmapLookup = font.getCmapLookup();
 
         // convert characters into glyphIds
-        for (char unicodeChar : charArray)
+        for (int codePoint : codePointArray)
         {
-            int glyphId = cmapLookup.getGlyphId(unicodeChar);
+            int glyphId = cmapLookup.getGlyphId(codePoint);
             if (glyphId <= 0)
             {
                 throw new IllegalStateException(
-                        "could not find the glyphId for the character: " + unicodeChar);
+                        "could not find the glyphId for the character: " + codePoint);
             }
             originalGlyphIds.add(glyphId);
         }

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java?rev=1917506&r1=1917505&r2=1917506&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java Sun May  5 04:00:39 2024
@@ -592,4 +592,49 @@ class TestFontEmbedding
 
         // no test for 1111
     }
+
+    /**
+     * PDFBOX-5812: Atka Mackerel in Japanese kanji. (surrogate pair)
+     */
+    @Test
+    void testSurrogatePairCharacter() throws IOException
+    {
+        final String message = "𩸽\uD867\uDE3D";
+        File pdf = new File(OUT_DIR, "PDFBOX-5812.pdf");
+        File IN_DIR = new File("src/test/resources/org/apache/pdfbox/ttf");
+
+        ByteArrayOutputStream baos;
+        try (PDDocument doc = new PDDocument())
+        {
+            PDPage page = new PDPage();
+            doc.addPage(page);
+            File ipafont = new File("target/fonts/ipag00303", "ipag.ttf");
+            PDFont font = PDType0Font.load(doc, ipafont);
+            try (PDPageContentStream contents = new PDPageContentStream(doc, page))
+            {
+                contents.beginText();
+                contents.setFont(font, 64);
+                contents.newLineAtOffset(100, 700);
+                contents.showText(message);
+                contents.endText();
+            }
+
+            baos = new ByteArrayOutputStream();
+            doc.save(baos);
+            doc.save(pdf);
+        }
+        try (PDDocument doc = Loader.loadPDF(baos.toByteArray()))
+        {
+            PDFTextStripper stripper = new PDFTextStripper();
+            String text = stripper.getText(doc).trim();
+            assertEquals(message, text);
+        }
+        
+        // compare rendering
+        if (!TestPDFToImage.doTestFile(pdf, IN_DIR.getAbsolutePath(), OUT_DIR.getAbsolutePath()))
+        {
+            // don't fail, rendering is different on different systems, result must be viewed manually
+            System.err.println("Rendering of " + pdf + " failed or is not identical to expected rendering in " + IN_DIR + " directory");
+        }
+    }
 }

Added: pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/ttf/PDFBOX-5812.pdf-1.png
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/ttf/PDFBOX-5812.pdf-1.png?rev=1917506&view=auto
==============================================================================
Binary file - no diff available.

Propchange: pdfbox/trunk/pdfbox/src/test/resources/org/apache/pdfbox/ttf/PDFBOX-5812.pdf-1.png
------------------------------------------------------------------------------
    svn:mime-type = image/png