Merge branch 'hotfix/fontstring' into develop

Autoported commit.
Original commit hash: [09282149a]

Author: Benoit Lagae

itext.tests/itext.layout.tests/itext/layout/renderer/TextRendererTest.cs

@@ -40,12 +40,16 @@ source product.
 For more information, please contact iText Software Corp. at this
 address: [email protected]
 */
+using System;
 using iText.Kernel.Geom;
 using iText.Kernel.Pdf;
 using iText.Layout;
 using iText.Layout.Element;
+using iText.Layout.Font;
 using iText.Layout.Layout;
+using iText.Layout.Properties;
 using iText.Test;
+using iText.Test.Attributes;
 
 namespace iText.Layout.Renderer {
     public class TextRendererTest : ExtendedITextTest {
@@ -66,5 +70,42 @@ public virtual void NextRendererTest() {
             LayoutResult result2 = textRenderer2.Layout(layoutContext);
             NUnit.Framework.Assert.AreEqual(result1.GetOccupiedArea(), result2.GetOccupiedArea());
         }
+
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT)]
+        public virtual void SetTextException() {
+            String val = "other text";
+            String fontName = "Helvetica";
+            TextRenderer rend = (TextRenderer)new Text("basic text").GetRenderer();
+            FontProvider fp = new FontProvider();
+            fp.AddFont(fontName);
+            rend.SetProperty(Property.FONT_PROVIDER, fp);
+            rend.SetProperty(Property.FONT, fontName);
+            rend.SetText(val);
+            NUnit.Framework.Assert.AreEqual(val, rend.GetText().ToString());
+        }
+
+        /// <summary>
+        /// This test assumes that absolute positioning for
+        /// <see cref="iText.Layout.Element.Text"/>
+        /// elements is
+        /// not supported. Adding this support is the subject of DEVSIX-1393.
+        /// </summary>
+        [NUnit.Framework.Test]
+        [LogMessage(iText.IO.LogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT)]
+        public virtual void SetFontAsText() {
+            PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteBufferOutputStream()));
+            pdfDoc.AddNewPage();
+            Document doc = new Document(pdfDoc);
+            Text txt = new Text("text");
+            txt.SetProperty(Property.POSITION, LayoutPosition.ABSOLUTE);
+            txt.SetProperty(Property.TOP, 5f);
+            FontProvider fp = new FontProvider();
+            fp.AddFont("Helvetica");
+            txt.SetProperty(Property.FONT_PROVIDER, fp);
+            txt.SetFont("Helvetica");
+            doc.Add(new Paragraph().Add(txt));
+            doc.Close();
+        }
     }
 }

itext/itext.io/itext/io/LogMessageConstant.cs

@@ -86,6 +86,8 @@ public sealed class LogMessageConstant {
 
         public const String FORBID_RELEASE_IS_SET = "ForbidRelease flag is set and release is called. Releasing will not be performed.";
 
+        public const String FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT = "The Font Property must be a PdfFont object";
+
         public const String FORM_FIELD_WAS_FLUSHED = "A form field was flushed. There's no way to create this field in the AcroForm dictionary.";
 
         public const String IMAGE_HAS_AMBIGUOUS_SCALE = "The image cannot be auto scaled and scaled by a certain parameter simultaneously";

itext/itext.layout/itext/layout/renderer/TextRenderer.cs

@@ -1238,7 +1238,14 @@ private bool IsGlyphPartOfWordForHyphenation(Glyph g) {
 
         private void UpdateFontAndText() {
             if (strToBeConverted != null) {
-                font = GetPropertyAsFont(Property.FONT);
+                try {
+                    font = GetPropertyAsFont(Property.FONT);
+                }
+                catch (InvalidCastException) {
+                    font = ResolveFirstPdfFont();
+                    ILogger logger = LoggerFactory.GetLogger(typeof(iText.Layout.Renderer.TextRenderer));
+                    logger.Error(iText.IO.LogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT);
+                }
                 text = ConvertToGlyphLine(strToBeConverted);
                 otfFeaturesApplied = false;
                 strToBeConverted = null;

port-hash

@@ -1 +1 @@
-c544ffc7af6136ff5fa27b49f79e64335e7b6020
+09282149a2b61964c6b1b0fa6d08498c955ef8e0