From b4c329859f23e9a619515697077bc48637173038 Mon Sep 17 00:00:00 2001 From: zhanglecong Date: Sat, 14 Sep 2024 00:38:26 +0800 Subject: [PATCH 1/2] Fix fontSize arg is not applied to MTMathImage --- Sources/SwiftMath/MathRender/MTMathImage.swift | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Sources/SwiftMath/MathRender/MTMathImage.swift b/Sources/SwiftMath/MathRender/MTMathImage.swift index 49bc043..20d62c4 100644 --- a/Sources/SwiftMath/MathRender/MTMathImage.swift +++ b/Sources/SwiftMath/MathRender/MTMathImage.swift @@ -16,8 +16,16 @@ import Foundation #endif public class MTMathImage { - public var font: MTFont? = nil - public let fontSize: CGFloat + public var font: MTFont? = MTFontManager.fontManager.defaultFont + public var fontSize:CGFloat { + set { + _fontSize = newValue + let font = font?.copy(withSize: newValue) + self.font = font // also forces an update + } + get { _fontSize } + } + private var _fontSize:CGFloat = 0 public let textColor: MTColor public let labelMode: MTMathUILabelMode @@ -30,10 +38,10 @@ public class MTMathImage { public init(latex: String, fontSize: CGFloat, textColor: MTColor, labelMode: MTMathUILabelMode = .display, textAlignment: MTTextAlignment = .center) { self.latex = latex - self.fontSize = fontSize self.textColor = textColor self.labelMode = labelMode self.textAlignment = textAlignment + self.fontSize = fontSize } } extension MTMathImage { From 0da9f64edabd21848196d3699ed6289bfa4d5d0c Mon Sep 17 00:00:00 2001 From: zhanglecong Date: Sat, 14 Sep 2024 00:40:48 +0800 Subject: [PATCH 2/2] Remove useless nil guard --- Sources/SwiftMath/MathRender/MTMathImage.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Sources/SwiftMath/MathRender/MTMathImage.swift b/Sources/SwiftMath/MathRender/MTMathImage.swift index 20d62c4..9f6bc2c 100644 --- a/Sources/SwiftMath/MathRender/MTMathImage.swift +++ b/Sources/SwiftMath/MathRender/MTMathImage.swift @@ -73,9 +73,7 @@ extension MTMathImage { let textY = (availableHeight - height) / 2 + displayList.descent + contentInsets.bottom displayList.position = CGPoint(x: textX, y: textY) } - if font == nil { - self.font = MTFontManager.fontManager.defaultFont - } + var error: NSError? guard let mathList = MTMathListBuilder.build(fromString: latex, error: &error), error == nil, let displayList = MTTypesetter.createLineForMathList(mathList, font: font, style: currentStyle) else {