Skip to content

Commit b0ccede

Browse files
iText-CIintrofog
authored andcommitted
[RELEASE] pdfHtml 5.0.3
2 parents 0838772 + 39a80d8 commit b0ccede

File tree

3,454 files changed

+5829
-3258
lines changed

Some content is hidden

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

3,454 files changed

+5829
-3258
lines changed

Jenkinsfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
def repoName = "pdfHtml"
55
def dependencyRegex = "itextcore"
66
def solutionFile = "itext.html2pdf.sln"
7-
def frameworksToTest = "net461;netcoreapp2.0"
7+
def frameworksToTest = "net461"
8+
def frameworksToTestForMainBranches = "net461;netcoreapp2.0"
89

9-
automaticDotnetBuild(repoName, dependencyRegex, solutionFile, frameworksToTest)
10+
automaticDotnetBuild(repoName, dependencyRegex, solutionFile, frameworksToTest, frameworksToTestForMainBranches)

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 5.0.2 API"
35+
PROJECT_NAME = "pdfHTML 5.0.3 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-2023 Apryse Group NV")]
10+
[assembly: AssemblyCopyright("Copyright (c) 1998-2024 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("5.0.2.0")]
19-
[assembly: AssemblyFileVersion("5.0.2.0")]
20-
[assembly: AssemblyInformationalVersion("5.0.2")]
18+
[assembly: AssemblyVersion("5.0.3.0")]
19+
[assembly: AssemblyFileVersion("5.0.3.0")]
20+
[assembly: AssemblyInformationalVersion("5.0.3")]
2121

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

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<AssemblyName>itext.html2pdf.tests</AssemblyName>
2828
</PropertyGroup>
2929
<ItemGroup>
30-
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.0" />
3130
<PackageReference Include="NUnit" Version="3.7.1" />
3231
<PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
3332
</ItemGroup>
@@ -45,17 +44,17 @@
4544
</ItemGroup>
4645
<ItemGroup>
4746
<ProjectReference Include="..\..\..\itextcore\itext\itext.io\itext.io.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
48-
<PackageReference Include="itext" Version="8.0.2" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
47+
<PackageReference Include="itext" Version="8.0.3" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
4948
<ProjectReference Include="..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')" />
5049
<ProjectReference Include="..\..\..\itextcore\itext\itext.layout\itext.layout.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')" />
5150
<ProjectReference Include="..\..\..\itextcore\itext\itext.forms\itext.forms.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')" />
5251
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')" />
5352
<ProjectReference Include="..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
54-
<PackageReference Include="itext.hyph" Version="8.0.2" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
53+
<PackageReference Include="itext.hyph" Version="8.0.3" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
5554
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
56-
<PackageReference Include="itext.pdftest" Version="8.0.2" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
55+
<PackageReference Include="itext.pdftest" Version="8.0.3" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
5756
<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')" />
58-
<PackageReference Include="itext.bouncy-castle-adapter" Version="8.0.2" Condition="!Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
57+
<PackageReference Include="itext.bouncy-castle-adapter" Version="8.0.3" Condition="!Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
5958
<ProjectReference Include="..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')" />
6059
<ProjectReference Include="..\..\..\itextcore\itext\itext.svg\itext.svg.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')" />
6160
<ProjectReference Include="..\..\itext\itext.html2pdf\itext.html2pdf.csproj" />

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-2023 Apryse Group NV
3+
Copyright (c) 1998-2024 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-2023 Apryse Group NV
3+
Copyright (c) 1998-2024 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-2023 Apryse Group NV
3+
Copyright (c) 1998-2024 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

+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-2023 Apryse Group NV
3+
Copyright (c) 1998-2024 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/Html2ElementsTest.cs

+37-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-2023 Apryse Group NV
3+
Copyright (c) 1998-2024 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.
@@ -36,8 +36,10 @@ You should have received a copy of the GNU Affero General Public License
3636
using iText.Layout;
3737
using iText.Layout.Element;
3838
using iText.Layout.Properties;
39+
using iText.Pdfa;
3940
using iText.Test;
4041
using iText.Test.Attributes;
42+
using iText.Test.Pdfa;
4143

4244
namespace iText.Html2pdf {
4345
[NUnit.Framework.Category("IntegrationTest")]
@@ -340,6 +342,40 @@ public virtual void HtmlToElementsSvgObjectTest() {
340342
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder));
341343
}
342344

345+
[NUnit.Framework.Test]
346+
public virtual void HtmlToElementsFormTest() {
347+
FileStream htmlFile = new FileStream(sourceFolder + "formelements.html", FileMode.Open, FileAccess.Read);
348+
String cmpPdf = sourceFolder + "cmp_htmlToElementsForms.pdf";
349+
String outPdf = destinationFolder + "htmlToElementsForms.pdf";
350+
IList<IElement> elements = HtmlConverter.ConvertToElements(htmlFile, new ConverterProperties().SetBaseUri(
351+
sourceFolder));
352+
using (Document document = new Document(new PdfDocument(new PdfWriter(outPdf)))) {
353+
foreach (IElement element in elements) {
354+
document.Add((IBlockElement)element);
355+
}
356+
}
357+
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder));
358+
}
359+
360+
[NUnit.Framework.Test]
361+
public virtual void HtmlToElementsToPDFATest() {
362+
FileStream htmlFile = new FileStream(sourceFolder + "formelements.html", FileMode.Open, FileAccess.Read);
363+
String cmpPdf = sourceFolder + "cmp_htmlToElementsFormsPDFA.pdf";
364+
String outPdf = destinationFolder + "htmlToElementsFormsPDFA.pdf";
365+
PdfOutputIntent intent = new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", new
366+
FileStream(sourceFolder + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read));
367+
IList<IElement> elements = HtmlConverter.ConvertToElements(htmlFile, new ConverterProperties().SetBaseUri(
368+
sourceFolder).SetCreateAcroForm(true).SetPdfAConformanceLevel(PdfAConformanceLevel.PDF_A_4));
369+
using (Document document = new Document(new PdfADocument(new PdfWriter(outPdf, new WriterProperties().SetPdfVersion
370+
(PdfVersion.PDF_2_0)), PdfAConformanceLevel.PDF_A_4, intent))) {
371+
foreach (IElement element in elements) {
372+
document.Add((IBlockElement)element);
373+
}
374+
}
375+
NUnit.Framework.Assert.IsNull(new VeraPdfValidator().Validate(outPdf));
376+
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder));
377+
}
378+
343379
private static void AddElementsToDocument(Document document, IList<IElement> elements) {
344380
foreach (IElement elem in elements) {
345381
if (elem is IBlockElement) {

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-2023 Apryse Group NV
3+
Copyright (c) 1998-2024 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

+2-2
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-2023 Apryse Group NV
3+
Copyright (c) 1998-2024 Apryse Group NV
44
Authors: Apryse Software.
55
66
This program is offered under a commercial and under the AGPL license.
@@ -79,4 +79,4 @@ public void MultiThreadedHtmlToPdfConversionTest()
7979
Assert.IsTrue(results.IsCompleted, "Not all tasks were successful.");
8080
}
8181
}
82-
}
82+
}

0 commit comments

Comments
 (0)