Merge branch 'develop' into devsecops

itext.tests/itext.svg.tests/itext/svg/css/FontRelativeUnitTest.cs

@@ -72,7 +72,7 @@ public virtual void TextFontSizeHierarchyEmAndRemUnitTest() {
 
         [NUnit.Framework.Test]
         [LogMessage(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNKNOWN_ABSOLUTE_METRIC_LENGTH_PARSED
-            , Count = 4)]
+            , Count = 6)]
         public virtual void TextFontSizeInheritanceFromUseTest() {
             // TODO DEVSIX-2607 relative font-size value is not supported for tspan element
             ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "textFontSizeInheritanceFromUseTest");

itext.tests/itext.svg.tests/itext/svg/customization/CustomizeTextLeafSvgNodeRendererTest.cs

@@ -34,6 +34,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Svg.Renderers;
 using iText.Svg.Renderers.Factories;
 using iText.Svg.Renderers.Impl;
+using iText.Svg.Utils;
 using iText.Test;
 
 namespace iText.Svg.Customization {
@@ -88,12 +89,13 @@ public override ISvgNodeRenderer CreateDeepCopy() {
             protected internal override void DoDraw(SvgDrawContext context) {
                 if (this.attributesAndStyles != null && this.attributesAndStyles.ContainsKey(SvgConstants.Attributes.TEXT_CONTENT
                     )) {
-                    PdfCanvas currentCanvas = context.GetCurrentCanvas();
-                    currentCanvas.SetFillColor(ColorConstants.RED);
-                    currentCanvas.MoveText(context.GetTextMove()[0], context.GetTextMove()[1]);
                     String initialText = this.attributesAndStyles.Get(SvgConstants.Attributes.TEXT_CONTENT);
                     String amendedText = "_" + initialText + "_";
-                    currentCanvas.ShowText(amendedText);
+                    SvgTextProperties properties = new SvgTextProperties(context.GetSvgTextProperties());
+                    context.GetSvgTextProperties().SetFillColor(ColorConstants.RED);
+                    base.DoDraw(context);
+                    GetText().SetText(amendedText);
+                    context.SetSvgTextProperties(properties);
                 }
             }
         }

itext.tests/itext.svg.tests/itext/svg/renderers/StrokeTest.cs

@@ -55,6 +55,8 @@ public virtual void NoLineStrokeWidthTest() {
 
         [NUnit.Framework.Test]
         public virtual void StrokeWithDashesTest() {
+            // TODO DEVSIX-8774 support stroke-opacity for text at layout level
+            // TODO DEVSIX-8776 support dash-pattern in layout
             ConvertAndCompare(SOURCE_FOLDER, DESTINATION_FOLDER, "strokeWithDashes");
         }
 

itext.tests/itext.svg.tests/itext/svg/renderers/impl/RectangleSvgNodeRendererIntegrationTest.cs

@@ -112,5 +112,10 @@ public virtual void ComplexRectangleTest() {
         public virtual void NoFillRectangleTest() {
             ConvertAndCompare(sourceFolder, destinationFolder, "noFillRectangle");
         }
+
+        [NUnit.Framework.Test]
+        public virtual void RectangleNoWidthNoHeightTest() {
+            ConvertAndCompare(sourceFolder, destinationFolder, "rectangleNoWidthNoHeight");
+        }
     }
 }

itext.tests/itext.svg.tests/itext/svg/renderers/impl/TSpanNodeRendererIntegrationTest.cs

@@ -225,5 +225,17 @@ public virtual void NoXNoYTest() {
         public virtual void YWithoutXTest() {
             ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "yWithoutX");
         }
+
+        [NUnit.Framework.Test]
+        public virtual void NegativeAbsoluteAndRelativePositionTest() {
+            // TODO DEVSIX-2507 support x, y, dx, dy attributes
+            ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "negativeAbsoluteAndRelativePosition");
+        }
+
+        [NUnit.Framework.Test]
+        public virtual void NoPositionAfterRelativeTest() {
+            // TODO DEVSIX-2507 support x, y, dx, dy attributes
+            ConvertAndCompareSinglePage(SOURCE_FOLDER, DESTINATION_FOLDER, "noPositionAfterRelative");
+        }
     }
 }