Merge pull request #11 from take-cheeze/md_3_8

Update for markdown 3.8

Author: take-cheeze

commit.py

@@ -35,7 +35,7 @@ def replace_commit_line(line: str) -> str:
 
 class CommitExtension(Extension):
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         pre = CommitPreprocessor(md)
 
         md.registerExtension(self)

defined_words.py

@@ -317,7 +317,7 @@ def __init__(self, **kwargs):
             if key in self.config:
                 self.setConfig(key, value)
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         """Add DefinedWordTreeprocessor to Markdown instance."""
         proc = DefinedWordTreeprocessor(md, self.getConfigs())
         md.postprocessors.register(proc, 'defined_words', 1)

fix_display_error.py

@@ -34,7 +34,7 @@ def is_item_end_line(line: str) -> bool:
 
 class FixDisplayErrorExtension(Extension):
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         pre = FixDisplayErrorPreprocessor(md)
 
         md.registerExtension(self)

footer.py

@@ -16,7 +16,7 @@ def __init__(self, configs):
         for key, value in configs:
             self.setConfig(key, value)
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         footer = FooterTreeprocessor()
         footer.config = self.getConfigs()
         md.registerExtension(self)

html_attribute.py

@@ -130,11 +130,11 @@ class SafeRawHtmlPostprocessor(postprocessors.Postprocessor):
     HTML_TAG_RE = re.compile(r'^\<\/?([a-zA-Z0-9]+)[^\>]*\>$')
 
     def run(self, text):
-        for i in range(self.markdown.htmlStash.html_counter):
-            html = self.markdown.htmlStash.rawHtmlBlocks[i]
+        for i in range(self.md.htmlStash.html_counter):
+            html = self.md.htmlStash.rawHtmlBlocks[i]
             # if not safe:
             #     html = self.escape(html)
-            text = text.replace(self.markdown.htmlStash.get_placeholder(i), html)
+            text = text.replace(self.md.htmlStash.get_placeholder(i), html)
         return text
 
     def escape(self, html):
@@ -387,10 +387,11 @@ def __init__(self, **kwargs):
 
         super().__init__(**kwargs)
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         attr = AttributePostprocessor(md, self.getConfigs())
-        md.postprocessors.add('html_attribute', attr, '_end')
-        md.postprocessors['raw_html'] = SafeRawHtmlPostprocessor(md)
+        md.postprocessors.register(attr, 'html_attribute', 0)
+        md.postprocessors.deregister('raw_html')
+        md.postprocessors.register(SafeRawHtmlPostprocessor(md), 'raw_html', 30)
 
 
 def makeExtension(**kwargs):

mark.py

@@ -27,7 +27,7 @@
 
 class MarkExtension(Extension):
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         markpre = MarkPreprocessor(md)
 
         md.registerExtension(self)

mathjax.py

@@ -24,7 +24,7 @@
 
 class MathJaxExtension(Extension):
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         mathjaxpre = MathJaxPreprocessor(md)
 
         md.registerExtension(self)
@@ -57,7 +57,7 @@ def run(self, lines):
             if not m:
                 break
             tex = m.group(0)
-            placeholder = self.markdown.htmlStash.store(code_escape(tex))
+            placeholder = self.md.htmlStash.store(code_escape(tex))
             text = text[:m.start()] + placeholder + text[m.end():]
 
         lines3 = []
@@ -68,7 +68,7 @@ def run(self, lines):
                 if not m:
                     break
                 tex = m.group(0)
-                placeholder = self.markdown.htmlStash.store(code_escape(tex))
+                placeholder = self.md.htmlStash.store(code_escape(tex))
                 line = line[:m.start()] + placeholder + line[m.end():]
             lines3.append(line)
 

meta.py

@@ -35,7 +35,7 @@
 
 class MetaExtension(Extension):
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         metapre = MetaPreprocessor(md)
         metapost = MetaPostprocessor(md)
 

qualified_fenced_code.py

@@ -61,7 +61,7 @@ class QualifiedFencedCodeExtension(Extension):
     def __init__(self, global_qualify_list):
         self.global_qualify_list = global_qualify_list
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         fenced_block = QualifiedFencedBlockPreprocessor(md, self.global_qualify_list)
         md.registerExtension(self)
 
@@ -263,7 +263,7 @@ def __init__(self, md, global_qualify_list):
     def run(self, lines):
         # Check for code hilite extension
         if not self.checked_for_codehilite:
-            for ext in self.markdown.registeredExtensions:
+            for ext in self.md.registeredExtensions:
                 if isinstance(ext, CodeHiliteExtension):
                     self.codehilite_conf = ext.config
                     break
@@ -288,7 +288,7 @@ def run(self, lines):
                 # サンプルコードだったら、self.markdown の中にコードの情報と ID を入れておく
                 if is_example:
                     example_id = hashlib.sha1((str(example_counter) + code).encode('utf-8')).hexdigest()
-                    self.markdown._example_codes.append({"id": example_id, "code": code})
+                    self.md._example_codes.append({"id": example_id, "code": code})
                     example_counter += 1
 
                 qualifier_list = QualifierList(qualifies)
@@ -319,7 +319,7 @@ def run(self, lines):
 
                 code = qualifier_list.qualify(code)
 
-                placeholder = self.markdown.htmlStash.store(code)
+                placeholder = self.md.htmlStash.store(code)
                 text = '%s\n%s\n%s' % (text[:m.start()], placeholder, text[m.end():])
             else:
                 break

sponsor.py

@@ -76,7 +76,7 @@ def replace_sponsor_line(line: str, now: datetime.datetime) -> str:
 
 class SponsorExtension(Extension):
 
-    def extendMarkdown(self, md, md_globals):
+    def extendMarkdown(self, md):
         pre = SponsorPreprocessor(md)
 
         md.registerExtension(self)