Skip to content

Commit 6f7d1ce

Browse files
SnipxiText-CI
Snipx
authored and
iText-CI
committed
OTF: Support GposLookupType1 format
DEVSIX-4633 Autoported commit. Original commit hash: [5c136f57c]
1 parent 6990c10 commit 6f7d1ce

File tree

7 files changed

+232
-1
lines changed

7 files changed

+232
-1
lines changed

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
This file is part of the iText (R) project.
3+
Copyright (c) 1998-2020 iText Group NV
4+
Authors: iText Software.
5+
6+
This program is offered under a commercial and under the AGPL license.
7+
For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below.
8+
9+
AGPL licensing:
10+
This program is free software: you can redistribute it and/or modify
11+
it under the terms of the GNU Affero General Public License as published by
12+
the Free Software Foundation, either version 3 of the License, or
13+
(at your option) any later version.
14+
15+
This program is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
GNU Affero General Public License for more details.
19+
20+
You should have received a copy of the GNU Affero General Public License
21+
along with this program. If not, see <https://www.gnu.org/licenses/>.
22+
*/
23+
using System;
24+
using System.Collections.Generic;
25+
using iText.IO.Font;
26+
using iText.IO.Util;
27+
using iText.Test;
28+
29+
namespace iText.IO.Font.Otf {
30+
public class GposLookupType1Test : ExtendedITextTest {
31+
private static readonly String RESOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
32+
.CurrentContext.TestDirectory) + "/resources/itext/io/font/otf/GposLookupType1Test/";
33+
34+
[NUnit.Framework.Test]
35+
public virtual void VerifyXAdvanceIsApplied() {
36+
TrueTypeFont fontProgram = (TrueTypeFont)FontProgramFactory.CreateFont(RESOURCE_FOLDER + "NotoSansMyanmar-Regular.ttf"
37+
);
38+
GlyphPositioningTableReader gposTableReader = fontProgram.GetGposTable();
39+
GposLookupType1 lookup = (GposLookupType1)gposTableReader.GetLookupTable(29);
40+
IList<Glyph> glyphs = JavaUtil.ArraysAsList(new Glyph(fontProgram.GetGlyphByCode(174)), new Glyph(fontProgram
41+
.GetGlyphByCode(5)));
42+
GlyphLine gl = new GlyphLine(glyphs);
43+
gl.idx = 0;
44+
NUnit.Framework.Assert.AreEqual(0, gl.Get(0).GetXAdvance());
45+
NUnit.Framework.Assert.IsTrue(lookup.TransformOne(gl));
46+
NUnit.Framework.Assert.AreEqual(219, gl.Get(0).GetXAdvance());
47+
}
48+
49+
[NUnit.Framework.Test]
50+
public virtual void VerifyPositionIsNotAppliedForIrrelevantGlyph() {
51+
TrueTypeFont fontProgram = (TrueTypeFont)FontProgramFactory.CreateFont(RESOURCE_FOLDER + "NotoSansMyanmar-Regular.ttf"
52+
);
53+
GlyphPositioningTableReader gposTableReader = fontProgram.GetGposTable();
54+
GposLookupType1 lookup = (GposLookupType1)gposTableReader.GetLookupTable(29);
55+
IList<Glyph> glyphs = JavaUtil.ArraysAsList(new Glyph(fontProgram.GetGlyphByCode(5)), new Glyph(fontProgram
56+
.GetGlyphByCode(174)));
57+
GlyphLine gl = new GlyphLine(glyphs);
58+
gl.idx = 0;
59+
NUnit.Framework.Assert.AreEqual(0, gl.Get(0).GetXAdvance());
60+
NUnit.Framework.Assert.IsFalse(lookup.TransformOne(gl));
61+
NUnit.Framework.Assert.AreEqual(0, gl.Get(0).GetXAdvance());
62+
}
63+
}
64+
}

‎itext.tests/itext.io.tests/resources/itext/io/font/otf/GposLookupType1Test/LICENSE_OFL.txt

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
This Font Software is licensed under the SIL Open Font License,
2+
Version 1.1.
3+
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
-----------------------------------------------------------
8+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
9+
-----------------------------------------------------------
10+
11+
PREAMBLE
12+
The goals of the Open Font License (OFL) are to stimulate worldwide
13+
development of collaborative font projects, to support the font
14+
creation efforts of academic and linguistic communities, and to
15+
provide a free and open framework in which fonts may be shared and
16+
improved in partnership with others.
17+
18+
The OFL allows the licensed fonts to be used, studied, modified and
19+
redistributed freely as long as they are not sold by themselves. The
20+
fonts, including any derivative works, can be bundled, embedded,
21+
redistributed and/or sold with any software provided that any reserved
22+
names are not used by derivative works. The fonts and derivatives,
23+
however, cannot be released under any other type of license. The
24+
requirement for fonts to remain under this license does not apply to
25+
any document created using the fonts or their derivatives.
26+
27+
DEFINITIONS
28+
"Font Software" refers to the set of files released by the Copyright
29+
Holder(s) under this license and clearly marked as such. This may
30+
include source files, build scripts and documentation.
31+
32+
"Reserved Font Name" refers to any names specified as such after the
33+
copyright statement(s).
34+
35+
"Original Version" refers to the collection of Font Software
36+
components as distributed by the Copyright Holder(s).
37+
38+
"Modified Version" refers to any derivative made by adding to,
39+
deleting, or substituting -- in part or in whole -- any of the
40+
components of the Original Version, by changing formats or by porting
41+
the Font Software to a new environment.
42+
43+
"Author" refers to any designer, engineer, programmer, technical
44+
writer or other person who contributed to the Font Software.
45+
46+
PERMISSION & CONDITIONS
47+
Permission is hereby granted, free of charge, to any person obtaining
48+
a copy of the Font Software, to use, study, copy, merge, embed,
49+
modify, redistribute, and sell modified and unmodified copies of the
50+
Font Software, subject to the following conditions:
51+
52+
1) Neither the Font Software nor any of its individual components, in
53+
Original or Modified Versions, may be sold by itself.
54+
55+
2) Original or Modified Versions of the Font Software may be bundled,
56+
redistributed and/or sold with any software, provided that each copy
57+
contains the above copyright notice and this license. These can be
58+
included either as stand-alone text files, human-readable headers or
59+
in the appropriate machine-readable metadata fields within text or
60+
binary files as long as those fields can be easily viewed by the user.
61+
62+
3) No Modified Version of the Font Software may use the Reserved Font
63+
Name(s) unless explicit written permission is granted by the
64+
corresponding Copyright Holder. This restriction only applies to the
65+
primary font name as presented to the users.
66+
67+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
68+
Software shall not be used to promote, endorse or advertise any
69+
Modified Version, except to acknowledge the contribution(s) of the
70+
Copyright Holder(s) and the Author(s) or with their explicit written
71+
permission.
72+
73+
5) The Font Software, modified or unmodified, in part or in whole,
74+
must be distributed entirely under this license, and must not be
75+
distributed under any other license. The requirement for fonts to
76+
remain under this license does not apply to any document created using
77+
the Font Software.
78+
79+
TERMINATION
80+
This license becomes null and void if any of the above conditions are
81+
not met.
82+
83+
DISCLAIMER
84+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
85+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
86+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
87+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
88+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
89+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
90+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
91+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
92+
OTHER DEALINGS IN THE FONT SOFTWARE.

