Merge pull request #11 from shinjukunian/imageSize

image size for nstextattachement

DocX/NSTextAttachement+Extensions.swift

@@ -69,7 +69,14 @@ extension NSTextAttachment{
     }
 
     var extentInEMU:Size{
-        let size=self.dataImageSize
+        let size:CGSize
+        if self.bounds != .zero{
+            size=self.bounds.size
+        }
+        else{
+            size=self.dataImageSize
+        }
+
         let width=size.width
         let height=size.height
 

DocXTests/DocXTests.swift

@@ -399,6 +399,28 @@ Specifies the border displayed above a set of paragraphs which have the same set
 
 
 
+    func testLenna_size() throws{
+        let longString = """
+        1. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum\r.
+        """
+        let imageURL=URL(fileURLWithPath: #file).deletingLastPathComponent().appendingPathComponent("lenna.png")
+        let imageData=try XCTUnwrap(Data(contentsOf: imageURL), "Image not found")
+        let attachement=NSTextAttachment(data: imageData, ofType: kUTTypePNG as String)
+        attachement.bounds=CGRect(x: 0, y: 0, width: 128, height: 128)
+
+        let attributed=NSMutableAttributedString(string: longString, attributes: [:])
+//        attributed.addAttributes([.link:URL(string: "http://officeopenxml.com/index.php")!], range: NSRange(location: 2, length: 6))
+        let imageString=NSAttributedString(attachment: attachement)
+        let result=NSMutableAttributedString()
+        result.append(attributed)
+        result.append(imageString)
+        result.append(attributed)
+//        result.append(attributed)
+        testWriteDocX(attributedString: result, useBuiltin: false)
+    }
+
+
+
 //    @available(macOS 12, *)
 //    func testAttributed(){
 //        var att=AttributedString("Lorem ipsum dolor sit amet")

Package.swift

@@ -45,7 +45,7 @@ let package = Package(
             dependencies: ["DocX"],
             path: "DocXTests",
             exclude: ["Info.plist"],
-            resources: [.copy("blank.docx"), .copy("Picture1.png")]
+            resources: [.copy("blank.docx"), .copy("Picture1.png"), .copy("lenna.png")]
         ),
 
         .testTarget(