Added macros for chapter and section