Merge branch 'develop' into devsecops

aleks-ivanov · Jan 27, 2025 · b3327a8 · b3327a8
2 parents aa3baca + f705f92
commit b3327a8
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/itext.tests/itext.io.tests/itext/io/font/otf/GposLookupType5Test.cs b/itext.tests/itext.io.tests/itext/io/font/otf/GposLookupType5Test.cs
@@ -34,9 +34,10 @@ public class GposLookupType5Test : ExtendedITextTest {
 
         [NUnit.Framework.Test]
         public virtual void VerifyMarkToBaseAttachment() {
-            TrueTypeFont fontProgram = (TrueTypeFont)FontProgramFactory.CreateFont(RESOURCE_FOLDER + "KhmerOS.ttf");
+            TrueTypeFont fontProgram = (TrueTypeFont)FontProgramFactory.CreateFont(RESOURCE_FOLDER + "NotoSansKhmer-Regular.ttf"
+                );
             GlyphPositioningTableReader gposTableReader = fontProgram.GetGposTable();
-            GposLookupType5 lookup = (GposLookupType5)gposTableReader.GetLookupTable(0);
+            GposLookupType5 lookup = (GposLookupType5)gposTableReader.GetLookupTable(25);
             IList<Glyph> glyphs = JavaUtil.ArraysAsList(new Glyph(fontProgram.GetGlyphByCode(445)), new Glyph(fontProgram
                 .GetGlyphByCode(394)));
             GlyphLine gl = new GlyphLine(glyphs);
@@ -45,8 +46,8 @@ public virtual void VerifyMarkToBaseAttachment() {
             NUnit.Framework.Assert.AreEqual(2, gl.Size());
             NUnit.Framework.Assert.AreEqual(445, gl.Get(0).GetCode());
             NUnit.Framework.Assert.AreEqual(394, gl.Get(1).GetCode());
-            NUnit.Framework.Assert.AreEqual(-1, gl.Get(1).GetAnchorDelta());
-            NUnit.Framework.Assert.AreEqual(756, gl.Get(1).GetXPlacement());
+            NUnit.Framework.Assert.AreEqual(0, gl.Get(1).GetAnchorDelta());
+            NUnit.Framework.Assert.AreEqual(0, gl.Get(1).GetXPlacement());
         }
 
         [NUnit.Framework.Test]

diff --git a/itext.tests/itext.io.tests/resources/itext/io/font/otf/GposLookupType5Test/KhmerOS.ttf b/itext.tests/itext.io.tests/resources/itext/io/font/otf/GposLookupType5Test/KhmerOS.ttf
diff --git a/itext.tests/itext.io.tests/resources/itext/io/font/otf/GposLookupType5Test/NOTICE.txt b/itext.tests/itext.io.tests/resources/itext/io/font/otf/GposLookupType5Test/NOTICE.txt
@@ -1,3 +1,3 @@
 This software uses the following test resources under the following licenses:
-| KhmerOS.ttf | LGPL License | https://sourceforge.net/projects/khmer/files/Fonts%20-%20KhmerOS/KhmerOS%20Fonts%205.0-%20LGPL%20Licence/ |
 | NotoNaskhArabic-Regular | OFL-1.1 | LICENSE_OFL.txt | In development version of font based on commit 4cdde035fd5138d6653a2176ba728b5b6f8cc533 (30.10.2019) from repository: "https://github.com/googlefonts/noto-fonts"
+| NotoSansKhmer-Regular | OFL-1.1 | LICENSE_OFL.txt | In development version of font based on commit 4cdde035fd5138d6653a2176ba728b5b6f8cc533 (30.10.2019) from repository: "https://github.com/googlefonts/noto-fonts"
diff --git a/.../itext.io.tests/resources/itext/io/font/otf/GposLookupType5Test/NotoSansKhmer-Regular.ttf b/.../itext.io.tests/resources/itext/io/font/otf/GposLookupType5Test/NotoSansKhmer-Regular.ttf
diff --git a/itext.tests/itext.layout.tests/itext/layout/renderer/WordWrapUnitTest.cs b/itext.tests/itext.layout.tests/itext/layout/renderer/WordWrapUnitTest.cs
@@ -47,7 +47,7 @@ public class WordWrapUnitTest : ExtendedITextTest {
             .CurrentContext.TestDirectory) + "/resources/itext/layout/fonts/NotoSans-Regular.ttf";
 
         public static readonly String KHMER_FONT = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
-            .CurrentContext.TestDirectory) + "/resources/itext/layout/fonts/KhmerOS.ttf";
+            .CurrentContext.TestDirectory) + "/resources/itext/layout/fonts/NotoSansKhmer-Regular.ttf";
 
         // หากอากาศดีในวันพรุ่งนี้เราจะไปปิกนิก - one sentence, multiple words.
         public const String THAI_TEXT = "\u0E2B\u0E32\u0E01\u0E2D\u0E32\u0E01\u0E32\u0E28\u0E14\u0E35" + "\u0E43\u0E19\u0E27\u0E31\u0E19\u0E1E\u0E23\u0E38\u0E48\u0E07\u0E19\u0E35\u0E49"

diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/fonts/KhmerOS.ttf b/itext.tests/itext.layout.tests/resources/itext/layout/fonts/KhmerOS.ttf
diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/fonts/NOTICE.txt b/itext.tests/itext.layout.tests/resources/itext/layout/fonts/NOTICE.txt
@@ -1,7 +1,6 @@
 Please notice that the following fonts are used with the mentioned below licenses.
 
 * FreeSans - GPL license you can find following the link: https://www.gnu.org/licenses
-* KhmerOS - LGPL license you can find following the link: https://www.gnu.org/licenses
 * NotoColorEmoji - SIL Open Font License v1.1
 * NotoEmoji-Regular - SIL Open Font License v1.1
 * NotoSansCJKjp-Bold - SIL Open Font License v1.1

diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/fonts/NotoSansKhmer-Regular.ttf b/itext.tests/itext.layout.tests/resources/itext/layout/fonts/NotoSansKhmer-Regular.ttf
diff --git a/port-hash b/port-hash
@@ -1 +1 @@
-45554228c115f16152064c2fe9580e0542dd381e
+9d53a68ec0f6b37fca7a158173dd4186797af57b
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		45554228c115f16152064c2fe9580e0542dd381e
		9d53a68ec0f6b37fca7a158173dd4186797af57b