Normal-form parsing for Combinatory Categorial Grammars with generalized composition and type-raising