From 039b9e4df3ce433fe2dc585f2741048091cff2c6 Mon Sep 17 00:00:00 2001
From: Calixte Denizet <calixte.denizet@gmail.com>
Date: Fri, 21 Nov 2025 18:59:32 +0100
Subject: [PATCH] When searching for a group of punctuation signs, only add
 extraspaces around the group

It fixes #20225.

And only add the extra spaces where it's required depending on their position in the query string.
---
 test/pdfs/.gitignore                  |   1 +
 test/pdfs/issue20225.pdf              | Bin 0 -> 9288 bytes
 test/unit/pdf_find_controller_spec.js |  24 ++++++++++++++++++++++--
 web/pdf_find_controller.js            |  20 ++++++++++++++++----
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100755 test/pdfs/issue20225.pdf

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index cb41f1d0a..2303ff0ec 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -761,3 +761,4 @@
 !extract_link.pdf
 !two_paragraphs.pdf
 !paragraph_and_link.pdf
+!issue20225.pdf
diff --git a/test/pdfs/issue20225.pdf b/test/pdfs/issue20225.pdf
new file mode 100755
index 0000000000000000000000000000000000000000..135c1b475545792413db59d03eb68e46f35d5612
GIT binary patch
literal 9288
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

literal 0
HcmV?d00001

diff --git a/test/unit/pdf_find_controller_spec.js b/test/unit/pdf_find_controller_spec.js
index c4d18925c..25f940861 100644
--- a/test/unit/pdf_find_controller_spec.js
+++ b/test/unit/pdf_find_controller_spec.js
@@ -634,8 +634,8 @@ describe("pdf_find_controller", function () {
         pageIndex: 0,
         matchIndex: 0,
       },
-      pageMatches: [[1497]],
-      pageMatchesLength: [[25]],
+      pageMatches: [[1498]],
+      pageMatchesLength: [[24]],
     });
   });
 
@@ -1138,6 +1138,26 @@ describe("pdf_find_controller", function () {
     });
   });
 
+  it("performs a search with a group of punctuation signs", async () => {
+    const { eventBus, pdfFindController } =
+      await initPdfFindController("issue20225.pdf");
+
+    await testSearch({
+      eventBus,
+      pdfFindController,
+      state: {
+        query: "....",
+      },
+      matchesPerPage: [1],
+      selectedMatch: {
+        pageIndex: 0,
+        matchIndex: 0,
+      },
+      pageMatches: [[8]],
+      pageMatchesLength: [[4]],
+    });
+  });
+
   describe("custom matcher", () => {
     it("calls to the matcher with the right arguments", async () => {
       const QUERY = "Foo  bar";
diff --git a/web/pdf_find_controller.js b/web/pdf_find_controller.js
index 19abf3fca..eaa4456f0 100644
--- a/web/pdf_find_controller.js
+++ b/web/pdf_find_controller.js
@@ -78,7 +78,7 @@ let DIACRITICS_EXCEPTION_STR; // Lazily initialized, see below.
 
 const DIACRITICS_REG_EXP = /\p{M}+/gu;
 const SPECIAL_CHARS_REG_EXP =
-  /([.*+?^${}()|[\]\\])|(\p{P})|(\s+)|(\p{M})|(\p{L})/gu;
+  /([*+^${}()|[\]\\])|(\p{P}+)|(\s+)|(\p{M})|(\p{L})/gu;
 const NOT_DIACRITIC_FROM_END_REG_EXP = /([^\p{M}])\p{M}*$/u;
 const NOT_DIACRITIC_FROM_START_REG_EXP = /^\p{M}*([^\p{M}])/u;
 
@@ -708,6 +708,18 @@ class PDFFindController {
   #convertToRegExpString(query, hasDiacritics) {
     const { matchDiacritics } = this.#state;
     let isUnicode = false;
+    const addExtraWhitespaces = (original, fixed) => {
+      if (original === query) {
+        return fixed;
+      }
+      if (query.startsWith(original)) {
+        return `${fixed}[ ]*`;
+      }
+      if (query.endsWith(original)) {
+        return `[ ]*${fixed}`;
+      }
+      return `[ ]*${fixed}[ ]*`;
+    };
     query = query.replaceAll(
       SPECIAL_CHARS_REG_EXP,
       (
@@ -723,11 +735,11 @@ class PDFFindController {
 
         if (p1) {
           // Escape characters like *+?... to not interfere with regexp syntax.
-          return `[ ]*\\${p1}[ ]*`;
+          return addExtraWhitespaces(p1, `\\${p1}`);
         }
         if (p2) {
-          // Allow whitespaces around punctuation signs.
-          return `[ ]*${p2}[ ]*`;
+          // Allow whitespaces around group of punctuation signs.
+          return addExtraWhitespaces(p2, p2.replaceAll(/[.?]/g, "\\$&"));
         }
         if (p3) {
           // Replace spaces by \s+ to be sure to match any spaces.