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

fix a bug with tokenization without spaces before string

Browse Source
This commit is contained in:
Eliot Jones
2018-01-10 22:15:29 +00:00
parent 10b0f87f09
commit ba8d2f5b1d
6 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,10 +31,11 @@
public IFont Generate(PdfDictionary dictionary, IRandomAccessRead reader, bool isLenientParsing)
{
var usingStandard14Only = !dictionary.ContainsKey(CosName.FIRST_CHAR);
var usingStandard14Only = !dictionary.ContainsKey(CosName.FIRST_CHAR) || !dictionary.ContainsKey(CosName.WIDTHS);
if (usingStandard14Only)
{
// TODO: some fonts combine standard 14 font with other metrics.
if (!dictionary.TryGetName(CosName.BASE_FONT, out var standard14Name))
{
throw new InvalidFontFormatException($"The Type 1 font did not contain a first character entry but also did not reference a standard 14 font: {dictionary}");

12
src/UglyToad.PdfPig/Graphics/ReflectionGraphicsStateOperationFactory.cs
View File

@@ -5,8 +5,10 @@ namespace UglyToad.PdfPig.Graphics
using System.Linq;
using System.Reflection;
using Cos;
using Exceptions;
using Operations;
using Operations.TextShowing;
using Operations.TextState;
using Tokenization.Tokens;
internal class ReflectionGraphicsStateOperationFactory : IGraphicsStateOperationFactory
@@ -75,6 +77,14 @@ namespace UglyToad.PdfPig.Graphics
var array = operands.ToArray();
return new ShowTextsWithPositioning(array);
case SetFontAndSize.Symbol:
if (operands.Count == 2 && operands[0] is NameToken name && operands[1] is NumericToken size)
{
return new SetFontAndSize(name.Data, size.Data);
}
var information = string.Join(", ", operands.Select(x => x.ToString()));
throw new PdfDocumentFormatException($"Attempted to set font with wrong number of parameters: [{information}]");
}
if (!operations.TryGetValue(op.Data, out Type operationType))
@@ -109,7 +119,7 @@ namespace UglyToad.PdfPig.Graphics
{
if (operands[offset] is NumericToken numeric)
{
arguments.Add(numeric.Data);
arguments.Add(numeric.Data);
}
else
{

2
src/UglyToad.PdfPig/PdfDocument.cs
View File

@@ -10,7 +10,7 @@
/// <inheritdoc />
/// <summary>
/// Provides access to document level information for this PDF document as well as access to the <see cref="T:UglyToad.PdfPig.Content.Page" />s contained in the document.
/// Provides access to document level information for this PDF document as well as access to the <see cref="T:UglyToad.PdfPig.Content.Page"/>s contained in the document.
/// </summary>
public class PdfDocument : IDisposable
{

3
src/UglyToad.PdfPig/Tokenization/PlainTokenizer.cs
View File

@@ -29,7 +29,8 @@
if (inputBytes.CurrentByte == '<' || inputBytes.CurrentByte == '['
|| inputBytes.CurrentByte == '/' || inputBytes.CurrentByte == ']'
|| inputBytes.CurrentByte == '>')
|| inputBytes.CurrentByte == '>' || inputBytes.CurrentByte == '('
|| inputBytes.CurrentByte == ')')
{
break;
}