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

package/ios/renderer/ListItemRenderer.m

@@ -1,4 +1,5 @@
 #import "ListItemRenderer.h"
+#import "BlockquoteBorder.h"
 #import "ENRMUIKit.h"
 #import "LastElementUtils.h"
 #import "MarkdownASTNode.h"
@@ -10,10 +11,14 @@
 NSString *const ListDepthAttribute = @"ListDepth";
 NSString *const ListTypeAttribute = @"ListType";
 NSString *const ListItemNumberAttribute = @"ListItemNumber";
+NSString *const ListItemMarkerStartAttribute = @"ListItemMarkerStart";
 NSString *const TaskItemAttribute = @"TaskItem";
 NSString *const TaskCheckedAttribute = @"TaskChecked";
 NSString *const TaskIndexAttribute = @"TaskIndex";
 
+@implementation ENRMListMarkerDescriptor
+@end
+
 @interface ListItemRenderer ()
 - (void)applyCheckedDecorationsTo:(NSMutableAttributedString *)output
                             range:(NSRange)range
@@ -22,7 +27,9 @@ NSString *const TaskIndexAttribute = @"TaskIndex";
 
 @implementation ListItemRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
   if (!context)
     return;
@@ -39,10 +46,28 @@ NSString *const TaskIndexAttribute = @"TaskIndex";
     context.taskItemCount++;
   }
 
+  // currentDepth - 1 handles the horizontal offset for nested lists
+  const NSInteger nestingLevel = currentDepth - 1;
+  const CGFloat baseMarkerWidth = isTask                                  ? [_config effectiveListMarginLeftForTask]
+                                  : (context.listType == ListTypeOrdered) ? [_config effectiveListMarginLeftForNumber]
+                                                                          : [_config effectiveListMarginLeftForBullet];
+
+  const CGFloat blockquoteIndent =
+      blockquoteIndentForDepth(context.blockquoteDepth, [_config blockquoteBorderWidth] + [_config blockquoteGapWidth]);
+
+  const CGFloat totalIndent = blockquoteIndent + baseMarkerWidth + [_config effectiveListGapWidth] +
+                              (nestingLevel * [_config listStyleMarginLeft]);
+
   const NSUInteger startLocation = output.length;
 
-  // Render the actual content of the list item (text, bolding, etc.)
-  [_rendererFactory renderChildrenOfNode:node into:output context:context];
+  // Manual save/restore — a scope snapshot would also roll back the listItemNumber increment
+  const CGFloat prevIndent = context.accumulatedIndent;
+  context.accumulatedIndent = totalIndent;
+  @try {
+    [_rendererFactory renderChildrenOfNode:node into:output context:context];
+  } @finally {
+    context.accumulatedIndent = prevIndent;
+  }
 
   // Ensure every list item ends with a newline to prevent paragraph merging
   if (output.length > startLocation && ![output.string hasSuffix:@"\n"]) {
@@ -59,15 +84,6 @@ NSString *const TaskIndexAttribute = @"TaskIndex";
                            depth:currentDepth
                        isOrdered:(context.listType == ListTypeOrdered)];
 
-  // currentDepth - 1 handles the horizontal offset for nested lists
-  const NSInteger nestingLevel = currentDepth - 1;
-  const CGFloat baseMarkerWidth = isTask                                  ? [_config effectiveListMarginLeftForTask]
-                                  : (context.listType == ListTypeOrdered) ? [_config effectiveListMarginLeftForNumber]
-                                                                          : [_config effectiveListMarginLeftForBullet];
-
-  const CGFloat totalIndent =
-      baseMarkerWidth + [_config effectiveListGapWidth] + (nestingLevel * [_config listStyleMarginLeft]);
-
   const CGFloat lineHeightConfig = [_config listStyleLineHeight];
 
   // Boxing metadata for attributed string storage
@@ -83,45 +99,87 @@ NSString *const TaskIndexAttribute = @"TaskIndex";
     metadata[TaskIndexAttribute] = @(taskIndex);
   }
 
