From 9adf03b2be526de7fbd0e84a3ea5128380596f0b Mon Sep 17 00:00:00 2001 From: "valery.bokov" Date: Sat, 21 Nov 2026 18:54:03 +0100 Subject: [PATCH 1/2] keep the order of surrogate pairs when PDFTextStripper reverses right-to-left text Co-Authored-By: Claude Opus 5.5 --- .../apache/pdfbox/text/PDFTextStripper.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java b/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java index 5c6d3d7745d..7ccd93ea10a 100644 --- a/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java +++ b/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java @@ -1954,23 +1954,20 @@ private String handleDirection(String word) if ((level & 1) != 0) { - while (--end >= start) + while (end > start) { - char character = word.charAt(end); - if (Character.isMirrored(word.codePointAt(end))) + // step back by code point to keep the order of surrogate pairs + int codePoint = word.codePointBefore(end); + end -= Character.charCount(codePoint); + // MIRRORING_CHAR_MAP has only BMP characters + if (Character.isBmpCodePoint(codePoint) && Character.isMirrored(codePoint) + && MIRRORING_CHAR_MAP.containsKey((char) codePoint)) { - if (MIRRORING_CHAR_MAP.containsKey(character)) - { - result.append(MIRRORING_CHAR_MAP.get(character)); - } - else - { - result.append(character); - } + result.append(MIRRORING_CHAR_MAP.get((char) codePoint)); } else { - result.append(character); + result.appendCodePoint(codePoint); } } } From 0f04c7aa77adae9a8f66800a48dc4b7fab765e68 Mon Sep 17 00:00:00 2001 From: "valery.bokov" Date: Sat, 21 Nov 2026 18:54:03 +0100 Subject: [PATCH 2/2] add test for PDFTextStripper with a surrogate pair in right-to-left text Co-Authored-By: Claude Opus 5.5 --- .../apache/pdfbox/text/TestTextStripper.java | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java b/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java index 36d931f65bc..ddc54c505d4 100644 --- a/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java +++ b/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java @@ -30,6 +30,7 @@ import java.io.BufferedReader; import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -43,6 +44,7 @@ import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Iterator; @@ -55,6 +57,7 @@ import org.apache.pdfbox.Loader; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; +import org.apache.pdfbox.cos.COSStream; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -888,6 +891,64 @@ void testUnclosedActualText() throws IOException } } + /** + * Test that a surrogate pair (here an emoji) in a right-to-left run keeps the order of its + * high and low surrogate when the run is reversed. + * + * @throws IOException + */ + @Test + void testSurrogatePairInRightToLeftText() throws IOException + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + try (PDDocument doc = new PDDocument()) + { + PDType1Font font = new PDType1Font(Standard14Fonts.FontName.HELVETICA); + PDPage page = new PDPage(); + try (PDPageContentStream cs = new PDPageContentStream(doc, page)) + { + cs.beginText(); + cs.setFont(font, 12); + cs.newLineAtOffset(50, 700); + cs.showText("abc"); + cs.endText(); + } + doc.addPage(page); + + // map "abc" to Hebrew alef, an emoji (U+1F600) and Hebrew bet, in visual order + String cmap = "/CIDInit /ProcSet findresource begin\n" + + "12 dict begin\n" + + "begincmap\n" + + "/CMapName /Test def\n" + + "1 begincodespacerange <00> endcodespacerange\n" + + "3 beginbfchar\n" + + "<61> <05D0>\n" + + "<62> \n" + + "<63> <05D1>\n" + + "endbfchar\n" + + "endcmap\n" + + "CMapName currentdict /CMap defineresource pop\n" + + "end\n" + + "end\n"; + COSStream toUnicode = doc.getDocument().createCOSStream(); + try (OutputStream os = toUnicode.createOutputStream()) + { + os.write(cmap.getBytes(StandardCharsets.US_ASCII)); + } + font.getCOSObject().setItem(COSName.TO_UNICODE, toUnicode); + doc.save(baos); + } + + // reload so that the font reads the ToUnicode CMap + try (PDDocument doc = Loader.loadPDF(baos.toByteArray())) + { + PDFTextStripper localStripper = new PDFTextStripper(); + localStripper.setLineSeparator("\n"); + localStripper.setPageEnd("\n"); + assertEquals("ב😀א\n", localStripper.getText(doc)); + } + } + private static PDPage createPageWithText(PDDocument doc, String text) throws IOException { PDPage page = new PDPage();