OTF: Support GposLookupType1 - table subformat 2

DEVSIX-5160

Autoported commit.
Original commit hash: [ff08e8fde]

Author: Snipx

itext.tests/itext.io.tests/itext/io/font/otf/GposLookupType1Test.cs

@@ -32,7 +32,7 @@ public class GposLookupType1Test : ExtendedITextTest {
             .CurrentContext.TestDirectory) + "/resources/itext/io/font/otf/GposLookupType1Test/";
 
         [NUnit.Framework.Test]
-        public virtual void VerifyXAdvanceIsApplied() {
+        public virtual void VerifyXAdvanceIsAppliedSubFormat1() {
             TrueTypeFont fontProgram = (TrueTypeFont)FontProgramFactory.CreateFont(RESOURCE_FOLDER + "NotoSansMyanmar-Regular.ttf"
                 );
             GlyphPositioningTableReader gposTableReader = fontProgram.GetGposTable();
@@ -47,7 +47,7 @@ public virtual void VerifyXAdvanceIsApplied() {
         }
 
         [NUnit.Framework.Test]
-        public virtual void VerifyPositionIsNotAppliedForIrrelevantGlyph() {
+        public virtual void VerifyPositionIsNotAppliedForIrrelevantGlyphSubFormat1() {
             TrueTypeFont fontProgram = (TrueTypeFont)FontProgramFactory.CreateFont(RESOURCE_FOLDER + "NotoSansMyanmar-Regular.ttf"
                 );
             GlyphPositioningTableReader gposTableReader = fontProgram.GetGposTable();
@@ -60,5 +60,26 @@ public virtual void VerifyPositionIsNotAppliedForIrrelevantGlyph() {
             NUnit.Framework.Assert.IsFalse(lookup.TransformOne(gl));
             NUnit.Framework.Assert.AreEqual(0, gl.Get(0).GetXAdvance());
         }
+
+        [NUnit.Framework.Test]
+        public virtual void VerifyDifferentXAdvanceIsAppliedSubFormat2() {
+            TrueTypeFont fontProgram = (TrueTypeFont)FontProgramFactory.CreateFont(RESOURCE_FOLDER + "NotoSansMyanmar-Regular.ttf"
+                );
+            GlyphPositioningTableReader gposTableReader = fontProgram.GetGposTable();
+            GposLookupType1 lookup = (GposLookupType1)gposTableReader.GetLookupTable(16);
+            IList<Glyph> glyphs = JavaUtil.ArraysAsList(new Glyph(fontProgram.GetGlyphByCode(401)), new Glyph(fontProgram
+                .GetGlyphByCode(5)));
+            GlyphLine gl = new GlyphLine(glyphs);
+            NUnit.Framework.Assert.AreEqual(0, gl.Get(0).GetXAdvance());
+            NUnit.Framework.Assert.IsTrue(lookup.TransformOne(gl));
+            NUnit.Framework.Assert.AreEqual(109, gl.Get(0).GetXAdvance());
+            // Subtable type 2 defines different GposValueRecords for different coverage glyphs
+            glyphs = JavaUtil.ArraysAsList(new Glyph(fontProgram.GetGlyphByCode(508)), new Glyph(fontProgram.GetGlyphByCode
+                (5)));
+            gl = new GlyphLine(glyphs);
+            NUnit.Framework.Assert.AreEqual(0, gl.Get(0).GetXAdvance());
+            NUnit.Framework.Assert.IsTrue(lookup.TransformOne(gl));
+            NUnit.Framework.Assert.AreEqual(158, gl.Get(0).GetXAdvance());
+        }
     }
 }

itext/itext.io/itext/io/font/otf/GposLookupType1.cs

@@ -20,6 +20,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
+using System;
 using System.Collections.Generic;
 
 namespace iText.IO.Font.Otf {
@@ -45,8 +46,8 @@ public override bool TransformOne(GlyphLine line) {
             GposValueRecord valueRecord = valueRecordMap.Get(glyphCode);
             if (valueRecord != null) {
                 Glyph newGlyph = new Glyph(line.Get(line.idx));
-                newGlyph.xAdvance += (short)valueRecord.XAdvance;
-                newGlyph.yAdvance += (short)valueRecord.YAdvance;
+                newGlyph.SetXAdvance((short)(newGlyph.GetXAdvance() + valueRecord.XAdvance));
+                newGlyph.SetYAdvance((short)(newGlyph.GetYAdvance() + valueRecord.YAdvance));
                 line.Set(line.idx, newGlyph);
                 positionApplied = true;
             }
@@ -56,13 +57,32 @@ public override bool TransformOne(GlyphLine line) {
 
         protected internal override void ReadSubTable(int subTableLocation) {
             openReader.rf.Seek(subTableLocation);
-            openReader.rf.ReadShort();
-            int coverage = openReader.rf.ReadUnsignedShort();
+            int subTableFormat = openReader.rf.ReadShort();
+            int coverageOffset = openReader.rf.ReadUnsignedShort();
             int valueFormat = openReader.rf.ReadUnsignedShort();
-            GposValueRecord valueRecord = OtfReadCommon.ReadGposValueRecord(openReader, valueFormat);
-            IList<int> coverageGlyphIds = openReader.ReadCoverageFormat(subTableLocation + coverage);
-            foreach (int? glyphId in coverageGlyphIds) {
-                valueRecordMap.Put((int)glyphId, valueRecord);
+            if (subTableFormat == 1) {
+                GposValueRecord valueRecord = OtfReadCommon.ReadGposValueRecord(openReader, valueFormat);
+                IList<int> coverageGlyphIds = openReader.ReadCoverageFormat(subTableLocation + coverageOffset);
+                foreach (int? glyphId in coverageGlyphIds) {
+                    valueRecordMap.Put((int)glyphId, valueRecord);
+                }
+            }
+            else {
+                if (subTableFormat == 2) {
+                    int valueCount = openReader.rf.ReadUnsignedShort();
+                    IList<GposValueRecord> valueRecords = new List<GposValueRecord>();
+                    for (int i = 0; i < valueCount; i++) {
+                        GposValueRecord valueRecord = OtfReadCommon.ReadGposValueRecord(openReader, valueFormat);
+                        valueRecords.Add(valueRecord);
+                    }
+                    IList<int> coverageGlyphIds = openReader.ReadCoverageFormat(subTableLocation + coverageOffset);
+                    for (int i = 0; i < coverageGlyphIds.Count; i++) {
+                        valueRecordMap.Put((int)coverageGlyphIds[i], valueRecords[i]);
+                    }
+                }
+                else {
+                    throw new ArgumentException("Bad subtable format identifier: " + subTableFormat);
+                }
             }
         }
     }

port-hash

@@ -1 +1 @@
-304ce6d86d44b034d84e409ffc93300db3d097a7
+ff08e8fdea70e17ac8b6294045d8c23209f42a63