From 232efce21239f98df53db9c37d0728fdb32ddca5 Mon Sep 17 00:00:00 2001
From: jonsd <jonsd@d46cf337-b52f-0410-862d-fd96e6ae7743>
Date: Wed, 23 May 2007 18:30:18 +0000
Subject: [PATCH] [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 |   2 +-
 dictsource/en_rules      |   1 +
 dictsource/is_list       |   2 +-
 dictsource/is_rules      |   8 +++++---
 phsource/compile_report  |   3 ++-
 phsource/ph_icelandic    |   6 ++++++
 phsource/vdiph/y#i_2     | Bin 20748 -> 20745 bytes
 phsource/vowel/y##       | Bin 0 -> 5807 bytes
 phsource/vowel/yy_4      | Bin 10625 -> 10628 bytes
 src/synthdata.cpp        |   2 +-
 src/transldlg.cpp        |   5 ++---
 11 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 phsource/vowel/y##

diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes
index 03ff95a5..8a94af6e 100644
--- a/dictsource/dict_phonemes
+++ b/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#   
diff --git a/dictsource/en_rules b/dictsource/en_rules
index ef8e9851..230b1cb3 100644
--- a/dictsource/en_rules
+++ b/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
diff --git a/dictsource/is_list b/dictsource/is_list
index a9f2b916..c6b2b41f 100755
--- a/dictsource/is_list
+++ b/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:
diff --git a/dictsource/is_rules b/dictsource/is_rules
index b026bd8f..c05dd45a 100644
--- a/dictsource/is_rules
+++ b/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 ú
diff --git a/phsource/compile_report b/phsource/compile_report
index ab75ee94..4071c554 100644
--- a/phsource/compile_report
+++ b/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
diff --git a/phsource/ph_icelandic b/phsource/ph_icelandic
index 6cd18ca7..f93a0818 100644
--- a/phsource/ph_icelandic
+++ b/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
diff --git a/phsource/vdiph/y#i_2 b/phsource/vdiph/y#i_2
index 47821923818ed3cf8b82dcce53649ff8c8593f5c..28bc900be6ca55702d9482879fa65d14ef63babb 100644
GIT binary patch
delta 200
zcmeBK#MrrrQ7|~b)j1^CHIS8ofuT}4Gu~*UNCJ;q1N$l_G3Gmr-V84o8H5v<5||3v
zOc+Ag7=%-p)R^XRonh$VVi4Foi{}}$E=27YMqjwvOg1gJ+8VBnV70FqA23GoWlUbk
zBR=_ph|=a~0v*hZ3nu4_$U+VH!RP@uppH!iZa@WBC)|J#zABIbn=goXX)y6{Y?iV8
GAPfM}T{C(B

delta 198
zcmeBN#MrZlQ6xCP)j1^CHIRdWfuXn{HMyjyG<Tz50*~4O&Q(le%y$^Q8GbM_2&*uu
zFcq?yFx0Ry2&XWqG0o#T!_dRUz_)oi&ogFSh}tiVzHqgfY+7)&HC!9PYF{%xV2t9+
zm^_b1eDYZlrOl58I+!Ovwh_~d2incR(7^yP<_Dt(+?YBx6}T}KT%8ar*NbFmFkN8Z
JENS~e7yuGSGUosQ

diff --git a/phsource/vowel/y## b/phsource/vowel/y##
new file mode 100644
index 0000000000000000000000000000000000000000..508f2472d576cc893609783662df300f18845238
GIT binary patch
literal 5807
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

literal 0
HcmV?d00001

diff --git a/phsource/vowel/yy_4 b/phsource/vowel/yy_4
index fcd827a18445c738c05b8cfe1ff491b3c465e78b..f96066aca5f2162028d07e080bb78e10feaa3aa1 100644
GIT binary patch
delta 147
zcmZn+ZV46$4sdl233d%+VPIgWtc*9=$ScMoxr9xWPlo9MqYCFg1{Kao?gxwy82NbJ
z8J=vmVL8ml_+gT;F<gx@R}vFU&0C%#pc)_HGG->050gJIi%z~NCI?p;gQW5TPYO__
WfOtMT<C4h@a^j3nHqVfI$prwvK`S!=

delta 162
zcmZn(ZVcuP4sdl233d%+WME*Z+$bQ%A~}amluw4~0iz1%KL!=fNbU!W4;cA)-5Kt0
zwr4ra$9Q5gv#>E-kup~j6HL)to+6+kf8jD_Ce~FG^+hM&5tD-}j6qU(fhPs1P*^;l
Y9WMQw^BmAZh-K4xLV?n=<z8|D0K(BN<p2Nx

diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index 0dfa7629..166c8298 100755
--- a/src/synthdata.cpp
+++ b/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;
diff --git a/src/transldlg.cpp b/src/transldlg.cpp
index 0384dbf7..627daee3 100755
--- a/src/transldlg.cpp
+++ b/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: