From 55b539b74e6a0cfdd8eab6cb2f1eaf1cf482db1f Mon Sep 17 00:00:00 2001 From: Michael Griebling Date: Tue, 8 Oct 2024 19:45:30 -0400 Subject: [PATCH] Updated MathView examples. --- README.md | 38 ++++++++++++--------- Sources/SwiftMath/MathBundle/MathFont.swift | 1 + 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index f0b71d5..2ae3ec9 100644 --- a/README.md +++ b/README.md @@ -108,21 +108,24 @@ import SwiftUI import SwiftMath struct MathView: UIViewRepresentable { - var equation: String - var fontSize: CGFloat + var font: MathFont = .latinModernFont + var textAlignment: MTTextAlignment = .center + var fontSize: CGFloat = 30 + var labelMode: MTMathUILabelMode = .text + var insets: MTEdgeInsets = MTEdgeInsets() func makeUIView(context: Context) -> MTMathUILabel { let view = MTMathUILabel() return view } - - func updateUIView(_ uiView: MTMathUILabel, context: Context) { - uiView.latex = equation - uiView.fontSize = fontSize - uiView.font = MTFontManager().termesFont(withSize: fontSize) - uiView.textAlignment = .right - uiView.labelMode = .text + func updateUIView(_ view: MTMathUILabel, context: Context) { + view.latex = equation + view.font = MTFontManager().font(withName: font.rawValue, size: fontSize) + view.textAlignment = textAlignment + view.labelMode = labelMode + view.textColor = MTColor(Color.primary) + view.contentInsets = insets } } ``` @@ -134,9 +137,12 @@ import SwiftUI import SwiftMath struct MathView: NSViewRepresentable { - var equation: String - var fontSize: CGFloat + var font: MathFont = .latinModernFont + var textAlignment: MTTextAlignment = .center + var fontSize: CGFloat = 30 + var labelMode: MTMathUILabelMode = .text + var insets: MTEdgeInsets = MTEdgeInsets() func makeNSView(context: Context) -> MTMathUILabel { let view = MTMathUILabel() @@ -145,11 +151,11 @@ struct MathView: NSViewRepresentable { func updateNSView(_ view: MTMathUILabel, context: Context) { view.latex = equation - view.fontSize = fontSize - view.font = MTFontManager().termesFont(withSize: fontSize) - view.textColor = .textColor - view.textAlignment = .center - view.labelMode = .display + view.font = MTFontManager().font(withName: font.rawValue, size: fontSize) + view.textAlignment = textAlignment + view.labelMode = labelMode + view.textColor = MTColor(Color.primary) + view.contentInsets = insets } } ``` diff --git a/Sources/SwiftMath/MathBundle/MathFont.swift b/Sources/SwiftMath/MathBundle/MathFont.swift index 5dc2848..95010ce 100644 --- a/Sources/SwiftMath/MathBundle/MathFont.swift +++ b/Sources/SwiftMath/MathBundle/MathFont.swift @@ -11,6 +11,7 @@ import UIKit import AppKit #endif +/// Now available for everyone to use public enum MathFont: String, CaseIterable, Identifiable { public var id: Self { self } // Makes things simpler for SwiftUI