Skip to content

Commit 130c58f

Browse files
iText-CIiText-CI
committed
[RELEASE] iText pdfHtml 6.1.0
2 parents f824995 + c6af07b commit 130c58f

File tree

4,825 files changed

+16041
-4928
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,825 files changed

+16041
-4928
lines changed

‎doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
3232
# title of most generated pages and in a few other places.
3333
# The default value is: My Project.
3434

35-
PROJECT_NAME = "pdfHTML 6.0.0 API"
35+
PROJECT_NAME = "pdfHTML 6.1.0 API"
3636

3737
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
3838
# could be handy for archiving the generated documentation or if some version

‎itext.tests/itext.html2pdf.tests/Properties/AssemblyInfo.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
[assembly: AssemblyConfiguration("")]
88
[assembly: AssemblyCompany("Apryse Group NV")]
99
[assembly: AssemblyProduct("iText")]
10-
[assembly: AssemblyCopyright("Copyright (c) 1998-2024 Apryse Group NV")]
10+
[assembly: AssemblyCopyright("Copyright (c) 1998-2025 Apryse Group NV")]
1111
[assembly: AssemblyTrademark("")]
1212
[assembly: AssemblyCulture("")]
1313

1414
[assembly: ComVisible(false)]
1515

1616
[assembly: Guid("ae4e5743-0665-4705-9a33-07ea57cdd269")]
1717

18-
[assembly: AssemblyVersion("6.0.0.0")]
19-
[assembly: AssemblyFileVersion("6.0.0.0")]
20-
[assembly: AssemblyInformationalVersion("6.0.0")]
18+
[assembly: AssemblyVersion("6.1.0.0")]
19+
[assembly: AssemblyFileVersion("6.1.0.0")]
20+
[assembly: AssemblyInformationalVersion("6.1.0")]
2121

2222
#if !NETSTANDARD2_0
2323
[assembly: NUnit.Framework.Timeout(300000)]

‎itext.tests/itext.html2pdf.tests/itext.html2pdf.tests.csproj

+5-4
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,20 @@
4444
</ItemGroup>
4545
<ItemGroup>
4646
<ProjectReference Include="..\..\..\itextcore\itext\itext.io\itext.io.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
47-
<PackageReference Include="itext" Version="9.0.0" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
47+
<PackageReference Include="itext" Version="9.1.0" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
4848
<ProjectReference Include="..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')" />
4949
<ProjectReference Include="..\..\..\itextcore\itext\itext.layout\itext.layout.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')" />
5050
<ProjectReference Include="..\..\..\itextcore\itext\itext.forms\itext.forms.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')" />
5151
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')" />
5252
<ProjectReference Include="..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
53-
<PackageReference Include="itext.hyph" Version="9.0.0" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
53+
<PackageReference Include="itext.hyph" Version="9.1.0" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
5454
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
55-
<PackageReference Include="itext.pdftest" Version="9.0.0" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
55+
<PackageReference Include="itext.pdftest" Version="9.1.0" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
5656
<ProjectReference Include="..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
57-
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.0.0" Condition="!Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
57+
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.1.0" Condition="!Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
5858
<ProjectReference Include="..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')" />
5959
<ProjectReference Include="..\..\..\itextcore\itext\itext.svg\itext.svg.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')" />
60+
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfua\itext.pdfua.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfua\itext.pdfua.csproj')" />
6061
<ProjectReference Include="..\..\itext\itext.html2pdf\itext.html2pdf.csproj" />
6162
</ItemGroup>
6263
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/ConverterPropertiesTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/ExtendedFontPropertiesTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/ExtendedHtmlConversionITextTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/FontProviderTest.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.
@@ -22,10 +22,10 @@ You should have received a copy of the GNU Affero General Public License
2222
*/
2323
using System;
2424
using System.IO;
25-
using iText.Html2pdf.Resolver.Font;
2625
using iText.IO.Font;
2726
using iText.Kernel.Utils;
2827
using iText.Layout.Font;
28+
using iText.StyledXmlParser.Resolver.Font;
2929
using iText.Test;
3030
using iText.Test.Attributes;
3131

