Skip to content

Commit e620594

Browse files
authored
Merge pull request #293 from dwrolvink/master
version 3.0.2 patch related to python-markdown 3.4
2 parents 9a01eca + 04172ab commit e620594

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

dist/obsidianhtml-3.0.1.tar.gz

-1.92 MB
Binary file not shown.

dist/obsidianhtml-3.0.2.tar.gz

1.93 MB
Binary file not shown.

obsidianhtml/DataviewExtension.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@
88
DataviewRegexBegin = re.compile(r"^\ *\`\`\`\ *dataview")
99
DataviewRegexEnd = re.compile(r"^\ *\`\`\`")
1010

11+
class DataviewExtension(Extension):
12+
def __init__(self, **kwargs):
13+
self.config = {
14+
'note_path' : ['not set', 'Path to the note relative to the vault'],
15+
'dataview_export_folder' : ['not set', 'Absolute path to the dataview export folder']
16+
}
17+
super(DataviewExtension, self).__init__(**kwargs)
18+
19+
""" Add source code hilighting to markdown codeblocks. """
20+
def extendMarkdown(self, md):
21+
md.preprocessors.register(DataviewPreprocessor(self, md), 'dataview', 35)
22+
md.registerExtension(self)
23+
24+
def makeExtension(**kwargs):
25+
return DataviewExtension(**kwargs)
1126

1227
class DataviewPreprocessor(Preprocessor):
1328
def __init__(self, extension, md=None):
@@ -77,18 +92,3 @@ def get_dataview_tables(self):
7792
return dataview_tables
7893

7994

80-
class DataviewExtension(Extension):
81-
def __init__(self, **kwargs):
82-
self.config = {
83-
'note_path' : ['not set', 'Path to the note relative to the vault'],
84-
'dataview_export_folder' : ['not set', 'Absolute path to the dataview export folder']
85-
}
86-
super(DataviewExtension, self).__init__(**kwargs)
87-
88-
""" Add source code hilighting to markdown codeblocks. """
89-
def extendMarkdown(self, md, md_globals):
90-
md.preprocessors.register(DataviewPreprocessor(self, md), 'dataview', 35)
91-
md.registerExtension(self)
92-
93-
def makeExtension(**kwargs):
94-
return DataviewExtension(**kwargs)

obsidianhtml/MermaidExtension.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def strip_notprintable(myStr):
2727
class MermaidExtension(Extension):
2828
""" Add source code hilighting to markdown codeblocks. """
2929

30-
def extendMarkdown(self, md, md_globals):
30+
def extendMarkdown(self, md):
3131
""" Add HilitePostprocessor to Markdown instance. """
3232
# Insert a preprocessor before ReferencePreprocessor
3333
md.preprocessors.register(MermaidPreprocessor(md), 'MermaidExtension', 35)

obsidianhtml/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ def main():
501501
print(f"Exported html template to {str(export_html_template_target_path)}")
502502
exit(0)
503503
if v == '--test':
504-
print('test 3.0.2 b')
504+
print('test 3.0.2 c')
505505
exit(0)
506506

507507

0 commit comments

Comments
 (0)