Skip to content

Handle empty encoding in Type1FontSimple and fix #1248 #1249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BobLd merged 1 commit into from
Feb 10, 2026
Merged

Handle empty encoding in Type1FontSimple and fix #1248 #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/UglyToad.PdfPig.Tests/Integration/Documents/jtehm-melillo-2679746.pdf
View file
Open in desktop
Binary file not shown.
19 changes: 19 additions & 0 deletions src/UglyToad.PdfPig.Tests/Integration/GithubIssuesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,25 @@

public class GithubIssuesTests
{
[Fact]
public void Issues1248()
{
var path = IntegrationHelpers.GetDocumentPath("jtehm-melillo-2679746.pdf");
using (var document = PdfDocument.Open(path, new ParsingOptions() { UseLenientParsing = true }))
{
var page = document.GetPage(1);
foreach (var letter in page.Letters)
{
var font = letter.GetFont();

if (font?.Name?.Data.Contains("TimesLT") == true)
{
Assert.True(font.TryGetPath(100, out _));
}
}
}
}

[Fact]
public void Issues1238()
{
Expand Down
4 changes: 2 additions & 2 deletions src/UglyToad.PdfPig/PdfFonts/Parser/Handlers/Type1FontHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public IFont Generate(DictionaryToken dictionary)
{
if (font.TryGetFirst(out var t1Font))
{
fromFont = t1Font.Encoding is not null ? new BuiltInEncoding(t1Font.Encoding) : default(Encoding);
fromFont = (t1Font.Encoding is not null && t1Font.Encoding.Count > 0) ? new BuiltInEncoding(t1Font.Encoding) : default(Encoding);
}
else if (font.TryGetSecond(out var cffFont))
{
Expand All @@ -135,7 +135,7 @@ public IFont Generate(DictionaryToken dictionary)

var encoding = encodingReader.Read(dictionary, descriptor, fromFont);

if (encoding is null && font != null && font.TryGetFirst(out var t1FontReplacement))
if (encoding is null && font != null && font.TryGetFirst(out var t1FontReplacement) && t1FontReplacement.Encoding?.Count > 0)
{
encoding = new BuiltInEncoding(t1FontReplacement.Encoding);
}
Expand Down
70 changes: 54 additions & 16 deletions src/UglyToad.PdfPig/PdfFonts/Simple/Type1FontSimple.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ internal sealed class Type1FontSimple : IFont

private readonly FontDescriptor fontDescriptor;

private readonly Encoding encoding;
private readonly Encoding? encoding;

private readonly Union<Type1Font, CompactFontFormatFontCollection>? fontProgram;

Expand Down Expand Up @@ -67,7 +67,7 @@ public Type1FontSimple(

var matrix = DefaultTransformationMatrix;

if (fontProgram != null)
if (fontProgram is not null)
{
if (fontProgram.TryGetFirst(out var t1Font))
{
Expand Down Expand Up @@ -183,15 +183,7 @@ public bool TryGetUnicode(int characterCode, [NotNullWhen(true)] out string? val

try
{
if (isZapfDingbats)
{
value = GlyphList.ZapfDingbats.NameToUnicode(name);
if (value is not null)
{
return true;
}
}
value = GlyphList.AdobeGlyphList.NameToUnicode(name);
value = NameToUnicode(name);
}
catch
{
Expand All @@ -201,6 +193,34 @@ public bool TryGetUnicode(int characterCode, [NotNullWhen(true)] out string? val
return value is not null;
}

private string? NameToUnicode(string name)
{
if (isZapfDingbats)
{
string value = GlyphList.ZapfDingbats.NameToUnicode(name);
if (value is not null)
{
return value;
}
}

return GlyphList.AdobeGlyphList.NameToUnicode(name);
}

public string UnicodeCodePointToName(int unicodeValue)
{
if (isZapfDingbats)
{
string value = GlyphList.ZapfDingbats.UnicodeCodePointToName(unicodeValue);
if (value is not null)
{
return value;
}
}

return GlyphList.AdobeGlyphList.UnicodeCodePointToName(unicodeValue);
}

public CharacterBoundingBox GetBoundingBox(int characterCode)
{
if (cachedBoundingBoxes.TryGetValue(characterCode, out var box))
Expand Down Expand Up @@ -255,7 +275,16 @@ private PdfRectangle GetBoundingBoxInGlyphSpace(int characterCode)
PdfRectangle? rect = null;
if (fontProgram.TryGetFirst(out var t1Font))
{
var name = encoding.GetName(characterCode);
string name;
if (encoding is not null)
{
name = encoding.GetName(characterCode);
}
else
{
name = UnicodeCodePointToName(characterCode);
}

rect = t1Font.GetCharacterBoundingBox(name);
}
else if (fontProgram.TryGetSecond(out var cffFont))
Expand Down Expand Up @@ -308,21 +337,30 @@ public bool TryGetPath(int characterCode, [NotNullWhen(true)] out IReadOnlyList<
return false;
}

if (fontProgram == null)
if (fontProgram is null)
{
return false;
}

if (fontProgram.TryGetFirst(out var t1Font))
{
var name = encoding.GetName(characterCode);
string name;
if (encoding is not null)
{
name = encoding.GetName(characterCode);
}
else
{
name = UnicodeCodePointToName(characterCode);
}

tempPath = t1Font.GetCharacterPath(name);
}
else if (fontProgram.TryGetSecond(out var cffFont))
{
var first = cffFont.FirstFont;
string characterName;
if (encoding != null)
if (encoding is not null)
{
characterName = encoding.GetName(characterCode);
}
Expand All @@ -334,7 +372,7 @@ public bool TryGetPath(int characterCode, [NotNullWhen(true)] out IReadOnlyList<
tempPath = first.GetCharacterPath(characterName);
}

if (tempPath != null)
if (tempPath is not null)
{
path = tempPath;
return true;
Expand Down
Loading