Revision: 3809
http://skim-app.svn.sourceforge.net/skim-app/?rev=3809&view=rev
Author: hofman
Date: 2008-04-24 04:46:59 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Rename some macros and functions.
Modified Paths:
--------------
trunk/SKTemplateParser.m
Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m 2008-04-24 11:30:09 UTC (rev 3808)
+++ trunk/SKTemplateParser.m 2008-04-24 11:46:59 UTC (rev 3809)
@@ -42,20 +42,20 @@
#import "SKTag.h"
#import "OBUtilities.h"
-#define STARTTAG_OPEN_DELIM @"<$"
-#define ENDTAG_OPEN_DELIM @"</$"
-#define SEPTAG_OPEN_DELIM @"<?$"
-#define SINGLETAG_CLOSE_DELIM @"/>"
-#define MULTITAG_CLOSE_DELIM @">"
-#define CONDITIONTAG_CLOSE_DELIM @"?>"
-#define CONDITIONTAG_EQUAL @"="
-#define CONDITIONTAG_CONTAIN @"~"
-#define CONDITIONTAG_SMALLER @"<"
-#define CONDITIONTAG_SMALLER_OR_EQUAL @"<="
+#define START_TAG_OPEN_DELIM @"<$"
+#define END_TAG_OPEN_DELIM @"</$"
+#define ALT_TAG_OPEN_DELIM @"<?$"
+#define VALUE_TAG_CLOSE_DELIM @"/>"
+#define COLLECTION_TAG_CLOSE_DELIM @">"
+#define CONDITION_TAG_CLOSE_DELIM @"?>"
+#define CONDITION_TAG_EQUAL @"="
+#define CONDITION_TAG_CONTAIN @"~"
+#define CONDITION_TAG_SMALLER @"<"
+#define CONDITION_TAG_SMALLER_OR_EQUAL @"<="
/*
- single tag: <$key/>
- multi tag: <$key> </$key>
+ value tag: <$key/>
+ collection tag: <$key> </$key>
or: <$key> <?$key> </$key>
condition tag: <$key?> </$key?>
or: <$key?> <?$key?> </$key?>
@@ -94,98 +94,98 @@
invertedKeyCharacterSet = [[keyCharacterSet invertedSet] copy];
}
-static NSMutableDictionary *endMultiDict = nil;
-static inline NSString *endMultiTagWithTag(NSString *tag){
- if(nil == endMultiDict)
- endMultiDict = [[NSMutableDictionary alloc] init];
+static inline NSString *endCollectionTagWithTag(NSString *tag) {
+ static NSMutableDictionary *endCollectionDict = nil;
+ if (nil == endCollectionDict)
+ endCollectionDict = [[NSMutableDictionary alloc] init];
- NSString *endTag = [endMultiDict objectForKey:tag];
- if(nil == endTag){
- endTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
ENDTAG_OPEN_DELIM, tag, MULTITAG_CLOSE_DELIM];
- [endMultiDict setObject:endTag forKey:tag];
+ NSString *endTag = [endCollectionDict objectForKey:tag];
+ if (nil == endTag) {
+ endTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
END_TAG_OPEN_DELIM, tag, COLLECTION_TAG_CLOSE_DELIM];
+ [endCollectionDict setObject:endTag forKey:tag];
}
return endTag;
}
-static NSMutableDictionary *sepMultiDict = nil;
-static inline NSString *sepMultiTagWithTag(NSString *tag){
- if(nil == sepMultiDict)
- sepMultiDict = [[NSMutableDictionary alloc] init];
+static inline NSString *sepCollectionTagWithTag(NSString *tag) {
+ static NSMutableDictionary *sepCollectionDict = nil;
+ if (nil == sepCollectionDict)
+ sepCollectionDict = [[NSMutableDictionary alloc] init];
- NSString *altTag = [sepMultiDict objectForKey:tag];
- if(nil == altTag){
- altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
SEPTAG_OPEN_DELIM, tag, MULTITAG_CLOSE_DELIM];
- [sepMultiDict setObject:altTag forKey:tag];
+ NSString *altTag = [sepCollectionDict objectForKey:tag];
+ if (nil == altTag) {
+ altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
ALT_TAG_OPEN_DELIM, tag, COLLECTION_TAG_CLOSE_DELIM];
+ [sepCollectionDict setObject:altTag forKey:tag];
}
return altTag;
}
-static NSMutableDictionary *endConditionDict = nil;
-static inline NSString *endConditionTagWithTag(NSString *tag){
- if(nil == endConditionDict)
+static inline NSString *endConditionTagWithTag(NSString *tag) {
+ static NSMutableDictionary *endConditionDict = nil;
+ if (nil == endConditionDict)
endConditionDict = [[NSMutableDictionary alloc] init];
NSString *endTag = [endConditionDict objectForKey:tag];
- if(nil == endTag){
- endTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
ENDTAG_OPEN_DELIM, tag, CONDITIONTAG_CLOSE_DELIM];
+ if (nil == endTag) {
+ endTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
END_TAG_OPEN_DELIM, tag, CONDITION_TAG_CLOSE_DELIM];
[endConditionDict setObject:endTag forKey:tag];
}
return endTag;
}
-static NSMutableDictionary *altConditionDict = nil;
-static inline NSString *altConditionTagWithTag(NSString *tag){
- if(nil == altConditionDict)
+static inline NSString *altConditionTagWithTag(NSString *tag) {
+ static NSMutableDictionary *altConditionDict = nil;
+ if (nil == altConditionDict)
altConditionDict = [[NSMutableDictionary alloc] init];
NSString *altTag = [altConditionDict objectForKey:tag];
- if(nil == altTag){
- altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
SEPTAG_OPEN_DELIM, tag, CONDITIONTAG_CLOSE_DELIM];
+ if (nil == altTag) {
+ altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
ALT_TAG_OPEN_DELIM, tag, CONDITION_TAG_CLOSE_DELIM];
[altConditionDict setObject:altTag forKey:tag];
}
return altTag;
}
-static NSMutableDictionary *equalConditionDict = nil;
-static NSMutableDictionary *containConditionDict = nil;
-static NSMutableDictionary *smallerConditionDict = nil;
-static NSMutableDictionary *smallerOrEqualConditionDict = nil;
-static inline NSString *compareConditionTagWithTag(NSString *tag, int
matchType){
+static inline NSString *compareConditionTagWithTag(NSString *tag, int
matchType) {
+ static NSMutableDictionary *equalConditionDict = nil;
+ static NSMutableDictionary *containConditionDict = nil;
+ static NSMutableDictionary *smallerConditionDict = nil;
+ static NSMutableDictionary *smallerOrEqualConditionDict = nil;
NSString *altTag = nil;
switch (matchType) {
case SKConditionTagMatchEqual:
- if(nil == equalConditionDict)
+ if (nil == equalConditionDict)
equalConditionDict = [[NSMutableDictionary alloc] init];
altTag = [equalConditionDict objectForKey:tag];
- if(nil == altTag){
- altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
SEPTAG_OPEN_DELIM, tag, CONDITIONTAG_EQUAL];
+ if (nil == altTag) {
+ altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
ALT_TAG_OPEN_DELIM, tag, CONDITION_TAG_EQUAL];
[equalConditionDict setObject:altTag forKey:tag];
}
break;
case SKConditionTagMatchContain:
- if(nil == containConditionDict)
+ if (nil == containConditionDict)
containConditionDict = [[NSMutableDictionary alloc] init];
altTag = [containConditionDict objectForKey:tag];
- if(nil == altTag){
- altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
SEPTAG_OPEN_DELIM, tag, CONDITIONTAG_CONTAIN];
+ if (nil == altTag) {
+ altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
ALT_TAG_OPEN_DELIM, tag, CONDITION_TAG_CONTAIN];
[containConditionDict setObject:altTag forKey:tag];
}
break;
case SKConditionTagMatchSmaller:
- if(nil == smallerConditionDict)
+ if (nil == smallerConditionDict)
smallerConditionDict = [[NSMutableDictionary alloc] init];
altTag = [smallerConditionDict objectForKey:tag];
- if(nil == altTag){
- altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
SEPTAG_OPEN_DELIM, tag, CONDITIONTAG_SMALLER];
+ if (nil == altTag) {
+ altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
ALT_TAG_OPEN_DELIM, tag, CONDITION_TAG_SMALLER];
[smallerConditionDict setObject:altTag forKey:tag];
}
break;
case SKConditionTagMatchSmallerOrEqual:
- if(nil == smallerOrEqualConditionDict)
+ if (nil == smallerOrEqualConditionDict)
smallerOrEqualConditionDict = [[NSMutableDictionary alloc]
init];
altTag = [smallerOrEqualConditionDict objectForKey:tag];
- if(nil == altTag){
- altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
SEPTAG_OPEN_DELIM, tag, CONDITIONTAG_SMALLER_OR_EQUAL];
+ if (nil == altTag) {
+ altTag = [NSString stringWithFormat:@"[EMAIL PROTECTED]@%@",
ALT_TAG_OPEN_DELIM, tag, CONDITION_TAG_SMALLER_OR_EQUAL];
[smallerOrEqualConditionDict setObject:altTag forKey:tag];
}
break;
@@ -193,7 +193,7 @@
return altTag;
}
-static inline NSRange altTemplateTagRange(NSString *template, NSString
*altTag, NSString *endDelim, NSString **argString){
+static inline NSRange altTemplateTagRange(NSString *template, NSString
*altTag, NSString *endDelim, NSString **argString) {
NSRange altTagRange = [template rangeOfString:altTag];
if (altTagRange.location != NSNotFound) {
// ignore whitespaces before the tag
@@ -236,7 +236,7 @@
NSString *tag = nil;
int start;
- if ([scanner scanUpToString:STARTTAG_OPEN_DELIM
intoString:&beforeText]) {
+ if ([scanner scanUpToString:START_TAG_OPEN_DELIM
intoString:&beforeText]) {
if (currentTag && [(SKTag *)currentTag type] == SKTextTagType) {
[currentTag setText:[[currentTag text]
stringByAppendingString:beforeText]];
} else {
@@ -246,7 +246,7 @@
}
}
- if ([scanner scanString:STARTTAG_OPEN_DELIM intoString:nil]) {
+ if ([scanner scanString:START_TAG_OPEN_DELIM intoString:nil]) {
start = [scanner scanLocation];
@@ -254,14 +254,14 @@
// scanUpToCharactersFromSet is used for efficiency instead of
scanCharactersFromSet
[scanner scanUpToCharactersFromSet:invertedKeyCharacterSet
intoString:&tag];
- if ([scanner scanString:SINGLETAG_CLOSE_DELIM intoString:nil]) {
+ if ([scanner scanString:VALUE_TAG_CLOSE_DELIM intoString:nil]) {
// simple template currentTag
currentTag = [[SKValueTag alloc] initWithKeyPath:tag];
[result addObject:currentTag];
[currentTag release];
- } else if ([scanner scanString:MULTITAG_CLOSE_DELIM
intoString:nil]) {
+ } else if ([scanner scanString:COLLECTION_TAG_CLOSE_DELIM
intoString:nil]) {
NSString *itemTemplate = nil, *separatorTemplate = nil;
NSString *endTag;
@@ -281,7 +281,7 @@
}
}
- endTag = endMultiTagWithTag(tag);
+ endTag = endCollectionTagWithTag(tag);
// ignore the rest of an empty line after the tag
[scanner scanEmptyLine];
if ([scanner scanString:endTag intoString:nil])
@@ -292,7 +292,7 @@
if (wsRange.location != NSNotFound)
itemTemplate = [itemTemplate
substringToIndex:wsRange.location];
- sepTagRange = altTemplateTagRange(itemTemplate,
sepMultiTagWithTag(tag), nil, NULL);
+ sepTagRange = altTemplateTagRange(itemTemplate,
sepCollectionTagWithTag(tag), nil, NULL);
if (sepTagRange.location != NSNotFound) {
separatorTemplate = [itemTemplate
substringFromIndex:NSMaxRange(sepTagRange)];
itemTemplate = [itemTemplate
substringToIndex:sepTagRange.location];
@@ -312,25 +312,25 @@
NSString *matchString = nil;
int matchType = SKConditionTagMatchOther;
- if ([scanner scanString:CONDITIONTAG_EQUAL intoString:nil]) {
- if([scanner scanUpToString:CONDITIONTAG_CLOSE_DELIM
intoString:&matchString] == NO)
+ if ([scanner scanString:CONDITION_TAG_EQUAL intoString:nil]) {
+ if ([scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString] == NO)
matchString = @"";
matchType = SKConditionTagMatchEqual;
- } else if ([scanner scanString:CONDITIONTAG_CONTAIN
intoString:nil]) {
- if([scanner scanUpToString:CONDITIONTAG_CLOSE_DELIM
intoString:&matchString] == NO)
+ } else if ([scanner scanString:CONDITION_TAG_CONTAIN
intoString:nil]) {
+ if ([scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString] == NO)
matchString = @"";
matchType = SKConditionTagMatchContain;
- } else if ([scanner scanString:CONDITIONTAG_SMALLER_OR_EQUAL
intoString:nil]) {
- if([scanner scanUpToString:CONDITIONTAG_CLOSE_DELIM
intoString:&matchString] == NO)
+ } else if ([scanner scanString:CONDITION_TAG_SMALLER_OR_EQUAL
intoString:nil]) {
+ if ([scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString] == NO)
matchString = @"";
matchType = SKConditionTagMatchSmallerOrEqual;
- } else if ([scanner scanString:CONDITIONTAG_SMALLER
intoString:nil]) {
- if([scanner scanUpToString:CONDITIONTAG_CLOSE_DELIM
intoString:&matchString] == NO)
+ } else if ([scanner scanString:CONDITION_TAG_SMALLER
intoString:nil]) {
+ if ([scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString] == NO)
matchString = @"";
matchType = SKConditionTagMatchSmaller;
}
- if ([scanner scanString:CONDITIONTAG_CLOSE_DELIM
intoString:nil]) {
+ if ([scanner scanString:CONDITION_TAG_CLOSE_DELIM
intoString:nil]) {
NSMutableArray *subTemplates, *matchStrings;
NSString *subTemplate = nil;
@@ -367,12 +367,12 @@
if (matchType != SKConditionTagMatchOther) {
altTag = compareConditionTagWithTag(tag,
matchType);
- altTagRange = altTemplateTagRange(subTemplate,
altTag, CONDITIONTAG_CLOSE_DELIM, &matchString);
+ altTagRange = altTemplateTagRange(subTemplate,
altTag, CONDITION_TAG_CLOSE_DELIM, &matchString);
while (altTagRange.location != NSNotFound) {
[subTemplates addObject:[subTemplate
substringToIndex:altTagRange.location]];
[matchStrings addObject:matchString ?
matchString : @""];
subTemplate = [subTemplate
substringFromIndex:NSMaxRange(altTagRange)];
- altTagRange = altTemplateTagRange(subTemplate,
altTag, CONDITIONTAG_CLOSE_DELIM, &matchString);
+ altTagRange = altTemplateTagRange(subTemplate,
altTag, CONDITION_TAG_CLOSE_DELIM, &matchString);
}
}
@@ -398,9 +398,9 @@
// an open delimiter without a close delimiter, so no
template tag. Rewind
if (currentTag && [(SKTag *)currentTag type] ==
SKTextTagType) {
- [currentTag setText:[[currentTag text]
stringByAppendingString:STARTTAG_OPEN_DELIM]];
+ [currentTag setText:[[currentTag text]
stringByAppendingString:START_TAG_OPEN_DELIM]];
} else {
- currentTag = [[SKTextTag alloc]
initWithText:STARTTAG_OPEN_DELIM];
+ currentTag = [[SKTextTag alloc]
initWithText:START_TAG_OPEN_DELIM];
[result addObject:currentTag];
[currentTag release];
}
@@ -408,7 +408,7 @@
}
}
- } // scan STARTTAG_OPEN_DELIM
+ } // scan START_TAG_OPEN_DELIM
} // while
[scanner release];
return [result autorelease];
@@ -538,7 +538,7 @@
start = [scanner scanLocation];
- if ([scanner scanUpToString:STARTTAG_OPEN_DELIM
intoString:&beforeText]) {
+ if ([scanner scanUpToString:START_TAG_OPEN_DELIM
intoString:&beforeText]) {
if (currentTag && [(SKTag *)currentTag type] == SKTextTagType) {
tmpAttrStr = [[currentTag attributedText] mutableCopy];
[tmpAttrStr appendAttributedString:[template
attributedSubstringFromRange:NSMakeRange(start, [beforeText length])]];
@@ -552,7 +552,7 @@
}
}
- if ([scanner scanString:STARTTAG_OPEN_DELIM intoString:nil]) {
+ if ([scanner scanString:START_TAG_OPEN_DELIM intoString:nil]) {
attr = [template attributesAtIndex:[scanner scanLocation] - 1
effectiveRange:NULL];
start = [scanner scanLocation];
@@ -561,14 +561,14 @@
// scanUpToCharactersFromSet is used for efficiency instead of
scanCharactersFromSet
[scanner scanUpToCharactersFromSet:invertedKeyCharacterSet
intoString:&tag];
- if ([scanner scanString:SINGLETAG_CLOSE_DELIM intoString:nil]) {
+ if ([scanner scanString:VALUE_TAG_CLOSE_DELIM intoString:nil]) {
// simple template tag
currentTag = [[SKRichValueTag alloc] initWithKeyPath:tag
attributes:attr];
[result addObject:currentTag];
[currentTag release];
- } else if ([scanner scanString:MULTITAG_CLOSE_DELIM
intoString:nil]) {
+ } else if ([scanner scanString:COLLECTION_TAG_CLOSE_DELIM
intoString:nil]) {
NSString *itemTemplateString = nil;
NSAttributedString *itemTemplate = nil, *separatorTemplate =
nil;
@@ -589,7 +589,7 @@
}
}
- endTag = endMultiTagWithTag(tag);
+ endTag = endCollectionTagWithTag(tag);
// ignore the rest of an empty line after the tag
[scanner scanEmptyLine];
if ([scanner scanString:endTag intoString:nil])
@@ -600,7 +600,7 @@
wsRange = [itemTemplateString rangeOfTrailingEmptyLine];
itemTemplate = [template
attributedSubstringFromRange:NSMakeRange(start, [itemTemplateString length] -
wsRange.length)];
- sepTagRange = altTemplateTagRange([itemTemplate string],
sepMultiTagWithTag(tag), nil, NULL);
+ sepTagRange = altTemplateTagRange([itemTemplate string],
sepCollectionTagWithTag(tag), nil, NULL);
if (sepTagRange.location != NSNotFound) {
separatorTemplate = [itemTemplate
attributedSubstringFromRange:NSMakeRange(NSMaxRange(sepTagRange), [itemTemplate
length] - NSMaxRange(sepTagRange))];
itemTemplate = [itemTemplate
attributedSubstringFromRange:NSMakeRange(0, sepTagRange.location)];
@@ -620,25 +620,25 @@
NSString *matchString = nil;
int matchType = SKConditionTagMatchOther;
- if ([scanner scanString:CONDITIONTAG_EQUAL intoString:nil]) {
- if([scanner scanUpToString:CONDITIONTAG_CLOSE_DELIM
intoString:&matchString] == NO)
+ if ([scanner scanString:CONDITION_TAG_EQUAL intoString:nil]) {
+ if ([scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString] == NO)
matchString = @"";
matchType = SKConditionTagMatchEqual;
- } else if ([scanner scanString:CONDITIONTAG_CONTAIN
intoString:nil]) {
- if([scanner scanUpToString:CONDITIONTAG_CLOSE_DELIM
intoString:&matchString] == NO)
+ } else if ([scanner scanString:CONDITION_TAG_CONTAIN
intoString:nil]) {
+ if ([scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString] == NO)
matchString = @"";
matchType = SKConditionTagMatchContain;
- } else if ([scanner scanString:CONDITIONTAG_SMALLER_OR_EQUAL
intoString:nil]) {
- if([scanner scanUpToString:CONDITIONTAG_CLOSE_DELIM
intoString:&matchString] == NO)
+ } else if ([scanner scanString:CONDITION_TAG_SMALLER_OR_EQUAL
intoString:nil]) {
+ if ([scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString] == NO)
matchString = @"";
matchType = SKConditionTagMatchSmallerOrEqual;
- } else if ([scanner scanString:CONDITIONTAG_SMALLER
intoString:nil]) {
- if([scanner scanUpToString:CONDITIONTAG_CLOSE_DELIM
intoString:&matchString] == NO)
+ } else if ([scanner scanString:CONDITION_TAG_SMALLER
intoString:nil]) {
+ if ([scanner scanUpToString:CONDITION_TAG_CLOSE_DELIM
intoString:&matchString] == NO)
matchString = @"";
matchType = SKConditionTagMatchSmaller;
}
- if ([scanner scanString:CONDITIONTAG_CLOSE_DELIM
intoString:nil]) {
+ if ([scanner scanString:CONDITION_TAG_CLOSE_DELIM
intoString:nil]) {
NSMutableArray *subTemplates, *matchStrings;
NSString *subTemplateString = nil;
@@ -677,12 +677,12 @@
if (matchType != SKConditionTagMatchOther) {
altTag = compareConditionTagWithTag(tag,
matchType);
- altTagRange = altTemplateTagRange([subTemplate
string], altTag, CONDITIONTAG_CLOSE_DELIM, &matchString);
+ altTagRange = altTemplateTagRange([subTemplate
string], altTag, CONDITION_TAG_CLOSE_DELIM, &matchString);
while (altTagRange.location != NSNotFound) {
[subTemplates addObject:[subTemplate
attributedSubstringFromRange:NSMakeRange(0, altTagRange.location)]];
[matchStrings addObject:matchString ?
matchString : @""];
subTemplate = [subTemplate
attributedSubstringFromRange:NSMakeRange(NSMaxRange(altTagRange), [subTemplate
length] - NSMaxRange(altTagRange))];
- altTagRange = altTemplateTagRange([subTemplate
string], altTag, CONDITIONTAG_CLOSE_DELIM, &matchString);
+ altTagRange = altTemplateTagRange([subTemplate
string], altTag, CONDITION_TAG_CLOSE_DELIM, &matchString);
}
}
@@ -706,15 +706,15 @@
} else {
- // a STARTTAG_OPEN_DELIM without MULTITAG_CLOSE_DELIM, so
no template tag. Rewind
+ // a START_TAG_OPEN_DELIM without
COLLECTION_TAG_CLOSE_DELIM, so no template tag. Rewind
if (currentTag && [(SKTag *)currentTag type] ==
SKTextTagType) {
tmpAttrStr = [[currentTag attributedText] mutableCopy];
- [tmpAttrStr appendAttributedString:[template
attributedSubstringFromRange:NSMakeRange(start - [STARTTAG_OPEN_DELIM length],
[STARTTAG_OPEN_DELIM length])]];
+ [tmpAttrStr appendAttributedString:[template
attributedSubstringFromRange:NSMakeRange(start - [START_TAG_OPEN_DELIM length],
[START_TAG_OPEN_DELIM length])]];
[tmpAttrStr fixAttributesInRange:NSMakeRange(0,
[tmpAttrStr length])];
[currentTag setAttributedText:tmpAttrStr];
[tmpAttrStr release];
} else {
- currentTag = [[SKRichTextTag alloc]
initWithAttributedText:[template attributedSubstringFromRange:NSMakeRange(start
- [STARTTAG_OPEN_DELIM length], [STARTTAG_OPEN_DELIM length])]];
+ currentTag = [[SKRichTextTag alloc]
initWithAttributedText:[template attributedSubstringFromRange:NSMakeRange(start
- [START_TAG_OPEN_DELIM length], [START_TAG_OPEN_DELIM length])]];
[result addObject:currentTag];
[currentTag release];
}
@@ -722,7 +722,7 @@
}
}
- } // scan STARTTAG_OPEN_DELIM
+ } // scan START_TAG_OPEN_DELIM
} // while
[scanner release];
@@ -1004,7 +1004,7 @@
return [self isEqualToNumber:[NSNumber numberWithBool:NO]] == NO;
}
-inline static NSString *romanNumeralForDigit(unsigned digit, NSString *i,
NSString *v, NSString *x){
+inline static NSString *romanNumeralForDigit(unsigned digit, NSString *i,
NSString *v, NSString *x) {
switch (digit) {
case 1: return i;
case 2: return [NSString stringWithFormat:@"[EMAIL PROTECTED]@", i, i];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
