From fd719e1a2ab95087b7e839d09f3979afc44185ac Mon Sep 17 00:00:00 2001 From: Rob van Son Date: Wed, 23 Sep 2015 16:06:21 +0200 Subject: [PATCH] Bug with selection of words ending in [r]. --- MainPage.praat | 4 ++-- wordlists/Elementary Chinese/wordlist.Table | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MainPage.praat b/MainPage.praat index cf6d0a8..8159cb2 100644 --- a/MainPage.praat +++ b/MainPage.praat @@ -462,8 +462,8 @@ procedure processMainPageSelectWords .clickX .clickY .pressed$ .showValue[.i] = 1 endif .showVariable$[.i] = .pinyin$[.i] - # This prevents some nasty attempts to use language elements as variabels - if index_regex(.showVariable$[.i], "[^0-9]$") + # This prevents some nasty attempts to use language elements as variables + if index_regex(.showVariable$[.i], "[^0-9r]$") or index_regex(.showVariable$[.i], "[0-9]") <= 0 .showVariable$[.i] = .pinyin$[.i]+"0" endif .tmp$ = replace_regex$(.showVariable$[.i], "^(.+)$", "\l\1", 0) diff --git a/wordlists/Elementary Chinese/wordlist.Table b/wordlists/Elementary Chinese/wordlist.Table index 7ba0aa9..5ee768d 100644 --- a/wordlists/Elementary Chinese/wordlist.Table +++ b/wordlists/Elementary Chinese/wordlist.Table @@ -118,7 +118,7 @@ shi4qing0 thing business 事情 12 - xiang3 to think 想 12 - gen1 with, and 跟 12 - tan2 to talk 谈 12 - -shi2hou0r time 时候 12 - +shi2hou0 time 时候 12 - hui2lai0 to come back 回来 12 - yi3hou4 later, after 以后 12 - gei3 to give, for 给 12 - -- 2.11.4.GIT