[RELEASE] Merge branch 'release/2.1.0'

Author: iText-CI

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

@@ -15,9 +15,9 @@
 
 [assembly: Guid("ae4e5743-0665-4705-9a33-07ea57cdd269")]
 
-[assembly: AssemblyVersion("2.0.2.0")]
-[assembly: AssemblyFileVersion("2.0.2.0")]
-[assembly: AssemblyInformationalVersion("2.0.2")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyInformationalVersion("2.1.0")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

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

@@ -33,8 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)\packages\NUnit.3.4.1\lib\net40\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -73,6 +73,14 @@
       <Project>{f9880dc4-f015-4413-af86-66d0e9512774}</Project>
       <Name>itext.pdftest</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\styled-xml-parser\itext\itext.styledxmlparser\itext.styledxmlparser.csproj">
+      <Project>{8636f290-00df-403e-b841-e4bfd6d9ce7a}</Project>
+      <Name>itext.styledxmlparser</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\svg\itext\itext.svg\itext.svg.csproj">
+      <Project>{ddec35d2-5781-471d-5ea1-a6e433eddb11}</Project>
+      <Name>itext.svg</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\itext\itext.html2pdf\itext.html2pdf.csproj">
       <Project>{ff6ba09d-3655-466a-8c17-a7bfd3479ca1}</Project>
       <Name>itext.html2pdf</Name>
@@ -83,9 +91,7 @@
     <None Include="itext.snk" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="itext\html2pdf\attach\impl" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

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

@@ -24,8 +24,6 @@
     <StartupObject />
     <AssemblyName>itext.html2pdf.tests</AssemblyName>
   </PropertyGroup>
-  <ItemGroup>
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
     <PackageReference Include="Microsoft.NETCore.App">
       <Version>1.0.0</Version>
@@ -53,6 +51,8 @@
     <ProjectReference Include="..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.netstandard.csproj" />
     <ProjectReference Include="..\..\..\itextcore\itext\itext.hyph\itext.hyph.netstandard.csproj" />
     <ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.netstandard.csproj" />
+    <ProjectReference Include="..\..\..\styled-xml-parser\itext\itext.styledxmlparser\itext.styledxmlparser.netstandard.csproj" />
+    <ProjectReference Include="..\..\..\svg\itext\itext.svg\itext.svg.netstandard.csproj" />
     <ProjectReference Include="..\..\itext\itext.html2pdf\itext.html2pdf.netstandard.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">

itext.tests/itext.html2pdf.tests/itext/html2pdf/BackgroundTest.cs

@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify

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

