[1.25.06] lang=is changes.

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@21 d46cf337-b52f-0410-862d-fd96e6ae7743

dictsource/dict_phonemes

@@ -313,7 +313,7 @@ Dictionary is_dict
 
 &    @-   a    aI   aU   e    E    eI   
 i    I    o    O    oU   oU2  u    W    
-y    Yy   
+y    y#   Yy   
 
 *    :    ;    b    c    C    d    D    
 f    g    h    j    J    k    l    l#   

dictsource/en_rules

@@ -5130,6 +5130,7 @@
              ? (?         kwEstS@nmA@ks
           ?) ?
              :            koUl@n
+         D_) : (_DD_             // omit colon in time, eg: 2:30
              $            d0l3
              %            p3sEnt
 ?5           %            pVRs'Ent

dictsource/is_list

@@ -359,7 +359,7 @@ _í   i:
 í    i:   $atend
 j    j'o:D
 k    k'aU:
-l    El
+l    Etl#
 m    Em
 n    En
 p    pje:

dictsource/is_rules

@@ -18,6 +18,7 @@
         au (CC   Yy
 
      _) al (@P2N ,a:l
+     _) a (ll+   &
 
 .group á
         á        aU:
@@ -222,13 +223,13 @@
 
 
 .group r
-     _) r        @-*
+     _) r        R2
      C) r        @-*
-     A) r (A     @-*
+     A) r (A     R
    L08) r        r#
         r (L08   r#
         r (_     r#
-        r        r
+        r        R
         rl       dl
         rl (K    rtl#
         rn       rdn#
@@ -256,6 +257,7 @@
         u (CC    y
      K) u (ng    u
      K) u (nk    u
+     &) ur (_    y#r#
 
 
 .group ú

phsource/compile_report

@@ -30,7 +30,7 @@
       el   8  114
       sv  25  115
       no  29  119
-      is  32  118
+      is  33  119
       vi  41  130
   zh_yue  32  121
       sw  14  102
@@ -513,6 +513,7 @@
   1  vowel/V_4      en_sc
   6  vowel/y        en de fi hu nl zh_yue
  10  vowel/y#       en en_wm de fi fr hu nl ro vi zh_yue
+  1  vowel/y##      is
   2  vowel/y_2      fr
   2  vowel/y#_2     hu sv
   1  vowel/y_3      af

phsource/ph_icelandic

@@ -87,6 +87,12 @@ phoneme y
   formants vowel/yy_4
 endphoneme
 
+phoneme y#
+  vowel starttype (@) endtype (@)
+  length 130
+  formants vowel/y##
+endphoneme
+
 phoneme W
   vowel starttype (@) endtype (@)
   length 130

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.25.04  23.May.07";
+const char *version_string = "1.25.06  23.May.07";
 const int version_phdata  = 0x012501;
 
 int option_device_number = -1;

src/transldlg.cpp

@@ -295,7 +295,7 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
 	case MENU_SPEAK_TRANSLATE:
 		SpeakNextClause(NULL,NULL,2);  // stop speaking file
 
-		strncpy0(buf,t_source->GetValue().mb_str(wxConvLocal),sizeof(buf));
+		strncpy0(buf,t_source->GetValue().mb_str(wxConvUTF8),sizeof(buf));
 		phon_out[0] = 0;
 		n_ph_list = 0;
 		clause_count = 0;
@@ -329,14 +329,13 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
 			rewind(f_trans);
 			while(fgets(buf,sizeof(buf),f_trans) != NULL)
 			{
-				t_phonetic->AppendText(wxString(buf,wxConvLocal));
+				t_phonetic->AppendText(wxString(buf,wxConvUTF8));
 			}
 			t_phonetic->AppendText(_T("---\n"));
 			fclose(f_trans);
 			remove(fname_temp);
 		}
 		t_phonetic->AppendText(wxString(phon_out,wxConvLocal));
-// MbrolaTranslate(ph_list,n_ph_list,stdout);     // for Testing
 		break;
 
 	case T_PROCESS: