Skip to content

Commit fcf9b4c

Browse files
committed
[RELEASE] iText pdfHtml 6.3.0
2 parents a80e393 + 6e20fd9 commit fcf9b4c

File tree

2,802 files changed

+33725
-371
lines changed

Some content is hidden

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

2,802 files changed

+33725
-371
lines changed

doxyfile

Lines changed: 1 addition & 1 deletion
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.2.1 API"
35+
PROJECT_NAME = "pdfHTML 6.3.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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

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

18-
[assembly: AssemblyVersion("6.2.1.0")]
19-
[assembly: AssemblyFileVersion("6.2.1.0")]
20-
[assembly: AssemblyInformationalVersion("6.2.1")]
18+
[assembly: AssemblyVersion("6.3.0.0")]
19+
[assembly: AssemblyFileVersion("6.3.0.0")]
20+
[assembly: AssemblyInformationalVersion("6.3.0")]
2121

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@
4646
</ItemGroup>
4747
<ItemGroup>
4848
<ProjectReference Include="..\..\..\itextcore\itext\itext.io\itext.io.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
49-
<PackageReference Include="itext" Version="9.3.0" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
49+
<PackageReference Include="itext" Version="9.4.0" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')" />
5050
<ProjectReference Include="..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')" />
5151
<ProjectReference Include="..\..\..\itextcore\itext\itext.layout\itext.layout.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')" />
5252
<ProjectReference Include="..\..\..\itextcore\itext\itext.forms\itext.forms.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')" />
5353
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')" />
5454
<ProjectReference Include="..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
55-
<PackageReference Include="itext.hyph" Version="9.3.0" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
55+
<PackageReference Include="itext.hyph" Version="9.4.0" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')" />
5656
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
57-
<PackageReference Include="itext.pdftest" Version="9.3.0" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
57+
<PackageReference Include="itext.pdftest" Version="9.4.0" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')" />
5858
<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')" />
59-
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.3.0" Condition="!Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
59+
<PackageReference Include="itext.bouncy-castle-adapter" Version="9.4.0" Condition="!Exists('..\..\..\itextcore\itext\itext.bouncy-castle-adapter\itext.bouncy-castle-adapter.csproj')" />
6060
<ProjectReference Include="..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')" />
6161
<ProjectReference Include="..\..\..\itextcore\itext\itext.svg\itext.svg.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')" />
6262
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfua\itext.pdfua.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfua\itext.pdfua.csproj')" />

itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterPdfUA1UA2Test.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,14 @@ public virtual void InputFieldsUA2Test(PdfUAConformance conformance) {
270270
ConvertToUaAndCheckCompliance(conformance, sourceHtml, destinationPdf, cmpFile, null, true, null);
271271
}
272272