-  // We enumerate to ensure we don't overwrite styles of nested sub-lists
-  // or code blocks that may have already been rendered inside this item.
+  // Preserve styles of nested sub-lists and code blocks by applying the list
+  // paragraph style only to the surviving gaps between them.
+  NSMutableArray<NSValue *> *skipRanges = [NSMutableArray array];
+  [output enumerateAttribute:CodeBlockAttributeName
+                     inRange:itemRange
+                     options:0
+                  usingBlock:^(id value, NSRange range, BOOL *stop) {
+                    if ([value boolValue]) {
+                      [skipRanges addObject:[NSValue valueWithRange:range]];
+                    }
+                  }];
   [output enumerateAttribute:ListDepthAttribute
                      inRange:itemRange
                      options:0
                   usingBlock:^(id depthAttr, NSRange range, BOOL *stop) {
-                    // If a segment already has a Depth attribute higher than our current level,
-                    // it belongs to a nested list and we should skip it to preserve its styling.
                     if (depthAttr && [depthAttr integerValue] > nestingLevel) {
-                      return;
-                    }
-
-                    // Skip code block ranges — CodeBlockRenderer already applied its own
-                    // paragraph style (padding, LTR indent). Overwriting would add list
-                    // markers ("2.") inside the code block.
-                    NSNumber *isCodeBlock = [output attribute:CodeBlockAttributeName
-                                                      atIndex:range.location
-                                               effectiveRange:nil];
-                    if ([isCodeBlock boolValue]) {
-                      return;
+                      [skipRanges addObject:[NSValue valueWithRange:range]];
                     }
+                  }];
+  [skipRanges sortUsingComparator:^NSComparisonResult(NSValue *a, NSValue *b) {
+    NSUInteger la = [a rangeValue].location;
+    NSUInteger lb = [b rangeValue].location;
+    return la < lb ? NSOrderedAscending : (la > lb ? NSOrderedDescending : NSOrderedSame);
+  }];
+
+  void (^applyStyleToRange)(NSRange) = ^(NSRange range) {
+    if (range.length == 0)
+      return;
+    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+    style.firstLineHeadIndent = totalIndent;
+    style.headIndent = totalIndent;
+    NSMutableDictionary *attributesToApply = [metadata mutableCopy];
+    attributesToApply[NSParagraphStyleAttributeName] = style;
+    [output addAttributes:attributesToApply range:range];
+    // Line height goes through the shared helper so list items get the same carve-out as
+    // paragraphs — inline math AND block images. Clamping maximumLineHeight here directly
+    // would push the line fragment below the height an inline math attachment draws at, and
+    // the overflow paints over the neighbouring lines. applyLineHeight reads the paragraph
+    // style back via getOrCreateParagraphStyle, so it must run AFTER addAttributes: for the
+    // indents above to survive; it early-returns on a non-positive line height.
+    applyLineHeight(output, range, lineHeightConfig);
+  };
+
+  NSUInteger pos = itemRange.location;
+  const NSUInteger itemEnd = NSMaxRange(itemRange);
+  for (NSValue *val in skipRanges) {
+    NSRange skip = [val rangeValue];
+    if (pos < skip.location) {
+      applyStyleToRange(NSMakeRange(pos, skip.location - pos));
+    }
+    pos = MAX(pos, NSMaxRange(skip));
+  }
+  if (pos < itemEnd) {
+    applyStyleToRange(NSMakeRange(pos, itemEnd - pos));
+  }
 
