diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-07-16 00:56:11 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-07-16 00:56:11 +0000 |
| commit | d403624bf112a49991e903cfd236f0f1ff653cdf (patch) | |
| tree | 7c6b47be0bb4008461e4c836521e4d679a0bd40e /utils/test-mixed.markup | |
| parent | 0814dec8b7765e472dca4e6d695f70c39976aec1 (diff) | |
| parent | bd06f7b94e563f276550cb81c3a0e5612c88c314 (diff) | |
| download | pango-d403624bf112a49991e903cfd236f0f1ff653cdf.tar.gz | |
Merge branch 'master' into 'wip/chergert/bidi-temp-allocs'wip/chergert/bidi-temp-allocs
# Conflicts:
# pango/pango-bidi-type.c
Diffstat (limited to 'utils/test-mixed.markup')
| -rw-r--r-- | utils/test-mixed.markup | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/utils/test-mixed.markup b/utils/test-mixed.markup new file mode 100644 index 00000000..894a1b81 --- /dev/null +++ b/utils/test-mixed.markup @@ -0,0 +1,9 @@ +<span lang="zh-cn">你好，这是中文竖排测试。 +欢迎来到中国北京。 +白日依山尽，</span> +<span lang="en">Roses are Red, +Grass is Green. 2006</span> +<span lang="fa">Arabic is گلها قرمزند، +چمن سبز. ۲۰۰۶</span> +<span lang="zh-cn">ＡＢＣ 白日依山尽， 2006</span> +<span lang="ja">「ノートを買った。」</span> |