Merge branch 'master' into android

configure.ac

@@ -220,14 +220,21 @@ dnl ================================================================
 dnl wxWidgets checks.
 dnl ================================================================
 
-AC_CHECK_PROG(WXCONFIG_CHECK,wx-config,yes)
-if test x"$WXCONFIG_CHECK" != x"yes" ; then
-    AC_MSG_ERROR([Please install wxWidgets which is needed for espeakedit.])
+AC_ARG_WITH([wx-config],
+    [AS_HELP_STRING([--with-wx-config], [specify the location of wx-config @<:@default=wx-config@:>@])],
+    [WX_CONFIG=$with_wx_config],
+    [WX_CONFIG=wx-config])
+
+if test ! -e "${WX_CONFIG}" ; then
+    AC_CHECK_PROG(WXCONFIG_CHECK,${WX_CONFIG},yes)
+    if test x"$WXCONFIG_CHECK" != x"yes" ; then
+        AC_MSG_ERROR([Cannot find wxWidgets which is needed for espeakedit to build the voices.])
+    fi
 fi
 
-WX_LIBS=`wx-config --libs`
-WX_CXXFLAGS=`wx-config --cxxflags`
-WX_VERSION=`wx-config --version`
+WX_LIBS=`${WX_CONFIG} --libs`
+WX_CXXFLAGS=`${WX_CONFIG} --cxxflags`
+WX_VERSION=`${WX_CONFIG} --version`
 
 AC_SUBST(WX_LIBS)
 AC_SUBST(WX_CXXFLAGS)
@@ -248,7 +255,7 @@ AC_MSG_NOTICE([
         Compiler:                      ${CXX}
         Compiler flags:                ${CXXFLAGS}
 
-        wxWidgets:                     ${WX_VERSION}
+        wxWidgets:                     ${WX_VERSION} (${WX_CONFIG})
         pulseaudio:                    ${have_pulseaudio}
         portaudio:                     ${have_portaudio}
         sada:                          ${have_sada}

dictsource/el_list

@@ -49,7 +49,6 @@ _0M2	ekatom'iria
 _1M3	'ena|Disekatom'irio
 _0M3	Disekatom'iria
 _dpt	_k'oma
-_.	tel'ia
 
 _#ος	os	// ordinal suffix
 _#η	i
@@ -102,6 +101,11 @@ _3M1o	trisCil^ost'
 -	m'ion
 =       ison $max3
 $	Dol'aria
+_.	tel'ia
+_,	k'oma
+_«	arister'a||isaQojik'a
+_»	Deksi'a||isaQojik'a
+
 
 // articles
 ο	o $u   // definate article
@@ -401,8 +405,6 @@ _ή	,ita||t'onos
 ῷ	om,eQa||perispom'eni||ipojeQram'eni
 ᾠ	om,eQa||psil'i||ipojeQram'eni
 
-_.      tel'ia
-_,      k'oma
 
 U+342	perispom'eni   // combining accent
 U+345	ipojeQram'eni   // combining iota subscript