improved sum and product macros, which distinguish text and display mode
Merge branch 'master' of github.com:HoTT/book