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 /pango-view/test-mixed.markup | |
| parent | 0814dec8b7765e472dca4e6d695f70c39976aec1 (diff) | |
| parent | bd06f7b94e563f276550cb81c3a0e5612c88c314 (diff) | |
| download | pango-wip/chergert/bidi-temp-allocs.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 'pango-view/test-mixed.markup')
| -rw-r--r-- | pango-view/test-mixed.markup | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pango-view/test-mixed.markup b/pango-view/test-mixed.markup deleted file mode 100644 index 894a1b81..00000000 --- a/pango-view/test-mixed.markup +++ /dev/null @@ -1,9 +0,0 @@ -<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> |