Merge branch 'develop' into devsecops

itext.tests/itext.layout.tests/itext/layout/FontSelectorTest.cs

@@ -952,6 +952,18 @@ public virtual void Family2UsedToSortFontsTest() {
                 ().GetDescriptor().GetFontName());
         }
 
+        [NUnit.Framework.Test]
+        public virtual void MonospaceFontsTest() {
+            FontSet set = new FontSet();
+            set.AddFont(fontsFolder + "SpaceMono-Regular.ttf");
+            IList<String> fontFamilies = new List<String>();
+            fontFamilies.Add("SpaceMono");
+            FontCharacteristics fc = new FontCharacteristics();
+            FontSelector fontSelector = new FontSelector(set.GetFonts(), fontFamilies, fc);
+            NUnit.Framework.Assert.IsTrue(fontSelector.BestMatch().GetDescriptor().IsMonospace(), "Font is not recognized as monospace."
+                );
+        }
+
         private void CheckSelector(ICollection<FontInfo> fontInfoCollection, String fontFamily, String expectedNormal
             , String expectedBold, String expectedItalic, String expectedBoldItalic) {
             IList<String> fontFamilies = new List<String>();

itext.tests/itext.layout.tests/resources/itext/layout/fonts/NOTICE.txt

@@ -14,7 +14,7 @@ Please notice that the following fonts are used with the mentioned below license
 * NotoSansCJKjp-Regular.otf - SIL Open Font License v1.1
 * NotoSansCherokee-Regular.ttf - SIL Open Font License v1.1
 * NotoKufiArabic-Regular.ttf - SIL Open Font License v1.1
-
+* SpaceMono-Regular - SIL Open Font License v1.1 - OFL.txt (29.04.2024)
 
 
 All the used bold Google Noto fonts have been taken from the https://github.com/googlefonts.

itext.tests/itext.layout.tests/resources/itext/layout/fonts/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2016 The Merriweather Project Authors (https://github.com/EbenSorkin/Merriweather), with Reserved Font Name "Merriweather".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/util/FontFamilySplitterTest.cs

@@ -30,6 +30,7 @@ namespace iText.StyledXmlParser.Util {
     public class FontFamilySplitterTest : ExtendedITextTest {
         [NUnit.Framework.Test]
         public virtual void FontFamilySplitter() {
+            //TODO DEVSIX-1130: Adapt after fix
             String fontFamilies = "'Puritan'\n" + "Puritan\n" + "'Pur itan'\n" + "Pur itan\n" + "'Pur it an'\n" + "Pur it an\n"
                  + "   \"Puritan\"\n" + "Puritan\n" + "  \"Pur itan\"\n" + "Pur itan\n" + "\"Pur it an\"\n" + "Pur it an\n"
                  + "FreeSans\n" + "FreeSans\n" + "'Puritan', FreeSans\n" + "Puritan; FreeSans\n" + "'Pur itan' , FreeSans\n"

itext.tests/itext.svg.tests/itext/svg/css/SvgStyleResolverIntegrationTest.cs

@@ -133,6 +133,7 @@ public virtual void ValidLocalFontTest() {
 
         [NUnit.Framework.Test]
         public virtual void FontWeightTest() {
+            //TODO DEVSIX-2079: change compare file after fix
             ConvertAndCompare(sourceFolder, destinationFolder, "fontWeightTest");
         }
 
@@ -193,5 +194,10 @@ public virtual void RelativeStyleInheritanceTest() {
             // TODO DEVSIX-4140 font-relative values doesn't support
             ConvertAndCompare(sourceFolder, destinationFolder, "relativeStyleInheritanceTest");
         }
+
+        [NUnit.Framework.Test]
+        public virtual void TextTagNoFontSizeTest() {
+            ConvertAndCompare(sourceFolder, destinationFolder, "textTagNoFontSize");
+        }
     }
 }

port-hash

@@ -1 +1 @@
-a7f7c26f10010a1a3f44abd94badd5c9cb45534c
+9d5273b8cb8f3e98eb1734d93a47e79173b826c6