FOP-2044: Hyphenation of Uppercase Words, Combined with Underlines; applied second patch by Robert Meyer; expanded the layout test case.