diff --git a/Sources/Font.swift b/Sources/Font.swift index ea7e5e8089f21e27ff6ab4c3405db1472a44e379..9d3a3197ac3c705cc44beb1d1ddccd174f343cb7 100644 --- a/Sources/Font.swift +++ b/Sources/Font.swift @@ -21,37 +21,24 @@ public enum Font: String, FontRepresentable { - // Font Family: Copperplate - case copperplateLight = "Copperplate-Light" - case copperplate = "Copperplate" - case copperplateBold = "Copperplate-Bold" - - // Font Family: Kohinoor Telugu - case kohinoorTeluguRegular = "KohinoorTelugu-Regular" - case kohinoorTeluguMedium = "KohinoorTelugu-Medium" - case kohinoorTeluguLight = "KohinoorTelugu-Light" + // Font Family: Academy Engraved LET + case academyEngravedLetPlain = "AcademyEngravedLetPlain" - // Font Family: Thonburi - case thonburi = "Thonburi" - case thonburiBold = "Thonburi-Bold" - case thonburiLight = "Thonburi-Light" + // Font Family: Al Nile + case alNileBold = "AlNile-Bold" + case alNile = "AlNile" - // Font Family: Courier New - case courierNewPSBoldMT = "CourierNewPS-BoldMT" - case courierNewPSItalicMT = "CourierNewPS-ItalicMT" - case courierNewPSMT = "CourierNewPSMT" - case courierNewPSBoldItalicMT = "CourierNewPS-BoldItalicMT" + // Font Family: American Typewriter + case americanTypewriterCondensedLight = "AmericanTypewriter-CondensedLight" + case americanTypewriter = "AmericanTypewriter" + case americanTypewriterCondensedBold = "AmericanTypewriter-CondensedBold" + case americanTypewriterLight = "AmericanTypewriter-Light" + case americanTypewriterSemibold = "AmericanTypewriter-Semibold" + case americanTypewriterBold = "AmericanTypewriter-Bold" + case americanTypewriterCondensed = "AmericanTypewriter-Condensed" - // Font Family: Gill Sans - case gillSansItalic = "GillSans-Italic" - case gillSansBold = "GillSans-Bold" - case gillSansBoldItalic = "GillSans-BoldItalic" - case gillSansLightItalic = "GillSans-LightItalic" - case gillSans = "GillSans" - case gillSansLight = "GillSans-Light" - case gillSansSemiBold = "GillSans-SemiBold" - case gillSansSemiBoldItalic = "GillSans-SemiBoldItalic" - case gillSansUltraBold = "GillSans-UltraBold" + // Font Family: Apple Color Emoji + case appleColorEmoji = "AppleColorEmoji" // Font Family: Apple SD Gothic Neo case appleSDGothicNeoBold = "AppleSDGothicNeo-Bold" @@ -62,9 +49,47 @@ public enum Font: String, FontRepresentable { case appleSDGothicNeoMedium = "AppleSDGothicNeo-Medium" case appleSDGothicNeoSemiBold = "AppleSDGothicNeo-SemiBold" - // Font Family: Marker Felt - case markerFeltThin = "MarkerFelt-Thin" - case markerFeltWide = "MarkerFelt-Wide" + // Font Family: Arial + case arialMT = "ArialMT" + case arialBoldItalicMT = "Arial-BoldItalicMT" + case arialBoldMT = "Arial-BoldMT" + case arialItalicMT = "Arial-ItalicMT" + + // Font Family: Arial Hebrew + case arialHebrewBold = "ArialHebrew-Bold" + case arialHebrewLight = "ArialHebrew-Light" + case arialHebrew = "ArialHebrew" + + // Font Family: Arial Rounded MT Bold + case arialRoundedMTBold = "ArialRoundedMTBold" + + // Font Family: Avenir + case avenirMedium = "Avenir-Medium" + case avenirHeavyOblique = "Avenir-HeavyOblique" + case avenirBook = "Avenir-Book" + case avenirLight = "Avenir-Light" + case avenirRoman = "Avenir-Roman" + case avenirBookOblique = "Avenir-BookOblique" + case avenirMediumOblique = "Avenir-MediumOblique" + case avenirBlack = "Avenir-Black" + case avenirBlackOblique = "Avenir-BlackOblique" + case avenirHeavy = "Avenir-Heavy" + case avenirLightOblique = "Avenir-LightOblique" + case avenirOblique = "Avenir-Oblique" + + // Font Family: Avenir Next + case avenirNextUltraLight = "AvenirNext-UltraLight" + case avenirNextUltraLightItalic = "AvenirNext-UltraLightItalic" + case avenirNextBold = "AvenirNext-Bold" + case avenirNextBoldItalic = "AvenirNext-BoldItalic" + case avenirNextDemiBold = "AvenirNext-DemiBold" + case avenirNextDemiBoldItalic = "AvenirNext-DemiBoldItalic" + case avenirNextMedium = "AvenirNext-Medium" + case avenirNextHeavyItalic = "AvenirNext-HeavyItalic" + case avenirNextHeavy = "AvenirNext-Heavy" + case avenirNextItalic = "AvenirNext-Italic" + case avenirNextRegular = "AvenirNext-Regular" + case avenirNextMediumItalic = "AvenirNext-MediumItalic" // Font Family: Avenir Next Condensed case avenirNextCondensedBoldItalic = "AvenirNextCondensed-BoldItalic" @@ -80,82 +105,63 @@ public enum Font: String, FontRepresentable { case avenirNextCondensedBold = "AvenirNextCondensed-Bold" case avenirNextCondensedDemiBoldItalic = "AvenirNextCondensed-DemiBoldItalic" - // Font Family: Tamil Sangam MN - case tamilSangamMN = "TamilSangamMN" - case tamilSangamMNBold = "TamilSangamMN-Bold" - - // Font Family: Helvetica Neue - case helveticaNeueItalic = "HelveticaNeue-Italic" - case helveticaNeueBold = "HelveticaNeue-Bold" - case helveticaNeueUltraLight = "HelveticaNeue-UltraLight" - case helveticaNeueCondensedBlack = "HelveticaNeue-CondensedBlack" - case helveticaNeueBoldItalic = "HelveticaNeue-BoldItalic" - case helveticaNeueCondensedBold = "HelveticaNeue-CondensedBold" - case helveticaNeueMedium = "HelveticaNeue-Medium" - case helveticaNeueLight = "HelveticaNeue-Light" - case helveticaNeueThin = "HelveticaNeue-Thin" - case helveticaNeueThinItalic = "HelveticaNeue-ThinItalic" - case helveticaNeueLightItalic = "HelveticaNeue-LightItalic" - case helveticaNeueUltraLightItalic = "HelveticaNeue-UltraLightItalic" - case helveticaNeueMediumItalic = "HelveticaNeue-MediumItalic" - case helveticaNeue = "HelveticaNeue" - - // Font Family: Gurmukhi MN - case gurmukhiMNBold = "GurmukhiMN-Bold" - case gurmukhiMN = "GurmukhiMN" - - // Font Family: Times New Roman - case timesNewRomanPSMT = "TimesNewRomanPSMT" - case timesNewRomanPSBoldItalicMT = "TimesNewRomanPS-BoldItalicMT" - case timesNewRomanPSItalicMT = "TimesNewRomanPS-ItalicMT" - case timesNewRomanPSBoldMT = "TimesNewRomanPS-BoldMT" - - // Font Family: Georgia - case georgiaBoldItalic = "Georgia-BoldItalic" - case georgia = "Georgia" - case georgiaItalic = "Georgia-Italic" - case georgiaBold = "Georgia-Bold" + // Font Family: Baskerville + case baskervilleItalic = "Baskerville-Italic" + case baskervilleSemiBold = "Baskerville-SemiBold" + case baskervilleBoldItalic = "Baskerville-BoldItalic" + case baskervilleSemiBoldItalic = "Baskerville-SemiBoldItalic" + case baskervilleBold = "Baskerville-Bold" + case baskerville = "Baskerville" - // Font Family: Apple Color Emoji - case appleColorEmoji = "AppleColorEmoji" + // Font Family: Bodoni 72 + case bodoniSvtyTwoITCTTBold = "BodoniSvtyTwoITCTT-Bold" + case bodoniSvtyTwoITCTTBook = "BodoniSvtyTwoITCTT-Book" + case bodoniSvtyTwoITCTTBookIta = "BodoniSvtyTwoITCTT-BookIta" - // Font Family: Arial Rounded MT Bold - case arialRoundedMTBold = "ArialRoundedMTBold" + // Font Family: Bodoni 72 Oldstyle + case bodoniSvtyTwoOSITCTTBook = "BodoniSvtyTwoOSITCTT-Book" + case bodoniSvtyTwoOSITCTTBold = "BodoniSvtyTwoOSITCTT-Bold" + case bodoniSvtyTwoOSITCTTBookIt = "BodoniSvtyTwoOSITCTT-BookIt" - // Font Family: Kailasa - case kailasaBold = "Kailasa-Bold" - case kailasa = "Kailasa" + // Font Family: Bodoni 72 Smallcaps + case bodoniSvtyTwoSCITCTTBook = "BodoniSvtyTwoSCITCTT-Book" - // Font Family: Kohinoor Devanagari - case kohinoorDevanagariLight = "KohinoorDevanagari-Light" - case kohinoorDevanagariRegular = "KohinoorDevanagari-Regular" - case kohinoorDevanagariSemibold = "KohinoorDevanagari-Semibold" + // Font Family: Bodoni Ornaments + case bodoniOrnamentsITCTT = "BodoniOrnamentsITCTT" - // Font Family: Kohinoor Bangla - case kohinoorBanglaSemibold = "KohinoorBangla-Semibold" - case kohinoorBanglaRegular = "KohinoorBangla-Regular" - case kohinoorBanglaLight = "KohinoorBangla-Light" + // Font Family: Bradley Hand + case bradleyHandITCTTBold = "BradleyHandITCTT-Bold" // Font Family: Chalkboard SE case chalkboardSEBold = "ChalkboardSE-Bold" case chalkboardSELight = "ChalkboardSE-Light" case chalkboardSERegular = "ChalkboardSE-Regular" - // Font Family: Sinhala Sangam MN - case sinhalaSangamMNBold = "SinhalaSangamMN-Bold" - case sinhalaSangamMN = "SinhalaSangamMN" + // Font Family: Chalkduster + case chalkduster = "Chalkduster" - // Font Family: PingFang TC - case pingFangTCMedium = "PingFangTC-Medium" - case pingFangTCRegular = "PingFangTC-Regular" - case pingFangTCLight = "PingFangTC-Light" - case pingFangTCUltralight = "PingFangTC-Ultralight" - case pingFangTCSemibold = "PingFangTC-Semibold" - case pingFangTCThin = "PingFangTC-Thin" + // Font Family: Cochin + case cochinBold = "Cochin-Bold" + case cochin = "Cochin" + case cochinItalic = "Cochin-Italic" + case cochinBoldItalic = "Cochin-BoldItalic" - // Font Family: Gujarati Sangam MN - case gujaratiSangamMNBold = "GujaratiSangamMN-Bold" - case gujaratiSangamMN = "GujaratiSangamMN" + // Font Family: Copperplate + case copperplateLight = "Copperplate-Light" + case copperplate = "Copperplate" + case copperplateBold = "Copperplate-Bold" + + // Font Family: Courier + case courierBoldOblique = "Courier-BoldOblique" + case courier = "Courier" + case courierBold = "Courier-Bold" + case courierOblique = "Courier-Oblique" + + // Font Family: Courier New + case courierNewPSBoldMT = "CourierNewPS-BoldMT" + case courierNewPSItalicMT = "CourierNewPS-ItalicMT" + case courierNewPSMT = "CourierNewPSMT" + case courierNewPSBoldItalicMT = "CourierNewPS-BoldItalicMT" // Font Family: Damascus case damascusLight = "DamascusLight" @@ -164,33 +170,22 @@ public enum Font: String, FontRepresentable { case damascusMedium = "DamascusMedium" case damascus = "Damascus" - // Font Family: Noteworthy - case noteworthyLight = "Noteworthy-Light" - case noteworthyBold = "Noteworthy-Bold" - - // Font Family: Geeza Pro - case geezaPro = "GeezaPro" - case geezaProBold = "GeezaPro-Bold" + // Font Family: Devanagari Sangam MN + case devanagariSangamMN = "DevanagariSangamMN" + case devanagariSangamMNBold = "DevanagariSangamMN-Bold" - // Font Family: Avenir - case avenirMedium = "Avenir-Medium" - case avenirHeavyOblique = "Avenir-HeavyOblique" - case avenirBook = "Avenir-Book" - case avenirLight = "Avenir-Light" - case avenirRoman = "Avenir-Roman" - case avenirBookOblique = "Avenir-BookOblique" - case avenirMediumOblique = "Avenir-MediumOblique" - case avenirBlack = "Avenir-Black" - case avenirBlackOblique = "Avenir-BlackOblique" - case avenirHeavy = "Avenir-Heavy" - case avenirLightOblique = "Avenir-LightOblique" - case avenirOblique = "Avenir-Oblique" + // Font Family: Didot + case didotItalic = "Didot-Italic" + case didotBold = "Didot-Bold" + case didot = "Didot" - // Font Family: Academy Engraved LET - case academyEngravedLetPlain = "AcademyEngravedLetPlain" + // Font Family: Euphemia UCAS + case euphemiaUCASItalic = "EuphemiaUCAS-Italic" + case euphemiaUCAS = "EuphemiaUCAS" + case euphemiaUCASBold = "EuphemiaUCAS-Bold" - // Font Family: Mishafi - case diwanMishafi = "DiwanMishafi" + // Font Family: Farah + case farah = "Farah" // Font Family: Futura case futuraCondensedMedium = "Futura-CondensedMedium" @@ -199,76 +194,34 @@ public enum Font: String, FontRepresentable { case futuraMediumItalic = "Futura-MediumItalic" case futuraBold = "Futura-Bold" - // Font Family: Farah - case farah = "Farah" - - // Font Family: Kannada Sangam MN - case kannadaSangamMN = "KannadaSangamMN" - case kannadaSangamMNBold = "KannadaSangamMN-Bold" - - // Font Family: Arial Hebrew - case arialHebrewBold = "ArialHebrew-Bold" - case arialHebrewLight = "ArialHebrew-Light" - case arialHebrew = "ArialHebrew" + // Font Family: Geeza Pro + case geezaPro = "GeezaPro" + case geezaProBold = "GeezaPro-Bold" - // Font Family: Arial - case arialMT = "ArialMT" - case arialBoldItalicMT = "Arial-BoldItalicMT" - case arialBoldMT = "Arial-BoldMT" - case arialItalicMT = "Arial-ItalicMT" + // Font Family: Georgia + case georgiaBoldItalic = "Georgia-BoldItalic" + case georgia = "Georgia" + case georgiaItalic = "Georgia-Italic" + case georgiaBold = "Georgia-Bold" - // Font Family: Party LET - case partyLetPlain = "PartyLetPlain" - - // Font Family: Chalkduster - case chalkduster = "Chalkduster" - - // Font Family: Hoefler Text - case hoeflerTextItalic = "HoeflerText-Italic" - case hoeflerTextRegular = "HoeflerText-Regular" - case hoeflerTextBlack = "HoeflerText-Black" - case hoeflerTextBlackItalic = "HoeflerText-BlackItalic" - - // Font Family: Optima - case optimaRegular = "Optima-Regular" - case optimaExtraBlack = "Optima-ExtraBlack" - case optimaBoldItalic = "Optima-BoldItalic" - case optimaItalic = "Optima-Italic" - case optimaBold = "Optima-Bold" - - // Font Family: Palatino - case palatinoBold = "Palatino-Bold" - case palatinoRoman = "Palatino-Roman" - case palatinoBoldItalic = "Palatino-BoldItalic" - case palatinoItalic = "Palatino-Italic" - - // Font Family: Lao Sangam MN - case laoSangamMN = "LaoSangamMN" - - // Font Family: Malayalam Sangam MN - case malayalamSangamMNBold = "MalayalamSangamMN-Bold" - case malayalamSangamMN = "MalayalamSangamMN" - - // Font Family: Al Nile - case alNileBold = "AlNile-Bold" - case alNile = "AlNile" - - // Font Family: Bradley Hand - case bradleyHandITCTTBold = "BradleyHandITCTT-Bold" + // Font Family: Gill Sans + case gillSansItalic = "GillSans-Italic" + case gillSansBold = "GillSans-Bold" + case gillSansBoldItalic = "GillSans-BoldItalic" + case gillSansLightItalic = "GillSans-LightItalic" + case gillSans = "GillSans" + case gillSansLight = "GillSans-Light" + case gillSansSemiBold = "GillSans-SemiBold" + case gillSansSemiBoldItalic = "GillSans-SemiBoldItalic" + case gillSansUltraBold = "GillSans-UltraBold" - // Font Family: PingFang HK - case pingFangHKUltralight = "PingFangHK-Ultralight" - case pingFangHKSemibold = "PingFangHK-Semibold" - case pingFangHKThin = "PingFangHK-Thin" - case pingFangHKLight = "PingFangHK-Light" - case pingFangHKRegular = "PingFangHK-Regular" - case pingFangHKMedium = "PingFangHK-Medium" + // Font Family: Gujarati Sangam MN + case gujaratiSangamMNBold = "GujaratiSangamMN-Bold" + case gujaratiSangamMN = "GujaratiSangamMN" - // Font Family: Trebuchet MS - case trebuchetBoldItalic = "Trebuchet-BoldItalic" - case trebuchetMS = "TrebuchetMS" - case trebuchetMSBold = "TrebuchetMS-Bold" - case trebuchetMSItalic = "TrebuchetMS-Italic" + // Font Family: Gurmukhi MN + case gurmukhiMNBold = "GurmukhiMN-Bold" + case gurmukhiMN = "GurmukhiMN" // Font Family: Helvetica case helveticaBold = "Helvetica-Bold" @@ -278,96 +231,72 @@ public enum Font: String, FontRepresentable { case helveticaBoldOblique = "Helvetica-BoldOblique" case helveticaLight = "Helvetica-Light" - // Font Family: Courier - case courierBoldOblique = "Courier-BoldOblique" - case courier = "Courier" - case courierBold = "Courier-Bold" - case courierOblique = "Courier-Oblique" - - // Font Family: Cochin - case cochinBold = "Cochin-Bold" - case cochin = "Cochin" - case cochinItalic = "Cochin-Italic" - case cochinBoldItalic = "Cochin-BoldItalic" + // Font Family: Helvetica Neue + case helveticaNeueItalic = "HelveticaNeue-Italic" + case helveticaNeueBold = "HelveticaNeue-Bold" + case helveticaNeueUltraLight = "HelveticaNeue-UltraLight" + case helveticaNeueCondensedBlack = "HelveticaNeue-CondensedBlack" + case helveticaNeueBoldItalic = "HelveticaNeue-BoldItalic" + case helveticaNeueCondensedBold = "HelveticaNeue-CondensedBold" + case helveticaNeueMedium = "HelveticaNeue-Medium" + case helveticaNeueLight = "HelveticaNeue-Light" + case helveticaNeueThin = "HelveticaNeue-Thin" + case helveticaNeueThinItalic = "HelveticaNeue-ThinItalic" + case helveticaNeueLightItalic = "HelveticaNeue-LightItalic" + case helveticaNeueUltraLightItalic = "HelveticaNeue-UltraLightItalic" + case helveticaNeueMediumItalic = "HelveticaNeue-MediumItalic" + case helveticaNeue = "HelveticaNeue" // Font Family: Hiragino Mincho ProN case hiraMinProNW6 = "HiraMinProN-W6" case hiraMinProNW3 = "HiraMinProN-W3" - // Font Family: Devanagari Sangam MN - case devanagariSangamMN = "DevanagariSangamMN" - case devanagariSangamMNBold = "DevanagariSangamMN-Bold" - - // Font Family: Oriya Sangam MN - case oriyaSangamMN = "OriyaSangamMN" - case oriyaSangamMNBold = "OriyaSangamMN-Bold" - - // Font Family: Snell Roundhand - case snellRoundhandBold = "SnellRoundhand-Bold" - case snellRoundhand = "SnellRoundhand" - case snellRoundhandBlack = "SnellRoundhand-Black" - - // Font Family: Zapf Dingbats - case zapfDingbatsITC = "ZapfDingbatsITC" - - // Font Family: Bodoni 72 - case bodoniSvtyTwoITCTTBold = "BodoniSvtyTwoITCTT-Bold" - case bodoniSvtyTwoITCTTBook = "BodoniSvtyTwoITCTT-Book" - case bodoniSvtyTwoITCTTBookIta = "BodoniSvtyTwoITCTT-BookIta" - - // Font Family: Verdana - case verdanaItalic = "Verdana-Italic" - case verdanaBoldItalic = "Verdana-BoldItalic" - case verdana = "Verdana" - case verdanaBold = "Verdana-Bold" + // Font Family: Hiragino Sans + case hiraginoSansW3 = "HiraginoSans-W3" + case hiraginoSansW6 = "HiraginoSans-W6" - // Font Family: American Typewriter - case americanTypewriterCondensedLight = "AmericanTypewriter-CondensedLight" - case americanTypewriter = "AmericanTypewriter" - case americanTypewriterCondensedBold = "AmericanTypewriter-CondensedBold" - case americanTypewriterLight = "AmericanTypewriter-Light" - case americanTypewriterSemibold = "AmericanTypewriter-Semibold" - case americanTypewriterBold = "AmericanTypewriter-Bold" - case americanTypewriterCondensed = "AmericanTypewriter-Condensed" + // Font Family: Hoefler Text + case hoeflerTextItalic = "HoeflerText-Italic" + case hoeflerTextRegular = "HoeflerText-Regular" + case hoeflerTextBlack = "HoeflerText-Black" + case hoeflerTextBlackItalic = "HoeflerText-BlackItalic" - // Font Family: Avenir Next - case avenirNextUltraLight = "AvenirNext-UltraLight" - case avenirNextUltraLightItalic = "AvenirNext-UltraLightItalic" - case avenirNextBold = "AvenirNext-Bold" - case avenirNextBoldItalic = "AvenirNext-BoldItalic" - case avenirNextDemiBold = "AvenirNext-DemiBold" - case avenirNextDemiBoldItalic = "AvenirNext-DemiBoldItalic" - case avenirNextMedium = "AvenirNext-Medium" - case avenirNextHeavyItalic = "AvenirNext-HeavyItalic" - case avenirNextHeavy = "AvenirNext-Heavy" - case avenirNextItalic = "AvenirNext-Italic" - case avenirNextRegular = "AvenirNext-Regular" - case avenirNextMediumItalic = "AvenirNext-MediumItalic" + // Font Family: Kailasa + case kailasaBold = "Kailasa-Bold" + case kailasa = "Kailasa" - // Font Family: Baskerville - case baskervilleItalic = "Baskerville-Italic" - case baskervilleSemiBold = "Baskerville-SemiBold" - case baskervilleBoldItalic = "Baskerville-BoldItalic" - case baskervilleSemiBoldItalic = "Baskerville-SemiBoldItalic" - case baskervilleBold = "Baskerville-Bold" - case baskerville = "Baskerville" + // Font Family: Kannada Sangam MN + case kannadaSangamMN = "KannadaSangamMN" + case kannadaSangamMNBold = "KannadaSangamMN-Bold" // Font Family: Khmer Sangam MN case khmerSangamMN = "KhmerSangamMN" - // Font Family: Didot - case didotItalic = "Didot-Italic" - case didotBold = "Didot-Bold" - case didot = "Didot" + // Font Family: Kohinoor Bangla + case kohinoorBanglaSemibold = "KohinoorBangla-Semibold" + case kohinoorBanglaRegular = "KohinoorBangla-Regular" + case kohinoorBanglaLight = "KohinoorBangla-Light" - // Font Family: Savoye LET - case savoyeLetPlain = "SavoyeLetPlain" + // Font Family: Kohinoor Devanagari + case kohinoorDevanagariLight = "KohinoorDevanagari-Light" + case kohinoorDevanagariRegular = "KohinoorDevanagari-Regular" + case kohinoorDevanagariSemibold = "KohinoorDevanagari-Semibold" - // Font Family: Bodoni Ornaments - case bodoniOrnamentsITCTT = "BodoniOrnamentsITCTT" + // Font Family: Kohinoor Telugu + case kohinoorTeluguRegular = "KohinoorTelugu-Regular" + case kohinoorTeluguMedium = "KohinoorTelugu-Medium" + case kohinoorTeluguLight = "KohinoorTelugu-Light" - // Font Family: Symbol - case symbol = "Symbol" + // Font Family: Lao Sangam MN + case laoSangamMN = "LaoSangamMN" + + // Font Family: Malayalam Sangam MN + case malayalamSangamMNBold = "MalayalamSangamMN-Bold" + case malayalamSangamMN = "MalayalamSangamMN" + + // Font Family: Marker Felt + case markerFeltThin = "MarkerFelt-Thin" + case markerFeltWide = "MarkerFelt-Wide" // Font Family: Menlo case menloItalic = "Menlo-Italic" @@ -375,16 +304,48 @@ public enum Font: String, FontRepresentable { case menloRegular = "Menlo-Regular" case menloBoldItalic = "Menlo-BoldItalic" - // Font Family: Bodoni 72 Smallcaps - case bodoniSvtyTwoSCITCTTBook = "BodoniSvtyTwoSCITCTT-Book" + // Font Family: Mishafi + case diwanMishafi = "DiwanMishafi" + + // Font Family: Myanmar Sangam MN + case myanmarSangamMNBold = "MyanmarSangamMN-Bold" + case myanmarSangamMN = "MyanmarSangamMN" + + // Font Family: Noteworthy + case noteworthyLight = "Noteworthy-Light" + case noteworthyBold = "Noteworthy-Bold" + + // Font Family: Optima + case optimaRegular = "Optima-Regular" + case optimaExtraBlack = "Optima-ExtraBlack" + case optimaBoldItalic = "Optima-BoldItalic" + case optimaItalic = "Optima-Italic" + case optimaBold = "Optima-Bold" + + // Font Family: Oriya Sangam MN + case oriyaSangamMN = "OriyaSangamMN" + case oriyaSangamMNBold = "OriyaSangamMN-Bold" + + // Font Family: Palatino + case palatinoBold = "Palatino-Bold" + case palatinoRoman = "Palatino-Roman" + case palatinoBoldItalic = "Palatino-BoldItalic" + case palatinoItalic = "Palatino-Italic" // Font Family: Papyrus case papyrus = "Papyrus" case papyrusCondensed = "Papyrus-Condensed" - // Font Family: Hiragino Sans - case hiraginoSansW3 = "HiraginoSans-W3" - case hiraginoSansW6 = "HiraginoSans-W6" + // Font Family: Party LET + case partyLetPlain = "PartyLetPlain" + + // Font Family: PingFang HK + case pingFangHKUltralight = "PingFangHK-Ultralight" + case pingFangHKSemibold = "PingFangHK-Semibold" + case pingFangHKThin = "PingFangHK-Thin" + case pingFangHKLight = "PingFangHK-Light" + case pingFangHKRegular = "PingFangHK-Regular" + case pingFangHKMedium = "PingFangHK-Medium" // Font Family: PingFang SC case pingFangSCUltralight = "PingFangSC-Ultralight" @@ -394,20 +355,59 @@ public enum Font: String, FontRepresentable { case pingFangSCLight = "PingFangSC-Light" case pingFangSCMedium = "PingFangSC-Medium" - // Font Family: Myanmar Sangam MN - case myanmarSangamMNBold = "MyanmarSangamMN-Bold" - case myanmarSangamMN = "MyanmarSangamMN" + // Font Family: PingFang TC + case pingFangTCMedium = "PingFangTC-Medium" + case pingFangTCRegular = "PingFangTC-Regular" + case pingFangTCLight = "PingFangTC-Light" + case pingFangTCUltralight = "PingFangTC-Ultralight" + case pingFangTCSemibold = "PingFangTC-Semibold" + case pingFangTCThin = "PingFangTC-Thin" - // Font Family: Euphemia UCAS - case euphemiaUCASItalic = "EuphemiaUCAS-Italic" - case euphemiaUCAS = "EuphemiaUCAS" - case euphemiaUCASBold = "EuphemiaUCAS-Bold" + // Font Family: Savoye LET + case savoyeLetPlain = "SavoyeLetPlain" + + // Font Family: Sinhala Sangam MN + case sinhalaSangamMNBold = "SinhalaSangamMN-Bold" + case sinhalaSangamMN = "SinhalaSangamMN" + + // Font Family: Snell Roundhand + case snellRoundhandBold = "SnellRoundhand-Bold" + case snellRoundhand = "SnellRoundhand" + case snellRoundhandBlack = "SnellRoundhand-Black" + // Font Family: Symbol + case symbol = "Symbol" + + // Font Family: Tamil Sangam MN + case tamilSangamMN = "TamilSangamMN" + case tamilSangamMNBold = "TamilSangamMN-Bold" + + // Font Family: Thonburi + case thonburi = "Thonburi" + case thonburiBold = "Thonburi-Bold" + case thonburiLight = "Thonburi-Light" + + // Font Family: Times New Roman + case timesNewRomanPSMT = "TimesNewRomanPSMT" + case timesNewRomanPSBoldItalicMT = "TimesNewRomanPS-BoldItalicMT" + case timesNewRomanPSItalicMT = "TimesNewRomanPS-ItalicMT" + case timesNewRomanPSBoldMT = "TimesNewRomanPS-BoldMT" + + // Font Family: Trebuchet MS + case trebuchetBoldItalic = "Trebuchet-BoldItalic" + case trebuchetMS = "TrebuchetMS" + case trebuchetMSBold = "TrebuchetMS-Bold" + case trebuchetMSItalic = "TrebuchetMS-Italic" + + // Font Family: Verdana + case verdanaItalic = "Verdana-Italic" + case verdanaBoldItalic = "Verdana-BoldItalic" + case verdana = "Verdana" + case verdanaBold = "Verdana-Bold" + + // Font Family: Zapf Dingbats + case zapfDingbatsITC = "ZapfDingbatsITC" + // Font Family: Zapfino case zapfino = "Zapfino" - - // Font Family: Bodoni 72 Oldstyle - case bodoniSvtyTwoOSITCTTBook = "BodoniSvtyTwoOSITCTT-Book" - case bodoniSvtyTwoOSITCTTBold = "BodoniSvtyTwoOSITCTT-Bold" - case bodoniSvtyTwoOSITCTTBookIt = "BodoniSvtyTwoOSITCTT-BookIt" } diff --git a/UIFontComplete.xcodeproj/project.pbxproj b/UIFontComplete.xcodeproj/project.pbxproj index 6dd848174e196d961abc83a0e3f2a1956cf0cc5c..20e275e06feb2a03e842096e249fe231eb27433b 100644 --- a/UIFontComplete.xcodeproj/project.pbxproj +++ b/UIFontComplete.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ AAE1A29D1E02618D00610C40 /* UIFontComplete.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAE1A2931E02618D00610C40 /* UIFontComplete.framework */; }; AAE1A2A21E02618D00610C40 /* UIFontCompleteTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE1A2A11E02618D00610C40 /* UIFontCompleteTests.swift */; }; AAE1A2A41E02618D00610C40 /* UIFontComplete.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE1A2961E02618D00610C40 /* UIFontComplete.h */; settings = {ATTRIBUTES = (Public, ); }; }; - AAE1A2B31E027E8100610C40 /* CodeGeneration.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAE1A2B21E027E8100610C40 /* CodeGeneration.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -36,7 +35,6 @@ AAE1A29C1E02618D00610C40 /* UIFontCompleteTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UIFontCompleteTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; AAE1A2A11E02618D00610C40 /* UIFontCompleteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIFontCompleteTests.swift; sourceTree = ""; }; AAE1A2A31E02618D00610C40 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AAE1A2B21E027E8100610C40 /* CodeGeneration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CodeGeneration.swift; path = Util/CodeGeneration.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -91,7 +89,6 @@ AAE1A2B61E027F4B00610C40 /* Supporting */, 136122C41EB2AD2A009F45E4 /* Sources */, AAE1A2B41E027F1A00610C40 /* Extensions */, - AAE1A2B11E027E5600610C40 /* Util */, ); path = UIFontComplete; sourceTree = ""; @@ -105,14 +102,6 @@ path = UIFontCompleteTests; sourceTree = ""; }; - AAE1A2B11E027E5600610C40 /* Util */ = { - isa = PBXGroup; - children = ( - AAE1A2B21E027E8100610C40 /* CodeGeneration.swift */, - ); - name = Util; - sourceTree = ""; - }; AAE1A2B41E027F1A00610C40 /* Extensions */ = { isa = PBXGroup; children = ( @@ -243,7 +232,6 @@ AA813B591F0092450096ABBD /* FontRepresentable.swift in Sources */, AA813B581F0092450096ABBD /* Font.swift in Sources */, AA813B5A1F0092450096ABBD /* UIFont+Extension.swift in Sources */, - AAE1A2B31E027E8100610C40 /* CodeGeneration.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/UIFontComplete/Util/CodeGeneration.swift b/UIFontComplete/Util/CodeGeneration.swift deleted file mode 100644 index c8f7627e11a6ce811f7642fe9a635e0b1d00deb7..0000000000000000000000000000000000000000 --- a/UIFontComplete/Util/CodeGeneration.swift +++ /dev/null @@ -1,67 +0,0 @@ -// -// CodeGeneration.swift -// UIFontComplete -// -// Created by Nicholas Maccharoli on 2016/12/15. -// -// - -import Foundation -import UIKit - -extension String { - fileprivate var enumified: String { - let hyphenless = self.replacingOccurrences(of: "-", with: "") - return String(hyphenless.characters.first!).lowercased() + String(hyphenless.characters.dropFirst()) - } -} - -enum FontCase { - case family(String) - case name(String, String) -} - -func createEnumNamesAndCases() -> [FontCase] { - var fontData = [FontCase]() - for family in UIFont.familyNames where !UIFont.fontNames(forFamilyName: family).isEmpty { - fontData += [FontCase.family(family)] - - for font in UIFont.fontNames(forFamilyName: family) { - fontData += [FontCase.name(font.enumified, font)] - } - } - return fontData -} - -func createEnum(with fonts: [FontCase], spacing: Int = 4, familyComment: Bool = true) -> String { - var outputString = "" - let indent = (0.. String { - func makeTestCase(fontInfo: FontCase) -> String? { - switch fontInfo { - case .name(let enumName, let fontString): - return "func testFont" + enumName.capitalized + "() {\n" + - " XCTAssert(UIFont(font: ." + enumName + ", size: 12.0) != nil," + - " \"Font \\\"\(fontString)\\\" can not be found.\")" + - "\n}" - - default: - return nil - } - } - let results = fonts.flatMap { makeTestCase(fontInfo: $0) } - return results.joined(separator: "\n\n") -}