Revision: 14000
http://sourceforge.net/p/skim-app/code/14000
Author: hofman
Date: 2023-12-28 00:04:45 +0000 (Thu, 28 Dec 2023)
Log Message:
-----------
remove some convenience methods
Modified Paths:
--------------
trunk/SKTemplateParser.h
trunk/SKTemplateParser.m
trunk/SKTemplateTag.m
Modified: trunk/SKTemplateParser.h
===================================================================
--- trunk/SKTemplateParser.h 2023-12-27 09:47:16 UTC (rev 13999)
+++ trunk/SKTemplateParser.h 2023-12-28 00:04:45 UTC (rev 14000)
@@ -45,12 +45,10 @@
@interface SKTemplateParser : NSObject
+ (NSString *)stringByParsingTemplateString:(NSString *)templateString
usingObject:(id)object;
-+ (NSArray<__kindof SKTemplateTag *> *)arrayByParsingTemplateString:(NSString
*)templateString;
+ (NSArray<__kindof SKTemplateTag *> *)arrayByParsingTemplateString:(NSString
*)templateString isSubtemplate:(BOOL)isSubtemplate;
+ (NSString *)stringFromTemplateArray:(NSArray<__kindof SKTemplateTag *>
*)templateArray usingObject:(id)object atIndex:(NSInteger)anIndex;
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString usingObject:(id)object;
-+ (NSArray<__kindof SKTemplateTag *>
*)arrayByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString;
+ (NSArray<__kindof SKTemplateTag *>
*)arrayByParsingTemplateAttributedString:(NSAttributedString
*)templateAttrString isSubtemplate:(BOOL)isSubtemplate;
+ (NSAttributedString *)attributedStringFromTemplateArray:(NSArray<__kindof
SKTemplateTag *> *)templateArray usingObject:(id)object
atIndex:(NSInteger)anIndex;
Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m 2023-12-27 09:47:16 UTC (rev 13999)
+++ trunk/SKTemplateParser.m 2023-12-28 00:04:45 UTC (rev 14000)
@@ -345,13 +345,9 @@
#pragma mark Parsing string templates
+ (NSString *)stringByParsingTemplateString:(NSString *)template
usingObject:(id)object {
- return [self stringFromTemplateArray:[self
arrayByParsingTemplateString:template] usingObject:object atIndex:0];
+ return [self stringFromTemplateArray:[self
arrayByParsingTemplateString:template isSubtemplate:NO] usingObject:object
atIndex:0];
}
-+ (NSArray *)arrayByParsingTemplateString:(NSString *)template {
- return [self arrayByParsingTemplateString:template isSubtemplate:NO];
-}
-
+ (NSArray *)arrayByParsingTemplateString:(NSString *)template
isSubtemplate:(BOOL)isSubtemplate {
NSScanner *scanner = [[NSScanner alloc] initWithString:template];
NSMutableArray *result = [[NSMutableArray alloc] init];
@@ -567,13 +563,9 @@
#pragma mark Parsing attributed string templates
+ (NSAttributedString
*)attributedStringByParsingTemplateAttributedString:(NSAttributedString
*)template usingObject:(id)object {
- return [self attributedStringFromTemplateArray:[self
arrayByParsingTemplateAttributedString:template] usingObject:object atIndex:0];
+ return [self attributedStringFromTemplateArray:[self
arrayByParsingTemplateAttributedString:template isSubtemplate:NO]
usingObject:object atIndex:0];
}
-+ (NSArray *)arrayByParsingTemplateAttributedString:(NSAttributedString
*)template {
- return [self arrayByParsingTemplateAttributedString:template
isSubtemplate:NO];
-}
-
+ (NSArray *)arrayByParsingTemplateAttributedString:(NSAttributedString
*)template isSubtemplate:(BOOL)isSubtemplate {
NSString *templateString = [template string];
NSScanner *scanner = [[NSScanner alloc] initWithString:templateString];
Modified: trunk/SKTemplateTag.m
===================================================================
--- trunk/SKTemplateTag.m 2023-12-27 09:47:16 UTC (rev 13999)
+++ trunk/SKTemplateTag.m 2023-12-28 00:04:45 UTC (rev 14000)
@@ -45,7 +45,7 @@
if ([aLink isKindOfClass:[NSURL class]])
aLink = [[aLink absoluteString] stringByRemovingPercentEncoding];
if ([aLink isKindOfClass:[NSString class]]) {
- NSArray *template = [SKTemplateParser
arrayByParsingTemplateString:aLink];
+ NSArray *template = [SKTemplateParser
arrayByParsingTemplateString:aLink isSubtemplate:NO];
if ([template count] > 1 || ([template count] == 1 && [(SKTemplateTag
*)[template lastObject] type] != SKTemplateTagText))
linkTemplate = [[SKAttributeTemplate alloc]
initWithTemplate:template range:range attributeClass:aClass];
}
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
