Add render rules to renderers as bound methods

This allows for rules to also be inherited

Author: chrisjsewell

markdown_it/extensions/footnote/index.py

@@ -366,8 +366,8 @@ def render_footnote_caption(self, tokens, idx, options, env):
 
 
 def render_footnote_ref(self, tokens, idx, options, env):
-    ident = self.rules["footnote_anchor_name"](self, tokens, idx, options, env)
-    caption = self.rules["footnote_caption"](self, tokens, idx, options, env)
+    ident = self.rules["footnote_anchor_name"](tokens, idx, options, env)
+    caption = self.rules["footnote_caption"](tokens, idx, options, env)
     refid = ident
 
     if tokens[idx].meta.get("subId", -1) > 0:
@@ -401,7 +401,7 @@ def render_footnote_block_close(self, tokens, idx, options, env):
 
 
 def render_footnote_open(self, tokens, idx, options, env):
-    ident = self.rules["footnote_anchor_name"](self, tokens, idx, options, env)
+    ident = self.rules["footnote_anchor_name"](tokens, idx, options, env)
 
     if tokens[idx].meta.get("subId", -1) > 0:
         ident += ":" + tokens[idx].meta["subId"]
@@ -414,7 +414,7 @@ def render_footnote_close(self, tokens, idx, options, env):
 
 
 def render_footnote_anchor(self, tokens, idx, options, env):
-    ident = self.rules["footnote_anchor_name"](self, tokens, idx, options, env)
+    ident = self.rules["footnote_anchor_name"](tokens, idx, options, env)
 
     if tokens[idx].meta["subId"] > 0:
         ident += ":" + str(tokens[idx].meta["subId"])

markdown_it/main.py

@@ -187,7 +187,7 @@ def add_render_rule(self, name: str, function: Callable, fmt="html"):
         Only applied when ``renderer.__output__ == fmt``
         """
         if self.renderer.__output__ == fmt:
-            self.renderer.rules[name] = function
+            self.renderer.rules[name] = function.__get__(self.renderer)
 
     def use(self, plugin: Callable, *params) -> "MarkdownIt":
         """Load specified plugin with given params into current parser instance. (chainable)

markdown_it/renderer.py

@@ -5,7 +5,7 @@ class Renderer
 copy of rules. Those can be rewritten with ease. Also, you can add new
 rules if you create plugin and adds new token types.
 """
-
+import inspect
 from typing import List
 
 from .common.utils import unescapeAll, escapeHtml
@@ -49,7 +49,7 @@ def strong_close(self, tokens, idx, options, env):
     def __init__(self):
         self.rules = {
             k: v
-            for k, v in self.__class__.__dict__.items()
+            for k, v in inspect.getmembers(self, predicate=inspect.ismethod)
             if not (k.startswith("render") or k.startswith("_"))
         }
 
@@ -68,7 +68,7 @@ def render(self, tokens: List[Token], options, env) -> str:
             if token.type == "inline":
                 result += self.renderInline(token.children, options, env)
             elif token.type in self.rules:
-                result += self.rules[token.type](self, tokens, i, options, env)
+                result += self.rules[token.type](tokens, i, options, env)
             else:
                 result += self.renderToken(tokens, i, options, env)
 
@@ -85,7 +85,7 @@ def renderInline(self, tokens: List[Token], options, env) -> str:
 
         for i, token in enumerate(tokens):
             if token.type in self.rules:
-                result += self.rules[token.type](self, tokens, i, options, env)
+                result += self.rules[token.type](tokens, i, options, env)
             else:
                 result += self.renderToken(tokens, i, options, env)