Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5cc0397acb | |||
| 73448f483c | |||
| 7b7fac07b3 | |||
| 759655059d | |||
| fa3d912e41 | |||
| 9ce9ca85be | |||
| 553c8ab719 | |||
| e768e9b06d | |||
| fd913a777c | |||
| ed9e6daec5 | |||
| ee6249a658 | |||
| b307304f46 | |||
| f028f82e11 | |||
| 719a3385f6 | |||
| 2adff11400 | |||
| 34fed6d547 | |||
| db2df75624 | |||
| 6b535752df | |||
| 556f87ff25 | |||
| fbebbd85eb | |||
| 4650c2a4ea | |||
| 5390fc3f1b | |||
| 0468dd5f02 |
@@ -0,0 +1,146 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using QuestPDF.Elements;
|
||||||
|
using QuestPDF.Fluent;
|
||||||
|
using QuestPDF.Helpers;
|
||||||
|
|
||||||
|
namespace QuestPDF.Examples
|
||||||
|
{
|
||||||
|
public class ProcessRunningTime
|
||||||
|
{
|
||||||
|
public TimeSpan FluentTime { get; set; }
|
||||||
|
public TimeSpan GenerationTime { get; set; }
|
||||||
|
public float Size { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GenerationBenchmark
|
||||||
|
{
|
||||||
|
public const int TestSize = 4096;
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void BenchmarkAsync()
|
||||||
|
{
|
||||||
|
RunTest(() => Enumerable
|
||||||
|
.Range(0, TestSize)
|
||||||
|
.AsParallel() // difference
|
||||||
|
.Select(GenerateAndCollect)
|
||||||
|
.ToList());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void BenchmarkSync()
|
||||||
|
{
|
||||||
|
RunTest(() => Enumerable
|
||||||
|
.Range(0, TestSize)
|
||||||
|
.Select(GenerateAndCollect)
|
||||||
|
.ToList());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RunTest(Func<IEnumerable<ProcessRunningTime>> handler)
|
||||||
|
{
|
||||||
|
var totalFluentTime = TimeSpan.Zero;
|
||||||
|
var totalGenerationTime = TimeSpan.Zero;
|
||||||
|
|
||||||
|
var stopWatch = new Stopwatch();
|
||||||
|
|
||||||
|
stopWatch.Start();
|
||||||
|
var results = handler();
|
||||||
|
stopWatch.Stop();
|
||||||
|
|
||||||
|
foreach (var result in results)
|
||||||
|
{
|
||||||
|
totalFluentTime += result.FluentTime;
|
||||||
|
totalGenerationTime += result.GenerationTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine($"Fluent: {totalFluentTime:g}");
|
||||||
|
Console.WriteLine($"Generation: {totalGenerationTime:g}");
|
||||||
|
Console.WriteLine($"Total: {stopWatch.Elapsed:g}");
|
||||||
|
}
|
||||||
|
|
||||||
|
static ProcessRunningTime GenerateAndCollect(int attemptNumber)
|
||||||
|
{
|
||||||
|
var stopwatch = new Stopwatch();
|
||||||
|
stopwatch.Start();
|
||||||
|
|
||||||
|
var container = new Container();
|
||||||
|
|
||||||
|
container
|
||||||
|
.Padding(10)
|
||||||
|
.MinimalBox()
|
||||||
|
.Border(1)
|
||||||
|
.Column(column =>
|
||||||
|
{
|
||||||
|
column.Item().Text($"Attempts {attemptNumber}");
|
||||||
|
|
||||||
|
const int numberOfRows = 100;
|
||||||
|
const int numberOfColumns = 10;
|
||||||
|
|
||||||
|
for (var y = 0; y < numberOfRows; y++)
|
||||||
|
{
|
||||||
|
column.Item().Row(row =>
|
||||||
|
{
|
||||||
|
for (var x = 0; x < numberOfColumns; x++)
|
||||||
|
{
|
||||||
|
row.RelativeItem()
|
||||||
|
|
||||||
|
.Background(Colors.Red.Lighten5)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Lighten4)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Lighten3)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Lighten2)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Lighten1)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Medium)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Darken1)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Darken2)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Darken3)
|
||||||
|
.Padding(3)
|
||||||
|
|
||||||
|
.Background(Colors.Red.Darken4)
|
||||||
|
.Height(3);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
var fluentTime = stopwatch.Elapsed;
|
||||||
|
|
||||||
|
stopwatch.Reset();
|
||||||
|
stopwatch.Start();
|
||||||
|
|
||||||
|
var size = Document
|
||||||
|
.Create(x => x.Page(page => page.Content().Element(container)))
|
||||||
|
.GeneratePdf()
|
||||||
|
.Length;
|
||||||
|
|
||||||
|
var generationTime = stopwatch.Elapsed;
|
||||||
|
|
||||||
|
return new ProcessRunningTime
|
||||||
|
{
|
||||||
|
FluentTime = fluentTime,
|
||||||
|
GenerationTime = generationTime,
|
||||||
|
Size = size
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using NUnit.Framework;
|
||||||
|
using QuestPDF.Examples.Engine;
|
||||||
|
using QuestPDF.Fluent;
|
||||||
|
using QuestPDF.Helpers;
|
||||||
|
|
||||||
|
namespace QuestPDF.Examples
|
||||||
|
{
|
||||||
|
public class RelativePaddingExamples
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void ItemTypes()
|
||||||
|
{
|
||||||
|
RenderingTest
|
||||||
|
.Create()
|
||||||
|
.ProduceImages()
|
||||||
|
.PageSize(250, 250)
|
||||||
|
.ShowResults()
|
||||||
|
.Render(container =>
|
||||||
|
{
|
||||||
|
container
|
||||||
|
.Width(250)
|
||||||
|
.Height(250)
|
||||||
|
|
||||||
|
.Padding(50)
|
||||||
|
.Background(Colors.Grey.Lighten2)
|
||||||
|
|
||||||
|
.RelativePaddingLeft(0.1f)
|
||||||
|
.RelativePaddingTop(0.2f)
|
||||||
|
.RelativePaddingRight(0.3f)
|
||||||
|
.RelativePaddingBottom(0.4f)
|
||||||
|
|
||||||
|
.Background(Colors.Grey.Darken2);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
using System.Linq;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using QuestPDF.Examples.Engine;
|
||||||
|
using QuestPDF.Fluent;
|
||||||
|
using QuestPDF.Helpers;
|
||||||
|
|
||||||
|
namespace QuestPDF.Examples
|
||||||
|
{
|
||||||
|
public class RelativePositionExamples
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void ItemTypes()
|
||||||
|
{
|
||||||
|
RenderingTest
|
||||||
|
.Create()
|
||||||
|
.ProduceImages()
|
||||||
|
.PageSize(500, 500)
|
||||||
|
.ShowResults()
|
||||||
|
.Render(container =>
|
||||||
|
{
|
||||||
|
container
|
||||||
|
.Padding(100)
|
||||||
|
.Background(Colors.Grey.Lighten2)
|
||||||
|
.RelativePositionVertical(0.5f, -0.5f)
|
||||||
|
.RelativePositionHorizontal(1f, -0.5f)
|
||||||
|
.RelativeWidth(0.4f)
|
||||||
|
.RelativeHeight(0.6f)
|
||||||
|
.Background(Colors.Grey.Darken2);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
using System.Linq;
|
||||||
|
using NUnit.Framework;
|
||||||
|
using QuestPDF.Examples.Engine;
|
||||||
|
using QuestPDF.Fluent;
|
||||||
|
using QuestPDF.Helpers;
|
||||||
|
|
||||||
|
namespace QuestPDF.Examples
|
||||||
|
{
|
||||||
|
public class RelativeSizeExamples
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void ItemTypes()
|
||||||
|
{
|
||||||
|
RenderingTest
|
||||||
|
.Create()
|
||||||
|
.ProduceImages()
|
||||||
|
.PageSize(600, 600)
|
||||||
|
.ShowResults()
|
||||||
|
.Render(container =>
|
||||||
|
{
|
||||||
|
container
|
||||||
|
.AlignMiddle()
|
||||||
|
.AlignCenter()
|
||||||
|
.Width(400)
|
||||||
|
.Height(400)
|
||||||
|
.Background(Colors.Grey.Lighten2)
|
||||||
|
.AlignMiddle()
|
||||||
|
.AlignCenter()
|
||||||
|
.Container()
|
||||||
|
.AlignMiddle()
|
||||||
|
.AlignCenter()
|
||||||
|
.RelativeWidth(0.25f)
|
||||||
|
.RelativeHeight(0.5f)
|
||||||
|
.Background(Colors.Grey.Darken2);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
using NUnit.Framework;
|
||||||
|
using QuestPDF.Examples.Engine;
|
||||||
|
using QuestPDF.Fluent;
|
||||||
|
using QuestPDF.Helpers;
|
||||||
|
|
||||||
|
namespace QuestPDF.Examples
|
||||||
|
{
|
||||||
|
public class ShrinkExamples
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void Shrink_Without()
|
||||||
|
{
|
||||||
|
RenderingTest
|
||||||
|
.Create()
|
||||||
|
.PageSize(300, 200)
|
||||||
|
.ProduceImages()
|
||||||
|
.ShowResults()
|
||||||
|
.Render(container =>
|
||||||
|
{
|
||||||
|
container
|
||||||
|
.Padding(20)
|
||||||
|
.Border(2)
|
||||||
|
.Background(Colors.Grey.Lighten2)
|
||||||
|
.Padding(20)
|
||||||
|
.Text("This is test.")
|
||||||
|
.FontSize(20);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Shrink_Horizontal()
|
||||||
|
{
|
||||||
|
RenderingTest
|
||||||
|
.Create()
|
||||||
|
.PageSize(300, 200)
|
||||||
|
.ProduceImages()
|
||||||
|
.ShowResults()
|
||||||
|
.Render(container =>
|
||||||
|
{
|
||||||
|
container
|
||||||
|
.Padding(20)
|
||||||
|
.Border(2)
|
||||||
|
.ShrinkHorizontal()
|
||||||
|
.Background(Colors.Grey.Lighten2)
|
||||||
|
.Padding(20)
|
||||||
|
.Text("This is test.")
|
||||||
|
.FontSize(20);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Shrink_Vertical()
|
||||||
|
{
|
||||||
|
RenderingTest
|
||||||
|
.Create()
|
||||||
|
.PageSize(300, 200)
|
||||||
|
.ProduceImages()
|
||||||
|
.ShowResults()
|
||||||
|
.Render(container =>
|
||||||
|
{
|
||||||
|
container
|
||||||
|
.Padding(20)
|
||||||
|
.Border(2)
|
||||||
|
.ShrinkVertical()
|
||||||
|
.Background(Colors.Grey.Lighten2)
|
||||||
|
.Padding(20)
|
||||||
|
.Text("This is test.")
|
||||||
|
.FontSize(20);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Shrink_Both()
|
||||||
|
{
|
||||||
|
RenderingTest
|
||||||
|
.Create()
|
||||||
|
.PageSize(300, 200)
|
||||||
|
.ProduceImages()
|
||||||
|
.ShowResults()
|
||||||
|
.Render(container =>
|
||||||
|
{
|
||||||
|
container
|
||||||
|
.Padding(20)
|
||||||
|
.Border(2)
|
||||||
|
.Shrink()
|
||||||
|
.Background(Colors.Grey.Lighten2)
|
||||||
|
.Padding(20)
|
||||||
|
.Text("This is test.")
|
||||||
|
.FontSize(20);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -111,7 +111,7 @@ namespace QuestPDF.Examples
|
|||||||
{
|
{
|
||||||
page.Margin(50);
|
page.Margin(50);
|
||||||
|
|
||||||
page.Content().Column(column =>
|
page.Content().PaddingVertical(10).Column(column =>
|
||||||
{
|
{
|
||||||
column.Item().Element(Title);
|
column.Item().Element(Title);
|
||||||
column.Item().PageBreak();
|
column.Item().PageBreak();
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
using QuestPDF.Elements.Text;
|
||||||
using QuestPDF.Examples.Engine;
|
using QuestPDF.Examples.Engine;
|
||||||
using QuestPDF.Fluent;
|
using QuestPDF.Fluent;
|
||||||
using QuestPDF.Helpers;
|
using QuestPDF.Helpers;
|
||||||
@@ -618,5 +619,43 @@ namespace QuestPDF.Examples
|
|||||||
.FontSize(20);
|
.FontSize(20);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void FontFallback()
|
||||||
|
{
|
||||||
|
RenderingTest
|
||||||
|
.Create()
|
||||||
|
.ProduceImages()
|
||||||
|
.ShowResults()
|
||||||
|
.RenderDocument(container =>
|
||||||
|
{
|
||||||
|
container.Page(page =>
|
||||||
|
{
|
||||||
|
page.Margin(50);
|
||||||
|
page.PageColor(Colors.White);
|
||||||
|
page.DefaultTextStyle(x => x
|
||||||
|
.Fallback(y => y.FontFamily("Segoe UI Emoji")
|
||||||
|
.Fallback(y => y.FontFamily("Microsoft YaHei"))));
|
||||||
|
|
||||||
|
page.Size(PageSizes.A4);
|
||||||
|
|
||||||
|
page.Content().Text(t =>
|
||||||
|
{
|
||||||
|
t.Line("This is normal text.");
|
||||||
|
t.EmptyLine();
|
||||||
|
|
||||||
|
t.Line("Following line should use font fallback:");
|
||||||
|
t.Line("中文文本");
|
||||||
|
t.EmptyLine();
|
||||||
|
|
||||||
|
t.Line("The following line contains a mix of known and unknown characters.");
|
||||||
|
t.Line("Mixed line: This 中文 is 文文 a mixed 本 本 line 本 中文文本!");
|
||||||
|
t.EmptyLine();
|
||||||
|
|
||||||
|
t.Line("Emojis work out of the box because of font fallback: 😊😅🥳👍❤😍👌");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<Authors>MarcinZiabek</Authors>
|
<Authors>MarcinZiabek</Authors>
|
||||||
<Company>CodeFlint</Company>
|
<Company>CodeFlint</Company>
|
||||||
<PackageId>QuestPDF.Previewer</PackageId>
|
<PackageId>QuestPDF.Previewer</PackageId>
|
||||||
<Version>2022.8.0</Version>
|
<Version>2022.9.1</Version>
|
||||||
<PackAsTool>true</PackAsTool>
|
<PackAsTool>true</PackAsTool>
|
||||||
<ToolCommandName>questpdf-previewer</ToolCommandName>
|
<ToolCommandName>questpdf-previewer</ToolCommandName>
|
||||||
<PackageDescription>QuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API.</PackageDescription>
|
<PackageDescription>QuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API.</PackageDescription>
|
||||||
|
|||||||
@@ -7,18 +7,20 @@ using QuestPDF.UnitTests.TestEngine;
|
|||||||
namespace QuestPDF.UnitTests
|
namespace QuestPDF.UnitTests
|
||||||
{
|
{
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class BoxTests
|
public class ShrinkTests
|
||||||
{
|
{
|
||||||
[Test]
|
[Test]
|
||||||
public void Measure() => SimpleContainerTests.Measure<MinimalBox>();
|
public void Measure() => SimpleContainerTests.Measure<Shrink>();
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void Draw_Wrap()
|
public void Draw_Wrap()
|
||||||
{
|
{
|
||||||
TestPlan
|
TestPlan
|
||||||
.For(x => new MinimalBox
|
.For(x => new Shrink
|
||||||
{
|
{
|
||||||
Child = x.CreateChild()
|
Child = x.CreateChild(),
|
||||||
|
ShrinkVertical = true,
|
||||||
|
ShrinkHorizontal = true
|
||||||
})
|
})
|
||||||
.DrawElement(new Size(400, 300))
|
.DrawElement(new Size(400, 300))
|
||||||
.ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.Wrap())
|
.ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.Wrap())
|
||||||
@@ -29,9 +31,11 @@ namespace QuestPDF.UnitTests
|
|||||||
public void Measure_PartialRender()
|
public void Measure_PartialRender()
|
||||||
{
|
{
|
||||||
TestPlan
|
TestPlan
|
||||||
.For(x => new MinimalBox
|
.For(x => new Shrink
|
||||||
{
|
{
|
||||||
Child = x.CreateChild()
|
Child = x.CreateChild(),
|
||||||
|
ShrinkVertical = true,
|
||||||
|
ShrinkHorizontal = true
|
||||||
})
|
})
|
||||||
.MeasureElement(new Size(400, 300))
|
.MeasureElement(new Size(400, 300))
|
||||||
.ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.PartialRender(200, 100))
|
.ExpectChildMeasure(expectedInput: new Size(400, 300), returns: SpacePlan.PartialRender(200, 100))
|
||||||
@@ -43,9 +47,11 @@ namespace QuestPDF.UnitTests
|
|||||||
public void Measure_FullRender()
|
public void Measure_FullRender()
|
||||||
{
|
{
|
||||||
TestPlan
|
TestPlan
|
||||||
.For(x => new MinimalBox
|
.For(x => new Shrink
|
||||||
{
|
{
|
||||||
Child = x.CreateChild()
|
Child = x.CreateChild(),
|
||||||
|
ShrinkVertical = true,
|
||||||
|
ShrinkHorizontal = true
|
||||||
})
|
})
|
||||||
.MeasureElement(new Size(500, 400))
|
.MeasureElement(new Size(500, 400))
|
||||||
.ExpectChildMeasure(expectedInput: new Size(500, 400), returns: SpacePlan.FullRender(300, 200))
|
.ExpectChildMeasure(expectedInput: new Size(500, 400), returns: SpacePlan.FullRender(300, 200))
|
||||||
@@ -172,7 +172,7 @@ namespace QuestPDF.Drawing
|
|||||||
{
|
{
|
||||||
if (textBlockItem is TextBlockSpan textSpan)
|
if (textBlockItem is TextBlockSpan textSpan)
|
||||||
{
|
{
|
||||||
textSpan.Style = textSpan.Style.ApplyGlobalStyle(TextStyle.LibraryDefault);
|
textSpan.Style = textSpan.Style.ApplyGlobalStyle(documentDefaultTextStyle);
|
||||||
}
|
}
|
||||||
else if (textBlockItem is TextBlockElement textElement)
|
else if (textBlockItem is TextBlockElement textElement)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,6 +4,11 @@ namespace QuestPDF.Drawing.Exceptions
|
|||||||
{
|
{
|
||||||
public class DocumentDrawingException : Exception
|
public class DocumentDrawingException : Exception
|
||||||
{
|
{
|
||||||
|
internal DocumentDrawingException(string message) : base(message)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
internal DocumentDrawingException(string message, Exception inner) : base(message, inner)
|
internal DocumentDrawingException(string message, Exception inner) : base(message, inner)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
namespace QuestPDF.Drawing
|
|
||||||
{
|
|
||||||
internal struct TextMeasurement
|
|
||||||
{
|
|
||||||
public int LineIndex { get; set; }
|
|
||||||
public float FragmentWidth { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -55,9 +55,6 @@ namespace QuestPDF.Drawing
|
|||||||
xOffset += glyphPositions[i].XAdvance * scaleX;
|
xOffset += glyphPositions[i].XAdvance * scaleX;
|
||||||
yOffset += glyphPositions[i].YAdvance * scaleY;
|
yOffset += glyphPositions[i].YAdvance * scaleY;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Settings.CheckIfAllTextGlyphsAreAvailableInSpecifiedFont)
|
|
||||||
CheckIfAllGlyphsAreAvailable(glyphs, text);
|
|
||||||
|
|
||||||
return new TextShapingResult(glyphs);
|
return new TextShapingResult(glyphs);
|
||||||
}
|
}
|
||||||
@@ -78,20 +75,6 @@ namespace QuestPDF.Drawing
|
|||||||
else
|
else
|
||||||
throw new NotSupportedException("TextEncoding of type GlyphId is not supported.");
|
throw new NotSupportedException("TextEncoding of type GlyphId is not supported.");
|
||||||
}
|
}
|
||||||
|
|
||||||
void CheckIfAllGlyphsAreAvailable(ShapedGlyph[] glyphs, string originalText)
|
|
||||||
{
|
|
||||||
var containsMissingGlyphs = glyphs.Any(x => x.Codepoint == default);
|
|
||||||
|
|
||||||
if (!containsMissingGlyphs)
|
|
||||||
return;
|
|
||||||
|
|
||||||
throw new ArgumentException(
|
|
||||||
$"Detected missing font glyphs while rendering text. " +
|
|
||||||
$"This means that the document contains text with characters not present in the assigned font. " +
|
|
||||||
$"Such characters are replaced by placeholders, usually visible as empty rectangles. " +
|
|
||||||
$"Font family used: {TextStyle.FontFamily}. Issue detected in text: '{originalText}'");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
internal struct ShapedGlyph
|
internal struct ShapedGlyph
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
using QuestPDF.Drawing;
|
|
||||||
using QuestPDF.Infrastructure;
|
|
||||||
|
|
||||||
namespace QuestPDF.Elements
|
|
||||||
{
|
|
||||||
internal class MinimalBox : ContainerElement
|
|
||||||
{
|
|
||||||
internal override void Draw(Size availableSpace)
|
|
||||||
{
|
|
||||||
var targetSize = base.Measure(availableSpace);
|
|
||||||
|
|
||||||
if (targetSize.Type == SpacePlanType.Wrap)
|
|
||||||
return;
|
|
||||||
|
|
||||||
base.Draw(targetSize);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
using System;
|
||||||
|
using QuestPDF.Drawing;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
|
||||||
|
namespace QuestPDF.Elements
|
||||||
|
{
|
||||||
|
internal class RelativePadding : ContainerElement
|
||||||
|
{
|
||||||
|
public float Top { get; set; }
|
||||||
|
public float Right { get; set; }
|
||||||
|
public float Bottom { get; set; }
|
||||||
|
public float Left { get; set; }
|
||||||
|
|
||||||
|
internal override SpacePlan Measure(Size availableSpace)
|
||||||
|
{
|
||||||
|
if (Child == null)
|
||||||
|
return SpacePlan.FullRender(0, 0);
|
||||||
|
|
||||||
|
var internalSpace = InternalSpace(availableSpace);
|
||||||
|
|
||||||
|
if (internalSpace.Width < 0 || internalSpace.Height < 0)
|
||||||
|
return SpacePlan.Wrap();
|
||||||
|
|
||||||
|
var measure = base.Measure(internalSpace);
|
||||||
|
|
||||||
|
if (measure.Type == SpacePlanType.Wrap)
|
||||||
|
return SpacePlan.Wrap();
|
||||||
|
|
||||||
|
if (measure.Type == SpacePlanType.PartialRender)
|
||||||
|
return SpacePlan.PartialRender(availableSpace);
|
||||||
|
|
||||||
|
if (measure.Type == SpacePlanType.FullRender)
|
||||||
|
return SpacePlan.FullRender(availableSpace);
|
||||||
|
|
||||||
|
throw new NotSupportedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
internal override void Draw(Size availableSpace)
|
||||||
|
{
|
||||||
|
if (Child == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var internalOffset = InternalOffset(availableSpace);
|
||||||
|
var internalSpace = InternalSpace(availableSpace);
|
||||||
|
|
||||||
|
Canvas.Translate(internalOffset);
|
||||||
|
base.Draw(internalSpace);
|
||||||
|
Canvas.Translate(internalOffset.Reverse());
|
||||||
|
}
|
||||||
|
|
||||||
|
private Position InternalOffset(Size availableSpace)
|
||||||
|
{
|
||||||
|
return new Position(
|
||||||
|
availableSpace.Width * Left,
|
||||||
|
availableSpace.Height * Top);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Size InternalSpace(Size availableSpace)
|
||||||
|
{
|
||||||
|
return new Size(
|
||||||
|
availableSpace.Width * (1f - Left - Right),
|
||||||
|
availableSpace.Height * (1f - Top - Bottom));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
using System;
|
||||||
|
using QuestPDF.Drawing;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
|
||||||
|
namespace QuestPDF.Elements
|
||||||
|
{
|
||||||
|
internal class RelativePosition : ContainerElement
|
||||||
|
{
|
||||||
|
public float VerticalParent { get; set; }
|
||||||
|
public float VerticalChild { get; set; }
|
||||||
|
|
||||||
|
public float HorizontalParent { get; set; }
|
||||||
|
public float HorizontalChild { get; set; }
|
||||||
|
|
||||||
|
internal override void Draw(Size availableSpace)
|
||||||
|
{
|
||||||
|
if (Child == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var childSize = base.Measure(availableSpace);
|
||||||
|
|
||||||
|
if (childSize.Type == SpacePlanType.Wrap)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var left = availableSpace.Width * HorizontalParent + childSize.Width * HorizontalChild;
|
||||||
|
var top = availableSpace.Height * VerticalParent + childSize.Height * VerticalChild;
|
||||||
|
|
||||||
|
Canvas.Translate(new Position(left, top));
|
||||||
|
base.Draw(childSize);
|
||||||
|
Canvas.Translate(new Position(-left, -top));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using System;
|
||||||
|
using QuestPDF.Drawing;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
|
||||||
|
namespace QuestPDF.Elements
|
||||||
|
{
|
||||||
|
internal class RelativeSize : ContainerElement
|
||||||
|
{
|
||||||
|
public float? WidthFactor { get; set; } = 1f;
|
||||||
|
public float? HeightFactor { get; set; } = 1f;
|
||||||
|
|
||||||
|
internal override SpacePlan Measure(Size availableSpace)
|
||||||
|
{
|
||||||
|
var internalSpace = new Size(
|
||||||
|
availableSpace.Width * (WidthFactor ?? 1),
|
||||||
|
availableSpace.Height * (HeightFactor ?? 1));
|
||||||
|
|
||||||
|
var childSpace = Child?.Measure(internalSpace) ?? SpacePlan.FullRender(0, 0);
|
||||||
|
|
||||||
|
if (childSpace.Type == SpacePlanType.Wrap)
|
||||||
|
return SpacePlan.Wrap();
|
||||||
|
|
||||||
|
var targetSpace = new Size(
|
||||||
|
WidthFactor.HasValue ? internalSpace.Width : childSpace.Width,
|
||||||
|
HeightFactor.HasValue ? internalSpace.Height : childSpace.Height);
|
||||||
|
|
||||||
|
if (childSpace.Type == SpacePlanType.PartialRender)
|
||||||
|
return SpacePlan.PartialRender(targetSpace);
|
||||||
|
|
||||||
|
if (childSpace.Type == SpacePlanType.FullRender)
|
||||||
|
return SpacePlan.FullRender(targetSpace);
|
||||||
|
|
||||||
|
throw new ArgumentException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using QuestPDF.Drawing;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
|
||||||
|
namespace QuestPDF.Elements
|
||||||
|
{
|
||||||
|
internal class Shrink : ContainerElement
|
||||||
|
{
|
||||||
|
public bool ShrinkVertical { get; set; }
|
||||||
|
public bool ShrinkHorizontal { get; set; }
|
||||||
|
|
||||||
|
internal override void Draw(Size availableSpace)
|
||||||
|
{
|
||||||
|
var childSize = base.Measure(availableSpace);
|
||||||
|
|
||||||
|
if (childSize.Type == SpacePlanType.Wrap)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var targetSize = new Size(
|
||||||
|
ShrinkVertical ? childSize.Width : availableSpace.Width,
|
||||||
|
ShrinkHorizontal ? childSize.Height : availableSpace.Height);
|
||||||
|
|
||||||
|
// TODO: adjust offset for RTL mode
|
||||||
|
|
||||||
|
base.Draw(targetSize);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using QuestPDF.Drawing;
|
||||||
|
using QuestPDF.Drawing.Exceptions;
|
||||||
|
using QuestPDF.Elements.Text.Items;
|
||||||
|
using QuestPDF.Fluent;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
using SkiaSharp;
|
||||||
|
|
||||||
|
namespace QuestPDF.Elements.Text
|
||||||
|
{
|
||||||
|
internal static class FontFallback
|
||||||
|
{
|
||||||
|
public struct TextRun
|
||||||
|
{
|
||||||
|
public string Content { get; set; }
|
||||||
|
public TextStyle Style { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class FallbackOption
|
||||||
|
{
|
||||||
|
public TextStyle Style { get; set; }
|
||||||
|
public SKFont Font { get; set; }
|
||||||
|
public SKTypeface Typeface { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static SKFontManager FontManager => SKFontManager.Default;
|
||||||
|
|
||||||
|
public static IEnumerable<TextRun> SplitWithFontFallback(this string text, TextStyle textStyle)
|
||||||
|
{
|
||||||
|
var fallbackOptions = GetFallbackOptions(textStyle).ToArray();
|
||||||
|
|
||||||
|
var spanStartIndex = 0;
|
||||||
|
var spanFallbackOption = fallbackOptions[0];
|
||||||
|
|
||||||
|
for (var i = 0; i < text.Length; i += char.IsSurrogatePair(text, i) ? 2 : 1)
|
||||||
|
{
|
||||||
|
var codepoint = char.ConvertToUtf32(text, i);
|
||||||
|
var newFallbackOption = MatchFallbackOption(fallbackOptions, codepoint);
|
||||||
|
|
||||||
|
if (newFallbackOption == spanFallbackOption)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
yield return new TextRun
|
||||||
|
{
|
||||||
|
Content = text.Substring(spanStartIndex, i - spanStartIndex),
|
||||||
|
Style = spanFallbackOption.Style
|
||||||
|
};
|
||||||
|
|
||||||
|
spanStartIndex = i;
|
||||||
|
spanFallbackOption = newFallbackOption;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spanStartIndex > text.Length)
|
||||||
|
yield break;
|
||||||
|
|
||||||
|
yield return new TextRun
|
||||||
|
{
|
||||||
|
Content = text.Substring(spanStartIndex, text.Length - spanStartIndex),
|
||||||
|
Style = spanFallbackOption.Style
|
||||||
|
};
|
||||||
|
|
||||||
|
static IEnumerable<FallbackOption> GetFallbackOptions(TextStyle? textStyle)
|
||||||
|
{
|
||||||
|
while (textStyle != null)
|
||||||
|
{
|
||||||
|
var font = textStyle.ToFont();
|
||||||
|
|
||||||
|
yield return new FallbackOption
|
||||||
|
{
|
||||||
|
Style = textStyle,
|
||||||
|
Font = font,
|
||||||
|
Typeface = font.Typeface
|
||||||
|
};
|
||||||
|
|
||||||
|
textStyle = textStyle.Fallback;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static FallbackOption MatchFallbackOption(ICollection<FallbackOption> fallbackOptions, int codepoint)
|
||||||
|
{
|
||||||
|
foreach (var fallbackOption in fallbackOptions)
|
||||||
|
{
|
||||||
|
if (fallbackOption.Font.ContainsGlyph(codepoint))
|
||||||
|
return fallbackOption;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw CreateNotMatchingFontException(codepoint);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Exception CreateNotMatchingFontException(int codepoint)
|
||||||
|
{
|
||||||
|
var character = char.ConvertFromUtf32(codepoint);
|
||||||
|
var unicode = $"U-{codepoint:X4}";
|
||||||
|
|
||||||
|
var proposedFonts = FindFontsContainingGlyph(codepoint);
|
||||||
|
var proposedFontsFormatted = proposedFonts.Any() ? string.Join(", ", proposedFonts) : "no fonts available";
|
||||||
|
|
||||||
|
return new DocumentDrawingException(
|
||||||
|
$"Could not find an appropriate font fallback for glyph: {unicode} '{character}'. " +
|
||||||
|
$"Font families available on current environment that contain this glyph: {proposedFontsFormatted}. " +
|
||||||
|
$"Possible solutions: " +
|
||||||
|
$"1) Use one of the listed fonts as the primary font in your document. " +
|
||||||
|
$"2) Configure the fallback TextStyle using the 'TextStyle.Fallback' method with one of the listed fonts. ");
|
||||||
|
}
|
||||||
|
|
||||||
|
static IEnumerable<string> FindFontsContainingGlyph(int codepoint)
|
||||||
|
{
|
||||||
|
var fontManager = SKFontManager.Default;
|
||||||
|
|
||||||
|
return fontManager
|
||||||
|
.GetFontFamilies()
|
||||||
|
.Select(fontManager.MatchFamily)
|
||||||
|
.Where(x => x.ContainsGlyph(codepoint))
|
||||||
|
.Select(x => x.FamilyName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IEnumerable<ITextBlockItem> ApplyFontFallback(this ICollection<ITextBlockItem> textBlockItems)
|
||||||
|
{
|
||||||
|
foreach (var textBlockItem in textBlockItems)
|
||||||
|
{
|
||||||
|
if (textBlockItem is TextBlockSpan textBlockSpan and not TextBlockPageNumber)
|
||||||
|
{
|
||||||
|
if (!Settings.CheckIfAllTextGlyphsAreAvailable && textBlockSpan.Style.Fallback == null)
|
||||||
|
{
|
||||||
|
yield return textBlockSpan;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var textRuns = textBlockSpan.Text.SplitWithFontFallback(textBlockSpan.Style);
|
||||||
|
|
||||||
|
foreach (var textRun in textRuns)
|
||||||
|
{
|
||||||
|
yield return new TextBlockSpan
|
||||||
|
{
|
||||||
|
Text = textRun.Content,
|
||||||
|
Style = textRun.Style
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
yield return textBlockItem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,8 +18,11 @@ namespace QuestPDF.Elements.Text
|
|||||||
private Queue<ITextBlockItem> RenderingQueue { get; set; }
|
private Queue<ITextBlockItem> RenderingQueue { get; set; }
|
||||||
private int CurrentElementIndex { get; set; }
|
private int CurrentElementIndex { get; set; }
|
||||||
|
|
||||||
|
private bool FontFallbackApplied { get; set; } = false;
|
||||||
|
|
||||||
public void ResetState()
|
public void ResetState()
|
||||||
{
|
{
|
||||||
|
ApplyFontFallback();
|
||||||
InitializeQueue();
|
InitializeQueue();
|
||||||
CurrentElementIndex = 0;
|
CurrentElementIndex = 0;
|
||||||
|
|
||||||
@@ -37,6 +40,15 @@ namespace QuestPDF.Elements.Text
|
|||||||
foreach (var item in Items)
|
foreach (var item in Items)
|
||||||
RenderingQueue.Enqueue(item);
|
RenderingQueue.Enqueue(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ApplyFontFallback()
|
||||||
|
{
|
||||||
|
if (FontFallbackApplied)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Items = Items.ApplyFontFallback().ToList();
|
||||||
|
FontFallbackApplied = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal override SpacePlan Measure(Size availableSpace)
|
internal override SpacePlan Measure(Size availableSpace)
|
||||||
|
|||||||
@@ -154,17 +154,6 @@ namespace QuestPDF.Fluent
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
[Obsolete("This element has been renamed since version 2022.1. Please use the MinimalBox method.")]
|
|
||||||
public static IContainer Box(this IContainer element)
|
|
||||||
{
|
|
||||||
return element.Element(new MinimalBox());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static IContainer MinimalBox(this IContainer element)
|
|
||||||
{
|
|
||||||
return element.Element(new MinimalBox());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static IContainer Unconstrained(this IContainer element)
|
public static IContainer Unconstrained(this IContainer element)
|
||||||
{
|
{
|
||||||
return element.Element(new Unconstrained());
|
return element.Element(new Unconstrained());
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
using System;
|
||||||
|
using QuestPDF.Elements;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
|
||||||
|
namespace QuestPDF.Fluent
|
||||||
|
{
|
||||||
|
public static class RelativePaddingExtensions
|
||||||
|
{
|
||||||
|
private static IContainer RelativePadding(this IContainer element, Action<RelativePadding> handler)
|
||||||
|
{
|
||||||
|
var relativePadding = element as RelativePadding ?? new RelativePadding();
|
||||||
|
handler(relativePadding);
|
||||||
|
|
||||||
|
return element.Element(relativePadding);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer RelativePaddingTop(this IContainer element, float value)
|
||||||
|
{
|
||||||
|
return element.RelativePadding(x => x.Top += value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer RelativePaddingBottom(this IContainer element, float value)
|
||||||
|
{
|
||||||
|
return element.RelativePadding(x => x.Bottom += value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer RelativePaddingLeft(this IContainer element, float value)
|
||||||
|
{
|
||||||
|
return element.RelativePadding(x => x.Left += value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer RelativePaddingRight(this IContainer element, float value)
|
||||||
|
{
|
||||||
|
return element.RelativePadding(x => x.Right += value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
using System;
|
||||||
|
using QuestPDF.Elements;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
|
||||||
|
namespace QuestPDF.Fluent
|
||||||
|
{
|
||||||
|
public static class RelativePositionExtensions
|
||||||
|
{
|
||||||
|
private static IContainer RelativePosition(this IContainer element, Action<RelativePosition> handler)
|
||||||
|
{
|
||||||
|
var relativePosition = element as RelativePosition ?? new RelativePosition();
|
||||||
|
handler(relativePosition);
|
||||||
|
|
||||||
|
return element.Element(relativePosition);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer RelativePositionVertical(this IContainer element, float parentOffset, float childOffset)
|
||||||
|
{
|
||||||
|
return element.RelativePosition(x =>
|
||||||
|
{
|
||||||
|
x.VerticalParent = parentOffset;
|
||||||
|
x.VerticalChild = childOffset;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer RelativePositionHorizontal(this IContainer element, float parentOffset, float childOffset)
|
||||||
|
{
|
||||||
|
return element.RelativePosition(x =>
|
||||||
|
{
|
||||||
|
x.HorizontalParent = parentOffset;
|
||||||
|
x.HorizontalChild = childOffset;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using System;
|
||||||
|
using QuestPDF.Elements;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
|
||||||
|
namespace QuestPDF.Fluent
|
||||||
|
{
|
||||||
|
public static class RelativeSizeExtensions
|
||||||
|
{
|
||||||
|
private static IContainer RelativeSize(this IContainer element, Action<RelativeSize> handler)
|
||||||
|
{
|
||||||
|
var relativeSize = element as RelativeSize ?? new RelativeSize();
|
||||||
|
handler(relativeSize);
|
||||||
|
|
||||||
|
return element.Element(relativeSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer RelativeWidth(this IContainer element, float value)
|
||||||
|
{
|
||||||
|
return element.RelativeSize(x => x.WidthFactor = value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer RelativeHeight(this IContainer element, float value)
|
||||||
|
{
|
||||||
|
return element.RelativeSize(x => x.HeightFactor = value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
using System;
|
||||||
|
using QuestPDF.Elements;
|
||||||
|
using QuestPDF.Infrastructure;
|
||||||
|
|
||||||
|
namespace QuestPDF.Fluent
|
||||||
|
{
|
||||||
|
public static class ShrinkExtensions
|
||||||
|
{
|
||||||
|
private static IContainer Shrink(this IContainer element, Action<Shrink> handler)
|
||||||
|
{
|
||||||
|
var shrink = element as Shrink ?? new Shrink();
|
||||||
|
handler(shrink);
|
||||||
|
|
||||||
|
return element.Element(shrink);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer Shrink(this IContainer element)
|
||||||
|
{
|
||||||
|
return element.ShrinkVertical().ShrinkHorizontal();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer ShrinkVertical(this IContainer element)
|
||||||
|
{
|
||||||
|
return element.Shrink(x => x.ShrinkVertical = true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IContainer ShrinkHorizontal(this IContainer element)
|
||||||
|
{
|
||||||
|
return element.Shrink(x => x.ShrinkHorizontal = true);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Obsolete
|
||||||
|
|
||||||
|
[Obsolete("This element has been renamed since version 2022.1. Please use the Shrink method.")]
|
||||||
|
public static IContainer Box(this IContainer element)
|
||||||
|
{
|
||||||
|
return element.Element(new Shrink());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Obsolete("This element has been renamed since version 2022.11. Please use the Shrink method.")]
|
||||||
|
public static IContainer MinimalBox(this IContainer element)
|
||||||
|
{
|
||||||
|
return element.Element(new Shrink());
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -36,6 +36,7 @@ namespace QuestPDF.Fluent
|
|||||||
internal TextPageNumberDescriptor(Action<TextStyle> assignTextStyle, Action<PageNumberFormatter> assignFormatFunction) : base(assignTextStyle)
|
internal TextPageNumberDescriptor(Action<TextStyle> assignTextStyle, Action<PageNumberFormatter> assignFormatFunction) : base(assignTextStyle)
|
||||||
{
|
{
|
||||||
AssignFormatFunction = assignFormatFunction;
|
AssignFormatFunction = assignFormatFunction;
|
||||||
|
AssignFormatFunction(x => x?.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
public TextPageNumberDescriptor Format(PageNumberFormatter formatter)
|
public TextPageNumberDescriptor Format(PageNumberFormatter formatter)
|
||||||
|
|||||||
@@ -15,6 +15,17 @@ namespace QuestPDF.Fluent
|
|||||||
return descriptor;
|
return descriptor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static T Fallback<T>(this T descriptor, TextStyle? value = null) where T : TextSpanDescriptor
|
||||||
|
{
|
||||||
|
descriptor.TextStyle.Fallback = value;
|
||||||
|
return descriptor;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static T Fallback<T>(this T descriptor, Func<TextStyle, TextStyle> handler) where T : TextSpanDescriptor
|
||||||
|
{
|
||||||
|
return descriptor.Fallback(handler(TextStyle.Default));
|
||||||
|
}
|
||||||
|
|
||||||
public static T FontColor<T>(this T descriptor, string value) where T : TextSpanDescriptor
|
public static T FontColor<T>(this T descriptor, string value) where T : TextSpanDescriptor
|
||||||
{
|
{
|
||||||
descriptor.MutateTextStyle(x => x.FontColor(value));
|
descriptor.MutateTextStyle(x => x.FontColor(value));
|
||||||
|
|||||||
@@ -4,8 +4,6 @@ using QuestPDF.Infrastructure;
|
|||||||
|
|
||||||
namespace QuestPDF.Fluent
|
namespace QuestPDF.Fluent
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
public static class TextStyleExtensions
|
public static class TextStyleExtensions
|
||||||
{
|
{
|
||||||
[Obsolete("This element has been renamed since version 2022.3. Please use the FontColor method.")]
|
[Obsolete("This element has been renamed since version 2022.3. Please use the FontColor method.")]
|
||||||
@@ -131,6 +129,7 @@ namespace QuestPDF.Fluent
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Position
|
#region Position
|
||||||
|
|
||||||
public static TextStyle NormalPosition(this TextStyle style)
|
public static TextStyle NormalPosition(this TextStyle style)
|
||||||
{
|
{
|
||||||
return style.Position(FontPosition.Normal);
|
return style.Position(FontPosition.Normal);
|
||||||
@@ -150,6 +149,21 @@ namespace QuestPDF.Fluent
|
|||||||
{
|
{
|
||||||
return style.Mutate(TextStyleProperty.FontPosition, fontPosition);
|
return style.Mutate(TextStyleProperty.FontPosition, fontPosition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region Fallback
|
||||||
|
|
||||||
|
public static TextStyle Fallback(this TextStyle style, TextStyle? value = null)
|
||||||
|
{
|
||||||
|
return style.Mutate(TextStyleProperty.Fallback, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TextStyle Fallback(this TextStyle style, Func<TextStyle, TextStyle> handler)
|
||||||
|
{
|
||||||
|
return style.Fallback(handler(TextStyle.Default));
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -17,6 +17,8 @@ namespace QuestPDF.Infrastructure
|
|||||||
internal bool? HasUnderline { get; set; }
|
internal bool? HasUnderline { get; set; }
|
||||||
internal bool? WrapAnywhere { get; set; }
|
internal bool? WrapAnywhere { get; set; }
|
||||||
|
|
||||||
|
internal TextStyle? Fallback { get; set; }
|
||||||
|
|
||||||
internal static TextStyle LibraryDefault { get; } = new()
|
internal static TextStyle LibraryDefault { get; } = new()
|
||||||
{
|
{
|
||||||
Color = Colors.Black,
|
Color = Colors.Black,
|
||||||
@@ -29,7 +31,8 @@ namespace QuestPDF.Infrastructure
|
|||||||
IsItalic = false,
|
IsItalic = false,
|
||||||
HasStrikethrough = false,
|
HasStrikethrough = false,
|
||||||
HasUnderline = false,
|
HasUnderline = false,
|
||||||
WrapAnywhere = false
|
WrapAnywhere = false,
|
||||||
|
Fallback = null
|
||||||
};
|
};
|
||||||
|
|
||||||
public static TextStyle Default { get; } = new();
|
public static TextStyle Default { get; } = new();
|
||||||
|
|||||||
@@ -16,13 +16,15 @@ namespace QuestPDF.Infrastructure
|
|||||||
IsItalic,
|
IsItalic,
|
||||||
HasStrikethrough,
|
HasStrikethrough,
|
||||||
HasUnderline,
|
HasUnderline,
|
||||||
WrapAnywhere
|
WrapAnywhere,
|
||||||
|
Fallback
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static class TextStyleManager
|
internal static class TextStyleManager
|
||||||
{
|
{
|
||||||
public static ConcurrentDictionary<(TextStyle origin, TextStyleProperty property, object value), TextStyle> TextStyleMutateCache = new();
|
private static readonly ConcurrentDictionary<(TextStyle origin, TextStyleProperty property, object value), TextStyle> TextStyleMutateCache = new();
|
||||||
public static ConcurrentDictionary<(TextStyle origin, TextStyle parent, bool overrideValue), TextStyle> TextStyleApplyCache = new();
|
private static readonly ConcurrentDictionary<(TextStyle origin, TextStyle parent), TextStyle> TextStyleApplyGlobalCache = new();
|
||||||
|
private static readonly ConcurrentDictionary<(TextStyle origin, TextStyle parent), TextStyle> TextStyleOverrideCache = new();
|
||||||
|
|
||||||
public static TextStyle Mutate(this TextStyle origin, TextStyleProperty property, object value)
|
public static TextStyle Mutate(this TextStyle origin, TextStyleProperty property, object value)
|
||||||
{
|
{
|
||||||
@@ -30,7 +32,7 @@ namespace QuestPDF.Infrastructure
|
|||||||
return TextStyleMutateCache.GetOrAdd(cacheKey, x => MutateStyle(x.origin, x.property, x.value));
|
return TextStyleMutateCache.GetOrAdd(cacheKey, x => MutateStyle(x.origin, x.property, x.value));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TextStyle MutateStyle(TextStyle origin, TextStyleProperty property, object value, bool overrideValue = true)
|
private static TextStyle MutateStyle(TextStyle origin, TextStyleProperty property, object? value, bool overrideValue = true)
|
||||||
{
|
{
|
||||||
if (overrideValue && value == null)
|
if (overrideValue && value == null)
|
||||||
return origin;
|
return origin;
|
||||||
@@ -177,38 +179,69 @@ namespace QuestPDF.Infrastructure
|
|||||||
|
|
||||||
return origin with { WrapAnywhere = castedValue };
|
return origin with { WrapAnywhere = castedValue };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (property == TextStyleProperty.Fallback)
|
||||||
|
{
|
||||||
|
if (!overrideValue && origin.Fallback != null)
|
||||||
|
return origin;
|
||||||
|
|
||||||
|
var castedValue = (TextStyle?)value;
|
||||||
|
|
||||||
|
if (origin.Fallback == castedValue)
|
||||||
|
return origin;
|
||||||
|
|
||||||
|
return origin with { Fallback = castedValue };
|
||||||
|
}
|
||||||
|
|
||||||
throw new ArgumentOutOfRangeException(nameof(property), property, "Expected to mutate the TextStyle object. Provided property type is not supported.");
|
throw new ArgumentOutOfRangeException(nameof(property), property, "Expected to mutate the TextStyle object. Provided property type is not supported.");
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static TextStyle ApplyGlobalStyle(this TextStyle style, TextStyle parent)
|
internal static TextStyle ApplyGlobalStyle(this TextStyle style, TextStyle parent)
|
||||||
{
|
{
|
||||||
var cacheKey = (style, parent, false);
|
var cacheKey = (style, parent);
|
||||||
return TextStyleApplyCache.GetOrAdd(cacheKey, key => ApplyStyle(key.origin, key.parent, key.overrideValue));
|
return TextStyleApplyGlobalCache.GetOrAdd(cacheKey, key => ApplyStyle(key.origin, key.parent, overrideStyle: false).ApplyFontFallback());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static TextStyle ApplyFontFallback(this TextStyle style)
|
||||||
|
{
|
||||||
|
var targetFallbackStyle = style
|
||||||
|
?.Fallback
|
||||||
|
?.ApplyStyle(style, overrideStyle: false, applyFallback: false)
|
||||||
|
?.ApplyFontFallback();
|
||||||
|
|
||||||
|
return MutateStyle(style, TextStyleProperty.Fallback, targetFallbackStyle);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static TextStyle OverrideStyle(this TextStyle style, TextStyle parent)
|
internal static TextStyle OverrideStyle(this TextStyle style, TextStyle parent)
|
||||||
{
|
{
|
||||||
var cacheKey = (style, parent, true);
|
var cacheKey = (style, parent);
|
||||||
return TextStyleApplyCache.GetOrAdd(cacheKey, key => ApplyStyle(key.origin, key.parent, key.overrideValue));
|
|
||||||
|
return TextStyleOverrideCache.GetOrAdd(cacheKey, key =>
|
||||||
|
{
|
||||||
|
var result = ApplyStyle(key.origin, key.parent);
|
||||||
|
return MutateStyle(result, TextStyleProperty.Fallback, key.parent.Fallback);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TextStyle ApplyStyle(TextStyle style, TextStyle parent, bool overrideValue)
|
private static TextStyle ApplyStyle(this TextStyle style, TextStyle parent, bool overrideStyle = true, bool applyFallback = true)
|
||||||
{
|
{
|
||||||
var result = style;
|
var result = style;
|
||||||
|
|
||||||
result = MutateStyle(result, TextStyleProperty.Color, parent.Color, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.Color, parent.Color, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.BackgroundColor, parent.BackgroundColor, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.BackgroundColor, parent.BackgroundColor, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.FontFamily, parent.FontFamily, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.FontFamily, parent.FontFamily, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.Size, parent.Size, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.Size, parent.Size, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.LineHeight, parent.LineHeight, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.LineHeight, parent.LineHeight, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.FontWeight, parent.FontWeight, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.FontWeight, parent.FontWeight, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.FontPosition, parent.FontPosition, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.FontPosition, parent.FontPosition, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.IsItalic, parent.IsItalic, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.IsItalic, parent.IsItalic, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.HasStrikethrough, parent.HasStrikethrough, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.HasStrikethrough, parent.HasStrikethrough, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.HasUnderline, parent.HasUnderline, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.HasUnderline, parent.HasUnderline, overrideStyle);
|
||||||
result = MutateStyle(result, TextStyleProperty.WrapAnywhere, parent.WrapAnywhere, overrideValue);
|
result = MutateStyle(result, TextStyleProperty.WrapAnywhere, parent.WrapAnywhere, overrideStyle);
|
||||||
|
|
||||||
|
if (applyFallback)
|
||||||
|
result = MutateStyle(result, TextStyleProperty.Fallback, parent.Fallback, overrideStyle);
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace QuestPDF.Previewer
|
|||||||
public event Action? OnPreviewerStopped;
|
public event Action? OnPreviewerStopped;
|
||||||
|
|
||||||
private const int RequiredPreviewerVersionMajor = 2022;
|
private const int RequiredPreviewerVersionMajor = 2022;
|
||||||
private const int RequiredPreviewerVersionMinor = 8;
|
private const int RequiredPreviewerVersionMinor = 9;
|
||||||
|
|
||||||
public PreviewerService(int port)
|
public PreviewerService(int port)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<Authors>MarcinZiabek</Authors>
|
<Authors>MarcinZiabek</Authors>
|
||||||
<Company>CodeFlint</Company>
|
<Company>CodeFlint</Company>
|
||||||
<PackageId>QuestPDF</PackageId>
|
<PackageId>QuestPDF</PackageId>
|
||||||
<Version>2022.8.2</Version>
|
<Version>2022.9.0</Version>
|
||||||
<PackageDescription>QuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API.</PackageDescription>
|
<PackageDescription>QuestPDF is an open-source, modern and battle-tested library that can help you with generating PDF documents by offering friendly, discoverable and predictable C# fluent API.</PackageDescription>
|
||||||
<PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/Resources/ReleaseNotes.txt"))</PackageReleaseNotes>
|
<PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/Resources/ReleaseNotes.txt"))</PackageReleaseNotes>
|
||||||
<LangVersion>9</LangVersion>
|
<LangVersion>9</LangVersion>
|
||||||
|
|||||||
@@ -1,20 +1,6 @@
|
|||||||
2022.8.0:
|
2022.9.0
|
||||||
|
- Implemented font-fallback algorithm,
|
||||||
- Improved library performance,
|
- Introduced new Settings API,
|
||||||
- Breaking change: changed default font from Calibri to an open-source Lato,
|
- Significantly reduced memory allocation cost for TextStyle objects,
|
||||||
- Default font files are included with the nuget package, making it safe to deploy on any environment,
|
- Implemented optional checking if all font glyphs are available,
|
||||||
- Default font files are significantly smaller, so output document files should be smaller too (up to 20x reduction in size),
|
- Minor text-rendering optimizations.
|
||||||
- When requested font is not available on the runtime environment, library provides list of available fonts,
|
|
||||||
- Fixed a rare layout overflow exception with the Inlined element,
|
|
||||||
- Fixed a memory leak connected to the HarfBuzz library.
|
|
||||||
|
|
||||||
|
|
||||||
2022.8.1:
|
|
||||||
- Fixed: default text style does not always work
|
|
||||||
- Fixed: page breaking rendering does not work in very specific corner cases
|
|
||||||
- Stability improvements for text wrapping
|
|
||||||
- Updated stability of rendering elements in negative space
|
|
||||||
- Optimization for the Column element: do not measure child when available height is negative
|
|
||||||
|
|
||||||
2022.8.2
|
|
||||||
- Fixed: the Column element incorrectly renders zero-height elements.
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
public static class Settings
|
public static class Settings
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This value represents the maximum lenght of the document that the library produces.
|
/// This value represents the maximum length of the document that the library produces.
|
||||||
/// This is useful when layout constraints are too strong, e.g. one element does not fit in another.
|
/// This is useful when layout constraints are too strong, e.g. one element does not fit in another.
|
||||||
/// In such cases, the library would produce document of infinite length, consuming all available resources.
|
/// In such cases, the library would produce document of infinite length, consuming all available resources.
|
||||||
/// To break the algorithm and save the environment, the library breaks the rendering process after reaching specified length of document.
|
/// To break the algorithm and save the environment, the library breaks the rendering process after reaching specified length of document.
|
||||||
@@ -35,6 +35,6 @@
|
|||||||
/// However, it provides hints that used fonts are not sufficient to produce correct results.
|
/// However, it provides hints that used fonts are not sufficient to produce correct results.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>By default, this flag is enabled only when the debugger IS attached.</remarks>
|
/// <remarks>By default, this flag is enabled only when the debugger IS attached.</remarks>
|
||||||
public static bool CheckIfAllTextGlyphsAreAvailableInSpecifiedFont { get; set; } = System.Diagnostics.Debugger.IsAttached;
|
public static bool CheckIfAllTextGlyphsAreAvailable { get; set; } = System.Diagnostics.Debugger.IsAttached;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -23,7 +23,8 @@ Choosing a project dependency could be difficult. We need to ensure stability an
|
|||||||
|
|
||||||
⭐ Please give this repository a star. It takes seconds and help thousands of developers! ⭐
|
⭐ Please give this repository a star. It takes seconds and help thousands of developers! ⭐
|
||||||
|
|
||||||
<img src="https://user-images.githubusercontent.com/9263853/184642026-27dd7567-a46a-45d4-9594-e6a70a7193e9.png" width="700" />
|
<img src="https://user-images.githubusercontent.com/9263853/190931857-8ca52ec8-cc7d-4d12-9467-4442b3342fa1.png" width="700" />
|
||||||
|
|
||||||
|
|
||||||
## Please share with the community
|
## Please share with the community
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user