[ca] Improved rules for hyphenated compounds