From 9dd782aff8b59b4143da07557d16a8aa5b70148b Mon Sep 17 00:00:00 2001
From: juurr00 <juurr00@juurlink.org>
Date: Wed, 1 Nov 2023 14:58:19 +0100
Subject: [PATCH] Add \n support for image.print(). This fixes #865

---
 packages/plugin-print/src/measure-text.js        |  14 +++++++-------
 .../plugin-print/test/images/with-newlines.png   | Bin 0 -> 2355 bytes
 packages/plugin-print/test/print.test.js         |  13 +++++++++++++
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 packages/plugin-print/test/images/with-newlines.png

diff --git a/packages/plugin-print/src/measure-text.js b/packages/plugin-print/src/measure-text.js
index 510b57f20..c112db53b 100644
--- a/packages/plugin-print/src/measure-text.js
+++ b/packages/plugin-print/src/measure-text.js
@@ -16,29 +16,29 @@ export function measureText(font, text) {
 }
 
 export function splitLines(font, text, maxWidth) {
-  const words = text.split(" ");
+  const words = text.replace(/[\r\n]+/g, " \n").split(" ");
+
   const lines = [];
   let currentLine = [];
   let longestLine = 0;
-
   words.forEach((word) => {
     const line = [...currentLine, word].join(" ");
     const length = measureText(font, line);
 
-    if (length <= maxWidth) {
+    const withinMaxWidth = length <= maxWidth;
+    const containsNewline = word.includes("\n");
+
+    if (withinMaxWidth && !containsNewline) {
       if (length > longestLine) {
         longestLine = length;
       }
-
       currentLine.push(word);
     } else {
       lines.push(currentLine);
-      currentLine = [word];
+      currentLine = [word.replace("\n", "")];
     }
   });
-
   lines.push(currentLine);
-
   return {
     lines,
     longestLine,
diff --git a/packages/plugin-print/test/images/with-newlines.png b/packages/plugin-print/test/images/with-newlines.png
new file mode 100644
index 0000000000000000000000000000000000000000..8da2d115a3d653ff8cc951cae8334e86c43b0c34
GIT binary patch
literal 2355
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
O$b^WGJSqxFDEK%05@rto

literal 0
HcmV?d00001

diff --git a/packages/plugin-print/test/print.test.js b/packages/plugin-print/test/print.test.js
index ed05e30ef..71766af0e 100644
--- a/packages/plugin-print/test/print.test.js
+++ b/packages/plugin-print/test/print.test.js
@@ -294,4 +294,17 @@ describe("Write text over image", function () {
 
     expect(height).toEqual(lineHeight);
   });
+
+  it("text with newlines, default alignment", async () => {
+    const expectedImage = await Jimp.read(
+      getTestDir(__dirname) + "/images/with-newlines.png"
+    );
+
+    const textImage = await createTextImage(100, 240, Jimp.FONT_SANS_16_BLACK, {
+      text: "This \nis only \na \ntest.",
+      maxWidth: 300,
+    });
+
+    expect(textImage.bitmap.data).toEqual(expectedImage.bitmap.data);
+  });
 });