lsm/PdfPig
1
0
Fork 0
mirror of https://github.com/UglyToad/PdfPig.git synced 2025-10-15 11:44:51 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

add support for standardencoding in type 1 fonts #78

Browse Source
This commit is contained in:
Eliot Jones
2019-12-05 16:32:10 +00:00
parent 2ea71ce3bb
commit d6e1dccc01
4 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/UglyToad.PdfPig/Fonts/Parser/Handlers/Type1FontHandler.cs
View File

@@ -97,13 +97,14 @@
}
}
Encoding fromFont = null;
font?.Match(x => fromFont = x.Encoding != null ? new BuiltInEncoding(x.Encoding) : default(Encoding), x =>
Encoding fromFont = font?.Match(x => x.Encoding != null ? new BuiltInEncoding(x.Encoding) : default(Encoding), x =>
{
if (x.Fonts != null && x.Fonts.Count > 0)
{
fromFont = x.Fonts.First().Value.Encoding;
return x.Fonts.First().Value.Encoding;
}
return default(Encoding);
});
Encoding encoding = encodingReader.Read(dictionary, isLenientParsing, descriptor, fromFont);

9
src/UglyToad.PdfPig/Fonts/Simple/Type1FontSimple.cs
View File

@@ -1,6 +1,5 @@
namespace UglyToad.PdfPig.Fonts.Simple
{
using System;
using System.Collections.Generic;
using Cmap;
using CompactFontFormat;
@@ -165,11 +164,10 @@
return new PdfRectangle(0, 0, widths[characterCode - firstChar], 0);
}
var rect = default(PdfRectangle?);
fontProgram.Match(x =>
var rect = fontProgram.Match(x =>
{
var name = encoding.GetName(characterCode);
rect = x.GetCharacterBoundingBox(name);
return x.GetCharacterBoundingBox(name);
},
x =>
{
@@ -182,7 +180,8 @@
{
characterName = x.GetCharacterName(characterCode);
}
rect = x.GetCharacterBoundingBox(characterName);
return x.GetCharacterBoundingBox(characterName);
});
if (!rect.HasValue)

42
src/UglyToad.PdfPig/Fonts/Type1/Parser/Type1FontParser.cs
View File

@@ -2,6 +2,7 @@
{
using System;
using System.Collections.Generic;
using Encodings;
using Exceptions;
using Geometry;
using IO;
@@ -254,7 +255,8 @@
if (key.Data.Equals(NameToken.Encoding))
{
dictionary[key] = ReadEncoding(scanner);
var encoding = ReadEncoding(scanner);
dictionary[key] = (IToken)encoding.encoding ?? encoding.name;
continue;
}
@@ -296,19 +298,25 @@
return new DictionaryToken(dictionary);
}
private static ArrayToken ReadEncoding(ISeekableTokenScanner scanner)
private static (ArrayToken encoding, NameToken name) ReadEncoding(ISeekableTokenScanner scanner)
{
var result = new List<IToken>();
// Treat encoding differently, it's what we came here for!
if (!scanner.TryReadToken(out NumericToken _))
{
return new ArrayToken(result);
// The tokens following /Encoding may be StandardEncoding def.
if (scanner.CurrentToken is OperatorToken encodingName
&& encodingName.Data.Equals(NameToken.StandardEncoding))
{
return (null, NameToken.StandardEncoding);
}
return (new ArrayToken(result), null);
}
if (!scanner.TryReadToken(out OperatorToken arrayOperatorToken) || arrayOperatorToken.Data != "array")
{
return new ArrayToken(result);
return (new ArrayToken(result), null);
}
while (scanner.MoveNext() && (!(scanner.CurrentToken is OperatorToken forOperator) || forOperator.Data != "for"))
@@ -318,7 +326,7 @@
if (scanner.CurrentToken != OperatorToken.For)
{
return new ArrayToken(result);
return (new ArrayToken(result), null);
}
while (scanner.MoveNext() && scanner.CurrentToken != OperatorToken.Def && scanner.CurrentToken != OperatorToken.Readonly)
@@ -347,26 +355,34 @@
// skip
}
return new ArrayToken(result);
return (new ArrayToken(result), null);
}
private static Dictionary<int, string> GetEncoding(IReadOnlyList<DictionaryToken> dictionaries)
private static IReadOnlyDictionary<int, string> GetEncoding(IReadOnlyList<DictionaryToken> dictionaries)
{
var result = new Dictionary<int, string>();
foreach (var dictionary in dictionaries)
{
if (dictionary.TryGet(NameToken.Encoding, out var token) && token is ArrayToken encodingArray)
if (dictionary.TryGet(NameToken.Encoding, out var token))
{
for (var i = 0; i < encodingArray.Data.Count; i += 2)
if (token is ArrayToken encodingArray)
{
var code = (NumericToken)encodingArray.Data[i];
var name = (NameToken)encodingArray.Data[i + 1];
for (var i = 0; i < encodingArray.Data.Count; i += 2)
{
var code = (NumericToken) encodingArray.Data[i];
var name = (NameToken) encodingArray.Data[i + 1];
result[code.Int] = name.Data;
result[code.Int] = name.Data;
}
return result;
}
return result;
if (token is NameToken encodingName && encodingName.Equals(NameToken.StandardEncoding))
{
return StandardEncoding.Instance.CodeToNameMap;
}
}
}

2
src/UglyToad.PdfPig/UglyToad.PdfPig.csproj
View File

@@ -12,7 +12,7 @@
<PackageTags>PDF;Reader;Document;Adobe;PDFBox;PdfPig;pdf-extract</PackageTags>
<RepositoryUrl>https://github.com/UglyToad/PdfPig</RepositoryUrl>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<Version>0.0.9</Version>
<Version>0.0.9.91</Version>
<AssemblyVersion>0.0.9.0</AssemblyVersion>
<FileVersion>0.0.9.0</FileVersion>
<PackageIconUrl>https://raw.githubusercontent.com/UglyToad/PdfPig/master/documentation/pdfpig.png</PackageIconUrl>