Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

README.md

@@ -13,6 +13,13 @@ This repository contains Aspose.Words Cloud SDK for Swift source code. This SDK
 * Watermarks and protection
 * Full read & write access to Document Object Model, including sections, paragraphs, text, images, tables, headers/footers and many others
 
+## Enhancements in Version 25.4
+
+- Added 'AttachmentsEmbeddingMode' property for PdfSaveOptionsData class.
+- Added 'UpdateAmbiguousTextFont' property for SaveOptionsData class.
+- Added 'Granularity' property for CompareOptions class.
+
+
 ## Enhancements in Version 25.2
 
 - Added 'IdPrefix' property for HtmlFixedSaveOptionsData and SvgSaveOptionsData class.
@@ -378,7 +385,7 @@ Add link to this repository as dependency to your Package.swift:
 
 dependencies: [
     // Dependencies declare other packages that this package depends on.
-    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git", from: "25.3")
+    .package(url: "https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git", from: "25.4")
 ],
 targets: [
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -396,7 +403,7 @@ targets: [
 Add link to git repository as dependency to your Podfile:
 
 ```ruby
-pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '25.3'
+pod 'AsposeWordsCloud', :git => 'https://github.com/aspose-words-cloud/aspose-words-cloud-swift.git', :tag => '25.4'
 ```
 
 ## Getting Started

Sources/AsposeWordsCloud/Api/Configuration.swift

@@ -187,6 +187,6 @@ public class Configuration : Codable {
 
     // Returns SDK version for using in statistics headers
     public func getSdkVersion() -> String {
-        return "25.3";
+        return "25.4";
     }
 }

Sources/AsposeWordsCloud/Model/CompareOptions.swift

@@ -29,6 +29,16 @@ import Foundation
 
 // DTO container with compare documents options.
 public class CompareOptions : Codable, WordsApiModel {
+    // Gets or sets the option indicating whether changes are tracked by character or by word.
+    public enum Granularity : String, Codable
+    {
+        // Enum value "charLevel"
+        case charLevel = "CharLevel"
+
+        // Enum value "wordLevel"
+        case wordLevel = "WordLevel"
+    }
+
     // Gets or sets the option that controls which document shall be used as a target during comparison.
     public enum Target : String, Codable
     {
@@ -51,6 +61,18 @@ public class CompareOptions : Codable, WordsApiModel {
         }
     }
 
+    // Field of granularity. DTO container with compare documents options.
+    private var _granularity : Granularity? = nil;
+
+    public var granularity : Granularity? {
+        get {
+            return self._granularity;
+        }
+        set {
+            self._granularity = newValue;
+        }
+    }
+
     // Field of ignoreCaseChanges. DTO container with compare documents options.
     private var _ignoreCaseChanges : Bool? = nil;
 
@@ -161,6 +183,7 @@ public class CompareOptions : Codable, WordsApiModel {
 
     private enum CodingKeys: String, CodingKey {
         case acceptAllRevisionsBeforeComparison = "AcceptAllRevisionsBeforeComparison";
+        case granularity = "Granularity";
         case ignoreCaseChanges = "IgnoreCaseChanges";
         case ignoreComments = "IgnoreComments";
         case ignoreFields = "IgnoreFields";
@@ -178,6 +201,10 @@ public class CompareOptions : Codable, WordsApiModel {
 
     public required init(from json: [String: Any]) throws {
         self.acceptAllRevisionsBeforeComparison = json["AcceptAllRevisionsBeforeComparison"] as? Bool;
+        if let raw_granularity = json["Granularity"] as? String {
+            self.granularity = Granularity(rawValue: raw_granularity);
+        }
+
         self.ignoreCaseChanges = json["IgnoreCaseChanges"] as? Bool;
         self.ignoreComments = json["IgnoreComments"] as? Bool;
         self.ignoreFields = json["IgnoreFields"] as? Bool;
@@ -195,6 +222,7 @@ public class CompareOptions : Codable, WordsApiModel {
     public required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self);
         self.acceptAllRevisionsBeforeComparison = try container.decodeIfPresent(Bool.self, forKey: .acceptAllRevisionsBeforeComparison);
+        self.granularity = try container.decodeIfPresent(Granularity.self, forKey: .granularity);
         self.ignoreCaseChanges = try container.decodeIfPresent(Bool.self, forKey: .ignoreCaseChanges);
         self.ignoreComments = try container.decodeIfPresent(Bool.self, forKey: .ignoreComments);
         self.ignoreFields = try container.decodeIfPresent(Bool.self, forKey: .ignoreFields);
@@ -211,6 +239,9 @@ public class CompareOptions : Codable, WordsApiModel {
         if (self.acceptAllRevisionsBeforeComparison != nil) {
             try container.encode(self.acceptAllRevisionsBeforeComparison, forKey: .acceptAllRevisionsBeforeComparison);
         }
+        if (self.granularity != nil) {
+            try container.encode(self.granularity, forKey: .granularity);
+        }
         if (self.ignoreCaseChanges != nil) {
             try container.encode(self.ignoreCaseChanges, forKey: .ignoreCaseChanges);
         }
@@ -258,6 +289,18 @@ public class CompareOptions : Codable, WordsApiModel {
     }
 
 
+    // Sets granularity. Gets or sets the option indicating whether changes are tracked by character or by word.
+    public func setGranularity(granularity : Granularity?) -> CompareOptions {
+        self.granularity = granularity;
+        return self;
+    }
+
+    // Gets granularity. Gets or sets the option indicating whether changes are tracked by character or by word.
+    public func getGranularity() -> Granularity? {
+        return self.granularity;
+    }
+
+
     // Sets ignoreCaseChanges. Gets or sets a value indicating whether documents comparison is case insensitive. By default comparison is case sensitive.
     public func setIgnoreCaseChanges(ignoreCaseChanges : Bool?) -> CompareOptions {
         self.ignoreCaseChanges = ignoreCaseChanges;

Sources/AsposeWordsCloud/Model/PageSetup.swift

@@ -322,6 +322,12 @@ public class PageSetup : LinkElement {
         // Enum value "number10Envelope"
         case number10Envelope = "Number10Envelope"
 
+        // Enum value "jisB4"
+        case jisB4 = "JisB4"
+
+        // Enum value "jisB5"
+        case jisB5 = "JisB5"
+
         // Enum value "custom"
         case custom = "Custom"
     }

Sources/AsposeWordsCloud/Model/PdfSaveOptionsData.swift

@@ -29,6 +29,22 @@ import Foundation
 
 // Container class for pdf save options.
 public class PdfSaveOptionsData : FixedPageSaveOptionsData {
+    // Gets or sets a value determining how attachments are embedded to the PDF document.
+    // Default value is None and attachments are not embedded.
+    // PDF/A-1, PDF/A-2 and regular PDF/A-4 (not PDF/A-4f) standards do not allow embedded files.
+    // None value will be used automatically.
+    public enum AttachmentsEmbeddingMode : String, Codable
+    {
+        // Enum value "_none"
+        case _none = "None"
+
+        // Enum value "annotations"
+        case annotations = "Annotations"
+
+        // Enum value "documentEmbeddedFiles"
+        case documentEmbeddedFiles = "DocumentEmbeddedFiles"
+    }
+
     // Gets or sets the PDF standards compliance level for output documents.
     public enum Compliance : String, Codable
     {
@@ -178,6 +194,18 @@ public class PdfSaveOptionsData : FixedPageSaveOptionsData {
         case fitBox = "FitBox"
     }
 
+    // Field of attachmentsEmbeddingMode. Container class for pdf save options.
+    private var _attachmentsEmbeddingMode : AttachmentsEmbeddingMode? = nil;
+
+    public var attachmentsEmbeddingMode : AttachmentsEmbeddingMode? {
+        get {
+            return self._attachmentsEmbeddingMode;
+        }
+        set {
+            self._attachmentsEmbeddingMode = newValue;
+        }
+    }
+
     // Field of cacheBackgroundGraphics. Container class for pdf save options.
     private var _cacheBackgroundGraphics : Bool? = nil;
 
@@ -536,6 +564,7 @@ public class PdfSaveOptionsData : FixedPageSaveOptionsData {
     }
 
     private enum CodingKeys: String, CodingKey {
+        case attachmentsEmbeddingMode = "AttachmentsEmbeddingMode";
         case cacheBackgroundGraphics = "CacheBackgroundGraphics";
         case compliance = "Compliance";
         case createNoteHyperlinks = "CreateNoteHyperlinks";
@@ -574,6 +603,10 @@ public class PdfSaveOptionsData : FixedPageSaveOptionsData {
 
     public required init(from json: [String: Any]) throws {
         try super.init(from: json);
+        if let raw_attachmentsEmbeddingMode = json["AttachmentsEmbeddingMode"] as? String {
+            self.attachmentsEmbeddingMode = AttachmentsEmbeddingMode(rawValue: raw_attachmentsEmbeddingMode);
+        }
+
         self.cacheBackgroundGraphics = json["CacheBackgroundGraphics"] as? Bool;
         if let raw_compliance = json["Compliance"] as? String {
             self.compliance = Compliance(rawValue: raw_compliance);
@@ -644,6 +677,7 @@ public class PdfSaveOptionsData : FixedPageSaveOptionsData {
     public required init(from decoder: Decoder) throws {
         try super.init(from: decoder);
         let container = try decoder.container(keyedBy: CodingKeys.self);
+        self.attachmentsEmbeddingMode = try container.decodeIfPresent(AttachmentsEmbeddingMode.self, forKey: .attachmentsEmbeddingMode);
         self.cacheBackgroundGraphics = try container.decodeIfPresent(Bool.self, forKey: .cacheBackgroundGraphics);
         self.compliance = try container.decodeIfPresent(Compliance.self, forKey: .compliance);
         self.createNoteHyperlinks = try container.decodeIfPresent(Bool.self, forKey: .createNoteHyperlinks);
@@ -678,6 +712,9 @@ public class PdfSaveOptionsData : FixedPageSaveOptionsData {
     public override func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder);
         var container = encoder.container(keyedBy: CodingKeys.self);
+        if (self.attachmentsEmbeddingMode != nil) {
+            try container.encode(self.attachmentsEmbeddingMode, forKey: .attachmentsEmbeddingMode);
+        }
         if (self.cacheBackgroundGraphics != nil) {
             try container.encode(self.cacheBackgroundGraphics, forKey: .cacheBackgroundGraphics);
         }
@@ -779,6 +816,18 @@ public class PdfSaveOptionsData : FixedPageSaveOptionsData {
 
     }
 
+    // Sets attachmentsEmbeddingMode. Gets or sets a value determining how attachments are embedded to the PDF document. Default value is None and attachments are not embedded. PDF/A-1, PDF/A-2 and regular PDF/A-4 (not PDF/A-4f) standards do not allow embedded files. None value will be used automatically.
+    public func setAttachmentsEmbeddingMode(attachmentsEmbeddingMode : AttachmentsEmbeddingMode?) -> PdfSaveOptionsData {
+        self.attachmentsEmbeddingMode = attachmentsEmbeddingMode;
+        return self;
+    }
+
+    // Gets attachmentsEmbeddingMode. Gets or sets a value determining how attachments are embedded to the PDF document. Default value is None and attachments are not embedded. PDF/A-1, PDF/A-2 and regular PDF/A-4 (not PDF/A-4f) standards do not allow embedded files. None value will be used automatically.
+    public func getAttachmentsEmbeddingMode() -> AttachmentsEmbeddingMode? {
+        return self.attachmentsEmbeddingMode;
+    }
+
+
     // Sets cacheBackgroundGraphics. Gets or sets a value determining whether or not to cache graphics placed in document's background. Default value is true and background graphics are written to the PDF document as an xObject. When the value is false background graphics are not cached. Some shapes are not supported for caching(shapes with fields, bookmarks, HRefs). Document background graphic is various shapes, charts, images placed in the footer or header, well as background and border of a page.
     public func setCacheBackgroundGraphics(cacheBackgroundGraphics : Bool?) -> PdfSaveOptionsData {
         self.cacheBackgroundGraphics = cacheBackgroundGraphics;
@@ -864,14 +913,14 @@ public class PdfSaveOptionsData : FixedPageSaveOptionsData {
 
 
     // Sets embedAttachments. Gets or sets a value determining whether or not to embed attachments to the PDF document. Default value is false and attachments are not embedded. When the value is true attachments are embedded to the PDF document. Embedding attachments is not supported when saving to PDF/A and PDF/UA compliance. false value will be used automatically. Embedding attachments is not supported when encryption is enabled. false value will be used automatically.
-    @available(*, deprecated, message: "This property will be removed in the future.")
+    @available(*, deprecated, message: "Obsolete, please use AttachmentsEmbeddingMode instead.")
     public func setEmbedAttachments(embedAttachments : Bool?) -> PdfSaveOptionsData {
         self.embedAttachments = embedAttachments;
         return self;
     }
 
     // Gets embedAttachments. Gets or sets a value determining whether or not to embed attachments to the PDF document. Default value is false and attachments are not embedded. When the value is true attachments are embedded to the PDF document. Embedding attachments is not supported when saving to PDF/A and PDF/UA compliance. false value will be used automatically. Embedding attachments is not supported when encryption is enabled. false value will be used automatically.
-    @available(*, deprecated, message: "This property will be removed in the future.")
+    @available(*, deprecated, message: "Obsolete, please use AttachmentsEmbeddingMode instead.")
     public func getEmbedAttachments() -> Bool? {
         return self.embedAttachments;
     }

Sources/AsposeWordsCloud/Model/SaveOptionsData.swift

@@ -163,6 +163,18 @@ public class SaveOptionsData : Codable, WordsApiModel {
         }
     }
 
+    // Field of updateAmbiguousTextFont. base container class for save options data.
+    private var _updateAmbiguousTextFont : Bool? = nil;
+
+    public var updateAmbiguousTextFont : Bool? {
+        get {
+            return self._updateAmbiguousTextFont;
+        }
+        set {
+            self._updateAmbiguousTextFont = newValue;
+        }
+    }
+
     // Field of updateCreatedTimeProperty. base container class for save options data.
     private var _updateCreatedTimeProperty : Bool? = nil;
 
@@ -240,6 +252,7 @@ public class SaveOptionsData : Codable, WordsApiModel {
         case dmlRenderingMode = "DmlRenderingMode";
         case fileName = "FileName";
         case imlRenderingMode = "ImlRenderingMode";
+        case updateAmbiguousTextFont = "UpdateAmbiguousTextFont";
         case updateCreatedTimeProperty = "UpdateCreatedTimeProperty";
         case updateFields = "UpdateFields";
         case updateLastPrintedProperty = "UpdateLastPrintedProperty";
@@ -275,6 +288,7 @@ public class SaveOptionsData : Codable, WordsApiModel {
             self.imlRenderingMode = ImlRenderingMode(rawValue: raw_imlRenderingMode);
         }
 
+        self.updateAmbiguousTextFont = json["UpdateAmbiguousTextFont"] as? Bool;
         self.updateCreatedTimeProperty = json["UpdateCreatedTimeProperty"] as? Bool;
         self.updateFields = json["UpdateFields"] as? Bool;
         self.updateLastPrintedProperty = json["UpdateLastPrintedProperty"] as? Bool;
@@ -292,6 +306,7 @@ public class SaveOptionsData : Codable, WordsApiModel {
         self.dmlRenderingMode = try container.decodeIfPresent(DmlRenderingMode.self, forKey: .dmlRenderingMode);
         self.fileName = try container.decodeIfPresent(String.self, forKey: .fileName);
         self.imlRenderingMode = try container.decodeIfPresent(ImlRenderingMode.self, forKey: .imlRenderingMode);
+        self.updateAmbiguousTextFont = try container.decodeIfPresent(Bool.self, forKey: .updateAmbiguousTextFont);
         self.updateCreatedTimeProperty = try container.decodeIfPresent(Bool.self, forKey: .updateCreatedTimeProperty);
         self.updateFields = try container.decodeIfPresent(Bool.self, forKey: .updateFields);
         self.updateLastPrintedProperty = try container.decodeIfPresent(Bool.self, forKey: .updateLastPrintedProperty);
@@ -323,6 +338,9 @@ public class SaveOptionsData : Codable, WordsApiModel {
         if (self.imlRenderingMode != nil) {
             try container.encode(self.imlRenderingMode, forKey: .imlRenderingMode);
         }
+        if (self.updateAmbiguousTextFont != nil) {
+            try container.encode(self.updateAmbiguousTextFont, forKey: .updateAmbiguousTextFont);
+        }
         if (self.updateCreatedTimeProperty != nil) {
             try container.encode(self.updateCreatedTimeProperty, forKey: .updateCreatedTimeProperty);
         }
@@ -439,6 +457,18 @@ public class SaveOptionsData : Codable, WordsApiModel {
     }
 
 
+    // Sets updateAmbiguousTextFont. Gets or sets a value indicating whether the font attributes will be changed according to the character code being used.
+    public func setUpdateAmbiguousTextFont(updateAmbiguousTextFont : Bool?) -> SaveOptionsData {
+        self.updateAmbiguousTextFont = updateAmbiguousTextFont;
+        return self;
+    }
+
+    // Gets updateAmbiguousTextFont. Gets or sets a value indicating whether the font attributes will be changed according to the character code being used.
+    public func getUpdateAmbiguousTextFont() -> Bool? {
+        return self.updateAmbiguousTextFont;
+    }
+
+
     // Sets updateCreatedTimeProperty. Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false.
     public func setUpdateCreatedTimeProperty(updateCreatedTimeProperty : Bool?) -> SaveOptionsData {
         self.updateCreatedTimeProperty = updateCreatedTimeProperty;