[ENH] Use of defaultFont in TextStyles ( conflict )

[denker at iam.unibe.ch]

Checking DefaultFont.cs (#5168) for method conflicts with changesets
after 5168advanceVersion-sw ...
...checking DisplayText>>composeForm
CONFLICT found for DisplayText class>>composeForm with newer changeset
5279TrueTypeTextStyle-yo
...checking Text class>>fromString:
1 conflict found.