react-native-enriched-markdown-scaffold 0.7.4-scaffold.9 → 1.0.2-scaffold.10

package/ios/renderer/BaseRenderer.h

@@ -3,11 +3,16 @@
 
 @class RendererFactory;
 @class StyleConfig;
+@class RenderContext;
+@class MarkdownASTNode;
 
 /// Shared base for all node renderers — provides `_rendererFactory` and `_config`
 /// as protected ivars and the common designated initializer.
-/// Concrete subclasses must implement `renderNode:into:context:`.
-@interface BaseRenderer : NSObject {
+/// `renderNode:into:context:` is a template method: take context snapshot ->
+/// `renderNodeContent:into:context:` -> restore snapshot. Subclasses implement
+/// `renderNodeContent:into:context:` and, when they mutate scoped context state,
+/// override `takeContextSnapshot:` to return `[context snapshotScope]`.
+@interface BaseRenderer : NSObject <NodeRenderer> {
 @protected
   __weak RendererFactory *_rendererFactory;
   StyleConfig *_config;
@@ -15,4 +20,14 @@
 
 - (instancetype)initWithRendererFactory:(id)rendererFactory config:(id)config;
 
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context;
+
+/// Default returns nil.
+- (nullable id)takeContextSnapshot:(RenderContext *)context;
+
+/// Default restores a scope frame when snapshot is non-nil, no-op otherwise.
+- (void)restoreContextSnapshot:(nullable id)snapshot context:(RenderContext *)context;
+
 @end

package/ios/renderer/BaseRenderer.m

@@ -1,4 +1,5 @@
 #import "BaseRenderer.h"
+#import "RenderContext.h"
 #import "RendererFactory.h"
 #import "StyleConfig.h"
 
@@ -13,4 +14,33 @@
   return self;
 }
 
+- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+{
+  id snapshot = [self takeContextSnapshot:context];
+  @try {
+    [self renderNodeContent:node into:output context:context];
+  } @finally {
+    [self restoreContextSnapshot:snapshot context:context];
+  }
+}
+
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
+{
+  [self doesNotRecognizeSelector:_cmd];
+}
+
+- (id)takeContextSnapshot:(RenderContext *)context
+{
+  return nil;
+}
+
+- (void)restoreContextSnapshot:(id)snapshot context:(RenderContext *)context
+{
+  if (snapshot) {
+    [context restoreScope:snapshot];
+  }
+}
+
 @end

package/ios/renderer/BlockquoteRenderer.h

@@ -2,5 +2,5 @@
 #import "MarkdownASTNode.h"
 #import "RenderContext.h"
 
-@interface BlockquoteRenderer : BaseRenderer <NodeRenderer>
+@interface BlockquoteRenderer : BaseRenderer
 @end

package/ios/renderer/BlockquoteRenderer.m

@@ -1,8 +1,11 @@
 #import "BlockquoteRenderer.h"
 #import "BlockquoteBorder.h"
 #import "FontUtils.h"
+#import "LastElementUtils.h"
+#import "ListItemRenderer.h"
 #import "MarkdownASTNode.h"
 #import "ParagraphStyleUtils.h"
+#import "RenderContext.h"
 #import "RendererFactory.h"
 #import "StyleConfig.h"
 
@@ -11,8 +14,19 @@ static NSString *const kNestedInfoRangeKey = @"range";
 
 @implementation BlockquoteRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (id)takeContextSnapshot:(RenderContext *)context
 {
+  return [context snapshotScope];
+}
+
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
+{
+  if (output.length > 0 && ![output.string hasSuffix:@"\n"]) {
+    [output appendAttributedString:kNewlineAttributedString];
+  }
+
   NSInteger currentDepth = context.blockquoteDepth;
   context.blockquoteDepth = currentDepth + 1;
 
@@ -22,19 +36,14 @@ static NSString *const kNestedInfoRangeKey = @"range";
             headingLevel:0];
 
   NSUInteger start = output.length;
-  @try {
-    [_rendererFactory renderChildrenOfNode:node into:output context:context];
-  } @finally {
-    [context clearBlockStyle];
-    context.blockquoteDepth = currentDepth;
-  }
+  [_rendererFactory renderChildrenOfNode:node into:output context:context];
 
   NSUInteger end = output.length;
   if (end <= start) {
     return;
   }
 
-  [self applyStylingAndSpacing:output start:start end:end currentDepth:currentDepth];
+  [self applyStylingAndSpacing:output start:start end:end currentDepth:currentDepth context:context];
 }
 
 #pragma mark - Styling and Spacing
