【文字图片编辑】文字图片编辑特殊字体判断

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -636,9 +636,13 @@ extension KMEditPDFTextPropertyViewController {
         let alignment = self.alignment
         let fontSize = Float((self.fontSizeVC?.stringValue.replacingOccurrences(of: "pt", with: ""))!)
         let fontName = self.fontNameVC?.stringValue
-        let fontStyle = self.fontStyleVC?.stringValue
+        var fontStyle = self.fontStyleVC?.stringValue
         let fontCurrentColor = self.currentColor
         
+        if fontStyle == "Regular" || fontStyle == "Roman" {
+            fontStyle = ""
+        }
+        
         let editringareas = self.listView.editingAreas()
         let count = self.listView.editingAreas()?.count
         let editingSelectionString = self.listView.editingSelectionString()
@@ -669,8 +673,8 @@ extension KMEditPDFTextPropertyViewController {
         if font == nil {
             self.fontName = ""
             self.fontStyle = ""
-            attributeFontDescriptor = NSFontDescriptor.init(fontAttributes: [NSFontDescriptor.AttributeName.family : self.fontNameVC?.items[0] ?? "Helvetica",NSFontDescriptor.AttributeName.face : self.fontStyleVC?.items[0] ?? "Bold"])
-            font = NSFont.init(descriptor: attributeFontDescriptor, size: CGFloat(Float(self.fontSizeVC!.stringValue)!))
+            attributeFontDescriptor = NSFontDescriptor.init(fontAttributes: [NSFontDescriptor.AttributeName.family : fontName ?? "Helvetica",NSFontDescriptor.AttributeName.face : fontStyle ?? "Bold"])
+            font = NSFont.init(descriptor: attributeFontDescriptor, size: CGFloat(fontSize!))
         }
         
         let attributes = [NSAttributedString.Key.font:font,NSAttributedString.Key.foregroundColor:color,NSAttributedString.Key.paragraphStyle:style]