*sortedEndedStyles = [previousActiveStyles sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"intValue" ascending:NO]]];
+
+ // append closing tags
+ for(NSNumber *style in sortedEndedStyles) {
+ NSString *tagContent = [self tagContentForStyle:style openingTag:NO location:currentRange.location];
+ [result appendString: [NSString stringWithFormat:@"", tagContent]];
+ }
+
+ // append closing paragraph tag
+ if([previousActiveStyles containsObject:@([UnorderedListStyle getStyleType])] ||
+ [previousActiveStyles containsObject:@([OrderedListStyle getStyleType])] ||
+ [previousActiveStyles containsObject:@([H1Style getStyleType])] ||
+ [previousActiveStyles containsObject:@([H2Style getStyleType])] ||
+ [previousActiveStyles containsObject:@([H3Style getStyleType])] ||
+ [previousActiveStyles containsObject:@([BlockQuoteStyle getStyleType])]
+ ) {
+ // do nothing, proper closing paragraph tags have been already appended
+ } else {
+ [result appendString:@""];
+ }
}
// clear the previous styles
@@ -392,12 +405,24 @@ - (NSString * _Nullable)initiallyProcessHtml:(NSString * _Nonnull)html {
if(html.length >= 15) {
NSString *firstSix = [html substringWithRange:NSMakeRange(0, 6)];
NSString *lastSeven = [html substringWithRange:NSMakeRange(html.length-7, 7)];
+ NSInteger newlinesCount = [[html componentsSeparatedByString:@"\n"] count] - 1;
if([firstSix isEqualToString:@""] && [lastSeven isEqualToString:@""]) {
- // looks like our format
- // we want to get the string without and and their newlines
- // so we skip first 7 characters and get the string 7+8 = 15 characters shorter
- fixedHtml = [html substringWithRange: NSMakeRange(7, html.length - 15)];
+ if(newlinesCount >= 2) {
+ // looks like our format
+ // we want to get the string without and and their newlines
+ // so we skip first 7 characters and get the string 7+8 = 15 characters shorter
+ fixedHtml = [html substringWithRange: NSMakeRange(7, html.length - 15)];
+ } else {
+ // most likely a valid html but with some newline differences
+ fixedHtml = [html copy];
+ // firstly remove newlined html tags if any:
+ fixedHtml = [fixedHtml stringByReplacingOccurrencesOfString:@"\n" withString:@""];
+ fixedHtml = [fixedHtml stringByReplacingOccurrencesOfString:@"\n" withString:@""];
+ // fallback; remove html tags without their newlines
+ fixedHtml = [fixedHtml stringByReplacingOccurrencesOfString:@"" withString:@""];
+ fixedHtml = [fixedHtml stringByReplacingOccurrencesOfString:@"" withString:@""];
+ }
} else {
// in other case we are most likely working with some external html - try getting the styles from between body tags
NSRange openingBodyRange = [html rangeOfString:@""];
@@ -411,9 +436,60 @@ - (NSString * _Nullable)initiallyProcessHtml:(NSString * _Nonnull)html {
}
}
+ // second processing - try fixing htmls with wrong newlines' setup
+ if(fixedHtml != nullptr) {
+ NSInteger newlinesCount = [[fixedHtml componentsSeparatedByString:@"/n"] count] - 1;
+ if(newlinesCount == 0) {
+ // add
tag wherever needed
+ fixedHtml = [fixedHtml stringByReplacingOccurrencesOfString:@"" withString:@"
"];
+
+ // remove tags inside of
+ fixedHtml = [fixedHtml stringByReplacingOccurrencesOfString:@"" withString:@"
"];
+ fixedHtml = [fixedHtml stringByReplacingOccurrencesOfString:@"" withString:@""];
+
+ // tags that have to be in separate lines
+ fixedHtml = [self stringByAddingNewlinesToTag:@"
" inString:fixedHtml leading:YES trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:YES trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"
" inString:fixedHtml leading:YES trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:YES trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"
" inString:fixedHtml leading:YES trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:YES trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"
" inString:fixedHtml leading:YES trailing:YES];
+
+ // line opening tags
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:YES trailing:NO];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"
" inString:fixedHtml leading:YES trailing:NO];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:YES trailing:NO];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:YES trailing:NO];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:YES trailing:NO];
+
+ // line closing tags
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:NO trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"
" inString:fixedHtml leading:NO trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:NO trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:NO trailing:YES];
+ fixedHtml = [self stringByAddingNewlinesToTag:@"" inString:fixedHtml leading:NO trailing:YES];
+ }
+ }
+
return fixedHtml;
}
+- (NSString *)stringByAddingNewlinesToTag:(NSString *)tag inString:(NSString *)html leading:(BOOL)leading trailing:(BOOL)trailing {
+ NSString *str = [html copy];
+ if(leading) {
+ NSString *formattedTag = [NSString stringWithFormat:@">%@", tag];
+ NSString *formattedNewTag = [NSString stringWithFormat:@">\n%@", tag];
+ str = [str stringByReplacingOccurrencesOfString:formattedTag withString:formattedNewTag];
+ }
+ if(trailing) {
+ NSString *formattedTag = [NSString stringWithFormat:@"%@<", tag];
+ NSString *formattedNewTag = [NSString stringWithFormat:@"%@\n<", tag];
+ str = [str stringByReplacingOccurrencesOfString:formattedTag withString:formattedNewTag];
+ }
+ return str;
+}
+
- (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
NSMutableString *plainText = [[NSMutableString alloc] initWithString: @""];
NSMutableDictionary *ongoingTags = [[NSMutableDictionary alloc] init];