From f46e429d96ead32943cb2670d7686df8c77de361 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 23 Jan 2018 09:39:05 +0000
Subject: mdwn: Restore historical behaviour

The Discount package in Debian historically enabled fenced code blocks,
PHP Markdown Extra-style definition lists, and an expanded character
set for tag names. Since Discount 2.2.0 those are runtime settings, so
enable them. Unfortunately Text::Markdown::Discount doesn't yet expose
the necessary constants:
https://rt.cpan.org/Public/Bug/Display.html?id=124188

The IDANCHOR option was historically also enabled in Debian, but is not
enabled here because ikiwiki does not enable the TOC option, and
IDANCHOR does nothing without TOC.

Closes: #888055
---
 IkiWiki/Plugin/mdwn.pm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 9f06c03f2..66116ae01 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -125,6 +125,31 @@ sub htmlize (@) {
 						$flags |= 0x00400000;
 					}
 
+					# Enable fenced code blocks in libmarkdown >= 2.2.0
+					# https://bugs.debian.org/888055
+					if (Text::Markdown::Discount->can("MKD_FENCEDCODE")) {
+						$flags |= Text::Markdown::Discount::MKD_FENCEDCODE();
+					}
+					else {
+						$flags |= 0x02000000;
+					}
+
+					# PHP Markdown Extra-style term\n: definition -> <dl>
+					if (Text::Markdown::Discount->can("MKD_DLEXTRA")) {
+						$flags |= Text::Markdown::Discount::MKD_DLEXTRA();
+					}
+					else {
+						$flags |= 0x01000000;
+					}
+
+					# Allow dashes and underscores in tag names
+					if (Text::Markdown::Discount->can("MKD_GITHUBTAGS")) {
+						$flags |= Text::Markdown::Discount::MKD_GITHUBTAGS();
+					}
+					else {
+						$flags |= 0x08000000;
+					}
+
 					return Text::Markdown::Discount::markdown($t, $flags);
 				}
 			}
-- 
cgit v1.2.3