273+
[NUnit.Framework.TestCaseSource("ConformanceLevels")]
274+
public virtual void FlexTagsUA2Test(PdfUAConformance conformance) {
275+
String sourceHtml = SOURCE_FOLDER + "flexTagsUA2.html";
276+
String cmpFile = SOURCE_FOLDER + "cmp_flexTagsUA" + conformance.GetPart() + ".pdf";
277+
String destinationPdf = DESTINATION_FOLDER + "flexTagsUA" + conformance.GetPart() + ".pdf";
278+
ConvertToUaAndCheckCompliance(conformance, sourceHtml, destinationPdf, cmpFile, null, true, null);
279+
}
280+
273281
[NUnit.Framework.TestCaseSource("ConformanceLevels")]
274282
[LogMessage(PdfUALogMessageConstants.PAGE_FLUSHING_DISABLED, Count = 1)]
275283
public virtual void TableUa2Test(PdfUAConformance conformance) {
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
/*
2+
This file is part of the iText (R) project.
3+
Copyright (c) 1998-2025 Apryse Group NV
4+
Authors: Apryse Software.
5+
6+
This program is offered under a commercial and under the AGPL license.
7+
For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below.
8+
9+
AGPL licensing:
10+
This program is free software: you can redistribute it and/or modify
11+
it under the terms of the GNU Affero General Public License as published by
12+
the Free Software Foundation, either version 3 of the License, or
13+
(at your option) any later version.
14+
15+
This program is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
GNU Affero General Public License for more details.
19+
20+
You should have received a copy of the GNU Affero General Public License
21+
along with this program. If not, see <https://www.gnu.org/licenses/>.
22+
*/
23+
using System;
24+
using iText.Html2pdf;
25+
using iText.Layout.Logs;
26+
using iText.Test.Attributes;
27+
28+
namespace iText.Html2pdf.Css {
29+
[NUnit.Framework.Category("IntegrationTest")]
30+
public class AreaBreakTest : ExtendedHtmlConversionITextTest {
31+
public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
32+
.CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css/AreaBreakTest/";
33+
34+
public static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
35+
+ "/test/itext/html2pdf/css/AreaBreakTest/";
36+
37+
[NUnit.Framework.OneTimeSetUp]
38+
public static void BeforeClass() {
39+
CreateOrClearDestinationFolder(DESTINATION_FOLDER);
40+
}
41+
42+
[NUnit.Framework.Test]
43+
public virtual void AreaBreakDefaultTest() {
44+
ConvertToPdfAndCompare("area-break-default-test", SOURCE_FOLDER, DESTINATION_FOLDER);
45+
}
46+
47+
[NUnit.Framework.Test]
48+
public virtual void AreaBreakFlexReverseTest() {
49+
ConvertToPdfAndCompare("area-break-flex-reverse-test", SOURCE_FOLDER, DESTINATION_FOLDER);
50+
}
51+
52+
[NUnit.Framework.Test]
53+
public virtual void AreaBreakFlexTest() {
54+
ConvertToPdfAndCompare("area-break-flex-test", SOURCE_FOLDER, DESTINATION_FOLDER);
55+
}
56+
57+
[NUnit.Framework.Test]
58+
public virtual void AreaBreakNestedFlexTest() {
59+
ConvertToPdfAndCompare("area-break-nested-flex-items", SOURCE_FOLDER, DESTINATION_FOLDER);
60+
}
61+
62+
[NUnit.Framework.Test]
63+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.CLIP_ELEMENT)]
64+
[LogMessage(LayoutLogMessageConstant.AREA_BREAK_UNEXPECTED)]
65+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.OCCUPIED_AREA_HAS_NOT_BEEN_INITIALIZED)]
66+
public virtual void AreaBreakNestedFixedHeightTest() {
67+
//TODO Change test files after DEVSIX-2024 is fixed
68+
ConvertToPdfAndCompare("area-break-nested-fixed-height", SOURCE_FOLDER, DESTINATION_FOLDER);
69+
}
70+
}
71+
}
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
This file is part of the iText (R) project.
3+
Copyright (c) 1998-2025 Apryse Group NV
4+
Authors: Apryse Software.
5+
6+
This program is offered under a commercial and under the AGPL license.
7+
For commercial licensing, contact us at https://itextpdf.com/sales. For AGPL licensing, see below.
8+
9+
AGPL licensing:
10+
This program is free software: you can redistribute it and/or modify
11+
it under the terms of the GNU Affero General Public License as published by
12+
the Free Software Foundation, either version 3 of the License, or
13+
(at your option) any later version.
14+
15+
This program is distributed in the hope that it will be useful,
16+
but WITHOUT ANY WARRANTY; without even the implied warranty of
17+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18+
GNU Affero General Public License for more details.
19+
20+
You should have received a copy of the GNU Affero General Public License
21+
along with this program. If not, see <https://www.gnu.org/licenses/>.
22+
*/
23+
using System;
24+
using iText.Html2pdf;
25+
26+
namespace iText.Html2pdf.Css {
27+
[NUnit.Framework.Category("IntegrationTest")]
28+
public class CssEscapedSelectorTest : ExtendedHtmlConversionITextTest {
29+
public static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
30+
.CurrentContext.TestDirectory) + "/resources/itext/html2pdf/css/CssEscapedSelectorTest/";
31+
32+
public static readonly String DESTINATION_FOLDER = NUnit.Framework.TestContext.CurrentContext.TestDirectory
33+
+ "/test/itext/html2pdf/css/CssEscapedSelectorTest/";
34+
35+
[NUnit.Framework.OneTimeSetUp]
36+
public static void BeforeClass() {
37+
CreateOrClearDestinationFolder(DESTINATION_FOLDER);
38+
}
39+
40+
[NUnit.Framework.Test]
41+
public virtual void EscapedDotTest() {
42+
ConvertToPdfAndCompare("escapedDotTest", SOURCE_FOLDER, DESTINATION_FOLDER);
43+
}
44+
45+
[NUnit.Framework.Test]
46+
public virtual void EscapedHexTest() {
47+
ConvertToPdfAndCompare("escapedHexTest", SOURCE_FOLDER, DESTINATION_FOLDER);
48+
}
49+
50+
[NUnit.Framework.Test]
51+
public virtual void EscapedAttributeTest() {
52+
ConvertToPdfAndCompare("escapedAttributeTest", SOURCE_FOLDER, DESTINATION_FOLDER);
53+
}
54+
55+
[NUnit.Framework.Test]
56+
public virtual void EscapedPseudoElementTest() {
57+
ConvertToPdfAndCompare("escapedPseudoElementTest", SOURCE_FOLDER, DESTINATION_FOLDER);
58+
}
59+
}
60+
}

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/FloatTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ public virtual void PlainTextIndentAfterBlockAndFloatTest() {
679679

680680
[NUnit.Framework.Test]
681681
public virtual void FloatElementInDivTest() {
682-
//TODO DEVSIX-5291 change cmp file
682+
// TODO DEVSIX-5291 floating elements are not included in the div
683683
RunTest("floatElementInDiv", "diff_floatElementInDiv_");
684684
}
685685

itext.tests/itext.html2pdf.tests/itext/html2pdf/css/FontFamilyTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ public virtual void SelectFontFromTTCTest() {
5959
String pdfPath = DESTINATION_FOLDER + "selectFontInGroup.pdf";
6060
String cmpPdfPath = SOURCE_FOLDER + "cmp_selectFontInGroup.pdf";
6161
HtmlConverter.ConvertToPdf(new FileInfo(htmlPath), new FileInfo(pdfPath));
62-
//TODO DEVSIX-1104: Change cmp file after supporting ttc#id when selecting font from ttc
63-
//Currently it will look for a font file where #{id} is part of the font path.
62+
// TODO DEVSIX-1104: Change cmp file after supporting ttc#id when selecting font from ttc
63+
// Currently it will look for a font file where #{id} is part of the font path.
6464
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(pdfPath, cmpPdfPath, DESTINATION_FOLDER,
6565
"diff_"));
6666
}

0 commit comments

Comments
 (0)