From fa93a4e4a628d5cb57e3305a1d2cb9474e021197 Mon Sep 17 00:00:00 2001
From: Simon Steiner <ssteiner@apache.org>
Date: Tue, 18 Jun 2024 09:36:25 +0100
Subject: [PATCH] BATIK-1355: Missing arabic characters

---
 .../batik/gvt/text/ArabicTextHandler.java     |  6 +++
 .../batik/svg/ArabicCharactersTestCase.java   | 47 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 batik-test-old/src/test/java/org/apache/batik/svg/ArabicCharactersTestCase.java

diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java b/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java
index 4ab75db694..544b95b673 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/text/ArabicTextHandler.java
@@ -620,6 +620,12 @@ public static boolean isLigature(char c) {
 
         null,                                          // 0x0628
         null,                                          // 0x0629
+        null,                                          // 0x062A
+        null,                                          // 0x062B
+        null,                                          // 0x062C
+        null,                                          // 0x062D
+        null,                                          // 0x062E
+        null,                                          // 0x062F
         null,                                          // 0x0630
         null,                                          // 0x0631
         null,                                          // 0x0632
diff --git a/batik-test-old/src/test/java/org/apache/batik/svg/ArabicCharactersTestCase.java b/batik-test-old/src/test/java/org/apache/batik/svg/ArabicCharactersTestCase.java
new file mode 100644
index 0000000000..8899269c3f
--- /dev/null
+++ b/batik-test-old/src/test/java/org/apache/batik/svg/ArabicCharactersTestCase.java
@@ -0,0 +1,47 @@
+/*
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+package org.apache.batik.svg;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ArabicCharactersTestCase  {
+    @Test
+    public void testDoubleCharRemappings() throws Exception {
+        String text = "\u0634\u0627\u0631\u0639 \u0637\u064E\u0648\u0650\u064A \u0623\u0645 \u0627\u0644\u0638\u0651\u0650\u0628\u0627";
+        String svgContent = "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" " +
+                "width=\"700\" height=\"500\" viewBox=\"0 0 700 500\">\n" +
+                "\t<g font-family=\"dialog\" font-size=\"35\" text-anchor=\"start\">\n" +
+                "\t\t<text fill=\"DarkRed\" x=\"5%\" y=\"10%\"\n" +
+                "\t\t> Arabic Shadda : " + text + "</text>\n" +
+                "\t</g>\n" +
+                "</svg>";
+        PNGTranscoder transcoder = new PNGTranscoder();
+        TranscoderInput input = new TranscoderInput(new ByteArrayInputStream(svgContent.getBytes()));
+        ByteArrayOutputStream ostream = new ByteArrayOutputStream();
+        TranscoderOutput output = new TranscoderOutput(ostream);
+        transcoder.transcode(input, output);
+        Assert.assertNotNull(ostream.toByteArray());
+    }
+}