-                    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
-                    style.firstLineHeadIndent = totalIndent;
-                    style.headIndent = totalIndent;
-
-                    NSMutableDictionary *attributesToApply = [metadata mutableCopy];
-                    attributesToApply[NSParagraphStyleAttributeName] = style;
-
-                    [output addAttributes:attributesToApply range:range];
+  ENRMListMarkerDescriptor *marker = [[ENRMListMarkerDescriptor alloc] init];
+  marker.isTask = isTask;
+  marker.isChecked = isChecked;
+  marker.taskIndex = taskIndex;
+  marker.listType = context.listType;
+  marker.number = currentPosition;
+  marker.depth = nestingLevel;
+  marker.indent = totalIndent;
+
+  // Anchor on the first content character so items that open with a code block
+  // or nested sublist still get their marker; fall back to startLocation for
+  // whitespace-only items.
+  NSUInteger anchorLocation = startLocation;
+  NSString *string = output.string;
+  for (NSUInteger i = startLocation; i < itemEnd; i++) {
+    if ([string characterAtIndex:i] != '\n') {
+      anchorLocation = i;
+      break;
+    }
+  }
 
-                    // Line height goes through the shared helper so list items get the same math
-                    // carve-out as paragraphs. Setting maximumLineHeight here directly would clamp
-                    // the line fragment below the height an inline math attachment draws at, and the
-                    // overflow paints over the neighbouring lines. applyLineHeight reads back the
-                    // paragraph style we just applied, so the indents above survive, and it
-                    // early-returns on a non-positive line height like the old guard did.
-                    applyLineHeight(output, range, lineHeightConfig);
-                  }];
+  NSArray *existingMarkers = [output attribute:ListItemMarkerStartAttribute atIndex:anchorLocation effectiveRange:NULL];
+  NSArray *markers =
+      [existingMarkers isKindOfClass:[NSArray class]] ? [existingMarkers arrayByAddingObject:marker] : @[ marker ];
+  [output addAttribute:ListItemMarkerStartAttribute value:markers range:NSMakeRange(anchorLocation, 1)];
 
   if (isTask && isChecked) {
     [self applyCheckedDecorationsTo:output range:itemRange nestingLevel:nestingLevel];
@@ -175,4 +233,4 @@ NSString *const TaskIndexAttribute = @"TaskIndex";
                   }];
 }
 
-@end
+@end

package/ios/renderer/ListRenderer.h

@@ -1,10 +1,10 @@
-#import "NodeRenderer.h"
+#import "BaseRenderer.h"
 
 @class RendererFactory;
 @class StyleConfig;
 @class RenderContext;
 
-@interface ListRenderer : NSObject <NodeRenderer>
+@interface ListRenderer : BaseRenderer
 
 - (instancetype)initWithRendererFactory:(RendererFactory *)rendererFactory
                                  config:(StyleConfig *)config

package/ios/renderer/ListRenderer.m

@@ -6,37 +6,75 @@
 #import "RendererFactory.h"
 #import "StyleConfig.h"
 
