move macros into _macros.html

This resolves #2