Merge pull request #63 from colinc86/develop

Develop

Author: colinc86

Package.resolved

@@ -16,7 +16,7 @@ let package = Package(
   ],
   dependencies: [
      .package(url: "https://github.com/colinc86/MathJaxSwift", from: "3.4.0"),
-     .package(url: "https://github.com/colinc86/SwiftDraw", branch: "latexswiftui"),
+     .package(url: "https://github.com/swhitty/SwiftDraw", from: "0.20.1"),
      .package(url: "https://github.com/Kitura/swift-html-entities", from: "4.0.1")
   ],
   targets: [

Package.swift

@@ -50,7 +50,7 @@ It won't
 Add the dependency to your package manifest file.
 
 ```swift
-.package(url: "https://github.com/colinc86/LaTeXSwiftUI", from: "1.4.0")
+.package(url: "https://github.com/colinc86/LaTeXSwiftUI", from: "1.4.1")
 ```
 
 ## Usage
@@ -284,7 +284,7 @@ LaTeX(input)
 
 > In the above example, the input text will be displayed until the SVGs have been rendered at which point the rendered views will animate in to view.
 
-### Styles
+### Styles (Deprecated)
 
 You can use the provided view styles or create your own.
 

README.md

@@ -26,7 +26,7 @@
 import Foundation
 import SwiftUI
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import UIKit
 #else
 import Cocoa
@@ -95,7 +95,7 @@ internal extension _Font {
         .caption2.bold(),
         .footnote.bold(),
         .body.bold():
-#if os(iOS)
+#if os(iOS) || os(visionOS)
       if let descriptor = _font.fontDescriptor.withSymbolicTraits(.traitBold) {
         return _Font(descriptor: descriptor, size: _font.pointSize)
       }
@@ -118,7 +118,7 @@ internal extension _Font {
         .caption2.monospaced(),
         .footnote.monospaced(),
         .body.monospaced():
-#if os(iOS)
+#if os(iOS) || os(visionOS)
       if let descriptor = _font.fontDescriptor.withSymbolicTraits(.traitMonoSpace) {
         return _Font(descriptor: descriptor, size: _font.pointSize)
       }
@@ -141,7 +141,7 @@ internal extension _Font {
         .caption2.italic(),
         .footnote.italic(),
         .body.italic():
-#if os(iOS)
+#if os(iOS) || os(visionOS)
       if let descriptor = _font.fontDescriptor.withSymbolicTraits(.traitItalic) {
         return _Font(descriptor: descriptor, size: _font.pointSize)
       }

Sources/LaTeXSwiftUI/Extensions/Font+Extensions.swift

@@ -22,13 +22,12 @@
 //  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 //  IN THE SOFTWARE.
 //
-
 import SwiftUI
 
 internal extension Image {
 
   init(image: _Image, scale: CGFloat = 1.0) {
-#if os(iOS)
+#if os(iOS) || os(visionOS)
     self.init(uiImage: image)
 #else
     if scale > 1.0 {

Sources/LaTeXSwiftUI/Extensions/Image+Extensions.swift

@@ -187,7 +187,7 @@ public struct LaTeX: View {
 
   public var body: some View {
     VStack(spacing: 0) {
-      if renderer.rendered {
+      if renderer.rendered || renderer.syncRendered {
         // If our blocks have been rendered, display them
         bodyWithBlocks(renderer.blocks)
       }
@@ -230,6 +230,7 @@ extension LaTeX {
   ///
   /// - Parameter style: The `LaTeX` view style to use.
   /// - Returns: A stylized view.
+  @available(*, deprecated, message: "This will be removed in a following version. Use other modifiers to set your style.")
   public func latexStyle<S>(_ style: S) -> some View where S: LaTeXStyle {
     style.makeBody(content: self)
   }

Sources/LaTeXSwiftUI/LaTeX.swift

@@ -25,7 +25,7 @@
 
 import Foundation
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import UIKit
 internal typealias _Image = UIImage
 internal typealias _Font = UIFont

Sources/LaTeXSwiftUI/Models/Aliases.swift

@@ -38,5 +38,4 @@ internal struct ImageContainer: Hashable {
   func hash(into hasher: inout Hasher) {
     hasher.combine(size)
   }
-  
 }

Sources/LaTeXSwiftUI/Models/ImageContainer.swift

@@ -28,7 +28,7 @@ import MathJaxSwift
 import SwiftDraw
 import SwiftUI
 
-#if os(iOS)
+#if os(iOS) || os(visionOS)
 import UIKit
 #else
 import Cocoa
@@ -58,11 +58,14 @@ internal class Renderer: ObservableObject {
   /// Whether or not the view's blocks have been rendered.
   @MainActor @Published var rendered: Bool = false
 
+  /// Whether or not the view's blocks have been rendered synchronously.
+  @MainActor var syncRendered: Bool = false
+  
   /// Whether or not the receiver is currently rendering.
-  @MainActor @Published var isRendering: Bool = false
+  @MainActor var isRendering: Bool = false
 
   /// The rendered blocks.
-  @MainActor @Published var blocks: [ComponentBlock] = []
+  @MainActor var blocks: [ComponentBlock] = []
 
   // MARK: Private properties
 
@@ -145,22 +148,21 @@ extension Renderer {
     guard !isRendering else {
       return []
     }
-    guard !rendered else {
+    guard !rendered && !syncRendered else {
       return blocks
     }
     isRendering = true
 
     let texOptions = TeXInputProcessorOptions(processEscapes: processEscapes, errorMode: errorMode)
-    let renderedBlocks = render(
+    blocks = render(
       blocks: parseBlocks(latex: latex, unencodeHTML: unencodeHTML, parsingMode: parsingMode),
       font: font,
       displayScale: displayScale,
       renderingMode: renderingMode,
       texOptions: texOptions)
 
-    blocks = renderedBlocks
     isRendering = false
-    rendered = true
+    syncRendered = true
     return blocks
   }
 
@@ -187,7 +189,8 @@ extension Renderer {
   ) async {
     let isRen = await isRendering
     let ren = await rendered
-    guard !isRen && !ren else {
+    let renSync = await syncRendered
+    guard !isRen && !ren && !renSync else {
       return
     }
     await MainActor.run {
@@ -413,9 +416,15 @@ extension Renderer {
 
     // Continue with getting the image
     let imageSize = svg.size(for: xHeight)
+    #if os(iOS) || os(visionOS)
+    guard let image = SwiftDraw.SVG(data: svg.data)?.rasterize(size: imageSize, scale: displayScale) else {
+      return nil
+    }
+    #else
     guard let image = SwiftDraw.SVG(data: svg.data)?.rasterize(with: imageSize, scale: displayScale) else {
       return nil
     }
+    #endif
 
     // Set the image in the cache
     Cache.shared.setImageCacheValue(image, for: cacheKey)

Sources/LaTeXSwiftUI/Models/Renderer.swift

@@ -217,7 +217,7 @@ extension SVGGeometry.XHeight {
   /// - Parameter font: The font.
   /// - Returns: The points.
   func toPoints(_ font: Font) -> CGFloat {
-    #if os(iOS)
+    #if os(iOS) || os(visionOS)
       toPoints(_Font.preferredFont(from: font))
     #else
       toPoints(_Font.preferredFont(from: font))