Merge pull request #953 from sarah-j-smith/v3.1

Handle odd line seperators in CCLabelBMFont.

Author: slembcke

cocos2d-ui-tests/tests/CCBMFontTest.m

@@ -12,6 +12,7 @@
 static NSString *TEST_STRINGS[] = {
 	@"ABCDEFGHIJKLM\nNOPQRSTUVWXYZ",
 	@"abcdefghijklm\nnopqrstuvwxyz",
+	@"first line\u2028second line",
 	@",.?!;:'\"",
 	@"()[]{}<>\\|/\n",
 	@"@#$%^&*+-=_",

cocos2d/CCLabelBMFont.m

@@ -762,7 +762,7 @@ -(void) createFontChars
 	// since the Y position needs to be calcualted before hand
 	for(NSUInteger i=0; i < stringLen-1;i++) {
 		unichar c = [_string characterAtIndex:i];
-		if( c=='\n')
+		if([[NSCharacterSet newlineCharacterSet] characterIsMember:c])
 			quantityOfLines++;
 	}
 
@@ -776,7 +776,7 @@ -(void) createFontChars
 	for(NSUInteger i = 0; i<stringLen; i++) {
 		unichar c = [_string characterAtIndex:i];
 
-		if (c == '\n') {
+        if ([[NSCharacterSet newlineCharacterSet] characterIsMember:c]) {
 			nextFontPositionX = 0;
 			nextFontPositionY -= _configuration->_commonHeight;
 			continue;