@@ -0,0 +1,207 @@
+/*
+This file is part of the iText (R) project.
+Copyright (c) 1998-2018 iText Group NV
+Authors: iText Software.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License version 3
+as published by the Free Software Foundation with the addition of the
+following permission added to Section 15 as permitted in Section 7(a):
+FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
+OF THIRD PARTY RIGHTS
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, see http://www.gnu.org/licenses or write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA, 02110-1301 USA, or download the license from the following URL:
+http://itextpdf.com/terms-of-use/
+
+The interactive user interfaces in modified source and object code versions
+of this program must display Appropriate Legal Notices, as required under
+Section 5 of the GNU Affero General Public License.
+
+In accordance with Section 7(b) of the GNU Affero General Public License,
+a covered work must retain the producer line in every PDF that is created
+or manipulated using iText.
+
+You can be released from the requirements of the license by purchasing
+a commercial license. Buying such a license is mandatory as soon as you
+develop commercial activities involving the iText software without
+disclosing the source code of your own applications.
+These activities include: offering paid services to customers as an ASP,
+serving PDFs on the fly in a web application, shipping iText with a closed
+source product.
+
+For more information, please contact iText Software Corp. at this
+address: [email protected]
+*/
+using System;
+using System.IO;
+using iText.Forms;
+using iText.IO.Util;
+using iText.Kernel.Pdf;
+using iText.Kernel.Utils;
+using iText.Layout;
+using iText.Layout.Element;
+using iText.Test;
+
+namespace iText.Html2pdf {
+    /// <summary>
+    /// This class is used for testing of pdfHTML conversion cases
+    /// extends ExtendedITextTest test class
+    /// </summary>
+    public abstract class ExtendedHtmlConversionITextTest : ExtendedITextTest {
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        public virtual void ConvertToPdfAndCompare(String name, String sourceFolder, String destinationFolder) {
+            ConvertToPdfAndCompare(name, sourceFolder, destinationFolder, false, sourceFolder);
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        public virtual void ConvertToPdfAndCompare(String name, String sourceFolder, String destinationFolder, bool
+             tagged) {
+            ConvertToPdfAndCompare(name, sourceFolder, destinationFolder, tagged, sourceFolder);
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        public virtual void ConvertToPdfAndCompare(String name, String sourceFolder, String destinationFolder, bool
+             tagged, String fontsFolder) {
+            String sourceHtml = sourceFolder + name + ".html";
+            String cmpPdf = sourceFolder + "cmp_" + name + ".pdf";
+            String destinationPdf = destinationFolder + name + ".pdf";
+            ConverterProperties converterProperties = GetConverterProperties(fontsFolder);
+            PdfDocument pdfDocument = new PdfDocument(new PdfWriter(destinationPdf));
+            if (tagged) {
+                pdfDocument.SetTagged();
+            }
+            using (FileStream fileInputStream = new FileStream(sourceHtml, FileMode.Open, FileAccess.Read)) {
+                HtmlConverter.ConvertToPdf(fileInputStream, pdfDocument, converterProperties);
+            }
+            System.Console.Out.WriteLine("html: file:///" + UrlUtil.ToNormalizedURI(sourceHtml).AbsolutePath + "\n");
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationPdf, cmpPdf, destinationFolder
+                , "diff_" + name + "_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        public virtual void ConvertToElementsAndCompare(String name, String sourceFolder, String destinationFolder
+            ) {
+            ConvertToElementsAndCompare(name, sourceFolder, destinationFolder, false, sourceFolder);
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        public virtual void ConvertToElementsAndCompare(String name, String sourceFolder, String destinationFolder
+            , bool tagged) {
+            ConvertToElementsAndCompare(name, sourceFolder, destinationFolder, tagged, sourceFolder);
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        public virtual void ConvertToElementsAndCompare(String name, String sourceFolder, String destinationFolder
+            , bool tagged, String fontsFolder) {
+            String sourceHtml = sourceFolder + name + ".html";
+            String cmpPdf = sourceFolder + "cmp_" + name + ".pdf";
+            String destinationPdf = destinationFolder + name + ".pdf";
+            ConverterProperties converterProperties = GetConverterProperties(fontsFolder);
+            PdfDocument pdfDocument = new PdfDocument(new PdfWriter(destinationPdf));
+            if (tagged) {
+                pdfDocument.SetTagged();
+            }
+            Document document = new Document(pdfDocument);
+            using (FileStream fileInputStream = new FileStream(sourceHtml, FileMode.Open, FileAccess.Read)) {
+                foreach (IElement element in HtmlConverter.ConvertToElements(fileInputStream, converterProperties)) {
+                    document.Add((IBlockElement)element);
+                }
+            }
+            System.Console.Out.WriteLine("html: file:///" + UrlUtil.ToNormalizedURI(sourceHtml).AbsolutePath + "\n");
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationPdf, cmpPdf, destinationFolder
+                , "diff_" + name + "_"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        /// <exception cref="Javax.Xml.Parsers.ParserConfigurationException"/>
+        /// <exception cref="Org.Xml.Sax.SAXException"/>
+        public virtual void ConvertToPdfAcroformFlattenAndCompare(String name, String sourceFolder, String destinationFolder
+            , bool tagged) {
+            String sourceHtml = sourceFolder + name + ".html";
+            if (tagged) {
+                name = name + "Tagged";
+            }
+            String outPdfPath = destinationFolder + name + ".pdf";
+            String outPdfPathAcro = destinationFolder + name + "_acro.pdf";
+            String outPdfPathFlatted = destinationFolder + name + "_acro_flatten.pdf";
+            String cmpPdfPath = sourceFolder + "cmp_" + name + ".pdf";
+            String cmpPdfPathAcro = sourceFolder + "cmp_" + name + "_acro.pdf";
+            String cmpPdfPathAcroFlatten = sourceFolder + "cmp_" + name + "_acro_flatten.pdf";
+            String diff1 = "diff1_" + name;
+            String diff2 = "diff2_" + name;
+            String diff3 = "diff3_" + name;
+            //convert tagged PDF without acroform (from html with form elements)
+            PdfWriter taggedWriter = new PdfWriter(outPdfPath);
+            PdfDocument pdfTagged = new PdfDocument(taggedWriter);
+            if (tagged) {
+                pdfTagged.SetTagged();
+            }
+            HtmlConverter.ConvertToPdf(new FileStream(sourceHtml, FileMode.Open, FileAccess.Read), pdfTagged, new ConverterProperties
+                ().SetBaseUri(sourceFolder));
+            //convert PDF with acroform
+            PdfWriter writerAcro = new PdfWriter(outPdfPathAcro);
+            PdfDocument pdfTaggedAcro = new PdfDocument(writerAcro);
+            if (tagged) {
+                pdfTaggedAcro.SetTagged();
+            }
+            ConverterProperties converterPropertiesAcro = new ConverterProperties();
+            converterPropertiesAcro.SetBaseUri(sourceFolder);
+            converterPropertiesAcro.SetCreateAcroForm(true);
+            HtmlConverter.ConvertToPdf(new FileStream(sourceHtml, FileMode.Open, FileAccess.Read), pdfTaggedAcro, converterPropertiesAcro
+                );
+            System.Console.Out.WriteLine("html: file:///" + UrlUtil.ToNormalizedURI(sourceHtml).AbsolutePath + "\n");
+            //flatted created tagged PDF with acroform
+            PdfDocument document = new PdfDocument(new PdfReader(outPdfPathAcro), new PdfWriter(outPdfPathFlatted));
+            PdfAcroForm acroForm = PdfAcroForm.GetAcroForm(document, false);
+            acroForm.FlattenFields();
+            document.Close();
+            //compare with cmp
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdfPath, cmpPdfPath, destinationFolder
+                , diff1));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdfPathAcro, cmpPdfPathAcro, destinationFolder
+                , diff2));
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(outPdfPathFlatted, cmpPdfPathAcroFlatten, 
+                destinationFolder, diff3));
+            //compare tags structure if tagged
+            if (tagged) {
+                CompareTagStructure(outPdfPath, cmpPdfPath);
+                CompareTagStructure(outPdfPathAcro, cmpPdfPathAcro);
+                CompareTagStructure(outPdfPathFlatted, cmpPdfPathAcroFlatten);
+            }
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        /// <exception cref="Javax.Xml.Parsers.ParserConfigurationException"/>
+        /// <exception cref="Org.Xml.Sax.SAXException"/>
+        private void CompareTagStructure(String outPath, String cmpPath) {
+            CompareTool compareTool = new CompareTool();
+            String tagStructureErrors = compareTool.CompareTagStructures(outPath, cmpPath);
+            String resultMessage = "";
+            if (tagStructureErrors != null) {
+                resultMessage += tagStructureErrors + "\n";
+            }
+            NUnit.Framework.Assert.IsTrue(tagStructureErrors == null, resultMessage);
+        }
+
+        private ConverterProperties GetConverterProperties(String fontsFolder) {
+            ConverterProperties properties = new ConverterProperties().SetBaseUri(fontsFolder);
+            return properties;
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify

itext.tests/itext.html2pdf.tests/itext/html2pdf/Html2PdfTest.cs

@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
@@ -45,6 +45,7 @@ source product.
 using iText.IO.Util;
 using iText.Kernel.Utils;
 using iText.Test;
+using iText.Test.Attributes;
 
 namespace iText.Html2pdf {
     public class Html2PdfTest : ExtendedITextTest {
@@ -144,5 +145,19 @@ public virtual void HelloDivDocumentTest() {
             NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + "hello_div.pdf", sourceFolder
                  + "cmp_hello_div.pdf", destinationFolder, "diff03_"));
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        [LogMessage(iText.Html2pdf.LogMessageConstant.WORKER_UNABLE_TO_PROCESS_OTHER_WORKER)]
+        public virtual void ABlockInPTagTest() {
+            //TODO after DEVSIX-2002 fix change cmp_ file and remove expected LogMessage annotation
+            HtmlConverter.ConvertToPdf(new FileInfo(sourceFolder + "aBlockInPTag.html"), new FileInfo(destinationFolder
+                 + "aBlockInPTag.pdf"));
+            System.Console.Out.WriteLine("html: file:///" + UrlUtil.ToNormalizedURI(sourceFolder + "aBlockInPTag.html"
+                ).AbsolutePath + "\n");
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + "aBlockInPTag.pdf", sourceFolder
+                 + "cmp_aBlockInPTag.pdf", destinationFolder, "diff03_"));
+        }
     }
 }

itext.tests/itext.html2pdf.tests/itext/html2pdf/ResourceResolverTest.cs

@@ -1,6 +1,6 @@
 /*
     This file is part of the iText (R) project.
-    Copyright (c) 1998-2017 iText Group NV
+    Copyright (c) 1998-2018 iText Group NV
     Authors: iText Software.
 
     This program is free software; you can redistribute it and/or modify
@@ -444,6 +444,26 @@ public void ResourceResolverTest16D()
             }
         }
 
+        [NUnit.Framework.Test]
+        [NUnit.Framework.Ignore("The path to the image shall be changed to reference some available shared file in order to run the test correctly.")]
+        public void ResourceResolverTest17()
+        {
+            String baseUri = sourceFolder;
+            String outPdf = destinationFolder + "resourceResolverTest17.pdf";
+            String cmpPdf = sourceFolder + "cmp_resourceResolverTest17.pdf";
+            using (
+                FileStream fileInputStream = new FileStream(sourceFolder + "resourceResolverTest17.html", FileMode.Open,
+                    FileAccess.Read),
+                fileOutputStream = new FileStream(outPdf, FileMode.Create))
+            {
+                HtmlConverter.ConvertToPdf(fileInputStream, fileOutputStream,
+                    new ConverterProperties().SetBaseUri(baseUri));
+                NUnit.Framework.Assert.IsNull(
+                    new CompareTool().CompareByContent(outPdf, cmpPdf, destinationFolder, "diff17_"));
+            }
+        }
+
+
         // TODO test with absolute http links for resources?
         // TODO test with http base URI?
     }

itext.tests/itext.html2pdf.tests/itext/html2pdf/attach/impl/FontFaceSrcTest.cs

@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify
@@ -43,9 +43,9 @@ source product.
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
-using iText.Html2pdf.Css;
-using iText.Html2pdf.Css.Parse;
 using iText.IO.Util;
+using iText.StyledXmlParser.Css;
+using iText.StyledXmlParser.Css.Parse;
 using iText.Test;
 using iText.Test.Attributes;
 
@@ -119,7 +119,7 @@ public virtual void SrcPropertyTest() {
 
         /// <exception cref="System.Exception"/>
         [NUnit.Framework.Test]
-        [LogMessage(iText.Html2pdf.LogMessageConstant.QUOTE_IS_NOT_CLOSED_IN_CSS_EXPRESSION)]
+        [LogMessage(iText.StyledXmlParser.LogMessageConstant.QUOTE_IS_NOT_CLOSED_IN_CSS_EXPRESSION)]
         public virtual void ParseBase64SrcTest() {
             CssStyleSheet styleSheet = CssStyleSheetParser.Parse(new FileStream(sourceFolder + "srcs2.css", FileMode.Open
                 , FileAccess.Read));

itext.tests/itext.html2pdf.tests/itext/html2pdf/attach/impl/layout/Html2PdfPropertyTest.cs

@@ -1,6 +1,6 @@
 /*
 This file is part of the iText (R) project.
-Copyright (c) 1998-2017 iText Group NV
+Copyright (c) 1998-2018 iText Group NV
 Authors: iText Software.
 
 This program is free software; you can redistribute it and/or modify