merge ditroff and troff versions