Replace Markdown toc extension and add improved version to macro package.