Revision: 5084
http://skim-app.svn.sourceforge.net/skim-app/?rev=5084&view=rev
Author: hofman
Date: 2008-12-22 12:48:51 +0000 (Mon, 22 Dec 2008)
Log Message:
-----------
fix removing empty lines around template tags
Modified Paths:
--------------
trunk/SKTemplateParser.m
Modified: trunk/SKTemplateParser.m
===================================================================
--- trunk/SKTemplateParser.m 2008-12-22 11:17:32 UTC (rev 5083)
+++ trunk/SKTemplateParser.m 2008-12-22 12:48:51 UTC (rev 5084)
@@ -224,7 +224,7 @@
unsigned int rangeEnd = NSMaxRange(lastCharRange);
if ([[NSCharacterSet newlineCharacterSet]
characterIsMember:lastChar])
range.length = rangeEnd;
- } else if (typeBefore == -1) {
+ } else if (isSubtemplate == NO && typeBefore == -1) {
range.length = 0;
}
}
@@ -240,7 +240,7 @@
else
range = NSMakeRange(rangeEnd, NSMaxRange(range) -
rangeEnd);
}
- } else if (typeAfter == -1) {
+ } else if (isSubtemplate == NO && typeAfter == -1) {
range.length = 0;
}
}
@@ -402,7 +402,7 @@
if ([tag type] != SKTextTemplateTagType) continue;
NSString *string = [(SKTextTemplateTag *)tag text];
- NSRange range = range = rangeAfterRemovingEmptyLines(string, i > 0 ?
[(SKTemplateTag *)[result objectAtIndex:i - 1] type] : -1, i < count - 1 ?
[(SKTemplateTag *)[result objectAtIndex:i + 1] type] : -1, isSubtemplate);
+ NSRange range = rangeAfterRemovingEmptyLines(string, i > 0 ?
[(SKTemplateTag *)[result objectAtIndex:i - 1] type] : -1, i < count - 1 ?
[(SKTemplateTag *)[result objectAtIndex:i + 1] type] : -1, isSubtemplate);
if (range.length == 0)
[result removeObjectAtIndex:i];
@@ -655,7 +655,7 @@
NSAttributedString *attrString = [(SKRichTextTemplateTag *)tag
attributedText];
NSString *string = [attrString string];
- NSRange range = range = rangeAfterRemovingEmptyLines(string, i > 0 ?
[(SKTemplateTag *)[result objectAtIndex:i - 1] type] : -1, i < count - 1 ?
[(SKTemplateTag *)[result objectAtIndex:i + 1] type] : -1, isSubtemplate);
+ NSRange range = rangeAfterRemovingEmptyLines(string, i > 0 ?
[(SKTemplateTag *)[result objectAtIndex:i - 1] type] : -1, i < count - 1 ?
[(SKTemplateTag *)[result objectAtIndex:i + 1] type] : -1, isSubtemplate);
if (range.length == 0)
[result removeObjectAtIndex:i];
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