@@ -43,19 +52,42 @@ static NSString *const kNestedInfoRangeKey = @"range";
                          start:(NSUInteger)start
                            end:(NSUInteger)end
                   currentDepth:(NSInteger)currentDepth
+                       context:(RenderContext *)context
 {
   NSUInteger contentStart = start;
   if (currentDepth == 0) {
     contentStart += applyBlockSpacingBefore(output, start, [_config blockquoteMarginTop]);
   }
 
-  NSRange blockquoteRange = NSMakeRange(contentStart, end - start);
+  // nested quotes pad their own box (matching web CSS padding)
+  CGFloat padding = [_config blockquotePadding];
+  NSUInteger topPadLength = 0;
+  NSUInteger bottomPadLength = 0;
+  if (padding > 0) {
+    NSMutableParagraphStyle *topSpacerStyle = [context spacerStyleWithHeight:padding spacing:0];
+    NSAttributedString *topSpacer = [[NSAttributedString alloc]
+        initWithString:@"\n"
+            attributes:@{NSParagraphStyleAttributeName : topSpacerStyle, BlockquoteSpacerAttributeName : @YES}];
+    [output insertAttributedString:topSpacer atIndex:contentStart];
+    topPadLength = 1;
+
+    NSUInteger bottomSpacerLocation = output.length;
+    [output appendAttributedString:kNewlineAttributedString];
+    NSMutableParagraphStyle *bottomSpacerStyle = [context spacerStyleWithHeight:padding spacing:0];
+    [output addAttributes:@{NSParagraphStyleAttributeName : bottomSpacerStyle, BlockquoteSpacerAttributeName : @YES}
+                    range:NSMakeRange(bottomSpacerLocation, 1)];
+    bottomPadLength = 1;
+  }
+
+  NSRange blockquoteRange = NSMakeRange(contentStart, (end - start) + topPadLength + bottomPadLength);
+  NSRange innerRange = NSMakeRange(contentStart + topPadLength, end - start);
   CGFloat levelSpacing = [_config blockquoteBorderWidth] + [_config blockquoteGapWidth];
-  NSArray<NSDictionary *> *nestedInfo = [self collectNestedBlockquotes:output range:blockquoteRange depth:currentDepth];
+  NSArray<NSDictionary *> *nestedInfo = [self collectNestedBlockquotes:output range:innerRange depth:currentDepth];
 
   // Apply base styling (indentation, depth, background, line height)
   [self applyBaseBlockquoteStyle:output
-                           range:blockquoteRange
+                        boxRange:blockquoteRange
+                      innerRange:innerRange
                            depth:currentDepth
                     levelSpacing:levelSpacing
                  backgroundColor:[_config blockquoteBackgroundColor]
@@ -94,26 +126,66 @@ static NSString *const kNestedInfoRangeKey = @"range";
 }
 
 - (void)applyBaseBlockquoteStyle:(NSMutableAttributedString *)output
-                           range:(NSRange)blockquoteRange
+                        boxRange:(NSRange)boxRange
+                      innerRange:(NSRange)innerRange
                            depth:(NSInteger)currentDepth
                     levelSpacing:(CGFloat)levelSpacing
                  backgroundColor:(RCTUIColor *)backgroundColor
                       lineHeight:(CGFloat)lineHeight
 {
-  NSMutableParagraphStyle *paragraphStyle = getOrCreateParagraphStyle(output, blockquoteRange.location);
-  CGFloat totalIndent = [self calculateIndentForDepth:currentDepth levelSpacing:levelSpacing];
-  paragraphStyle.firstLineHeadIndent = totalIndent;
-  paragraphStyle.headIndent = totalIndent;
-
-  NSMutableDictionary *newAttributes =
-      [NSMutableDictionary dictionaryWithObjectsAndKeys:paragraphStyle, NSParagraphStyleAttributeName, @(currentDepth),
-                                                        BlockquoteDepthAttributeName, nil];
+  CGFloat totalIndent = blockquoteIndentForDepth(currentDepth + 1, levelSpacing);
+  CGFloat padding = [_config blockquotePadding];
+
+  // Depth and background cover the whole box (incl. padding spacers) so the
+  // border and background render behind list content and the padding rows.
+  NSMutableDictionary *depthAttributes =
+      [NSMutableDictionary dictionaryWithObjectsAndKeys:@(currentDepth), BlockquoteDepthAttributeName, nil];
   if (backgroundColor) {
-    newAttributes[BlockquoteBackgroundColorAttributeName] = backgroundColor;
+    depthAttributes[BlockquoteBackgroundColorAttributeName] = backgroundColor;
   }
-  [output addAttributes:newAttributes range:blockquoteRange];
+  [output addAttributes:depthAttributes range:boxRange];
 
-  applyLineHeight(output, blockquoteRange, lineHeight);
+  // List items bake the blockquote indent into their own paragraph style; only non-list content is stamped here.
+  [self enumerateNonListRangesIn:output
+                           range:innerRange
+                      usingBlock:^(NSRange nonListRange) {
+                        NSMutableParagraphStyle *paragraphStyle =
+                            getOrCreateParagraphStyle(output, nonListRange.location);
+                        paragraphStyle.firstLineHeadIndent = totalIndent;
+                        paragraphStyle.headIndent = totalIndent;
+                        if (padding > 0) {
+                          paragraphStyle.tailIndent = -padding;
+                        }
+                        [output addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:nonListRange];
+                        applyLineHeight(output, nonListRange, lineHeight);
+                      }];
+
+  if (padding > 0) {
+    [self applyTailIndent:-padding toListRangesIn:output range:innerRange];
+  }
+}
+
+- (void)applyTailIndent:(CGFloat)tailIndent toListRangesIn:(NSMutableAttributedString *)output range:(NSRange)range
+{
+  [output enumerateAttribute:ListDepthAttribute
+                     inRange:range
+                     options:0
+                  usingBlock:^(id value, NSRange listRange, BOOL *stop) {
+                    if (!value) {
+                      return;
+                    }
+                    [output enumerateAttribute:NSParagraphStyleAttributeName
+                                       inRange:listRange
+                                       options:0
+                                    usingBlock:^(NSParagraphStyle *style, NSRange styleRange, BOOL *innerStop) {
+                                      NSMutableParagraphStyle *mutableStyle =
+                                          style ? [style mutableCopy] : [[NSMutableParagraphStyle alloc] init];
+                                      mutableStyle.tailIndent = tailIndent;
+                                      [output addAttribute:NSParagraphStyleAttributeName
+                                                     value:mutableStyle
+                                                     range:styleRange];
+                                    }];
+                  }];
 }
 
 - (void)reapplyNestedStyles:(NSMutableAttributedString *)output
@@ -122,27 +194,64 @@ static NSString *const kNestedInfoRangeKey = @"range";
 {
   // Re-apply indentation to nested blockquotes since applyBaseBlockquoteStyle
   // overwrote them with the parent's indentation
+  CGFloat padding = [_config blockquotePadding];
   for (NSDictionary *info in nestedInfo) {
     NSRange nestedRange = [info[kNestedInfoRangeKey] rangeValue];
     NSInteger nestedDepth = [info[kNestedInfoDepthKey] integerValue];
-    NSMutableParagraphStyle *style = getOrCreateParagraphStyle(output, nestedRange.location);
+    CGFloat indent = blockquoteIndentForDepth(nestedDepth + 1, levelSpacing);
 
-    CGFloat indent = [self calculateIndentForDepth:nestedDepth levelSpacing:levelSpacing];
-    style.firstLineHeadIndent = indent;
-    style.headIndent = indent;
-    style.tailIndent = 0;
+    [output addAttribute:BlockquoteDepthAttributeName value:info[kNestedInfoDepthKey] range:nestedRange];
 
-    [output
-        addAttributes:@{NSParagraphStyleAttributeName : style, BlockquoteDepthAttributeName : info[kNestedInfoDepthKey]}
-                range:nestedRange];
+    [self enumerateNonListRangesIn:output
+                             range:nestedRange
+                        usingBlock:^(NSRange nonListRange) {
+                          NSMutableParagraphStyle *style = getOrCreateParagraphStyle(output, nonListRange.location);
+                          style.firstLineHeadIndent = indent;
+                          style.headIndent = indent;
+                          style.tailIndent = padding > 0 ? -padding : 0;
+                          [output addAttribute:NSParagraphStyleAttributeName value:style range:nonListRange];
+                        }];
   }
 }
 
-#pragma mark - Helper Methods
-
-- (CGFloat)calculateIndentForDepth:(NSInteger)depth levelSpacing:(CGFloat)levelSpacing
+- (void)enumerateNonListRangesIn:(NSMutableAttributedString *)output
+                           range:(NSRange)range
+                      usingBlock:(void (^)(NSRange nonListRange))block
 {
-  return (depth + 1) * levelSpacing;
+  // List items — and code blocks nested inside them (which carry a list-derived
+  // indent instead of ListDepthAttribute) — already bake the correct indent in.
+  NSMutableArray<NSValue *> *listRanges = [NSMutableArray array];
+  void (^collectRanges)(NSString *) = ^(NSString *attribute) {
+    [output enumerateAttribute:attribute
+                       inRange:range
+                       options:0
+                    usingBlock:^(id value, NSRange subRange, BOOL *stop) {
+                      if (value) {
+                        [listRanges addObject:[NSValue valueWithRange:subRange]];
+                      }
+                    }];
+  };
+  collectRanges(ListDepthAttribute);
+  collectRanges(CodeBlockIndentAttributeName);
+  collectRanges(BlockquoteSpacerAttributeName);
+  [listRanges sortUsingComparator:^NSComparisonResult(NSValue *a, NSValue *b) {
+    NSUInteger la = [a rangeValue].location;
+    NSUInteger lb = [b rangeValue].location;
+    return la < lb ? NSOrderedAscending : (la > lb ? NSOrderedDescending : NSOrderedSame);
+  }];
+
+  NSUInteger pos = range.location;
+  const NSUInteger end = NSMaxRange(range);
+  for (NSValue *val in listRanges) {
+    NSRange listRange = [val rangeValue];
+    if (pos < listRange.location) {
+      block(NSMakeRange(pos, listRange.location - pos));
+    }
+    pos = MAX(pos, NSMaxRange(listRange));
+  }
+  if (pos < end) {
+    block(NSMakeRange(pos, end - pos));
+  }
 }
 
 @end

package/ios/renderer/CodeBlockRenderer.h

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface CodeBlockRenderer : BaseRenderer <NodeRenderer>
+@interface CodeBlockRenderer : BaseRenderer
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/renderer/CodeBlockRenderer.m

@@ -1,5 +1,7 @@
 #import "CodeBlockRenderer.h"
 #import "CodeBlockBackground.h"
+#import "ENRMCodeBlockContent.h"
+#import "ENRMCodeBlockHighlighter.h"
 #import "LastElementUtils.h"
 #import "MarkdownASTNode.h"
 #import "ParagraphStyleUtils.h"
@@ -9,12 +11,25 @@
 
 @implementation CodeBlockRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (id)takeContextSnapshot:(RenderContext *)context
 {
+  return [context snapshotScope];
+}
+
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
+{
+  // In tight lists md4c emits raw Text siblings without paragraph wrappers,
+  // so the preceding content may not terminate with a newline.
+  if (output.length > 0 && ![output.string hasSuffix:@"\n"]) {
+    [output appendAttributedString:kNewlineAttributedString];
+  }
+
   [context setBlockStyle:BlockTypeCodeBlock font:[_config codeBlockFont] color:[_config codeBlockColor] headingLevel:0];
 
+  CGFloat listIndent = context.accumulatedIndent;
   CGFloat padding = [_config codeBlockPadding];
-  CGFloat lineHeight = [_config codeBlockLineHeight];
   CGFloat marginTop = [_config codeBlockMarginTop];
   CGFloat marginBottom = [_config codeBlockMarginBottom];
 
@@ -31,11 +46,7 @@
   }
 
   NSUInteger contentStart = output.length;
-  @try {
-    [_rendererFactory renderChildrenOfNode:node into:output context:context];
-  } @finally {
-    [context clearBlockStyle];
-  }
+  [_rendererFactory renderChildrenOfNode:node into:output context:context];
 
   NSUInteger contentEnd = output.length;
   if (contentEnd <= contentStart)
@@ -43,25 +54,15 @@
 
   NSRange contentRange = NSMakeRange(contentStart, contentEnd - contentStart);
 
-  UIFont *codeFont = [_config codeBlockFont];
-  RCTUIColor *codeColor = [_config codeBlockColor];
-  if (codeColor) {
-    [output addAttributes:@{NSFontAttributeName : codeFont, NSForegroundColorAttributeName : codeColor}
-                    range:contentRange];
-  } else {
-    [output addAttribute:NSFontAttributeName value:codeFont range:contentRange];
-  }
+  ENRMApplyCodeBlockTextAttributes(output, contentRange, _config);
 
-  if (lineHeight > 0) {
-    applyLineHeight(output, contentRange, lineHeight);
-  }
+  ENRMApplyHighlightTokens(output, contentRange, ENRMCodeBlockExtractCode(node), ENRMCodeBlockLanguage(node), _config);
 
-  // Code is always LTR regardless of app writing direction
+  // Horizontal padding is paragraph indentation in this flavor; the shared
+  // helper already forced the LTR left-aligned base style.
   NSMutableParagraphStyle *baseStyle = [getOrCreateParagraphStyle(output, contentStart) mutableCopy];
-  baseStyle.baseWritingDirection = NSWritingDirectionLeftToRight;
-  baseStyle.alignment = NSTextAlignmentLeft;
-  baseStyle.firstLineHeadIndent = padding;
-  baseStyle.headIndent = padding;
+  baseStyle.firstLineHeadIndent = padding + listIndent;
+  baseStyle.headIndent = padding + listIndent;
   baseStyle.tailIndent = -padding;
   [output addAttribute:NSParagraphStyleAttributeName value:baseStyle range:contentRange];
 
@@ -80,6 +81,9 @@
   // Define the range for background rendering (includes padding, excludes margins)
   NSRange backgroundRange = NSMakeRange(blockStart, output.length - blockStart);
   [output addAttribute:CodeBlockAttributeName value:@YES range:backgroundRange];
+  if (listIndent > 0) {
+    [output addAttribute:CodeBlockIndentAttributeName value:@(listIndent) range:backgroundRange];
+  }
 
   // External Margin: Applied outside the background range
   if (marginBottom > 0) {

package/ios/renderer/CodeRenderer.h

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface CodeRenderer : BaseRenderer <NodeRenderer>
+@interface CodeRenderer : BaseRenderer
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/renderer/CodeRenderer.m

@@ -10,7 +10,9 @@
 
 @implementation CodeRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
 
   BlockStyle *blockStyle = [context getBlockStyle];

package/ios/renderer/ENRMImageRenderer.h

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ENRMImageRenderer : BaseRenderer <NodeRenderer>
+@interface ENRMImageRenderer : BaseRenderer
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/renderer/ENRMImageRenderer.m

@@ -10,7 +10,9 @@ static const unichar kZeroWidthSpace = 0x200B;
 
 @implementation ENRMImageRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
   NSString *imageURL = node.attributes[@"url"];
   if (!imageURL || imageURL.length == 0) {
@@ -45,6 +47,8 @@ static const unichar kZeroWidthSpace = 0x200B;
 {
   if (node.content.length > 0) {
     [buffer appendString:node.content];
+  } else if (node.type == MarkdownNodeTypeSoftBreak || node.type == MarkdownNodeTypeLineBreak) {
+    [buffer appendString:@" "];
   }
 
   for (MarkdownASTNode *child in node.children) {

package/ios/renderer/ENRMMathInlineRenderer.h

@@ -3,7 +3,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ENRMMathInlineRenderer : BaseRenderer <NodeRenderer>
+@interface ENRMMathInlineRenderer : BaseRenderer
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/renderer/ENRMMathInlineRenderer.m

@@ -12,7 +12,9 @@
 
 @implementation ENRMMathInlineRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
   NSString *latex = [self extractLatexFromNode:node];
   if (latex.length == 0) {
@@ -28,6 +30,7 @@
   attachment.mathTextColor = [_config inlineMathColor];
   attachment.containerPaddingVertical = [_config inlineMathPaddingVertical];
   attachment.bold = ENRMMathFontWeightIsBold([_config inlineMathFontWeight]);
+  attachment.glyphOverflow = [_config inlineMathGlyphOverflow];
 
 #if TARGET_OS_OSX
   // On macOS, NSLayoutManager uses self.image/self.bounds rather than calling
@@ -53,6 +56,8 @@
   for (MarkdownASTNode *child in node.children) {
     if (child.content.length > 0) {
       [buffer appendString:child.content];
+    } else if (child.type == MarkdownNodeTypeSoftBreak || child.type == MarkdownNodeTypeLineBreak) {
+      [buffer appendString:@" "];
     }
   }
   return buffer;

package/ios/renderer/ENRMSpoilerRenderer.h

@@ -1,5 +1,5 @@
 #pragma once
 #import "BaseRenderer.h"
 
-@interface ENRMSpoilerRenderer : BaseRenderer <NodeRenderer>
+@interface ENRMSpoilerRenderer : BaseRenderer
 @end

package/ios/renderer/ENRMSpoilerRenderer.m

@@ -6,7 +6,9 @@
 
 @implementation ENRMSpoilerRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
   NSUInteger start = output.length;
   [_rendererFactory renderChildrenOfNode:node into:output context:context];

package/ios/renderer/EmphasisRenderer.h

@@ -1,5 +1,5 @@
 #pragma once
 #import "BaseRenderer.h"
 
-@interface EmphasisRenderer : BaseRenderer <NodeRenderer>
+@interface EmphasisRenderer : BaseRenderer
 @end

package/ios/renderer/EmphasisRenderer.m

@@ -10,7 +10,9 @@
 
 #pragma mark - Rendering
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
   NSUInteger start = output.length;
   [_rendererFactory renderChildrenOfNode:node into:output context:context];

package/ios/renderer/HeadingRenderer.h

@@ -2,5 +2,5 @@
 #import "MarkdownASTNode.h"
 #import "RenderContext.h"
 
-@interface HeadingRenderer : BaseRenderer <NodeRenderer>
+@interface HeadingRenderer : BaseRenderer
 @end

package/ios/renderer/HeadingRenderer.m

@@ -21,8 +21,19 @@ static NSString *const kHeadingTypes[] = {nil,          @"heading-1", @"heading-
 
 @implementation HeadingRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (id)takeContextSnapshot:(RenderContext *)context
 {
+  return [context snapshotScope];
+}
+
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
+{
+  if (output.length > 0 && ![output.string hasSuffix:@"\n"]) {
+    [output appendAttributedString:kNewlineAttributedString];
+  }
+
   NSInteger level = [node.attributes[@"level"] integerValue];
   if (level < 1 || level > 6)
     level = 1;
@@ -40,11 +51,7 @@ static NSString *const kHeadingTypes[] = {nil,          @"heading-1", @"heading-
     start += offset;
   }
 
-  @try {
-    [_rendererFactory renderChildrenOfNode:node into:output context:context];
-  } @finally {
-    [context clearBlockStyle];
-  }
+  [_rendererFactory renderChildrenOfNode:node into:output context:context];
 
   NSRange range = NSMakeRange(start, output.length - start);
   if (range.length == 0)

package/ios/renderer/HighlightRenderer.h

@@ -3,5 +3,5 @@
 
 extern NSString *const HighlightAttributeName;
 
-@interface HighlightRenderer : BaseRenderer <NodeRenderer>
+@interface HighlightRenderer : BaseRenderer
 @end

package/ios/renderer/HighlightRenderer.m

@@ -10,7 +10,9 @@ NSString *const HighlightAttributeName = @"EnrichedMarkdownHighlight";
 
 #pragma mark - Rendering
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
   NSUInteger start = output.length;
   [_rendererFactory renderChildrenOfNode:node into:output context:context];

package/ios/renderer/LinkRenderer.h

@@ -2,5 +2,5 @@
 #import "MarkdownASTNode.h"
 #import "RenderContext.h"
 
-@interface LinkRenderer : BaseRenderer <NodeRenderer>
+@interface LinkRenderer : BaseRenderer
 @end