Release/2.3.1 (#227)

* Added macOS compatibility to tests (#224)
* Fixed missing file ref
* #225: Fixing incorrect US page size (#226)
Corrected the usLetter page height and usLedger page width to reflect 11inx72dpi
* Fixed missing file ref
* Updated changelog

Co-authored-by: Sami Khoury <50881610+Sgkhour@users.noreply.github.com>

Author: Philip Niedertscheider

.travis.yml

@@ -21,7 +21,7 @@ stages:
 jobs:
   include:
   - stage: Tests
-    name: "Unit Tests"
+    name: "iOS Unit Tests"
     language: objective-c
     env:
     - TEST_FRAMEWORK_SCHEME="TPPDF-Package"
@@ -43,6 +43,25 @@ jobs:
     after_success:
     - bundle exec slather coverage -t --build-directory ${TRAVIS_BUILD_DIR}/derived_data
     - bash <(curl -s https://codecov.io/bash) -f cobertura.xml -X coveragepy -X gco
+  - stage: Tests
+    name: "macOS Unit Tests"
+    language: objective-c
+    env:
+    - TEST_FRAMEWORK_SCHEME="TPPDF-Package"
+    - PROJECT="TPPDF.xcodeproj"
+    script:
+    - set -o pipefail
+    - swift package resolve
+    - set -o pipefail
+    - xcodebuild -project ${PROJECT}
+                 -scheme ${TEST_FRAMEWORK_SCHEME}
+                 -clonedSourcePackagesDirPath .
+                 -derivedDataPath ${TRAVIS_BUILD_DIR}/derived_data
+                 -sdk macosx
+                 -destination "platform=macOS"
+                 -configuration Debug
+                 ONLY_ACTIVE_ARCH=YES
+                 test | xcpretty
 
   - stage: Examples
     name: "Example iOS - Cocoapods"

CHANGELOG.md

@@ -7,10 +7,16 @@
 
 **Fixed bugs:**
 
+- Fixed invalid US page formats (#225)
+
 **Closed issues:**
 
+- Issue #225
+
 **Merged pull requests:**
 
+- PR #226
+
 ## [2.3.0](https://github.com/techprimate/TPPDF/tree/2.3.0) (2020-07-16)
 [Full Changelog](https://github.com/techprimate/TPPDF/compare/2.2.0...2.3.0)
 

Example macOS/Example.xcodeproj/project.pbxproj

@@ -266,7 +266,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1150;
-				LastUpgradeCheck = 1150;
+				LastUpgradeCheck = 1160;
 				ORGANIZATIONNAME = "techprimate GmbH & Co. KG";
 				TargetAttributes = {
 					D48C538424A269F400D7A3DD = {
@@ -478,6 +478,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";
@@ -502,6 +503,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = Example/Example.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Example/Preview Content\"";

Example macOS/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1160"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example macOS/Example/AppDelegate.swift

@@ -27,6 +27,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         window.setFrameAutosaveName("Main Window")
         window.contentView = NSHostingView(rootView: contentView)
         window.makeKeyAndOrderFront(nil)
+        window.setFrameAutosaveName("main")
     }
 
     func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {

Example macOS/Example/UI/ContentView.swift

@@ -13,7 +13,7 @@ import TPPDF
 class ContentViewModel: ObservableObject {
 
     @Published var url: URL?
-    @State var selectedFactory = Examples.factories.first?.examples.first
+    @State var selectedFactory = Examples.defaultFactory
 
 }
 
@@ -37,7 +37,7 @@ struct ContentView: View {
                    alignment: .topLeading)
             .listStyle(SidebarListStyle())
 
-            DetailView(example: viewModel.selectedFactory!)
+            DetailView(example: viewModel.selectedFactory)
                 .frame(minWidth: 0, maxWidth: .infinity,
                        minHeight: 0, maxHeight: .infinity,
                        alignment: .topLeading)

Shared/Examples/Examples.swift

@@ -48,5 +48,9 @@ enum Examples {
             ])
         ]
     }
+
+    static var defaultFactory: Example {
+        return factories[1].examples[0]
+    }
 }
 

Shared/Examples/TableExampleFactory.swift

@@ -20,7 +20,7 @@ class TableExampleFactory: ExampleFactory {
         let document = PDFDocument(format: .a4)
 
         // Create a table
-        let table = PDFTable(rows: 10, columns: 4)
+        var table = PDFTable(rows: 10, columns: 4)
 
         // Tables can contain Strings, Numbers, Images or nil, in case you need an empty cell.
         // If you add a unknown content type, an assertion will be thrown and the rendering will stop.
@@ -85,6 +85,40 @@ class TableExampleFactory: ExampleFactory {
 
         document.add(table: table)
 
+        // Another table:
+
+        table = PDFTable(rows: 50, columns: 4)
+        table.widths = [0.1, 0.3, 0.3, 0.3]
+        table.margin = 10
+        table.padding = 10
+        table.showHeadersOnEveryPage = false
+        table.style.columnHeaderCount = 3
+
+        for row in 0..<table.size.rows {
+            table[row, 0].content = "\(row)".asTableContent
+            for column in 1..<table.size.columns {
+                table[row, column].content = "\(row),\(column)".asTableContent
+            }
+        }
+
+        for i in stride(from: 3, to: 48, by: 3) {
+            table[rows: i...(i + 2), column: 1].merge(with: PDFTableCell(content: Array(repeating: "\(i),1", count: 3).joined(separator: "\n").asTableContent,
+                                                           alignment: .center))
+        }
+        for i in stride(from: 4, to: 47, by: 3) {
+            table[rows: i...(i + 2), column: 2].merge(with: PDFTableCell(content: Array(repeating: "\(i),2", count: 3).joined(separator: "\n").asTableContent,
+                                                           alignment: .center))
+        }
+        for i in stride(from: 5, to: 48, by: 3) {
+            table[rows: i...(i + 2), column: 3].merge(with: PDFTableCell(content: Array(repeating: "\(i),3", count: 3).joined(separator: "\n").asTableContent,
+                                                           alignment: .center))
+        }
+
+        table[rows: 0..<2, column: 2].merge()
+        table[rows: 1..<3, column: 3].merge()
+
+        document.add(table: table)
+
         return [document]
     }
 }

Source/API/Groups/PDFGroup+Objects.swift

@@ -126,7 +126,7 @@ public extension PDFGroup {
      - parameter container: Container whose text color will be reset, defaults to `PDFGroupContainer.left`
      */
     func resetFont(_ container: PDFGroupContainer = PDFGroupContainer.left) {
-        objects += [(container, PDFFontObject(font: Font.systemFont(ofSize: Font.systemFontSize)))]
+        objects += [(container, PDFFontObject(font: Font.systemFont(ofSize: PDFConstants.defaultFontSize)))]
     }
 
     /**

Source/API/PDFDocument.swift

@@ -180,7 +180,7 @@ public class PDFDocument: CustomStringConvertible {
      - parameter container: Container whose text color will be reset, defaults to `PDFContainer.contentLeft`
      */
     public func resetFont(_ container: PDFContainer = PDFContainer.contentLeft) {
-        objects += [(container, PDFFontObject(font: Font.systemFont(ofSize: Font.systemFontSize)))]
+        objects += [(container, PDFFontObject(font: Font.systemFont(ofSize: PDFConstants.defaultFontSize)))]
     }
 
     /**