mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-25 00:02:28 +02:00
Code Issues Releases Wiki Activity

v2.17 issue 539 fix missing attributes in headlines and improve id and anchor for toc

Browse Source
This commit is contained in:
trendschau
2025-05-17 22:54:32 +02:00
parent 256f627ede
commit ebcba4658f
2 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cache/timer.yaml vendored
View File

@@ -1 +1 @@
licenseupdate: 1747478031
licenseupdate: 1747512483

90
system/typemill/Extensions/ParsedownExtension.php
View File

@@ -362,56 +362,50 @@ class ParsedownExtension extends \ParsedownExtra
protected function blockHeader($Line)
{
if (isset($Line['text'][1]))
# Let ParsedownExtra do its job first
$block = parent::blockHeader($Line);
if (!$block)
{
$level = strspn($Line['text'], '#');
if ($level > 6)
{
return;
}
$text = trim($Line['text'], '#');
$lang = $this->settings['langattr'] ?? false;
$headline = Slug::createSlug($Line['text'], $lang);
if ($this->strictMode and isset($text[0]) and $text[0] !== ' ')
{
return;
}
$text = trim($text, ' ');
$tocText = $text;
if($this->showAnchor && $level > 1)
{
# should we add more info like level so duplicate headline text is possible?
$text = "[#](#h-$headline){.tm-heading-anchor}" . $text;
}
$Block = array(
'element' => array(
'name' => 'h' . min(6, $level),
'attributes' => array(
'id' => "h-$headline"
),
'handler' => array(
'function' => 'lineElements',
'argument' => $text,
'destination' => 'elements',
),
)
);
# fix: make sure no duplicates in headlines if user logged in and restrictions on
if(!isset($this->headlines[$headline]))
{
$this->headlines[$headline] = array('level' => $level, 'name' => $Block['element']['name'], 'attribute' => $Block['element']['attributes']['id'], 'text' => $tocText);
}
return $Block;
return;
}
$text = $block['element']['handler']['argument'] ?? '';
$level = (int) str_replace('h', '', $block['element']['name']);
if ($level > 6)
{
return;
}
$lang = $this->settings['langattr'] ?? false;
# Get plain text for TOC slug (strip anchor link syntax)
$tocText = strip_tags($text);
if (isset($block['element']['attributes']['id']))
{
$id = $block['element']['attributes']['id'];
}
else
{
$id = "h$level-" . Slug::createSlug($tocText, $lang);
$block['element']['attributes']['id'] = $id;
}
# Add anchor only for levels > 1
if ($this->showAnchor && $level > 1)
{
$anchor = "[#](#$id){.tm-heading-anchor}";
$block['element']['handler']['argument'] = $anchor . $text;
}
# Store for TOC
$this->headlines[$id] = [
'level' => $level,
'name' => $block['element']['name'],
'attribute' => $id,
'text' => $tocText
];
return $block;
}