Changed ordering of FormOf, handling of FormOf, handing of Encoding.

[DictionaryPC.git] / testdata / goldens / wiktionary.zh_zh.quickdic.text

diff --git a/testdata/goldens/wiktionary.zh_zh.quickdic.text b/testdata/goldens/wiktionary.zh_zh.quickdic.text
index be714279b7c74d411a03ab7b3bc2c415455e517c..598eaf7adc69555007dd59749669d2eb6b519f23 100644 (file)
--- a/testdata/goldens/wiktionary.zh_zh.quickdic.text
+++ b/testdata/goldens/wiktionary.zh_zh.quickdic.text
@@ -379,7 +379,7 @@ Index: zh zh->en
   OK (adjective) :: all right
     [http://books.google.co.uk/books?id=iMpJGrutbcYC&pg=PA90&dq=%22OK%E5%90%97%22&hl=en&ei=VPqJTuWrIomgOo3dhdUB&sa=X&oi=book_result&ct=result&resnum=1&ved=0CC0Q6AEwAA#v=onepage&q=%22OK%E5%90%97%22&f=false 11樓 - Page 90] :: --
     「70%咖啡 OK 嗎?」 :: --
-    {{Hant|[[OK]][[嗎]]？}}(trad.) / {{Hans|[[OK]][[吗]]？}}(simpl.) :: OK ma?
+    {{Hant|OK嗎？}}(trad.) / {{Hans|OK吗？}}(simpl.) :: OK ma?
     Is it OK? :: --
 ===盆===
   雨 {{cmn-noun|ts|pin=yǔ|pint=yu3|rs=雨00}} :: rain
@@ -556,7 +556,7 @@ Index: zh zh->en
   OK (adjective) :: all right
     [http://books.google.co.uk/books?id=iMpJGrutbcYC&pg=PA90&dq=%22OK%E5%90%97%22&hl=en&ei=VPqJTuWrIomgOo3dhdUB&sa=X&oi=book_result&ct=result&resnum=1&ved=0CC0Q6AEwAA#v=onepage&q=%22OK%E5%90%97%22&f=false 11樓 - Page 90] :: --
     「70%咖啡 OK 嗎?」 :: --
-    {{Hant|[[OK]][[嗎]]？}}(trad.) / {{Hans|[[OK]][[吗]]？}}(simpl.) :: OK ma?
+    {{Hant|OK嗎？}}(trad.) / {{Hans|OK吗？}}(simpl.) :: OK ma?
     Is it OK? :: --
 ===tā===
   中國 {{cmn-proper noun|t|pin=Zhōngguó|pint=zhong1guo2|tra=中國|sim=中国|rs=丨03}} :: China
@@ -594,7 +594,7 @@ Index: zh zh->en
   OK (adjective) :: all right
     [http://books.google.co.uk/books?id=iMpJGrutbcYC&pg=PA90&dq=%22OK%E5%90%97%22&hl=en&ei=VPqJTuWrIomgOo3dhdUB&sa=X&oi=book_result&ct=result&resnum=1&ved=0CC0Q6AEwAA#v=onepage&q=%22OK%E5%90%97%22&f=false 11樓 - Page 90] :: --
     「70%咖啡 OK 嗎?」 :: --
-    {{Hant|[[OK]][[嗎]]？}}(trad.) / {{Hans|[[OK]][[吗]]？}}(simpl.) :: OK ma?
+    {{Hant|OK嗎？}}(trad.) / {{Hans|OK吗？}}(simpl.) :: OK ma?
     Is it OK? :: --
 ===万===
   万 {{cmn-adv|tra=萬|pin=wàn|pint=wan4|rs=一02}} :: absolutely
@@ -824,7 +824,7 @@ Index: zh zh->en
   中文 {{cmn-proper noun|ts|pin=Zhōngwén|pint=zhong1wen2|rs=丨03}} :: The Chinese spoken language 普通话/Pǔtōnghuà/Standard Mandarin.
     nǐ shuō zhōngwén ma? "Do you speak Chinese?" :: --
 ===丶===
-  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點
+  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點, 点, diǎn
 ===子宫===
   子宫 {{cmn-noun|s|pin=zǐgōng|pint=zi3gong1|tra=子宮|sim=子宫|rs=子00}} :: womb, uterus
   子宫 {{cmn-noun|s|pin=zǐgōng|pint=zi3gong1|tra=子宮|sim=子宫|rs=子00}} :: uterine
@@ -1082,8 +1082,12 @@ Index: en en->zh
   乙 {{cmn-hanzi|pin=niè (nie4), yǐ (yi3)|wg=nieh<sup>4</sup>, i<sup>3</sup>}} :: the seventh scale degree in gongche musical notation
 ===deity===
   (Cantonese) 神 {{yue-hanzi|jyut=|y=san4}} :: god, supernatural (spiritual) deity
+===diǎn===
+  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點, 点, diǎn
+===点===
+  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點, 点, diǎn
 ===點===
-  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點
+  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點, 点, diǎn
 ===did===
   耶和华神对女人说，你作的是什么事呢？女人说，那蛇引诱我，我就吃了。 :: --
     Yēhéhuá shén duì nǚrén shuō , nǐ zuò de shì shénme shì ne . nǚrén shuō , nà shé yǐnyòu wǒ , wǒ jiù chī le . :: And the LORD God said unto the woman, What is this that thou hast done? And the woman said, The serpent beguiled me, and I did eat.
@@ -1126,7 +1130,7 @@ Index: en en->zh
   耶和华神对女人说，你作的是什么事呢？女人说，那蛇引诱我，我就吃了。 :: --
     Yēhéhuá shén duì nǚrén shuō , nǐ zuò de shì shénme shì ne . nǚrén shuō , nà shé yǐnyòu wǒ , wǒ jiù chī le . :: And the LORD God said unto the woman, What is this that thou hast done? And the woman said, The serpent beguiled me, and I did eat.
 ===dot===
-  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點
+  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點, 点, diǎn
 ===豆腐心===
   刀 :: 刀子嘴，豆腐心
 ===drink===
@@ -1401,7 +1405,7 @@ Index: en en->zh
   OK (adjective) :: all right
     [http://books.google.co.uk/books?id=iMpJGrutbcYC&pg=PA90&dq=%22OK%E5%90%97%22&hl=en&ei=VPqJTuWrIomgOo3dhdUB&sa=X&oi=book_result&ct=result&resnum=1&ved=0CC0Q6AEwAA#v=onepage&q=%22OK%E5%90%97%22&f=false 11樓 - Page 90] :: --
     「70%咖啡 OK 嗎?」 :: --
-    {{Hant|[[OK]][[嗎]]？}}(trad.) / {{Hans|[[OK]][[吗]]？}}(simpl.) :: OK ma?
+    {{Hant|OK嗎？}}(trad.) / {{Hans|OK吗？}}(simpl.) :: OK ma?
     Is it OK? :: --
 ===machine===
   車 {{cmn-noun|t|pin=chē|pint=che1|tra=車|sim=车|rs=車00}} :: {{Beginning Mandarin|skey=車00}} machine; instrument
@@ -1521,7 +1525,7 @@ Index: en en->zh
   OK (adjective) :: all right
     [http://books.google.co.uk/books?id=iMpJGrutbcYC&pg=PA90&dq=%22OK%E5%90%97%22&hl=en&ei=VPqJTuWrIomgOo3dhdUB&sa=X&oi=book_result&ct=result&resnum=1&ved=0CC0Q6AEwAA#v=onepage&q=%22OK%E5%90%97%22&f=false 11樓 - Page 90] :: --
     「70%咖啡 OK 嗎?」 :: --
-    {{Hant|[[OK]][[嗎]]？}}(trad.) / {{Hans|[[OK]][[吗]]？}}(simpl.) :: OK ma?
+    {{Hant|OK嗎？}}(trad.) / {{Hans|OK吗？}}(simpl.) :: OK ma?
     Is it OK? :: --
 ===open===
   爽快 {{cmn-adj|ts|pin=shuǎngkuài|pint=shuang3kuai4|rs=爻07}} :: {{Advanced Mandarin|skey=爻07}} frank; open; straightforward
@@ -1611,7 +1615,7 @@ Index: en en->zh
   OK (adjective) :: all right
     [http://books.google.co.uk/books?id=iMpJGrutbcYC&pg=PA90&dq=%22OK%E5%90%97%22&hl=en&ei=VPqJTuWrIomgOo3dhdUB&sa=X&oi=book_result&ct=result&resnum=1&ved=0CC0Q6AEwAA#v=onepage&q=%22OK%E5%90%97%22&f=false 11樓 - Page 90] :: --
     「70%咖啡 OK 嗎?」 :: --
-    {{Hant|[[OK]][[嗎]]？}}(trad.) / {{Hans|[[OK]][[吗]]？}}(simpl.) :: OK ma?
+    {{Hant|OK嗎？}}(trad.) / {{Hans|OK吗？}}(simpl.) :: OK ma?
     Is it OK? :: --
   中国 {{cmn-proper noun|s|pin=Zhōngguó|pint=zhong1guo2|tra=中國|sim=中国|rs=丨03}} :: China
     中国的首都是北京。 :: --
@@ -1642,7 +1646,7 @@ Index: en en->zh
   (Cantonese) 安全 {{yue-noun|ts|jyut=on1cyun4}} :: safety, security
   安全 {{cmn-noun|ts|pin=ānquán|pint=an1quan2|rs=宀03}} :: {{Elementary Mandarin|skey=宀03}} safety; security
 ===said===
-  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點
+  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點, 点, diǎn
   耶和华神对女人说，你作的是什么事呢？女人说，那蛇引诱我，我就吃了。 :: --
     Yēhéhuá shén duì nǚrén shuō , nǐ zuò de shì shénme shì ne . nǚrén shuō , nà shé yǐnyòu wǒ , wǒ jiù chī le . :: And the LORD God said unto the woman, What is this that thou hast done? And the woman said, The serpent beguiled me, and I did eat.
 ===sāndiǎnshuǐ===
@@ -1729,7 +1733,7 @@ Index: en en->zh
 ===straightforward===
   爽快 {{cmn-adj|ts|pin=shuǎngkuài|pint=shuang3kuai4|rs=爻07}} :: {{Advanced Mandarin|skey=爻07}} frank; open; straightforward
 ===stroke===
-  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點
+  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點, 点, diǎn
   丿 {{cmn-hanzi|pin=piě (pie3)|wg=p'ieh<sup>3</sup>}} :: left-falling stroke, usually read as 撇 (piě)
 ===stronger===
   NB {{cmn-adj|p|pint=nb}} :: {{slang|skey=nb}} fucking awesome
@@ -1854,7 +1858,7 @@ Index: en en->zh
 ===using===
   中文 {{cmn-proper noun|ts|pin=Zhōngwén|pint=zhong1wen2|rs=丨03}} :: The Chinese written languages using Chinese characters.
 ===usually===
-  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點
+  丶 {{cmn-hanzi|pin=zhǔ (zhu3)|wg=chu<sup>3</sup>}} :: dot stroke, usually said as 點, 点, diǎn
   丿 {{cmn-hanzi|pin=piě (pie3)|wg=p'ieh<sup>3</sup>}} :: left-falling stroke, usually read as 撇 (piě)
   亅 {{cmn-hanzi|pin=jué (jue2)|wg=chüeh<sup>2</sup>}} :: A vertical line with a hook, usually read as 竖勾 (shùgōu).
 ===uterine===