Skip to content

Commit b1c26b2

Browse files
Merge pull request #617 from Crozzers/link-processor
Add `MarkdownFileLinks` extra (#528)
2 parents a3b766b + 259a47e commit b1c26b2

11 files changed

+404
-198
lines changed

CHANGES.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## python-markdown2 2.5.4 (not yet released)
44

5-
(nothing yet)
5+
- [pull #617] Add MarkdownFileLinks extra (#528)
66

77

88
## python-markdown2 2.5.3

lib/markdown2.py

+383-193
Large diffs are not rendered by default.

test/testall.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def _python_ver_from_python(python):
1717
assert ' ' not in python
1818
o = os.popen('''%s -c "import sys; print(sys.version)"''' % python)
1919
ver_str = o.read().strip()
20-
ver_bits = re.split(r"\.|[^\d]", ver_str, 2)[:2]
20+
ver_bits = re.split(r"\.|[^\d]", ver_str, maxsplit=2)[:2]
2121
ver = tuple(map(int, ver_bits))
2222
return ver
2323

test/tm-cases/fenced_code_blocks_issue426.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2>URL PARAMETERS IN THE TEMPLATE</h2>
1515
<li><p><code>ContextMixin</code> defines the method <code>get_context_data</code>:</p>
1616

1717
<div class="codehilite">
18-
<pre><span></span><code><span class="k">def</span> <span class="nf">get_context_data</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
18+
<pre><span></span><code><span class="k">def</span><span class="w"> </span><span class="nf">get_context_data</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
1919
<span class="n">kwargs</span><span class="o">.</span><span class="n">setdefault</span><span class="p">(</span><span class="s1">&#39;view&#39;</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span>
2020
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">extra_context</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
2121
<span class="n">kwargs</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">extra_context</span><span class="p">)</span>
@@ -26,7 +26,7 @@ <h2>URL PARAMETERS IN THE TEMPLATE</h2>
2626
<p>So when overriding one must be careful to extends <code>super</code>'s <code>kwargs</code>:</p>
2727

2828
<div class="codehilite">
29-
<pre><span></span><code><span class="k">def</span> <span class="nf">get_context_data</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
29+
<pre><span></span><code><span class="k">def</span><span class="w"> </span><span class="nf">get_context_data</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
3030
<span class="n">kwargs</span> <span class="o">=</span> <span class="nb">super</span><span class="p">()</span><span class="o">.</span><span class="n">get_context_data</span><span class="p">(</span><span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
3131
<span class="n">kwargs</span><span class="p">[</span><span class="s1">&#39;page_title&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="s2">&quot;Documentation&quot;</span>
3232
<span class="k">return</span> <span class="n">kwargs</span>

test/tm-cases/fenced_code_blocks_syntax_indentation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="codehilite">
2-
<pre><span></span><code><span class="k">def</span> <span class="nf">foo</span><span class="p">():</span>
2+
<pre><span></span><code><span class="k">def</span><span class="w"> </span><span class="nf">foo</span><span class="p">():</span>
33
<span class="nb">print</span> <span class="s2">&quot;foo&quot;</span>
44

55
<span class="nb">print</span> <span class="s2">&quot;bar&quot;</span>
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<p><a href="./file.html">This is a link to a markdown file</a></p>
2+
3+
<p><a href="./something.html">This is a reference to a markdown file link</a></p>
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{'extras': ['markdown-file-links']}
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[This is a link to a markdown file](./file.md)
2+
3+
[This is a reference to a markdown file link][]
4+
5+
6+
[This is a reference to a markdown file link]: ./something.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<p><a href="./something.md">This is a reference to a markdown file link</a> but link definition swapping is disabled</p>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{'extras': {'markdown-file-links': {'link_defs': False}}}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[This is a reference to a markdown file link][] but link definition swapping is disabled
2+
3+
4+
[This is a reference to a markdown file link]: ./something.md

0 commit comments

Comments
 (0)