Introduce StandardFontFamilies class, remove TIMES constant from StandardFonts

DEVSIX-1789

Autoported commit.
Original commit hash: [dc1d22808]

Author: LodrKumquat

itext/itext.io/itext/io/font/FontConstants.cs

@@ -126,10 +126,6 @@ public class FontConstants {
         /// <summary>This is a possible value of a base 14 type 1 font</summary>
         [System.ObsoleteAttribute(@"use iText.IO.Font.Constants.StandardFonts.ZAPFDINGBATS instead.")]
         public const String ZAPFDINGBATS = "ZapfDingbats";
-
-        /// <summary>This is a possible value of a base 14 type 1 font</summary>
-        [System.ObsoleteAttribute(@"use iText.IO.Font.Constants.StandardFonts.TIMES instead.")]
-        public const String TIMES = "Times";
         //-Font styles------------------------------------------------------------------------------------------------------
         //-Default fonts----------------------------------------------------------------------------------------------------
     }

itext/itext.io/itext/io/font/FontRegisterProvider.cs

@@ -94,7 +94,8 @@ internal virtual FontProgram GetFont(String fontName, int style, bool cached) {
                 return null;
             }
             String lowerCaseFontName = fontName.ToLowerInvariant();
-            IList<String> family = fontFamilies.Get(lowerCaseFontName);
+            IList<String> family = !lowerCaseFontName.EqualsIgnoreCase(StandardFonts.TIMES_ROMAN) ? fontFamilies.Get(lowerCaseFontName
+                ) : fontFamilies.Get(StandardFontFamilies.TIMES.ToLowerInvariant());
             if (family != null) {
                 lock (family) {
                     // some bugs were fixed here by Daniel Marczisovszky
@@ -142,26 +143,25 @@ protected internal virtual void RegisterStandardFontFamilies() {
             family.Add(StandardFonts.COURIER_BOLD);
             family.Add(StandardFonts.COURIER_OBLIQUE);
             family.Add(StandardFonts.COURIER_BOLDOBLIQUE);
-            fontFamilies.Put(StandardFonts.COURIER.ToLowerInvariant(), family);
+            fontFamilies.Put(StandardFontFamilies.COURIER.ToLowerInvariant(), family);
             family = new List<String>();
             family.Add(StandardFonts.HELVETICA);
             family.Add(StandardFonts.HELVETICA_BOLD);
             family.Add(StandardFonts.HELVETICA_OBLIQUE);
             family.Add(StandardFonts.HELVETICA_BOLDOBLIQUE);
-            fontFamilies.Put(StandardFonts.HELVETICA.ToLowerInvariant(), family);
+            fontFamilies.Put(StandardFontFamilies.HELVETICA.ToLowerInvariant(), family);
             family = new List<String>();
             family.Add(StandardFonts.SYMBOL);
-            fontFamilies.Put(StandardFonts.SYMBOL.ToLowerInvariant(), family);
+            fontFamilies.Put(StandardFontFamilies.SYMBOL.ToLowerInvariant(), family);
             family = new List<String>();
             family.Add(StandardFonts.TIMES_ROMAN);
             family.Add(StandardFonts.TIMES_BOLD);
             family.Add(StandardFonts.TIMES_ITALIC);
             family.Add(StandardFonts.TIMES_BOLDITALIC);
-            fontFamilies.Put(StandardFonts.TIMES.ToLowerInvariant(), family);
-            fontFamilies.Put(StandardFonts.TIMES_ROMAN.ToLowerInvariant(), family);
+            fontFamilies.Put(StandardFontFamilies.TIMES.ToLowerInvariant(), family);
             family = new List<String>();
             family.Add(StandardFonts.ZAPFDINGBATS);
-            fontFamilies.Put(StandardFonts.ZAPFDINGBATS.ToLowerInvariant(), family);
+            fontFamilies.Put(StandardFontFamilies.ZAPFDINGBATS.ToLowerInvariant(), family);
         }
 
         /// <exception cref="System.IO.IOException"/>

itext/itext.io/itext/io/font/constants/StandardFontFamilies.cs

@@ -0,0 +1,69 @@
+using System;
+
+namespace iText.IO.Font.Constants {
+    /// <summary>
+    /// Class containing families for
+    /// <see cref="StandardFonts"/>
+    /// .
+    /// This class was made for
+    /// <see cref="iText.IO.Font.FontRegisterProvider"/>
+    /// .
+    /// </summary>
+    public sealed class StandardFontFamilies {
+        private StandardFontFamilies() {
+        }
+
+        /// <summary>
+        /// Font family for
+        /// <see cref="StandardFonts.COURIER"/>
+        /// ,
+        /// <see cref="StandardFonts.COURIER_BOLD"/>
+        /// ,
+        /// <see cref="StandardFonts.COURIER_OBLIQUE"/>
+        /// and
+        /// <see cref="StandardFonts.COURIER_BOLDOBLIQUE"/>
+        /// .
+        /// </summary>
+        public const String COURIER = "Courier";
+
+        /// <summary>
+        /// Font family for
+        /// <see cref="StandardFonts.HELVETICA"/>
+        /// ,
+        /// <see cref="StandardFonts.HELVETICA_BOLD"/>
+        /// ,
+        /// <see cref="StandardFonts.HELVETICA_OBLIQUE"/>
+        /// and
+        /// <see cref="StandardFonts.HELVETICA_BOLDOBLIQUE"/>
+        /// .
+        /// </summary>
+        public const String HELVETICA = "Helvetica";
+
+        /// <summary>
+        /// Font family for
+        /// <see cref="StandardFonts.SYMBOL"/>
+        /// .
+        /// </summary>
+        public const String SYMBOL = "Symbol";
+
+        /// <summary>
+        /// Font family for
+        /// <see cref="StandardFonts.ZAPFDINGBATS"/>
+        /// .
+        /// </summary>
+        public const String ZAPFDINGBATS = "ZapfDingbats";
+
+        /// <summary>
+        /// Font family for
+        /// <see cref="StandardFonts.TIMES_ROMAN"/>
+        /// ,
+        /// <see cref="StandardFonts.TIMES_BOLD"/>
+        /// ,
+        /// <see cref="StandardFonts.TIMES_ITALIC"/>
+        /// and
+        /// <see cref="StandardFonts.TIMES_BOLDITALIC"/>
+        /// .
+        /// </summary>
+        public const String TIMES = "Times";
+    }
+}

itext/itext.io/itext/io/font/constants/StandardFonts.cs

@@ -112,7 +112,5 @@ public static bool IsStandardFont(String fontName) {
 
         /// <summary>This is a possible value of a base 14 type 1 font</summary>
         public const String ZAPFDINGBATS = "ZapfDingbats";
-
-        public const String TIMES = "Times";
     }
 }

port-hash

@@ -1 +1 @@
-9c63e0f84eb62cf50b768e3dc8be8d6cce5b5c09
+dc1d22808d8442fcc7fb2ebba38f757920ca541e