Revision: 15486
http://sourceforge.net/p/skim-app/code/15486
Author: hofman
Date: 2025-06-17 15:58:42 +0000 (Tue, 17 Jun 2025)
Log Message:
-----------
define character set
Modified Paths:
--------------
trunk/NSCharacterSet_SKExtensions.h
trunk/NSCharacterSet_SKExtensions.m
trunk/SKMainWindowController.m
Modified: trunk/NSCharacterSet_SKExtensions.h
===================================================================
--- trunk/NSCharacterSet_SKExtensions.h 2025-06-17 15:55:02 UTC (rev 15485)
+++ trunk/NSCharacterSet_SKExtensions.h 2025-06-17 15:58:42 UTC (rev 15486)
@@ -42,6 +42,7 @@
@interface NSCharacterSet (SKExtensions)
@property (class, nonatomic, readonly) NSCharacterSet
*nonWhitespaceAndNewlineCharacterSet;
+@property (class, nonatomic, readonly) NSCharacterSet
*nonDecimalDigitCharacterSet;
@property (class, nonatomic, readonly) NSCharacterSet
*URLBookmarkNameAllowedCharacterSet;
@property (class, nonatomic, readonly) NSCharacterSet
*URLGenericAllowedCharacterSet;
@end
Modified: trunk/NSCharacterSet_SKExtensions.m
===================================================================
--- trunk/NSCharacterSet_SKExtensions.m 2025-06-17 15:55:02 UTC (rev 15485)
+++ trunk/NSCharacterSet_SKExtensions.m 2025-06-17 15:58:42 UTC (rev 15486)
@@ -48,6 +48,13 @@
return nonWhitespaceAndNewlineCharacterSet;
}
++ (NSCharacterSet *)nonDecimalDigitCharacterSet {
+ static NSCharacterSet *nonDecimalDigitCharacterSet = nil;
+ if (nonDecimalDigitCharacterSet == nil)
+ nonDecimalDigitCharacterSet = [[[NSCharacterSet
decimalDigitCharacterSet] invertedSet] copy];
+ return nonDecimalDigitCharacterSet;
+}
+
+ (NSCharacterSet *)URLBookmarkNameAllowedCharacterSet {
static NSCharacterSet *URLBookmarkNameAllowedCharacterSet = nil;
if (URLBookmarkNameAllowedCharacterSet == nil) {
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2025-06-17 15:55:02 UTC (rev 15485)
+++ trunk/SKMainWindowController.m 2025-06-17 15:58:42 UTC (rev 15486)
@@ -108,6 +108,7 @@
#import "SKPresentationView.h"
#import "SKNoteToolbarController.h"
#import "SKPresentationNotesAuxiliary.h"
+#import "NSCharacterSet_SKExtensions.h"
#define MULTIPLICATION_SIGN_CHARACTER (unichar)0x00d7
@@ -1261,7 +1262,7 @@
- (BOOL)validatePageLabel:(id *)value error:(NSError **)error {
if ([pageLabels indexOfObject:*value] == NSNotFound) {
- if ([PDFPage usesSequentialPageNumbering] == NO && [*value
rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet]
invertedSet]].location == NSNotFound) {
+ if ([PDFPage usesSequentialPageNumbering] == NO && [*value
rangeOfCharacterFromSet:[NSCharacterSet nonDecimalDigitCharacterSet]].location
== NSNotFound) {
NSUInteger idx = [*value integerValue];
if (idx < [pageLabels count])
*value = [pageLabels objectAtIndex:idx];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
