no message
no message
no message
no message
Merge commit '7a0b76da98d967143e02d417cc94ccd5f7ea88c6' into branch_Liyuanfeng
no message
no message
计算文字折行位置接口
加一个参数返回切字宽度
no message
no message
no message
粗体、斜体接口及实现
Merge commit '55ff9a753cb761e0c886845e28e8f7fcdc5e7d1a' into branch_Liyuanfeng
Merge commit '21680b7b53914324881c4c9241d1ac615eec5f03' into branch_Liyuanfeng

Conflicts:
	CrossApp/platform/CAFreeTypeFont.h
字体长度bug
no message
Merge commit '706d9fd05b3b6fc074f02d2b4e6fc8dce7aacca1' into branch_Liyuanfeng
no message
no message