diff --git a/Sources/SwiftMath/MathRender/MTColor.swift b/Sources/SwiftMath/MathRender/MTColor.swift index a753f40..88f8a0d 100644 --- a/Sources/SwiftMath/MathRender/MTColor.swift +++ b/Sources/SwiftMath/MathRender/MTColor.swift @@ -11,7 +11,7 @@ import Foundation extension MTColor { - static func color(fromHexString hexString:String) -> MTColor? { + public convenience init?(fromHexString hexString:String) { if hexString.isEmpty { return nil } if !hexString.hasPrefix("#") { return nil } @@ -19,10 +19,10 @@ extension MTColor { let scanner = Scanner(string: hexString) scanner.charactersToBeSkipped = CharacterSet(charactersIn: "#") scanner.scanHexInt64(&rgbValue) - return MTColor(red: CGFloat((rgbValue & 0xFF0000) >> 16)/255.0, - green: CGFloat((rgbValue & 0xFF00) >> 8)/255.0, - blue: CGFloat((rgbValue & 0xFF))/255.0, - alpha: 1.0) + self.init(red: CGFloat((rgbValue & 0xFF0000) >> 16)/255.0, + green: CGFloat((rgbValue & 0xFF00) >> 8)/255.0, + blue: CGFloat((rgbValue & 0xFF))/255.0, + alpha: 1.0) } } diff --git a/Sources/SwiftMath/MathRender/MTTypesetter.swift b/Sources/SwiftMath/MathRender/MTTypesetter.swift index e80dfc5..fbcf7e1 100644 --- a/Sources/SwiftMath/MathRender/MTTypesetter.swift +++ b/Sources/SwiftMath/MathRender/MTTypesetter.swift @@ -502,7 +502,7 @@ class MTTypesetter { } let colorAtom = atom as! MTMathColor let display = MTTypesetter.createLineForMathList(colorAtom.innerList, font: font, style: style) - display!.localTextColor = MTColor.color(fromHexString: colorAtom.colorString) + display!.localTextColor = MTColor(fromHexString: colorAtom.colorString) display!.position = currentPosition currentPosition.x += display!.width displayAtoms.append(display!) @@ -515,7 +515,7 @@ class MTTypesetter { let colorboxAtom = atom as! MTMathColorbox let display = MTTypesetter.createLineForMathList(colorboxAtom.innerList, font:font, style:style) - display!.localBackgroundColor = MTColor.color(fromHexString: colorboxAtom.colorString) + display!.localBackgroundColor = MTColor(fromHexString: colorboxAtom.colorString) display!.position = currentPosition currentPosition.x += display!.width; displayAtoms.append(display!)