@@ -92,7 +92,7 @@ public virtual void ComparatorErrorTest() {
9292
// TODO: DEVSIX-4017 (Combination of default and pdfCalligraph fonts with italic style and '"courier new", courier,
9393
// monospace' family reproduces comparator exception. Update test after fixing.)
9494
ConverterProperties properties = new ConverterProperties();
95-
FontProvider pro = new DefaultFontProvider();
95+
FontProvider pro = new BasicFontProvider();
9696
pro.AddFont(FontProgramFactory.CreateFont(SOURCE_FOLDER + "NotoSansArabic-Regular.ttf"));
9797
pro.AddFont(FontProgramFactory.CreateFont(SOURCE_FOLDER + "NotoSansArabic-Bold.ttf"));
9898
pro.AddFont(FontProgramFactory.CreateFont(SOURCE_FOLDER + "NotoSansGurmukhi-Regular.ttf"));
@@ -142,7 +142,7 @@ public virtual void ComparatorErrorTest() {
142142
[NUnit.Framework.Test]
143143
public virtual void DifferentFontFamiliesTest() {
144144
ConverterProperties properties = new ConverterProperties();
145-
FontProvider fontProvider = new DefaultFontProvider(false, false, false);
145+
FontProvider fontProvider = new BasicFontProvider(false, false, false);
146146
fontProvider.AddDirectory(SOURCE_FOLDER + "Lato_fonts");
147147
properties.SetFontProvider(fontProvider);
148148
HtmlConverter.ConvertToPdf(new FileInfo(SOURCE_FOLDER + "differentFontFamilies.html"), new FileInfo(DESTINATION_FOLDER

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/Html2ElementsTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterMetaInfoTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterMultiThreadedTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterPdfA3Test.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.
@@ -23,10 +23,10 @@ You should have received a copy of the GNU Affero General Public License
2323
using System;
2424
using System.IO;
2525
using iText.Commons.Utils;
26-
using iText.Html2pdf.Resolver.Font;
2726
using iText.Kernel.Pdf;
2827
using iText.Pdfa;
2928
using iText.Pdfa.Exceptions;
29+
using iText.StyledXmlParser.Resolver.Font;
3030
using iText.Test;
3131
using iText.Test.Attributes;
3232

@@ -120,7 +120,7 @@ public virtual void ConvertToPdfA3UWithCustomFontProviderTest() {
120120
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
121121
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
122122
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
123-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
123+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
124124
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoSans-Regular.ttf");
125125
converterProperties.SetFontProvider(fontProvider);
126126
using (FileStream fileInputStream = new FileStream(sourceHtml, FileMode.Open, FileAccess.Read)) {
@@ -154,7 +154,7 @@ public virtual void ConvertToPdfA3UnreferencedGlyphsTest() {
154154
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
155155
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
156156
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
157-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
157+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
158158
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoSans-Regular.ttf");
159159
converterProperties.SetFontProvider(fontProvider);
160160
using (FileStream fOutput = new FileStream(destinationPdf, FileMode.Create)) {
@@ -177,7 +177,7 @@ public virtual void ConvertToPdfA3ArabicFontTest() {
177177
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
178178
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
179179
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
180-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
180+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
181181
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoNaskhArabic-Regular.ttf");
182182
converterProperties.SetFontProvider(fontProvider);
183183
FileStream fOutput = new FileStream(destinationPdf, FileMode.Create);
@@ -194,7 +194,7 @@ public virtual void ConvertToPdfA3UnreferencedEmojiTest() {
194194
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
195195
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
196196
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
197-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
197+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
198198
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoSans-Regular.ttf");
199199
converterProperties.SetFontProvider(fontProvider);
200200
using (FileStream fOutput = new FileStream(destinationPdf, FileMode.Create)) {
@@ -217,7 +217,7 @@ public virtual void ConvertToPdfA3EmojiTest() {
217217
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
218218
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
219219
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
220-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
220+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
221221
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoEmoji-Regular.ttf");
222222
converterProperties.SetFontProvider(fontProvider);
223223
FileStream fOutput = new FileStream(destinationPdf, FileMode.Create);

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterPdfA4Test.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.
@@ -23,12 +23,12 @@ You should have received a copy of the GNU Affero General Public License
2323
using System;
2424
using System.IO;
2525
using iText.Commons.Utils;
26-
using iText.Html2pdf.Resolver.Font;
2726
using iText.Kernel.Pdf;
2827
using iText.Pdfa;
2928
using iText.Pdfa.Checker;
3029
using iText.Pdfa.Exceptions;
3130
using iText.Pdfa.Logs;
31+
using iText.StyledXmlParser.Resolver.Font;
3232
using iText.Test;
3333
using iText.Test.Attributes;
3434

@@ -116,7 +116,7 @@ public virtual void ConvertToPdfA4ArabicFontTest() {
116116
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_4);
117117
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
118118
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
119-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
119+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
120120
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoNaskhArabic-Regular.ttf");
121121
converterProperties.SetFontProvider(fontProvider);
122122
FileStream fOutput = new FileStream(destinationPdf, FileMode.Create);
@@ -133,7 +133,7 @@ public virtual void ConvertToPdfA4UnreferencedGlyphsTest() {
133133
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_4);
134134
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
135135
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
136-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
136+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
137137
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoSans-Regular.ttf");
138138
converterProperties.SetFontProvider(fontProvider);
139139
using (FileStream fOutput = new FileStream(destinationPdf, FileMode.Create)) {
@@ -155,7 +155,7 @@ public virtual void ConvertToPdfA4UnreferencedEmojiTest() {
155155
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_4);
156156
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
157157
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
158-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
158+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
159159
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoSans-Regular.ttf");
160160
converterProperties.SetFontProvider(fontProvider);
161161
using (FileStream fOutput = new FileStream(destinationPdf, FileMode.Create)) {
@@ -178,7 +178,7 @@ public virtual void ConvertToPdfA4EmojiTest() {
178178
converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_4);
179179
converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
180180
, new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
181-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
181+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
182182
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoEmoji-Regular.ttf");
183183
converterProperties.SetFontProvider(fontProvider);
184184
FileStream fOutput = new FileStream(destinationPdf, FileMode.Create);
@@ -223,7 +223,7 @@ public virtual void ConvertToPdfAWithProvidingPdADocumentAndCustomFontProviderTe
223223
String cmpPdf = SOURCE_FOLDER + "cmp_simple_doc_custom_font.pdf";
224224
String destinationPdf = DESTINATION_FOLDER + "simple_doc_custom_font.pdf";
225225
ConverterProperties properties = new ConverterProperties();
226-
DefaultFontProvider fontProvider = new DefaultFontProvider(false, false, false);
226+
BasicFontProvider fontProvider = new BasicFontProvider(false, false, false);
227227
fontProvider.AddFont(RESOURCES_SOURCE_FOLDER + "NotoSans-Regular.ttf");
228228
properties.SetFontProvider(fontProvider);
229229
PdfWriter writer = new PdfWriter(destinationPdf, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0));

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterPdfAParameterizedTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
This file is part of the iText (R) project.
3-
Copyright (c) 1998-2024 Apryse Group NV
3+
Copyright (c) 1998-2025 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.

0 commit comments

Comments
 (0)