Skip to content

Commit a80e393

Browse files
iText-CIiText-CI
committed
[RELEASE] iText pdfHtml 6.2.1
2 parents 446afb8 + 7942d9f commit a80e393

File tree

1,123 files changed

+7785
-579
lines changed

Some content is hidden

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

1,123 files changed

+7785
-579
lines changed

‎InspectHeadersNet.groovy‎

Lines changed: 0 additions & 179 deletions
This file was deleted.

‎Jenkinsfile‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,4 @@ def solutionFile = "itext.html2pdf.sln"
77
def frameworksToTest = "net461"
88
def frameworksToTestForMainBranches = "net461;netcoreapp2.0"
99

10-
withEnv(
11-
['ITEXT_VERAPDFVALIDATOR_ENABLE_SERVER=true',
12-
'ITEXT_VERAPDFVALIDATOR_PORT=8092']) {
13-
automaticDotnetBuild(repoName, dependencyRegex, solutionFile, frameworksToTest, frameworksToTestForMainBranches)
14-
}
10+
automaticDotnetBuild(repoName, dependencyRegex, solutionFile, frameworksToTest, frameworksToTestForMainBranches)

‎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.0 API"
35+
PROJECT_NAME = "pdfHTML 6.2.1 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.0.0")]
19-
[assembly: AssemblyFileVersion("6.2.0.0")]
20-
[assembly: AssemblyInformationalVersion("6.2.0")]
18+
[assembly: AssemblyVersion("6.2.1.0")]
19+
[assembly: AssemblyFileVersion("6.2.1.0")]
20+
[assembly: AssemblyInformationalVersion("6.2.1")]
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.2.0" 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')" />
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.2.0" 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')" />
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.2.0" 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')" />
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.2.0" 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')" />
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: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ public virtual void ParagraphsInHeadingsTest(PdfUAConformance conformance) {
161161

162162
[NUnit.Framework.TestCaseSource("ConformanceLevels")]
163163
public virtual void PageBreakAfterAvoidTest(PdfUAConformance conformance) {
164-
// TODO DEVSIX-8864 PDF 2.0: Destination in GoTo action is not a structure destination
165164
String sourceHtml = SOURCE_FOLDER + "pageBreakAfterAvoid.html";
166165
if (conformance == PdfUAConformance.PDF_UA_1) {
167166
String cmpPdfUa1 = SOURCE_FOLDER + "cmp_pageBreakAfterAvoidUa1.pdf";
@@ -171,24 +170,18 @@ public virtual void PageBreakAfterAvoidTest(PdfUAConformance conformance) {
171170
if (conformance == PdfUAConformance.PDF_UA_2) {
172171
String cmpPdfUa2 = SOURCE_FOLDER + "cmp_pageBreakAfterAvoidUa2.pdf";
173172
String destinationPdfUa2 = DESTINATION_FOLDER + "pageBreakAfterAvoidUa2.pdf";
173+
// Both structure destination and page destination are not created, because content is not rendered.
174174
ConvertToUaAndCheckCompliance(conformance, sourceHtml, destinationPdfUa2, cmpPdfUa2, null, false, null);
175175
}
176176
}
177177

178178
[NUnit.Framework.TestCaseSource("ConformanceLevels")]
179+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.NAME_ALREADY_EXISTS_IN_THE_NAME_TREE)]
179180
public virtual void LinkWithPageBreakBeforeTest(PdfUAConformance conformance) {
180-
// TODO DEVSIX-8864 PDF 2.0: Destination in GoTo action is not a structure destination
181181
String sourceHtml = SOURCE_FOLDER + "linkWithPageBreakBefore.html";
182-
if (conformance == PdfUAConformance.PDF_UA_1) {
183-
String cmpPdfUa1 = SOURCE_FOLDER + "cmp_linkWithPageBreakBeforeUa1.pdf";
184-
String destinationPdfUa1 = DESTINATION_FOLDER + "linkWithPageBreakBeforeUa1.pdf";
185-
ConvertToUaAndCheckCompliance(conformance, sourceHtml, destinationPdfUa1, cmpPdfUa1, null, true, null);
186-
}
187-
if (conformance == PdfUAConformance.PDF_UA_2) {
188-
String cmpPdfUa2 = SOURCE_FOLDER + "cmp_linkWithPageBreakBeforeUa2.pdf";
189-
String destinationPdfUa2 = DESTINATION_FOLDER + "linkWithPageBreakBeforeUa2.pdf";
190-
ConvertToUaAndCheckCompliance(conformance, sourceHtml, destinationPdfUa2, cmpPdfUa2, null, false, null);
191-
}
182+
String cmpFile = SOURCE_FOLDER + "cmp_linkWithPageBreakBeforeUa" + conformance.GetPart() + ".pdf";
183+
String destinationPdf = DESTINATION_FOLDER + "linkWithPageBreakBeforeUa" + conformance.GetPart() + ".pdf";
184+
ConvertToUaAndCheckCompliance(conformance, sourceHtml, destinationPdf, cmpFile, null, true, null);
192185
}
193186

194187
[NUnit.Framework.TestCaseSource("ConformanceLevels")]
@@ -220,7 +213,7 @@ public virtual void InputWithTitleTagTest(PdfUAConformance conformance) {
220213

221214
[NUnit.Framework.TestCaseSource("ConformanceLevels")]
222215
public virtual void SvgBase64Test(PdfUAConformance conformance) {
223-
// TODO DEVSIX-8883 content is not tagged as real content or tagged as artifact after conversion
216+
// TODO DDEVSIX-9036 current VeraPdf version behaves incorrectly.
224217
String sourceHtml = SOURCE_FOLDER + "svgBase64.html";
225218
if (conformance == PdfUAConformance.PDF_UA_1) {
226219
String cmpPdfUa1 = SOURCE_FOLDER + "cmp_svgBase64Ua1.pdf";
@@ -236,7 +229,7 @@ public virtual void SvgBase64Test(PdfUAConformance conformance) {
236229

237230
[NUnit.Framework.TestCaseSource("ConformanceLevels")]
238231
public virtual void PngInDivStyleTest(PdfUAConformance conformance) {
239-
// TODO DEVSIX-8883 content is not tagged as real content or tagged as artifact after conversion
232+
// TODO DDEVSIX-9036 current VeraPdf version behaves incorrectly.
240233
// Investigate why VeraPdf doesn't complain about the missing tag.
241234
String sourceHtml = SOURCE_FOLDER + "pngInDivStyle.html";
242235
if (conformance == PdfUAConformance.PDF_UA_1) {
@@ -260,7 +253,8 @@ public virtual void SvgAlternativeDescription(PdfUAConformance conformance) {
260253
}
261254

262255
[NUnit.Framework.TestCaseSource("ConformanceLevels")]
263-
[LogMessage(PdfUALogMessageConstants.PAGE_FLUSHING_DISABLED, Count = 1)]
256+
[LogMessage(PdfUALogMessageConstants.PAGE_FLUSHING_DISABLED)]
257+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.NAME_ALREADY_EXISTS_IN_THE_NAME_TREE, Count = 12)]
264258
public virtual void ExtensiveRepairTaggingStructRepairTest(PdfUAConformance conformance) {
265259
String sourceHtml = SOURCE_FOLDER + "tagStructureFixes.html";
266260
String cmpFile = SOURCE_FOLDER + "cmp_tagStructureFixesUA" + conformance.GetPart() + ".pdf";

‎itext.tests/itext.html2pdf.tests/itext/html2pdf/attach/impl/OutlineHandlerTest.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ You should have received a copy of the GNU Affero General Public License
3434
using iText.Kernel.Utils;
3535
using iText.StyledXmlParser.Node;
3636
using iText.StyledXmlParser.Node.Impl.Jsoup.Node;
37+
using iText.Test.Attributes;
3738

3839
namespace iText.Html2pdf.Attach.Impl {
3940
[NUnit.Framework.Category("IntegrationTest")]
@@ -96,8 +97,8 @@ public virtual void CustomDestinationPrefixTest() {
9697
}
9798

9899
[NUnit.Framework.Test]
100+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.NAME_ALREADY_EXISTS_IN_THE_NAME_TREE)]
99101
public virtual void DefaultOutlineHandlerWithHTagHavingIdTest() {
100-
// TODO DEVSIX-5195 fix cmp after fix is introduced
101102
String inFile = SOURCE_FOLDER + "defaultOutlineHandlerWithHTagHavingIdTest.html";
102103
String outFile = DESTINATION_FOLDER + "defaultOutlineHandlerWithHTagHavingIdTest.pdf";
103104
String cmpFile = SOURCE_FOLDER + "cmp_defaultOutlineHandlerWithHTagHavingIdTest.pdf";
@@ -162,6 +163,19 @@ public virtual void OverrideOutlineHandlerTest() {
162163
));
163164
}
164165

166+
[NUnit.Framework.Test]
167+
[LogMessage(iText.IO.Logs.IoLogMessageConstant.NAME_ALREADY_EXISTS_IN_THE_NAME_TREE)]
168+
public virtual void LinkOnOutlineElementTest() {
169+
String inFile = SOURCE_FOLDER + "linkOnOutlineElement.html";
170+
String outFile = DESTINATION_FOLDER + "linkOnOutlineElement.pdf";
171+
String cmpFile = SOURCE_FOLDER + "cmp_linkOnOutlineElement.pdf";
172+
OutlineHandler handler = OutlineHandler.CreateStandardHandler();
173+
HtmlConverter.ConvertToPdf(new FileInfo(inFile), new FileInfo(outFile), new ConverterProperties().SetOutlineHandler
174+
(handler));
175+
NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outFile, cmpFile, DESTINATION_FOLDER, "diff_LinkOnOutlineElement"
176+
));
177+
}
178+
165179
public class ChangedOutlineHandler : OutlineHandler {
166180
protected internal override OutlineHandler AddOutlineAndDestToDocument(ITagWorker tagWorker, IElementNode
167181
element, ProcessorContext context) {

0 commit comments

Comments
 (0)