‎itext.tests/itext.io.tests/resources/itext/io/font/otf/GposLookupType1Test/NOTICE.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This software uses the following test resources under the following licenses:
2+
| NotoSansMyanmar-Regular.ttf | OFL-1.1 | LICENSE-OFL.txt |

‎itext.tests/itext.io.tests/resources/itext/io/font/otf/GposLookupType1Test/NotoSansMyanmar-Regular.ttf

150 KB
Binary file not shown.

‎itext/itext.io/itext/io/font/otf/GlyphPositioningTableReader.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ protected internal override OpenTableLookup ReadLookupTable(int lookupType, int
7373
}
7474
}
7575
switch (lookupType) {
76+
case 1: {
77+
return new GposLookupType1(this, lookupFlag, subTableLocations);
78+
}
79+
7680
case 2: {
7781
return new GposLookupType2(this, lookupFlag, subTableLocations);
7882
}

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

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
/*
2+
This file is part of the iText (R) project.
3+
Copyright (c) 1998-2020 iText Group NV
4+
Authors: iText Software.
5+
6+
This program is offered under a commercial and under the AGPL license.
7+
For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below.
8+
9+
AGPL licensing:
10+
This program is free software: you can redistribute it and/or modify
11+
it under the terms of the GNU Affero General Public License as published by
12+
the Free Software Foundation, either version 3 of the License, or
13+
(at your option) any later version.
14+
15+
This program is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
GNU Affero General Public License for more details.
19+
20+
You should have received a copy of the GNU Affero General Public License
21+
along with this program. If not, see <https://www.gnu.org/licenses/>.
22+
*/
23+
using System.Collections.Generic;
24+
25+
namespace iText.IO.Font.Otf {
26+
/// <summary>Lookup Type 1: Single Adjustment Positioning Subtable</summary>
27+
public class GposLookupType1 : OpenTableLookup {
28+
private IDictionary<int, GposValueRecord> valueRecordMap = new Dictionary<int, GposValueRecord>();
29+
30+
public GposLookupType1(OpenTypeFontTableReader openReader, int lookupFlag, int[] subTableLocations)
31+
: base(openReader, lookupFlag, subTableLocations) {
32+
ReadSubTables();
33+
}
34+
35+
public override bool TransformOne(GlyphLine line) {
36+
if (line.idx >= line.end) {
37+
return false;
38+
}
39+
if (openReader.IsSkip(line.Get(line.idx).GetCode(), lookupFlag)) {
40+
line.idx++;
41+
return false;
42+
}
43+
int glyphCode = line.Get(line.idx).GetCode();
44+
bool positionApplied = false;
45+
GposValueRecord valueRecord = valueRecordMap.Get(glyphCode);
46+
if (valueRecord != null) {
47+
Glyph newGlyph = new Glyph(line.Get(line.idx));
48+
newGlyph.xAdvance += (short)valueRecord.XAdvance;
49+
newGlyph.yAdvance += (short)valueRecord.YAdvance;
50+
line.Set(line.idx, newGlyph);
51+
positionApplied = true;
52+
}
53+
line.idx++;
54+
return positionApplied;
55+
}
56+
57+
protected internal override void ReadSubTable(int subTableLocation) {
58+
openReader.rf.Seek(subTableLocation);
59+
openReader.rf.ReadShort();
60+
int coverage = openReader.rf.ReadUnsignedShort();
61+
int valueFormat = openReader.rf.ReadUnsignedShort();
62+
GposValueRecord valueRecord = OtfReadCommon.ReadGposValueRecord(openReader, valueFormat);
63+
IList<int> coverageGlyphIds = openReader.ReadCoverageFormat(subTableLocation + coverage);
64+
foreach (int? glyphId in coverageGlyphIds) {
65+
valueRecordMap.Put((int)glyphId, valueRecord);
66+
}
67+
}
68+
}
69+
}

‎port-hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4e37c92a26ee4dc8584c4a53ea6c7889d6f9024b
1+
5c136f57c062e01fdfc1ec39a3f30174752f62f3

0 commit comments

Comments
 (0)