+// Inserts the configured vertical gap between consecutive list items (including
+// nested ones) by raising paragraphSpacing on the paragraph preceding each item
+// start. The first item of the root list gets no spacing above it.
+static void applyListItemSpacing(NSMutableAttributedString *output, RenderContext *context, NSUInteger listStart,
+                                 CGFloat itemSpacing)
+{
+  if (itemSpacing <= 0)
+    return;
+
+  NSMutableIndexSet *itemStarts = [NSMutableIndexSet indexSet];
+  for (NSValue *value in context.listItemRanges) {
+    NSUInteger location = [value rangeValue].location;
+    if (location >= listStart && location < output.length) {
+      [itemStarts addIndex:location];
+    }
+  }
+  if (itemStarts.count < 2)
+    return;
+
+  NSString *string = output.string;
+  const NSUInteger firstStart = itemStarts.firstIndex;
+  [itemStarts enumerateIndexesUsingBlock:^(NSUInteger itemStart, BOOL *stop) {
+    if (itemStart == firstStart)
+      return;
+    NSRange prevParagraph = [string paragraphRangeForRange:NSMakeRange(itemStart - 1, 0)];
+    [output enumerateAttribute:NSParagraphStyleAttributeName
+                       inRange:prevParagraph
+                       options:0
+                    usingBlock:^(NSParagraphStyle *style, NSRange range, BOOL *innerStop) {
+                      if (style.paragraphSpacing >= itemSpacing)
+                        return;
+                      NSMutableParagraphStyle *updated =
+                          style ? [style mutableCopy] : [[NSMutableParagraphStyle alloc] init];
+                      updated.paragraphSpacing = itemSpacing;
+                      [output addAttribute:NSParagraphStyleAttributeName value:updated range:range];
+                    }];
+  }];
+}
+
 @implementation ListRenderer {
-  __weak RendererFactory *_rendererFactory;
-  StyleConfig *_config;
   BOOL _isOrdered;
 }
 
 - (instancetype)initWithRendererFactory:(RendererFactory *)factory config:(StyleConfig *)config isOrdered:(BOOL)ordered
 {
-  if (self = [super init]) {
-    _rendererFactory = factory;
-    _config = config;
+  if (self = [super initWithRendererFactory:factory config:config]) {
     _isOrdered = ordered;
   }
   return self;
 }
 
-- (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 (!context)
     return;
 
   const NSInteger prevDepth = context.listDepth;
-  const ListType prevType = context.listType;
-  const NSInteger prevNum = context.listItemNumber;
-
   const NSUInteger startLocation = output.length;
-  NSUInteger contentStart = startLocation;
 
   if (prevDepth == 0) {
     // Apply top margin for root-level list
-    contentStart += applyBlockSpacingBefore(output, startLocation, _config.listStyleMarginTop);
+    applyBlockSpacingBefore(output, startLocation, _config.listStyleMarginTop);
   } else if (output.length > 0 && ![output.string hasSuffix:@"\n"]) {
     // Ensure nested lists start on a new line
     [output appendAttributedString:kNewlineAttributedString];
@@ -44,27 +82,27 @@
 
   context.listDepth = prevDepth + 1;
   context.listType = _isOrdered ? ListTypeOrdered : ListTypeUnordered;
-  context.listItemNumber = 0; // Reset counter for this specific list level
+  NSInteger startNumber = 1;
+  NSString *startAttr = node.attributes[@"start"];
+  if (_isOrdered && startAttr != nil) {
+    startNumber = MAX((NSInteger)0, (NSInteger)startAttr.integerValue);
+  }
+  // ListItemRenderer pre-increments, so the counter starts one below the
+  // first rendered number.
+  context.listItemNumber = startNumber - 1;
 
   [context setBlockStyle:_isOrdered ? BlockTypeOrderedList : BlockTypeUnorderedList
                     font:_config.listStyleFont
                    color:_config.listStyleColor
             headingLevel:0];
 
-  @try {
-    [_rendererFactory renderChildrenOfNode:node into:output context:context];
-  } @finally {
-    context.listDepth = prevDepth;
-    context.listType = prevType;
-    context.listItemNumber = prevNum;
-
-    if (prevDepth == 0) {
-      [context clearBlockStyle];
+  [_rendererFactory renderChildrenOfNode:node into:output context:context];
 
-      // Apply bottom margin for root-level list
-      applyBlockSpacingAfter(output, _config.listStyleMarginBottom);
-    }
+  if (prevDepth == 0) {
+    applyListItemSpacing(output, context, startLocation, [_config listStyleItemSpacing]);
+    // Apply bottom margin for root-level list
+    applyBlockSpacingAfter(output, _config.listStyleMarginBottom);
   }
 }
 
-@end
+@end

package/ios/renderer/ParagraphRenderer.h

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

package/ios/renderer/ParagraphRenderer.m

@@ -7,8 +7,22 @@
 
 @implementation ParagraphRenderer
 
-- (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
+{
+  // Synthetic wrapper around tight list item inlines (see wrapListItemInlineRuns
+  // in MD4CParser) — render transparently, the list owns spacing and layout.
+  if ([node.attributes[@"tight"] boolValue]) {
+    [_rendererFactory renderChildrenOfNode:node into:output context:context];
+    return;
+  }
+
   // Only set block style if a parent element (e.g. List, Blockquote) hasn't already established one
   BOOL isTopLevel = (context.currentBlockType == BlockTypeNone);
 
@@ -33,13 +47,7 @@
     start += offset;
   }
 
-  @try {
-    [_rendererFactory renderChildrenOfNode:node into:output context:context];
-  } @finally {
-    if (isTopLevel) {
-      [context clearBlockStyle];
-    }
-  }
+  [_rendererFactory renderChildrenOfNode:node into:output context:context];
 
   if (output.length <= start)
     return;

package/ios/renderer/RenderContext.h

@@ -41,6 +41,7 @@ typedef NS_ENUM(NSInteger, ListType) { ListTypeUnordered, ListTypeOrdered };
 @property (nonatomic, assign) NSInteger listDepth;
 @property (nonatomic, assign) ListType listType;
 @property (nonatomic, assign) NSInteger listItemNumber;
+@property (nonatomic, assign) CGFloat accumulatedIndent;
 @property (nonatomic, assign) BOOL allowFontScaling;
 @property (nonatomic, assign) CGFloat maxFontSizeMultiplier;
 @property (nonatomic, assign) NSInteger taskItemCount;
@@ -79,6 +80,15 @@ typedef NS_ENUM(NSInteger, ListType) { ListTypeUnordered, ListTypeOrdered };
 - (NSDictionary *)getTextAttributes;
 - (void)clearBlockStyle;
 
+/**
+ * Captures/restores the scoped context state: block style, block type, heading level,
+ * blockquote/list depths, list type, list item counter and accumulated indent.
+ * Accumulators (range registries, taskItemCount) are excluded on purpose — they
+ * must survive restores.
+ */
+- (id)snapshotScope;
+- (void)restoreScope:(id)snapshot;
+
 /**
  * Checks if colors should be preserved based on existing attributes.
  * Returns YES if the text is inside a link or inline code, which means

package/ios/renderer/RenderContext.m

@@ -6,6 +6,30 @@
 @implementation BlockStyle
 @end
 
+static NSArray<NSString *> *ENRMScopedKeyPaths(void)
+{
+  static NSArray<NSString *> *keyPaths;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    keyPaths = @[
+      @"currentBlockType",
+      @"currentHeadingLevel",
+      @"currentBlockStyle.fontSize",
+      @"currentBlockStyle.fontFamily",
+      @"currentBlockStyle.fontWeight",
+      @"currentBlockStyle.color",
+      @"currentBlockStyle.cachedFont",
+      @"currentBlockStyle.cachedTextAttributes",
+      @"blockquoteDepth",
+      @"listDepth",
+      @"listType",
+      @"listItemNumber",
+      @"accumulatedIndent",
+    ];
+  });
+  return keyPaths;
+}
+
 @implementation RenderContext {
   NSMutableDictionary<NSString *, UIFont *> *_fontCache;
   NSParagraphStyle *_baseSpacerTemplate;
@@ -235,6 +259,25 @@
   _currentBlockStyle.cachedTextAttributes = nil;
 }
 
+- (id)snapshotScope
+{
+  NSArray<NSString *> *keyPaths = ENRMScopedKeyPaths();
+  NSMutableDictionary *snapshot = [NSMutableDictionary dictionaryWithCapacity:keyPaths.count];
+  for (NSString *keyPath in keyPaths) {
+    snapshot[keyPath] = [self valueForKeyPath:keyPath] ?: [NSNull null];
+  }
+  return snapshot;
+}
+
+- (void)restoreScope:(id)snapshot
+{
+  NSDictionary *frame = snapshot;
+  for (NSString *keyPath in ENRMScopedKeyPaths()) {
+    id value = frame[keyPath];
+    [self setValue:(value == [NSNull null] ? nil : value) forKeyPath:keyPath];
+  }
+}
+
 #pragma mark - Reset
 
 - (void)reset
@@ -256,6 +299,7 @@
   _listDepth = 0;
   _listType = ListTypeUnordered;
   _listItemNumber = 0;
+  _accumulatedIndent = 0;
   _taskItemCount = 0;
 
   // Revert shared style object to baseline defaults

package/ios/renderer/RendererFactory.m

@@ -112,6 +112,14 @@
 #if ENRICHED_MARKDOWN_MATH
     case MarkdownNodeTypeLatexMathInline:
       return [[ENRMMathInlineRenderer alloc] initWithRendererFactory:self config:_config];
+    case MarkdownNodeTypeLatexMathDisplay:
+      // Display math INSIDE a paragraph (mid-paragraph / softbreak-adjacent
+      // `$$…$$`) previously fell through to the nil-renderer child dump —
+      // the body leaked as plain text with its delimiters silently dropped.
+      // Typeset it as an inline attachment instead; block-level display math
+      // is unaffected (SegmentRenderer intercepts root-level display nodes
+      // before this factory is consulted).
+      return [[ENRMMathInlineRenderer alloc] initWithRendererFactory:self config:_config];
 #endif
     case MarkdownNodeTypeSpoiler:
       return [[ENRMSpoilerRenderer alloc] initWithRendererFactory:self config:_config];
@@ -135,6 +143,12 @@
       [output appendAttributedString:lineBreak];
       continue;
     }
+    if (child.type == MarkdownNodeTypeSoftBreak) {
+      NSAttributedString *softBreak = [[NSAttributedString alloc] initWithString:@" "
+                                                                      attributes:[context getTextAttributes]];
+      [output appendAttributedString:softBreak];
+      continue;
+    }
     id<NodeRenderer> renderer = [self rendererForNodeType:child.type];
     if (renderer) {
       [renderer renderNode:child into:output context:context];

package/ios/renderer/StrikethroughRenderer.h

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

package/ios/renderer/StrikethroughRenderer.m

@@ -8,7 +8,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/StrongRenderer.h

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

package/ios/renderer/StrongRenderer.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/SubscriptRenderer.h

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

package/ios/renderer/SubscriptRenderer.m

@@ -7,7 +7,9 @@
 
 @implementation SubscriptRenderer
 
-- (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/SuperscriptRenderer.h

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

package/ios/renderer/SuperscriptRenderer.m

@@ -7,7 +7,9 @@
 
 @implementation SuperscriptRenderer
 
-- (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/TextRenderer.h

@@ -1,6 +1,6 @@
+#import "BaseRenderer.h"
 #import "MarkdownASTNode.h"
-#import "NodeRenderer.h"
 #import "RenderContext.h"
 
-@interface TextRenderer : NSObject <NodeRenderer>
+@interface TextRenderer : BaseRenderer
 @end

package/ios/renderer/TextRenderer.m

@@ -3,7 +3,9 @@
 
 @implementation TextRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
   if (!node.content)
     return;

package/ios/renderer/ThematicBreakRenderer.h

@@ -1,4 +1,4 @@
 #import "BaseRenderer.h"
 
-@interface ThematicBreakRenderer : BaseRenderer <NodeRenderer>
+@interface ThematicBreakRenderer : BaseRenderer
 @end

package/ios/renderer/ThematicBreakRenderer.m

@@ -7,7 +7,9 @@
 
 @implementation ThematicBreakRenderer
 
-- (void)renderNode:(MarkdownASTNode *)node into:(NSMutableAttributedString *)output context:(RenderContext *)context
+- (void)renderNodeContent:(MarkdownASTNode *)node
+                     into:(NSMutableAttributedString *)output
+                  context:(RenderContext *)context
 {
   [self ensureStartingNewline:output];
 

package/ios/renderer/UnderlineRenderer.h

@@ -1,4 +1,4 @@
 #import "BaseRenderer.h"
 
-@interface UnderlineRenderer : BaseRenderer <NodeRenderer>
+@interface UnderlineRenderer : BaseRenderer
 @end

package/ios/renderer/UnderlineRenderer.m

@@ -8,7 +8,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];