X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=plugins%2Fmarkdown%2Fmarkdown.php;h=6b1c1d4433b8be80c32b7fc981e0effa97637661;hb=17c9ac7c35754b607dba2db74b4aa69d1cec335c;hp=5a702c7b5df8a639c6b41257ae3d152167352cf8;hpb=40b25bef6a027b8e39975a84e8843a921ac1f607;p=github%2Fshaarli%2FShaarli.git
diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php
index 5a702c7b..6b1c1d44 100644
--- a/plugins/markdown/markdown.php
+++ b/plugins/markdown/markdown.php
@@ -8,6 +8,11 @@
require_once 'Parsedown.php';
+/*
+ * If this tag is used on a shaare, the description won't be processed by Parsedown.
+ */
+define('NO_MD_TAG', 'nomarkdown');
+
/**
* Parse linklist descriptions.
*
@@ -18,6 +23,29 @@ require_once 'Parsedown.php';
function hook_markdown_render_linklist($data)
{
foreach ($data['links'] as &$value) {
+ if (!empty($value['tags']) && noMarkdownTag($value['tags'])) {
+ $value['taglist'] = stripNoMarkdownTag($value['taglist']);
+ continue;
+ }
+ $value['description'] = process_markdown($value['description']);
+ }
+ return $data;
+}
+
+/**
+ * Parse feed linklist descriptions.
+ *
+ * @param array $data linklist data.
+ *
+ * @return mixed linklist data parsed in markdown (and converted to HTML).
+ */
+function hook_markdown_render_feed($data)
+{
+ foreach ($data['links'] as &$value) {
+ if (!empty($value['tags']) && noMarkdownTag($value['tags'])) {
+ $value['tags'] = stripNoMarkdownTag($value['tags']);
+ continue;
+ }
$value['description'] = process_markdown($value['description']);
}
@@ -36,6 +64,9 @@ function hook_markdown_render_daily($data)
// Manipulate columns data
foreach ($data['cols'] as &$value) {
foreach ($value as &$value2) {
+ if (!empty($value2['tags']) && noMarkdownTag($value2['tags'])) {
+ continue;
+ }
$value2['formatedDescription'] = process_markdown($value2['formatedDescription']);
}
}
@@ -43,6 +74,31 @@ function hook_markdown_render_daily($data)
return $data;
}
+/**
+ * Check if noMarkdown is set in tags.
+ *
+ * @param string $tags tag list
+ *
+ * @return bool true if markdown should be disabled on this link.
+ */
+function noMarkdownTag($tags)
+{
+ return strpos($tags, NO_MD_TAG) !== false;
+}
+
+/**
+ * Remove the no-markdown meta tag so it won't be displayed.
+ *
+ * @param string $tags Tag list.
+ *
+ * @return string tag list without no markdown tag.
+ */
+function stripNoMarkdownTag($tags)
+{
+ unset($tags[array_search(NO_MD_TAG, $tags)]);
+ return array_values($tags);
+}
+
/**
* When link list is displayed, include markdown CSS.
*
@@ -75,6 +131,12 @@ function hook_markdown_render_editlink($data)
{
// Load help HTML into a string
$data['edit_link_plugin'][] = file_get_contents(PluginManager::$PLUGINS_PATH .'/markdown/help.html');
+
+ // Add no markdown 'meta-tag' in tag list if it was never used, for autocompletion.
+ if (! in_array(NO_MD_TAG, $data['tags'])) {
+ $data['tags'][NO_MD_TAG] = 0;
+ }
+
return $data;
}
@@ -89,7 +151,44 @@ function hook_markdown_render_editlink($data)
*/
function reverse_text2clickable($description)
{
- return preg_replace('![^ ]+!m', '$1', $description);
+ $descriptionLines = explode(PHP_EOL, $description);
+ $descriptionOut = '';
+ $codeBlockOn = false;
+ $lineCount = 0;
+
+ foreach ($descriptionLines as $descriptionLine) {
+ // Detect line of code
+ $codeLineOn = preg_match('/^ /', $descriptionLine) > 0;
+ // Detect and toggle block of code
+ if (!$codeBlockOn) {
+ $codeBlockOn = preg_match('/^```/', $descriptionLine) > 0;
+ }
+ elseif (preg_match('/^```/', $descriptionLine) > 0) {
+ $codeBlockOn = false;
+ }
+
+ $hashtagTitle = ' title="Hashtag [^"]+"';
+ // Reverse `inline code` hashtags.
+ $descriptionLine = preg_replace(
+ '!(`[^`\n]*)([^<]+)([^`\n]*`)!m',
+ '$1$2$3',
+ $descriptionLine
+ );
+
+ // Reverse hashtag links if we're in a code block.
+ $hashtagFilter = ($codeBlockOn || $codeLineOn) ? $hashtagTitle : '';
+ $descriptionLine = preg_replace(
+ '!([^<]+)!m',
+ '$1',
+ $descriptionLine
+ );
+
+ $descriptionOut .= $descriptionLine;
+ if ($lineCount++ < count($descriptionLines) - 1) {
+ $descriptionOut .= PHP_EOL;
+ }
+ }
+ return $descriptionOut;
}
/**
@@ -164,9 +263,9 @@ function process_markdown($description)
$parsedown = new Parsedown();
$processedDescription = $description;
- $processedDescription = reverse_text2clickable($processedDescription);
$processedDescription = reverse_nl2br($processedDescription);
$processedDescription = reverse_space2nbsp($processedDescription);
+ $processedDescription = reverse_text2clickable($processedDescription);
$processedDescription = unescape($processedDescription);
$processedDescription = $parsedown
->setMarkupEscaped(false)