Redone fixing Cocoanetics#156

because it not properly deal with non-empty paragraph.
sephiria · Mar 29, 2012 · fe89a60 · fe89a60
1 parent 7e7d5ec
commit fe89a60
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Core/Source/NSAttributedString+DTCoreText.m b/Core/Source/NSAttributedString+DTCoreText.m
@@ -340,12 +340,20 @@ - (NSString *)htmlString
 
 	NSArray *previousListStyles = nil;
 
-	// one empty paragraph at end we don't care about
-	for (int i=0; i<[paragraphs count]-1; i++)
+	for (int i=0; i<[paragraphs count]; i++)
 	{
 		NSString *oneParagraph = [paragraphs objectAtIndex:i];
 		NSRange paragraphRange = NSMakeRange(location, [oneParagraph length]);
 
+		// skip empty paragraph at the end
+		if (i==[paragraphs count]-1)
+		{
+			if (!paragraphRange.length)
+			{
+				continue;
+			}
+		}
+
 		BOOL needsToRemovePrefix = NO;
 
 		BOOL fontIsBlockLevel = NO;

diff --git a/Demo/Resources/CurrentTest.html b/Demo/Resources/CurrentTest.html
@@ -1,2 +1,3 @@
-<p style="font-size:30px">some text 中文</p>
-<p style="font-size:30px"><b>some text 中文</b></p>
+<p style="font-family:'Times New Roman';font-size:20px;">Hello</p>
+<p style="font-family:'Times New Roman';font-size:20px;"></p>
+<p style="font-family:'Times New Roman';font-size:20px;">World</p>