make lists counting based on 1

blueseaguo · Jun 23, 2011 · 3477775 · 3477775
1 parent 22c226f
commit 3477775
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Classes/NSAttributedString+HTML.m b/Classes/NSAttributedString+HTML.m
@@ -505,6 +505,8 @@ - (id)initWithHTML:(NSData *)data options:(NSDictionary *)options documentAttrib
 			{
 				if (tagOpen)
 				{
+					// have inherit the correct list counter from parent
+
 					DTHTMLElement *counterElement = currentTag.parent;
 
 					NSNumber *valueNum = [tagAttributesDict objectForKey:@"value"];
@@ -514,11 +516,8 @@ - (id)initWithHTML:(NSData *)data options:(NSDictionary *)options documentAttrib
 						counterElement.listCounter = value;
 						currentTag.listCounter = value;
 					}
-					else
-					{
-						counterElement.listCounter++;
-						currentTag.listCounter = counterElement.listCounter;
-					}
+
+					counterElement.listCounter++;
 
 					needsListItemStart = YES;
                     currentTag.paragraphStyle.paragraphSpacing = 0;
@@ -586,11 +585,11 @@ - (id)initWithHTML:(NSData *)data options:(NSDictionary *)options documentAttrib
 					if (valueNum)
 					{
 						NSInteger value = [valueNum integerValue];
-						currentTag.listCounter = value-1;
+						currentTag.listCounter = value;
 					}
 					else
 					{
-						currentTag.listCounter = 0;
+						currentTag.listCounter = 1;
 					}
 
                     needsNewLineBefore = YES;