Make glyphs independent in bidi-reordered line from pre-reordering

DEVSIX-5161

Autoported commit.
Original commit hash: [20a73e3e8]

Author: yulian-gaponenko

itext.tests/itext.layout.tests/itext/layout/renderer/TypographyUtilsTest.cs

@@ -40,6 +40,9 @@ source product.
 For more information, please contact iText Software Corp. at this
 address: [email protected]
 */
+using System.Collections.Generic;
+using iText.IO.Font.Otf;
+using iText.IO.Util;
 using iText.Test;
 
 namespace iText.Layout.Renderer {
@@ -48,5 +51,41 @@ public class TypographyUtilsTest : ExtendedITextTest {
         public virtual void VerifyPdfCalligraphIsNotAvailable() {
             NUnit.Framework.Assert.IsFalse(TypographyUtils.IsPdfCalligraphAvailable());
         }
+
+        [NUnit.Framework.Test]
+        public virtual void UpdateAnchorDeltaMarkNotReorderedTest() {
+            // original line 'abm', and 'm' is a mark based on 'b'
+            Glyph mGlyph = new Glyph(100, 'm');
+            mGlyph.SetAnchorDelta((short)-1);
+            mGlyph.SetXAdvance((short)15);
+            mGlyph.SetYAdvance((short)25);
+            LineRenderer.RendererGlyph b = new LineRenderer.RendererGlyph(new Glyph(100, 'b'), null);
+            LineRenderer.RendererGlyph m = new LineRenderer.RendererGlyph(mGlyph, null);
+            LineRenderer.RendererGlyph a = new LineRenderer.RendererGlyph(new Glyph(100, 'a'), null);
+            IList<LineRenderer.RendererGlyph> reorderedLine = JavaUtil.ArraysAsList(b, m, a);
+            int[] reorder = new int[] { 1, 2, 0 };
+            int[] inverseReorder = new int[] { 2, 0, 1 };
+            TypographyUtils.UpdateAnchorDeltaForReorderedLineGlyphs(reorder, inverseReorder, reorderedLine);
+            NUnit.Framework.Assert.AreSame(mGlyph, m.glyph);
+            NUnit.Framework.Assert.AreEqual(-1, m.glyph.GetAnchorDelta());
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void UpdateAnchorDeltaMarkReorderedTest() {
+            // original line 'abm', and 'm' is a mark based on 'b'
+            Glyph mGlyph = new Glyph(100, 'm');
+            mGlyph.SetAnchorDelta((short)-1);
+            mGlyph.SetXAdvance((short)15);
+            mGlyph.SetYAdvance((short)25);
+            LineRenderer.RendererGlyph m = new LineRenderer.RendererGlyph(mGlyph, null);
+            LineRenderer.RendererGlyph b = new LineRenderer.RendererGlyph(new Glyph(100, 'b'), null);
+            LineRenderer.RendererGlyph a = new LineRenderer.RendererGlyph(new Glyph(100, 'a'), null);
+            IList<LineRenderer.RendererGlyph> reorderedLine = JavaUtil.ArraysAsList(m, b, a);
+            int[] reorder = new int[] { 2, 1, 0 };
+            int[] inverseReorder = new int[] { 2, 1, 0 };
+            TypographyUtils.UpdateAnchorDeltaForReorderedLineGlyphs(reorder, inverseReorder, reorderedLine);
+            NUnit.Framework.Assert.AreNotSame(mGlyph, m.glyph);
+            NUnit.Framework.Assert.AreEqual(1, m.glyph.GetAnchorDelta());
+        }
     }
 }

itext/itext.layout/itext/layout/renderer/TypographyUtils.cs

@@ -236,16 +236,7 @@ internal static int[] ReorderLine(IList<LineRenderer.RendererGlyph> line, byte[]
                         }
                     }
                 }
-                // fix anchorDelta
-                for (int i = 0; i < reorderedLine.Count; i++) {
-                    Glyph glyph = reorderedLine[i].glyph;
-                    if (glyph.HasPlacement()) {
-                        int oldAnchor = reorder[i] + glyph.GetAnchorDelta();
-                        int newPos = inverseReorder[oldAnchor];
-                        int newAnchorDelta = newPos - i;
-                        glyph.SetAnchorDelta((short)newAnchorDelta);
-                    }
-                }
+                UpdateAnchorDeltaForReorderedLineGlyphs(reorder, inverseReorder, reorderedLine);
                 line.Clear();
                 line.AddAll(reorderedLine);
                 return reorder;
@@ -279,6 +270,23 @@ internal static IList<int> GetPossibleBreaks(String str) {
                 String) }, str);
         }
 
+        internal static void UpdateAnchorDeltaForReorderedLineGlyphs(int[] reorder, int[] inverseReorder, IList<LineRenderer.RendererGlyph
+            > reorderedLine) {
+            for (int i = 0; i < reorderedLine.Count; i++) {
+                Glyph glyph = reorderedLine[i].glyph;
+                if (glyph.HasPlacement()) {
+                    int oldAnchor = reorder[i] + glyph.GetAnchorDelta();
+                    int newPos = inverseReorder[oldAnchor];
+                    int newAnchorDelta = newPos - i;
+                    if (glyph.GetAnchorDelta() != newAnchorDelta) {
+                        glyph = new Glyph(glyph);
+                        reorderedLine[i].glyph = glyph;
+                        glyph.SetAnchorDelta((short)newAnchorDelta);
+                    }
+                }
+            }
+        }
+
         private static Object CallMethod(String className, String methodName, Type[] parameterTypes, params Object
             [] args) {
             return CallMethod(className, methodName, (Object)null, parameterTypes, args);

port-hash

@@ -1 +1 @@
-110246b0030a7779e696394f4b6435e4c3c81468
+20a73e3e8cd223bca411d62b4420115265218873