From eedc26bfe6112eb107ba6d8678111387d6de3727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Thu, 3 Jun 2021 02:00:10 +0200
Subject: [PATCH] Fix self-link for TOC links.

Previously TOC links contained a closing </a>-tag, but lacked the
accompanying start tag, leading to invalid HTML. This fixes that, along
with placing class="justcenter" on the correct tag once again.
---
 autoload/vimwiki/html.vim | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index b075bdd..3022770 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1236,24 +1236,26 @@ function! s:process_tag_h(line, id) abort
       endif
       let h_complete_id = s:escape_html_attribute(h_complete_id)
       let h_part  = '<div id="'.h_complete_id.'">'
-      let h_part .= '<h'.h_level.' id="'.h_id.'" class="header">'
-      let h_part .= '<a href="#'.h_complete_id.'"'
+      let h_part .= '<h'.h_level.' id="'.h_id.'"'
+      let a_tag = '<a href="#'.h_complete_id.'">'
 
     else
 
-      let h_part = '<div id="'.h_id.'" class="toc"><h'.h_level.' id="'.h_id.'"'
+      let h_part = '<div id="'.h_id.'" class="toc">'
+      let h_part .= '<h'.h_level.' id="'.h_id.'"'
+      let a_tag = '<a href="#'.h_id.'">'
 
     endif
 
     if centered
-      let h_part .= ' class="justcenter">'
+      let h_part .= ' class="header justcenter">'
     else
-      let h_part .= '>'
+      let h_part .= ' class="header">'
     endif
 
     let h_text = s:process_inline_tags(h_text, a:id)
 
-    let line = h_part.h_text.'</a></h'.h_level.'></div>'
+    let line = h_part.a_tag.h_text.'</a></h'.h_level.'></div>'
 
     let processed = 1
   endif