Merge branch 'dev'

* dev:
  fix: color of ruby annotation
  only generate furigana for kanji
  fix: crash while generating kanji annotation

Author: ddddxxx

LyricsX/Supporting Files/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.3</string>
 	<key>CFBundleVersion</key>
-	<string>1973</string>
+	<string>1984</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

LyricsX/Utility/CFExtension.swift

@@ -95,15 +95,12 @@ extension CFStringTokenizer {
     func currentFuriganaAnnotation(in string: NSString) -> (NSString, NSRange)? {
         let range = currentTokenRange()
         let tokenStr = string.substring(with: range)
-        guard let latin = currentTokenAttribute(.latinTranscription),
+        guard tokenStr.unicodeScalars.contains(where: CharacterSet.kanji.contains),
+            let latin = currentTokenAttribute(.latinTranscription),
             let hiragana = latin.applyingTransform(.latinToHiragana, reverse: false),
-            let katakana = latin.applyingTransform(.hiraganaToKatakana, reverse: false),
-            !katakana.isEmpty,
-            katakana != tokenStr,
-            hiragana != tokenStr else {
+            let (rangeToAnnotate, rangeInAnnotation) = rangeOfUncommonContent(tokenStr, hiragana) else {
                 return nil
         }
-        let (rangeToAnnotate, rangeInAnnotation) = rangeOfUncommonContent(tokenStr, hiragana)!
         let annotation = String(hiragana[rangeInAnnotation]) as NSString
         var nsrangeToAnnotate = NSRange(rangeToAnnotate, in: tokenStr)
         nsrangeToAnnotate.location += range.location
@@ -112,7 +109,7 @@ extension CFStringTokenizer {
 }
 
 private func rangeOfUncommonContent(_ s1: String, _ s2: String) -> (Range<String.Index>, Range<String.Index>)? {
-    guard s1 != s2 else {
+    guard s1 != s2, !s1.isEmpty, !s2.isEmpty else {
         return nil
     }
     var (l1, l2) = (s1.startIndex, s2.startIndex)
@@ -125,15 +122,16 @@ private func rangeOfUncommonContent(_ s1: String, _ s2: String) -> (Range<String
     }
 
     var (r1, r2) = (s1.endIndex, s2.endIndex)
-    while s1[r1] == s2[r2] {
+    repeat {
         guard let nr1 = s1.index(r1, offsetBy: -1, limitedBy: s1.startIndex),
             let nr2 = s2.index(r2, offsetBy: -1, limitedBy: s2.startIndex) else {
                 break
         }
         (r1, r2) = (nr1, nr2)
-    }
+    } while s1[r1] == s2[r2]
+    
     let range1 = (l1...r1).relative(to: s1.indices)
-    let range2 = (l2...r2).relative(to: s1.indices)
+    let range2 = (l2...r2).relative(to: s2.indices)
     return (range1, range2)
 }
 

LyricsX/Utility/CTExtension.swift

@@ -29,6 +29,8 @@ extension NSAttributedStringKey {
 
     /// kCTRubyAnnotationSizeFactorAttributeName
     static let rubyAnnotationSizeFactor = NSAttributedStringKey("CTRubyAnnotationSizeFactor")
+    
+    static let ctForegroundColor = kCTForegroundColorAttributeName as NSAttributedStringKey
 }
 
 extension CTRubyAnnotation {

LyricsX/Utility/StdExtension.swift

@@ -94,3 +94,11 @@ extension NSAttributedString {
         return NSRange(location: 0, length: length)
     }
 }
+
+extension CharacterSet {
+    
+    static let hiragana = CharacterSet(charactersIn: "\u{3040}"..<"\u{30a0}")
+    static let katakana = CharacterSet(charactersIn: "\u{30a0}"..<"\u{3100}")
+    static let kana = CharacterSet(charactersIn: "\u{3040}"..<"\u{3100}")
+    static let kanji = CharacterSet(charactersIn: "\u{4e00}"..<"\u{9fc0}")
+}

LyricsX/View/KaraokeLabel.swift

@@ -89,7 +89,7 @@ class KaraokeLabel: NSTextField {
             guard shouldDrawFurigana else { continue }
             if let (furigana, range) = tokenizer.currentFuriganaAnnotation(in: string) {
                 var attr: [NSAttributedStringKey: Any] = [.rubyAnnotationSizeFactor: 0.5]
-                attr[.foregroundColor] = textColor // Set ruby text color but it seems doesn't work.
+                attr[.ctForegroundColor] = textColor
                 let annotation = CTRubyAnnotation.create(furigana, attributes: attr)
                 attrString.addAttribute(.rubyAnnotation, value: annotation, range: range)
             }