X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=plugins%2Fmarkdown%2Fmarkdown.php;h=eb7bf23d12a530f976ed7e7b5484644fb8b85619;hb=e680cfea08051150827dae26ae5e59374880c46c;hp=57fcce3268a6aa5c0454e97cab9a395959635e46;hpb=92a381f51737de1e4a03c482fe7c43da311ad556;p=github%2Fshaarli%2FShaarli.git
diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php
index 57fcce32..eb7bf23d 100644
--- a/plugins/markdown/markdown.php
+++ b/plugins/markdown/markdown.php
@@ -6,13 +6,10 @@
* Shaare's descriptions are parsed with Markdown.
*/
-require_once 'Parsedown.php';
-
/*
* If this tag is used on a shaare, the description won't be processed by Parsedown.
- * Using a private tag so it won't appear for visitors.
*/
-define('NO_MD_TAG', '.nomarkdown');
+define('NO_MD_TAG', 'nomarkdown');
/**
* Parse linklist descriptions.
@@ -25,11 +22,11 @@ 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;
}
@@ -44,6 +41,7 @@ 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']);
@@ -86,6 +84,19 @@ 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.
*
@@ -138,7 +149,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;
}
/**
@@ -213,9 +261,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)