CTAN has a new package: diagmac2