Revision: 13318
http://sourceforge.net/p/skim-app/code/13318
Author: hofman
Date: 2023-02-27 15:41:56 +0000 (Mon, 27 Feb 2023)
Log Message:
-----------
Fix code paths for iOS. Link and import PDFKit, as Quartz is not available on
iOS. Import and link CoreGraphics for iOS. Fix imports. Enable modules.
Modified Paths:
--------------
trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig
trunk/SkimNotes/Configurations/SkimNotes-Framework-iOS.xcconfig
trunk/SkimNotes/Configurations/SkimNotesBase-Framework-iOS.xcconfig
trunk/SkimNotes/PDFAnnotation_SKNExtensions.h
trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
trunk/SkimNotes/PDFDocument_SKNExtensions.h
trunk/SkimNotes/PDFDocument_SKNExtensions.m
trunk/SkimNotes/SKNPDFAnnotationNote.h
trunk/SkimNotes/SKNPDFAnnotationNote.m
trunk/SkimNotes/SKNUtilities.m
trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
trunk/SkimNotes/SkimNotesBase_Prefix.pch
trunk/SkimNotes/SkimNotes_Prefix.pch
trunk/SkimNotes/SkimPDF_Tool_Prefix.pch
trunk/SkimNotes/skimpdf.m
Modified: trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig 2023-02-26
17:49:27 UTC (rev 13317)
+++ trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig 2023-02-27
15:41:56 UTC (rev 13318)
@@ -31,6 +31,8 @@
GCC_MODEL_TUNING = G5
+CLANG_ENABLE_MODULES = YES
+
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES
GCC_WARN_ABOUT_RETURN_TYPE = YES
GCC_WARN_SIGN_COMPARE = YES
Modified: trunk/SkimNotes/Configurations/SkimNotes-Framework-iOS.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Framework-iOS.xcconfig
2023-02-26 17:49:27 UTC (rev 13317)
+++ trunk/SkimNotes/Configurations/SkimNotes-Framework-iOS.xcconfig
2023-02-27 15:41:56 UTC (rev 13318)
@@ -7,5 +7,3 @@
SDKROOT = iphoneos
IPHONEOS_DEPLOYMENT_TARGET = 11.0
-
-FRAMEWORK_SEARCH_PATHS = $(inherited)
$(SDKROOT)/System/iOSSupport/System/Library/Frameworks
Modified: trunk/SkimNotes/Configurations/SkimNotesBase-Framework-iOS.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotesBase-Framework-iOS.xcconfig
2023-02-26 17:49:27 UTC (rev 13317)
+++ trunk/SkimNotes/Configurations/SkimNotesBase-Framework-iOS.xcconfig
2023-02-27 15:41:56 UTC (rev 13318)
@@ -7,5 +7,3 @@
SDKROOT = iphoneos
IPHONEOS_DEPLOYMENT_TARGET = 11.0
-
-FRAMEWORK_SEARCH_PATHS = $(inherited)
$(SDKROOT)/System/iOSSupport/System/Library/Frameworks
Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.h
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.h 2023-02-26 17:49:27 UTC
(rev 13317)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.h 2023-02-27 15:41:56 UTC
(rev 13318)
@@ -42,7 +42,7 @@
@discussion This header file provides API for an
<code>PDFAnnotation</code> categories to convert Skim note dictionaries to
<code>PDFAnnotations</code> and back.
*/
#import <Foundation/Foundation.h>
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#ifndef PDFRect
#define PDFRect NSRect
Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2023-02-26 17:49:27 UTC
(rev 13317)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2023-02-27 15:41:56 UTC
(rev 13318)
@@ -38,14 +38,16 @@
#import "PDFAnnotation_SKNExtensions.h"
#import "SKNPDFAnnotationNote.h"
-#import <objc/objc-runtime.h>
#import <tgmath.h>
#if defined(PDFKIT_PLATFORM_IOS)
+#import <CoreGraphics/CoreGraphics.h>
+#import <objc/runtime.h>
+
#define SKNMakePoint(x, y) CGPointMake(x, y)
#define SKNPointFromString(string) CGPointFromString(string)
-#define SKNStringFromPoint(point) NSStringFromCCGPoint(point)
+#define SKNStringFromPoint(point) NSStringFromCGPoint(point)
#define SKNRectFromString(string) CGRectFromString(string)
#define SKNStringFromRect(point) NSStringFromCGRect(point)
#define SKNPointFromValue(value) [value CGPointValue]
@@ -52,6 +54,8 @@
#else
+#import <objc/objc-runtime.h>
+
#if !defined(PDFKIT_PLATFORM_OSX)
#define PDFKIT_PLATFORM_OSX
@@ -358,7 +362,7 @@
Class arrayClass = [NSArray class];
Class dateClass = [NSDate class];
NSString *contents = [dict objectForKey:SKNPDFAnnotationContentsKey];
- NSColor *color = [dict objectForKey:SKNPDFAnnotationColorKey];
+ PDFKitPlatformColor *color = [dict
objectForKey:SKNPDFAnnotationColorKey];
NSDate *modificationDate = [dict
objectForKey:SKNPDFAnnotationModificationDateKey];
NSString *userName = [dict objectForKey:SKNPDFAnnotationUserNameKey];
NSNumber *lineWidth = [dict objectForKey:SKNPDFAnnotationLineWidthKey];
@@ -404,9 +408,9 @@
NSNumber *startLineStyle = [dict
objectForKey:SKNPDFAnnotationStartLineStyleKey];
NSNumber *endLineStyle = [dict
objectForKey:SKNPDFAnnotationEndLineStyleKey];
if ([startPoint isKindOfClass:stringClass])
- [self setStartPoint:NSPointFromString(startPoint)];
+ [self setStartPoint:SKNPointFromString(startPoint)];
if ([endPoint isKindOfClass:stringClass])
- [self setEndPoint:NSPointFromString(endPoint)];
+ [self setEndPoint:SKNPointFromString(endPoint)];
if ([startLineStyle respondsToSelector:@selector(integerValue)])
[self setStartLineStyle:[startLineStyle integerValue]];
if ([endLineStyle respondsToSelector:@selector(integerValue)])
@@ -461,8 +465,8 @@
for (i = 0; i < iMax; i++) {
NSArray *pointStrings = [pointLists objectAtIndex:i];
if ([pointStrings isKindOfClass:arrayClass]) {
- NSBezierPath *path = [[NSBezierPath alloc] init];
- SKNSkimNotePathSetPoints(path, pointStrings);
+ PDFKitPlatformBezierPath *path =
[[PDFKitPlatformBezierPath alloc] init];
+ [[self class] setPoints:pointStrings
ofSkimNotePath:path];
[self addBezierPath:path];
[path release];
}
@@ -533,7 +537,7 @@
c[i] = [[value objectAtIndex:i] doubleValue];
CGColorSpaceRef cs = [value count] < 3 ? CGColorSpaceCreateDeviceGray() :
[value count] < 4 ? CGColorSpaceCreateDeviceRGB() :
CGColorSpaceCreateDeviceCMYK();
CGColorRef cgColor = CGColorCreate(cs, c);
- CIColor *color = [CIColor colorWithCGColor:cgColor];
+ UIColor *color = [UIColor colorWithCGColor:cgColor];
CGColorRelease(cgColor);
CGColorSpaceRelease(cs);
return color;
@@ -603,7 +607,7 @@
if ([self respondsToSelector:@selector(valueForAnnotationKey:)]) {
NSString *type = [self type];
- NSRect bounds = [self bounds];
+ PDFRect bounds = [self bounds];
id value = nil;
Class arrayClass = [NSArray class];
Class stringClass = [NSString class];
@@ -637,14 +641,14 @@
}
if ([self respondsToSelector:@selector(startPoint)] && [self
respondsToSelector:@selector(endPoint)]) {
- [dict setValue:NSStringFromPoint([(id)self startPoint])
forKey:SKNPDFAnnotationStartPointKey];
- [dict setValue:NSStringFromPoint([(id)self endPoint])
forKey:SKNPDFAnnotationEndPointKey];
+ [dict setValue:SKNStringFromPoint([(id)self startPoint])
forKey:SKNPDFAnnotationStartPointKey];
+ [dict setValue:SKNStringFromPoint([(id)self endPoint])
forKey:SKNPDFAnnotationEndPointKey];
} else if ((value = [self valueForAnnotationKey:@"/L"])) {
if ([value isKindOfClass:arrayClass] && [value count] == 4) {
PDFPoint p = SKNMakePoint([[value objectAtIndex:0]
doubleValue] - bounds.origin.x, [[value objectAtIndex:1] doubleValue] -
bounds.origin.y);
- [dict setValue:NSStringFromPoint(p)
forKey:SKNPDFAnnotationStartPointKey];
+ [dict setValue:SKNStringFromPoint(p)
forKey:SKNPDFAnnotationStartPointKey];
p = SKNMakePoint([[value objectAtIndex:2] doubleValue] -
bounds.origin.x, [[value objectAtIndex:3] doubleValue] - bounds.origin.y);
- [dict setValue:NSStringFromPoint(p)
forKey:SKNPDFAnnotationEndPointKey];
+ [dict setValue:SKNStringFromPoint(p)
forKey:SKNPDFAnnotationEndPointKey];
}
}
}
@@ -656,7 +660,7 @@
NSUInteger i, iMax = [quadPoints count];
NSMutableArray *quadPointStrings = [[NSMutableArray alloc]
initWithCapacity:iMax];
for (i = 0; i < iMax; i++)
- [quadPointStrings
addObject:NSStringFromPoint([[quadPoints objectAtIndex:i] pointValue])];
+ [quadPointStrings
addObject:SKNStringFromPoint(SKNPointFromValue([quadPoints objectAtIndex:i]))];
[dict setValue:quadPointStrings
forKey:SKNPDFAnnotationQuadrilateralPointsKey];
[quadPointStrings release];
}
@@ -692,7 +696,7 @@
NSUInteger i, iMax = [paths count];
NSMutableArray *pointLists = [[NSMutableArray alloc]
initWithCapacity:iMax];
for (i = 0; i < iMax; i++) {
- NSBezierPath *path = [paths objectAtIndex:i];
+ PDFKitPlatformBezierPath *path = [paths
objectAtIndex:i];
NSArray *pointStrings = [selfClass
pointsFromSkimNotePath:path];
if ([pointStrings count])
[pointLists addObject:pointStrings];
@@ -945,7 +949,11 @@
controlPoint2.y -= diff1.y / (3.0 * (d0 + d2));
}
+#if defined(PDFKIT_PLATFORM_IOS)
+ [path addCurveToPoint:prevPoint controlPoint1:controlPoint1
controlPoint2:controlPoint2];
+#else
[path curveToPoint:prevPoint controlPoint1:controlPoint1
controlPoint2:controlPoint2];
+#endif
controlPoint1 = prevPoint;
if (d1 > 0.0) {
@@ -955,10 +963,17 @@
}
}
+#if defined(PDFKIT_PLATFORM_IOS)
if (iMax == 2)
+ [path addLineToPoint:point];
+ else if (iMax > 2)
+ [path addCurveToPoint:point controlPoint1:controlPoint1
controlPoint2:point];
+#else
+ if (iMax == 2)
[path lineToPoint:point];
else if (iMax > 2)
[path curveToPoint:point controlPoint1:controlPoint1
controlPoint2:point];
+#endif
}
#if !defined(PDFKIT_PLATFORM_IOS)
Modified: trunk/SkimNotes/PDFDocument_SKNExtensions.h
===================================================================
--- trunk/SkimNotes/PDFDocument_SKNExtensions.h 2023-02-26 17:49:27 UTC (rev
13317)
+++ trunk/SkimNotes/PDFDocument_SKNExtensions.h 2023-02-27 15:41:56 UTC (rev
13318)
@@ -42,7 +42,7 @@
@discussion This header file provides API for an <code>PDFDocument</code>
category to add Skim note annotations to a <code>PDFDocument</code>.
*/
#import <Foundation/Foundation.h>
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
/*!
Modified: trunk/SkimNotes/PDFDocument_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFDocument_SKNExtensions.m 2023-02-26 17:49:27 UTC (rev
13317)
+++ trunk/SkimNotes/PDFDocument_SKNExtensions.m 2023-02-27 15:41:56 UTC (rev
13318)
@@ -43,8 +43,10 @@
#if defined(PDFKIT_PLATFORM_IOS)
+#import <CoreGraphics/CoreGraphics.h>
+
#define SKNRectFromString(string) CGRectFromString(string)
-#define SKNEqualRects(rect1, rect2) CGRectEqual(CGRectIntegral(rect1),
CGRectIntegral(rect2))
+#define SKNEqualRects(rect1, rect2) CGRectEqualToRect(CGRectIntegral(rect1),
CGRectIntegral(rect2))
#else
@@ -95,6 +97,7 @@
}
static inline SKNPDFWidgetType SKNWidgetTypeForAnnotation(PDFAnnotation
*annotation) {
+#if !defined(PDFKIT_PLATFORM_IOS)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([annotation isKindOfClass:[PDFAnnotationTextWidget class]])
@@ -106,6 +109,7 @@
else if ([annotation respondsToSelector:@selector(valueForAnnotationKey:)]
== NO)
return kSKNPDFWidgetTypeUnknown;
#pragma clang diagnostic pop
+#endif
NSString *ft = [annotation valueForAnnotationKey:@"/FT"];
if ([ft isKindOfClass:[NSString class]] == NO)
return kSKNPDFWidgetTypeUnknown;
@@ -154,13 +158,17 @@
if (widgetType == kSKNPDFWidgetTypeButton) {
if ([annotation
respondsToSelector:@selector(setButtonWidgetState:)])
[annotation setButtonWidgetState:[[dict
objectForKey:SKNPDFAnnotationStateKey] integerValue]];
+#if !defined(PDFKIT_PLATFORM_IOS)
else if ([annotation
respondsToSelector:@selector(setState:)])
[(id)annotation setState:[[dict
objectForKey:SKNPDFAnnotationStateKey] integerValue]];
+#endif
} else {
if ([annotation
respondsToSelector:@selector(setWidgetStringValue:)])
[annotation setWidgetStringValue:[dict
objectForKey:SKNPDFAnnotationStringValueKey]];
+#if !defined(PDFKIT_PLATFORM_IOS)
else if ([annotation
respondsToSelector:@selector(setStringValue:)])
[(id)annotation setStringValue:[dict
objectForKey:SKNPDFAnnotationStringValueKey]];
+#endif
}
break;
}
Modified: trunk/SkimNotes/SKNPDFAnnotationNote.h
===================================================================
--- trunk/SkimNotes/SKNPDFAnnotationNote.h 2023-02-26 17:49:27 UTC (rev
13317)
+++ trunk/SkimNotes/SKNPDFAnnotationNote.h 2023-02-27 15:41:56 UTC (rev
13318)
@@ -42,11 +42,14 @@
@discussion This header file declares API for a concrete
<code>PDFAnnotation</code> class representing a Skim anchored note.
*/
#import <Foundation/Foundation.h>
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#ifndef PDFKitPlatformImage
#define PDFKitPlatformImage NSImage
#endif
+#ifndef PDFSize
+#define PDFSize NSSize
+#endif
/*!
@discussion Global string for annotation text key.
@@ -60,7 +63,7 @@
/*!
@discussion Default size of an anchored note.
*/
-extern NSSize SKNPDFAnnotationNoteSize;
+extern PDFSize SKNPDFAnnotationNoteSize;
/*!
@abstract A concrete <code>PDFAnnotation</code> subclass, a subclass of
<code>PDFAnnotationText</code>, representing a Skim anchored note.
Modified: trunk/SkimNotes/SKNPDFAnnotationNote.m
===================================================================
--- trunk/SkimNotes/SKNPDFAnnotationNote.m 2023-02-26 17:49:27 UTC (rev
13317)
+++ trunk/SkimNotes/SKNPDFAnnotationNote.m 2023-02-27 15:41:56 UTC (rev
13318)
@@ -42,10 +42,12 @@
NSString *SKNPDFAnnotationTextKey = @"text";
NSString *SKNPDFAnnotationImageKey = @"image";
-NSSize SKNPDFAnnotationNoteSize = {16.0, 16.0};
+PDFSize SKNPDFAnnotationNoteSize = {16.0, 16.0};
#if !defined(PDFKIT_PLATFORM_IOS)
+#import <CoreGraphics/CoreGraphics.h>
+
static inline void drawIconComment(CGContextRef context, NSRect bounds);
static inline void drawIconKey(CGContextRef context, NSRect bounds);
static inline void drawIconNote(CGContextRef context, NSRect bounds);
Modified: trunk/SkimNotes/SKNUtilities.m
===================================================================
--- trunk/SkimNotes/SKNUtilities.m 2023-02-26 17:49:27 UTC (rev 13317)
+++ trunk/SkimNotes/SKNUtilities.m 2023-02-27 15:41:56 UTC (rev 13318)
@@ -41,6 +41,7 @@
#if (defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR) ||
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
#import <UIKit/UIKit.h>
+#import <CoreGraphics/CoreGraphics.h>
#define SKIMNOTES_PLATFORM_IOS
@@ -141,7 +142,7 @@
}
}
[attrString fixAttributesInRange:NSMakeRange(0, [attrString length])];
- return [attrString RTFFromRange:NSMakeRange(0, [attrString length])
documentAttributes:[NSDictionary
dictionaryWithObjectsAndKeys:NSRTFTextDocumentType,
NSDocumentTypeDocumentAttribute, nil]];
+ return [attrString dataFromRange:NSMakeRange(0, [attrString length])
documentAttributes:[NSDictionary
dictionaryWithObjectsAndKeys:NSRTFTextDocumentType,
NSDocumentTypeDocumentAttribute, nil] error:NULL];
}
#pragma mark -
@@ -269,7 +270,7 @@
NSNumber *fontSize = [dict
objectForKey:NOTE_FONT_SIZE_KEY];
if ([value isKindOfClass:[NSString class]]) {
CGFloat pointSize = [fontSize
isKindOfClass:[NSNumber class]] ? [fontSize doubleValue] : 0.0;
- value = [SKNFont fontWithName:value
size:pointSize] ?: [SKNFont userFontOfSize:pointSize];
+ value = [SKNFont fontWithName:value
size:pointSize] ?: [SKNFont fontWithName:@"Helvetica" size:pointSize];
[dict setObject:value forKey:NOTE_FONT_KEY];
}
[dict removeObjectForKey:NOTE_FONT_NAME_KEY];
@@ -312,11 +313,10 @@
NSData *SKNDataFromSkimNotes(NSArray *noteDicts, BOOL asPlist) {
NSData *data = nil;
if (noteDicts) {
-#if defined(SKIMNOTES_PLATFORM_IOS)
- if (1) {
-#else
+#if defined(PDFKIT_PLATFORM_IOS)
+ asPlist = YES;
+#endif
if (asPlist) {
-#endif
NSMutableArray *array = [[NSMutableArray alloc] init];
NSMapTable *colors = nil;
for (NSDictionary *noteDict in noteDicts) {
@@ -346,10 +346,14 @@
}
if ((value = [dict objectForKey:NOTE_TEXT_KEY])) {
if ([value isKindOfClass:[NSAttributedString class]]) {
+#if !defined(PDFKIT_PLATFORM_IOS) && (!defined(MAC_OS_X_VERSION_10_11) ||
MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
if ([value containsAttachments]) {
- value = [value RTFDFromRange:NSMakeRange(0, [value
length]) documentAttributes:[NSDictionary dictionary]];
+#else
+ if ([value containsAttachmentsInRange:NSMakeRange(0,
[value length])]) {
+#endif
+ value = [value dataFromRange:NSMakeRange(0, [value
length]) documentAttributes:[NSDictionary
dictionaryWithObjectsAndKeys:NSRTFDTextDocumentType,
NSDocumentTypeDocumentAttribute, nil] error:NULL];
} else {
- value = [value RTFFromRange:NSMakeRange(0, [value
length]) documentAttributes:[NSDictionary dictionary]];
+ value = [value dataFromRange:NSMakeRange(0, [value
length]) documentAttributes:[NSDictionary
dictionaryWithObjectsAndKeys:NSRTFTextDocumentType,
NSDocumentTypeDocumentAttribute, nil] error:NULL];
}
[dict setObject:value forKey:NOTE_TEXT_KEY];
} else if ([value isKindOfClass:[NSData class]] == NO) {
Modified: trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
===================================================================
--- trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2023-02-26 17:49:27 UTC
(rev 13317)
+++ trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2023-02-27 15:41:56 UTC
(rev 13318)
@@ -51,7 +51,6 @@
CE0C361329A9361D0056897C /* NSFileManager_SKNExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEBA2BD40E05826D0000B2E6 /*
NSFileManager_SKNExtensions.m */; };
CE0C361429A9361D0056897C /* PDFDocument_SKNExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEBA2BE10E0587EB0000B2E6 /*
PDFDocument_SKNExtensions.m */; };
CE0C361529A9361D0056897C /* SKNUtilities.m in Sources */ = {isa
= PBXBuildFile; fileRef = CE37768B0E2FC26100261604 /* SKNUtilities.m */; };
- CE0C361729A9361D0056897C /* Quartz.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = CEF57FD92988180700594EC0 /* Quartz.framework */;
};
CE0C361929A9361D0056897C /* Foundation.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = CEF57FD12988171C00594EC0 /*
Foundation.framework */; };
CE0C361A29A9361D0056897C /* libbz2.dylib in Frameworks */ =
{isa = PBXBuildFile; fileRef = CEBA2D1A0E05A61F0000B2E6 /* libbz2.dylib */; };
CE0C362229A9362B0056897C /* SkimNotesBase.h in Headers */ =
{isa = PBXBuildFile; fileRef = CEA5F5490E2CED6D00F65088 /* SkimNotesBase.h */;
settings = {ATTRIBUTES = (Public, ); }; };
@@ -62,7 +61,6 @@
CE0C362929A9362B0056897C /* NSFileManager_SKNExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEBA2BD40E05826D0000B2E6 /*
NSFileManager_SKNExtensions.m */; };
CE0C362A29A9362B0056897C /* SKNExtendedAttributeManager.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEBA2B640E05675E0000B2E6 /*
SKNExtendedAttributeManager.m */; };
CE0C362B29A9362B0056897C /* SKNUtilities.m in Sources */ = {isa
= PBXBuildFile; fileRef = CE37768B0E2FC26100261604 /* SKNUtilities.m */; };
- CE0C362D29A9362B0056897C /* Quartz.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = CEF57FD92988180700594EC0 /* Quartz.framework */;
};
CE0C362F29A9362B0056897C /* Foundation.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = CEF57FD12988171C00594EC0 /*
Foundation.framework */; };
CE0C363029A9362B0056897C /* libbz2.dylib in Frameworks */ =
{isa = PBXBuildFile; fileRef = CEBA2D1A0E05A61F0000B2E6 /* libbz2.dylib */; };
CE1412881229B73100C9EBA0 /* AppKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */;
};
@@ -75,6 +73,8 @@
CE1414291229B8B300C9EBA0 /* PDFAnnotation_SKNExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEBA2B700E0568430000B2E6 /*
PDFAnnotation_SKNExtensions.m */; };
CE14142A1229B8B400C9EBA0 /* PDFDocument_SKNExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEBA2BE10E0587EB0000B2E6 /*
PDFDocument_SKNExtensions.m */; };
CE14142B1229B8B500C9EBA0 /* SKNPDFAnnotationNote.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CEBA2B8C0E0569010000B2E6 /*
SKNPDFAnnotationNote.m */; };
+ CE1586F429ACB319001ADBCB /* PDFKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = CE1586F329ACB319001ADBCB /* PDFKit.framework */;
};
+ CE1586F529ACBF95001ADBCB /* PDFKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = CE1586F329ACB319001ADBCB /* PDFKit.framework */;
};
CE1F64E20E34FF7F00E07E76 /* Foundation.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /*
Foundation.framework */; };
CE1F64E30E34FF8000E07E76 /* AppKit.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */;
};
CE268622169DB35200B36A1E /* SkimNotesBase.framework in
CopyFiles */ = {isa = PBXBuildFile; fileRef = CEA5F53D0E2CED0E00F65088 /*
SkimNotesBase.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -86,6 +86,8 @@
CE3776960E2FC52A00261604 /* SKNUtilities.m in Sources */ = {isa
= PBXBuildFile; fileRef = CE37768B0E2FC26100261604 /* SKNUtilities.m */; };
CE3776970E2FC53000261604 /* SKNUtilities.h in Headers */ = {isa
= PBXBuildFile; fileRef = CE37768A0E2FC26100261604 /* SKNUtilities.h */; };
CE3907B00E082C460015B0B7 /* SkimNotes.strings in Resources */ =
{isa = PBXBuildFile; fileRef = CE3907AF0E082C460015B0B7 /* SkimNotes.strings
*/; };
+ CE91CB7429ACF9290058749E /* CoreGraphics.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = CEF57FD7298817CB00594EC0 /*
CoreGraphics.framework */; };
+ CE91CB7529ACF9450058749E /* CoreGraphics.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = CEF57FD7298817CB00594EC0 /*
CoreGraphics.framework */; };
CEA5F54E0E2CEDFB00F65088 /* SkimNotesBase.h in Headers */ =
{isa = PBXBuildFile; fileRef = CEA5F5490E2CED6D00F65088 /* SkimNotesBase.h */;
settings = {ATTRIBUTES = (Public, ); }; };
CEA5F54F0E2CEDFE00F65088 /* NSFileManager_SKNExtensions.h in
Headers */ = {isa = PBXBuildFile; fileRef = CEBA2BD30E05826D0000B2E6 /*
NSFileManager_SKNExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
CEA5F5500E2CEDFF00F65088 /* NSFileManager_SKNExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEBA2BD40E05826D0000B2E6 /*
NSFileManager_SKNExtensions.m */; };
@@ -208,6 +210,7 @@
CE1414221229B80300C9EBA0 /* skimpdf.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= skimpdf.m; sourceTree = "<group>"; };
CE1414251229B86500C9EBA0 /* SkimPDF_Tool_Prefix.pch */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SkimPDF_Tool_Prefix.pch; sourceTree = "<group>"; };
CE157F2712D4EDC700515B85 /* ja */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ja; path =
ja.lproj/SkimNotes.strings; sourceTree = "<group>"; };
+ CE1586F329ACB319001ADBCB /* PDFKit.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
PDFKit.framework; path =
System/iOSSupport/System/Library/Frameworks/PDFKit.framework; sourceTree =
SDKROOT; };
CE1632C71582ACC600CFF419 /* zh_CN */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_CN; path =
zh_CN.lproj/SkimNotes.strings; sourceTree = "<group>"; };
CE17EF840E250E8A00DE06EA /* SkimNotes-Debug.xcconfig */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path =
"SkimNotes-Debug.xcconfig"; sourceTree = "<group>"; };
CE17EF850E250E8A00DE06EA /* SkimNotes-Framework.xcconfig */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig;
path = "SkimNotes-Framework.xcconfig"; sourceTree = "<group>"; };
@@ -291,9 +294,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- CE0C361729A9361D0056897C /* Quartz.framework in
Frameworks */,
CE0C361929A9361D0056897C /*
Foundation.framework in Frameworks */,
CE0C361A29A9361D0056897C /* libbz2.dylib in
Frameworks */,
+ CE1586F429ACB319001ADBCB /* PDFKit.framework in
Frameworks */,
+ CE91CB7429ACF9290058749E /*
CoreGraphics.framework in Frameworks */,
CEB20D9A29A973A500086B9E /* UIKit.framework in
Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -302,9 +306,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- CE0C362D29A9362B0056897C /* Quartz.framework in
Frameworks */,
CE0C362F29A9362B0056897C /*
Foundation.framework in Frameworks */,
CE0C363029A9362B0056897C /* libbz2.dylib in
Frameworks */,
+ CE1586F529ACBF95001ADBCB /* PDFKit.framework in
Frameworks */,
+ CE91CB7529ACF9450058749E /*
CoreGraphics.framework in Frameworks */,
CEB20D9B29A973B100086B9E /* UIKit.framework in
Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -530,6 +535,7 @@
CEF57FCE2988170B00594EC0 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ CE1586F329ACB319001ADBCB /* PDFKit.framework */,
CEB20D9929A973A400086B9E /* UIKit.framework */,
CEF57FDE2988184800594EC0 /*
QuartzCore.framework */,
CEF57FDB2988181100594EC0 /* Cocoa.framework */,
Modified: trunk/SkimNotes/SkimNotesBase_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotesBase_Prefix.pch 2023-02-26 17:49:27 UTC (rev
13317)
+++ trunk/SkimNotes/SkimNotesBase_Prefix.pch 2023-02-27 15:41:56 UTC (rev
13318)
@@ -4,7 +4,12 @@
#ifdef __OBJC__
#import <Foundation/Foundation.h>
+#if (defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR) ||
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
+ #import <UIKit/UIKit.h>
+ #import <CoreGraphics/CoreGraphics.h>
+#else
#import <AppKit/AppKit.h>
+#endif
#define SKNLocalizedString(key, comment)
NSLocalizedStringFromTableInBundle(key, @"SkimNotes", [NSBundle
bundleWithIdentifier:@"net.sourceforge.skim-app.framework.SkimNotesBase"],
comment)
#endif
Modified: trunk/SkimNotes/SkimNotes_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotes_Prefix.pch 2023-02-26 17:49:27 UTC (rev
13317)
+++ trunk/SkimNotes/SkimNotes_Prefix.pch 2023-02-27 15:41:56 UTC (rev
13318)
@@ -4,8 +4,7 @@
#ifdef __OBJC__
#import <Foundation/Foundation.h>
- #import <AppKit/AppKit.h>
- #import <Quartz/Quartz.h>
-
+ #import <PDFKit/PDFKit.h>
+
#define SKNLocalizedString(key, comment)
NSLocalizedStringFromTableInBundle(key, @"SkimNotes", [NSBundle
bundleWithIdentifier:@"net.sourceforge.skim-app.framework.SkimNotes"], comment)
#endif
Modified: trunk/SkimNotes/SkimPDF_Tool_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimPDF_Tool_Prefix.pch 2023-02-26 17:49:27 UTC (rev
13317)
+++ trunk/SkimNotes/SkimPDF_Tool_Prefix.pch 2023-02-27 15:41:56 UTC (rev
13318)
@@ -5,7 +5,7 @@
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#import <AppKit/AppKit.h>
- #import <Quartz/Quartz.h>
+ #import <PDFKit/PDFKit.h>
#define SKNLocalizedString(key, comment) key
#endif
Modified: trunk/SkimNotes/skimpdf.m
===================================================================
--- trunk/SkimNotes/skimpdf.m 2023-02-26 17:49:27 UTC (rev 13317)
+++ trunk/SkimNotes/skimpdf.m 2023-02-27 15:41:56 UTC (rev 13318)
@@ -37,7 +37,7 @@
*/
#import <Foundation/Foundation.h>
-#import <Quartz/Quartz.h>
+#import <PDFKit/PDFKit.h>
#import "NSFileManager_SKNExtensions.h"
#import "PDFDocument_SKNExtensions.h"
#import "PDFAnnotation_SKNExtensions.h"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
