diff --git a/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/components/qqface/QDQQFaceUsageFragment.kt b/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/components/qqface/QDQQFaceUsageFragment.kt
index 8b5ef0cd..d2af607d 100644
--- a/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/components/qqface/QDQQFaceUsageFragment.kt
+++ b/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/components/qqface/QDQQFaceUsageFragment.kt
@@ -74,6 +74,10 @@ class QDQQFaceUsageFragment : BaseFragment() {
     @BindView(R.id.line_type_2)
     var mLineType2: LineTypeView? = null
 
+    @JvmField
+    @BindView(R.id.line_type_3)
+    var mLineType3: LineTypeView? = null
+
     @JvmField
     @BindView(R.id.qqface1)
     var mQQFace1: QMUIQQFaceView? = null
@@ -177,7 +181,6 @@ class QDQQFaceUsageFragment : BaseFragment() {
         mLineType1!!.lineHeight = QMUIDisplayHelper.dp2px(context, 36)
         mLineType1!!.textColor = Color.BLACK
         mLineType1!!.textSize = QMUIDisplayHelper.sp2px(context, 15).toFloat()
-        mLineType1!!.textParser = textParser
         mLineType1!!.text = "QMUI Android 的设计[微笑]目的🙃🙃🙃🙃是用于辅助快速搭建一个具备基本设计还原[微笑]效果的 Android 项目，" +
                 "同时利用自身[微笑]提供的丰富控件及兼容处理，让开[微笑]发者能专注于业务需求而无需耗费[微笑]精力在基础代[微笑]码的设计上。" +
                 "不管是新项目的创建，或是已有项[微笑]目的维护，均可使开[微笑]发效率和项目[微笑]质量得到大幅度提升。"
@@ -205,7 +208,6 @@ class QDQQFaceUsageFragment : BaseFragment() {
         mLineType2!!.lineHeight = QMUIDisplayHelper.dp2px(context, 36)
         mLineType2!!.textColor = Color.BLACK
         mLineType2!!.textSize = QMUIDisplayHelper.sp2px(context, 15).toFloat()
-        mLineType2!!.textParser = textParser
         val content2 = "a.这一条很重要，你要仔细研读研读。\n" +
                 "b.这一条不重要，但是有很多很多很多很多很多很多很多很多内容。。\n" +
                 "c.这一条特别重要，但是我也不知道对不对，只能放这里了，哈哈哈哈。\n"
@@ -223,6 +225,14 @@ class QDQQFaceUsageFragment : BaseFragment() {
         }
         mLineType2!!.lineLayout.lineIndentHandler = SerialLineIndentHandler(pairs)
 
+
+        mLineType3!!.textParser = textParser
+        mLineType3!!.lineHeight = QMUIDisplayHelper.dp2px(context, 36)
+        mLineType3!!.textColor = Color.BLACK
+        mLineType3!!.textSize = QMUIDisplayHelper.sp2px(context, 15).toFloat()
+        mLineType3!!.text = "འདི་བཞིན་གྱི་ཡིད་བརྙན་གྱི་ཚོགས་མང་པོ་ཞིག་གིས་ཞེ་དྲག་བསམ་གཞིག་གི་བར་སྟོང་ཡངས་པོར་ཕྱེས་འགྲོ"
+
+
         mQQFace1!!.text = "这是一行很长很长[微笑][微笑][微笑][微笑]的文本，但是[微笑][微笑][微笑][微笑]只能单行显示"
         mQQFace2!!.text = "这是一段很长很长[微笑][微笑][微笑][微笑]的文本，但是最多只能显示三行；" +
                 "这是一段很长很长[微笑][微笑][微笑][微笑]的文本，但是最多只能显示三行；" +
diff --git a/qmuidemo/src/main/res/layout/fragment_qqface_layout.xml b/qmuidemo/src/main/res/layout/fragment_qqface_layout.xml
index dae1a30c..8efb05be 100644
--- a/qmuidemo/src/main/res/layout/fragment_qqface_layout.xml
+++ b/qmuidemo/src/main/res/layout/fragment_qqface_layout.xml
@@ -81,6 +81,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
+            <TextView
+                style="@style/QDCommonTitle"
+                android:text="藏文"
+                android:layout_marginTop="20dp"/>
+
+            <com.qmuiteam.qmui.type.view.LineTypeView
+                android:id="@+id/line_type_3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
             <TextView
                 style="@style/QDCommonTitle"
                 android:text="单行表情，末尾省略"
diff --git a/type/src/main/java/com/qmuiteam/qmui/type/parser/EmojiTextParser.kt b/type/src/main/java/com/qmuiteam/qmui/type/parser/EmojiTextParser.kt
index 86b8630c..68e31c1d 100644
--- a/type/src/main/java/com/qmuiteam/qmui/type/parser/EmojiTextParser.kt
+++ b/type/src/main/java/com/qmuiteam/qmui/type/parser/EmojiTextParser.kt
@@ -102,8 +102,7 @@ class EmojiTextParser(
                     }
                 }
                 if (!handled) {
-                    val unicode = Character.codePointAt(text, i)
-                    val charCount = Character.charCount(unicode)
+                    val charCount = ParserHelper.handleUnionIfNeeded(text, i)
                     tmp = TextElement(text.subSequence(i, i + charCount), index, i)
                     i += charCount - 1
                 }
diff --git a/type/src/main/java/com/qmuiteam/qmui/type/parser/ParserHelper.kt b/type/src/main/java/com/qmuiteam/qmui/type/parser/ParserHelper.kt
index e1bf024c..01f33ce5 100644
--- a/type/src/main/java/com/qmuiteam/qmui/type/parser/ParserHelper.kt
+++ b/type/src/main/java/com/qmuiteam/qmui/type/parser/ParserHelper.kt
@@ -29,7 +29,7 @@ object ParserHelper {
                 curr.wordPart = Element.WORD_PART_START
             } else {
                 curr.wordPart = Element.WORD_PART_MIDDLE
-                if(wordBreakChecker(c)){
+                if (wordBreakChecker(c)) {
                     curr.lineBreakType = Element.LINE_BREAK_WORD_BREAK_ALLOWED
                 }
             }
@@ -41,4 +41,22 @@ object ParserHelper {
             curr.wordPart = Element.WORD_PART_WHOLE
         }
     }
+
+    fun handleUnionIfNeeded(text: CharSequence, i: Int): Int {
+        val unicode = Character.codePointAt(text, i)
+        var charCount = Character.charCount(unicode)
+        var next = i + charCount
+        while (next < text.length) {
+            val nextUnicode = Character.codePointAt(text, next)
+            val type = Character.getType(nextUnicode)
+            if (type == Character.NON_SPACING_MARK.toInt()) {
+                val nextCharCount = Character.charCount(nextUnicode)
+                charCount += nextCharCount
+                next += nextCharCount
+            } else {
+                break
+            }
+        }
+        return charCount
+    }
 }
\ No newline at end of file
diff --git a/type/src/main/java/com/qmuiteam/qmui/type/parser/PlainTextParser.kt b/type/src/main/java/com/qmuiteam/qmui/type/parser/PlainTextParser.kt
index 69a928eb..bf4bade7 100644
--- a/type/src/main/java/com/qmuiteam/qmui/type/parser/PlainTextParser.kt
+++ b/type/src/main/java/com/qmuiteam/qmui/type/parser/PlainTextParser.kt
@@ -57,8 +57,7 @@ class PlainTextParser(
                     tmp = NextParagraphElement(text.subSequence(i, i + 1), index, i)
                 }
             } else {
-                val unicode = Character.codePointAt(text, i)
-                val charCount = Character.charCount(unicode)
+                val charCount = ParserHelper.handleUnionIfNeeded(text, i)
                 tmp = TextElement(text.subSequence(i, i + charCount), index, i)
                 i += charCount - 1
             }