chiark / gitweb /
Numbering-within macros added.