From a7d2dfc4fc1c0592964b6173a748c03d7807901f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Mon, 4 Jun 2018 18:35:54 +0300
Subject: [PATCH] Fix some issues with ToC (#8797)

* Allow HTML in ToC

Fixes #4793

* Extract ToC id from the header

This is needed when the id is set explicitly in markdown.
---
 layouts/partials/templates/blocks.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/layouts/partials/templates/blocks.html b/layouts/partials/templates/blocks.html
index 280aa6aa5d..765b884ac7 100644
--- a/layouts/partials/templates/blocks.html
+++ b/layouts/partials/templates/blocks.html
@@ -9,8 +9,10 @@
 {{ $section := $.ctx.Scratch.Get "section" }}
 {{ $headers := findRE "<h2.*?>(.|\n)*?</h2>" $section }}
 {{ range $headers }}
-{{ $header := . | replaceRE "</?h2.*?>" "" | htmlUnescape }}
-<li><a href="#{{ $header | anchorize }}">{{ $header }}</a></li>
+{{ $id := . | strings.TrimPrefix "<h2 id=\"" }}
+{{ $id := $id | replaceRE "\">.*" "" }}
+{{ $header := . | replaceRE "</?h2.*?>" "" | htmlUnescape | safeHTML }}
+<li><a href="#{{ $id }}">{{ $header }}</a></li>
 {{ end }}
 {{ $.ctx.Scratch.Add "sections" $section }}
 {{ end }}