Revision: 3041
          http://skim-app.svn.sourceforge.net/skim-app/?rev=3041&view=rev
Author:   hofman
Date:     2007-10-14 10:11:26 -0700 (Sun, 14 Oct 2007)

Log Message:
-----------
First get separator subtemplate before cutting it off from the item subtemplate.

Modified Paths:
--------------
    trunk/SKTemplateParser.m

Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m    2007-10-13 18:47:05 UTC (rev 3040)
+++ trunk/SKTemplateParser.m    2007-10-14 17:11:26 UTC (rev 3041)
@@ -291,8 +291,8 @@
                     
                     sepTagRange = altTemplateTagRange(itemTemplate, 
sepMultiTagWithTag(tag), nil, NULL);
                     if (sepTagRange.location != NSNotFound) {
+                        separatorTemplate = [itemTemplate 
substringFromIndex:NSMaxRange(sepTagRange)];
                         itemTemplate = [itemTemplate 
substringToIndex:sepTagRange.location];
-                        separatorTemplate = [itemTemplate 
substringFromIndex:NSMaxRange(sepTagRange)];
                     }
                     
                     currentTag = [[SKCollectionTag alloc] initWithKeyPath:tag 
itemTemplateString:itemTemplate separatorTemplateString:separatorTemplate];
@@ -584,8 +584,8 @@
                     
                     sepTagRange = altTemplateTagRange([itemTemplate string], 
sepMultiTagWithTag(tag), nil, NULL);
                     if (sepTagRange.location != NSNotFound) {
+                        separatorTemplate = [itemTemplate 
attributedSubstringFromRange:NSMakeRange(NSMaxRange(sepTagRange), [itemTemplate 
length] - NSMaxRange(sepTagRange))];
                         itemTemplate = [itemTemplate 
attributedSubstringFromRange:NSMakeRange(0, sepTagRange.location)];
-                        separatorTemplate = [itemTemplate 
attributedSubstringFromRange:NSMakeRange(NSMaxRange(sepTagRange), [itemTemplate 
length] - NSMaxRange(sepTagRange))];
                     }
                     
                     currentTag = [[SKRichCollectionTag alloc] 
initWithKeyPath:tag itemTemplateAttributedString:itemTemplate 
separatorTemplateAttributedString:separatorTemplate];


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: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to