Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes

dictsource/an_list

@@ -102,7 +102,6 @@ _7C	sjEteTj'Entos
 _8C	gwitoTj'Entos
 _9C	nowTj'Entos
 _0M1	m'il
-_1M1	m'il
 _0M2	mil^'ons
 _1M2	un||mil^'on
 _0M4	bil^'ons
@@ -115,7 +114,7 @@ _dpt	kon
 // ordinal numbers
 _#º	o
 _#ª	a
-//_ord	eno
+
 
 _1ox	prim'Er
 _2ox	seQ'und
@@ -166,7 +165,6 @@ _8Co	gw,eItoTEnt'en
 _9Co	nweUTEnt'en
 
 _0M1o	mil'en
-_1M1	mil'en
 _0M2o	mil^on'en
 _1M2o	mil^on'en
 

dictsource/an_rules

@@ -256,6 +256,7 @@
 
 
 .group
+        '
         á          ''a
         é          ''e
         í          ''i

dictsource/en_list

@@ -510,6 +510,7 @@ agm	$abbrev
 ai	$abbrev
 amd	$abbrev
 aol	$abbrev
+aph	$abbrev
 api	$abbrev
 apr	apr@
 asap	$abbrev
@@ -1051,6 +1052,7 @@ caterer		keIt3r3
 cathedral	$alt3
 catholic	kaTlIk
 carotid		$alt3
+cartel		kA@t'El
 cavalier	$3
 caveat		kavIat
 ?3 caveat	kavIA:t
@@ -1156,6 +1158,7 @@ colonel		k3:n@L
 colosseum	k0l@s'i@m
 comanche	k@mantSi
 combat		k0mbat       // combating
+?3 combative	k@mbatIv
 combo		k0mboU
 comely		kVmlI    // comeliness
 comer		kVm3
@@ -1625,6 +1628,7 @@ goodday		$2
 goodnight	$2
 gorilla		g3rIl@
 gospel		g0sp@L
+gossamer	g0s@m3
 goto		goUtu:
 gourmand	gU@mA:nd
 gourmet		gU@meI
@@ -1780,6 +1784,7 @@ interim		$1
 intermediate	Int3m'i:di@t
 intern		Int3:n  $noun
 interrogatory	$3
+intestine	I2ntEstI#n
 inventory	Inv@ntri
 ?3 inventory	Inv@nto:ri
 interface	$1
@@ -1843,6 +1848,7 @@ laboratory	la#b'0r@trI
 labor		leIb3
 labored		leIb@d
 laborer		leIb@r3
+laborious	$alt3
 labyrinth	lab3rInT
 lager		lA:g3
 laity		leI@ti
@@ -1875,6 +1881,7 @@ lemonade	$3
 leo		li:oU
 leona		li:'oUn@
 leopard		lEp3d
+leprechaun	lEpr@kO:n
 lesion		li:Z@n
 lethal		li:T@L
 liaison		li:'eIz0n
@@ -1970,6 +1977,7 @@ mausoleum	mO:s@'li:@m
 mayhem		meIhEm
 meant		mEnt
 meadow		mEdoU
+medallion	$alt3
 mediaeval	mEdI'i:v@L
 medicine	mEds@n
 ?3 medicine	mEd@s@n
@@ -2380,6 +2388,7 @@ pythagoras	paIT'ag@r@s
 python		paIT@n
 pyramidal	pI2r'amId@L
 
+qaeda		kaId@
 quadrilateral	$3
 quash		kw0S
 quaternary	kw@t3:n@rI
@@ -2825,6 +2834,7 @@ trajectory	tr@dZEkt@rI
 traverse	$alt3
 travesty	trav@sti
 treatise	tri:tIz
+tremendous	$alt3
 triage		tri:A:Z
 tribunal	traIb'ju:n@L
 triceratops	traIs'Er@t0ps
@@ -3007,6 +3017,7 @@ yessir		jEss3:
 yoghurt		j0g3t
 ?3 yoghurt	joUg3t
 ?3 yogurt	joUg3t
+?3 youtube	ju:t2u:b
 yoyo		joUjoU
 
 zavala		$alt3
@@ -3203,6 +3214,7 @@ Korean		kOr'i:@n
 Kosovo		k0s@voU
 Kuala		kwA:la#
 Lagos		leIg0s
+Lebanon		lEba#n@n
 Leipzig		laIpsIg
 Leone		li:'oUn
 Lesotho		l@s'u:tu:

dictsource/en_rules

@@ -1190,6 +1190,9 @@
             au (_        aU
          _) auch         %O:x
             aud (_       'O:d
+            audio        O:dI2oU
+         _) aud (iolo    O:d
+         _) aud (iom     O:d     
             augh         O:
          l) augh         aaf
         sl) augh         O:
@@ -5403,6 +5406,8 @@
          s) uag          weIdZ
         @g) ua (ge       wI
             u (al_       ju:
+         g) u (al_       w
+         n) u (al_       ju:
          g) ua (rA       a
          g) uar (d       A@
             uary (_      ju:@ri

dictsource/hu_rules

@@ -820,6 +820,12 @@ _megsz) í (vatta   i
 szabad) ítsz       its:
     sz) í (vemészt i:
   vesz) ítsz       i:ts:
+progressz) í (ve i:
+sz) í (vemel i:
+sz) í (vere i:
+sz) í (veré i:
+sz) í (verő i:
+sz) í (vevő i:
 
 .group j
         j          j
@@ -1171,6 +1177,7 @@ _tetszé) s         S
 kolbászo) s        S
 feldolgozá) s      S
    _ki) s (szín    S
+kérdé) s S
 
 .group ss
         ssz        ss2
@@ -1706,6 +1713,8 @@ szállodá) ssz      Ss
 visszaélé) ssz     Ss
    esé) ssz (erű   Ss
   webe) ssz        Ss
+beleve) ssz (en s:
+
 
 .group sz
         sz         s

dictsource/ko_rules

@@ -260,7 +260,7 @@
 		ᇂ	(A
 
 .group		ᆯ	// ㄹ
-		ᆯ		rr
+		ᆯ		L
 		ᆯᄅ		l
 		ᆯ	(A	*
 

src/dictionary.cpp

@@ -1495,8 +1495,8 @@ void SetWordStress(Translator *tr, char *output, unsigned int *dictionary_flags,
 			else
 			{
 				// no long vowels or consonant clusters
-				if(vowel_count > 4)
-					stressed_syllable = vowel_count - 3;
+				if(vowel_count > 5)
+					stressed_syllable = vowel_count - 3;  // more than 4 syllables
 				else
 					stressed_syllable = vowel_count - 1;
 			}

src/phonemelist.cpp

@@ -124,6 +124,7 @@ void MakePhonemeList(Translator *tr, int post_pause, int start_sentence)
 	int alternative;
 	int delete_count;
 	int word_start;
+	int inserted;
 	PHONEME_DATA phdata;
 
 	int n_ph_list3;
@@ -341,9 +342,7 @@ void MakePhonemeList(Translator *tr, int post_pause, int start_sentence)
 	{
 		plist3 = &ph_list3[j];
 
-		if(plist3->sourceix != 0)
-			word_start = j;
-
+		inserted = 0;
 		if(insert_ph != 0)
 		{
 			// we have a (linking) phoneme which we need to insert here
@@ -374,10 +373,14 @@ void MakePhonemeList(Translator *tr, int post_pause, int start_sentence)
 			ph = phoneme_tab[insert_ph];
 			plist3->ph = ph;
 			insert_ph = 0;
+			inserted = 1;    // don't insert the same phoneme repeatedly
 		}
 		else
 		{
 			// otherwise get the next phoneme from the list
+			if(plist3->sourceix != 0)
+				word_start = j;
+
 			ph = phoneme_tab[plist3->phcode];
 			plist3[0].ph = ph;
 
@@ -394,7 +397,7 @@ void MakePhonemeList(Translator *tr, int post_pause, int start_sentence)
 
 		InterpretPhoneme(tr, 0x100, plist3, &phdata, &worddata);
 
-		if((alternative = phdata.pd_param[pd_INSERTPHONEME]) > 0)
+		if(((alternative = phdata.pd_param[pd_INSERTPHONEME]) > 0) && (inserted == 0))
 		{
 			// PROBLEM: if we insert a phoneme before a vowel then we loose the stress.
 			PHONEME_TAB *ph2;

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.47.01  18.Mar.13";
+const char *version_string = "1.47.02  19.Mar.13";
 const int version_phdata  = 0x014701;
 
 int option_device_number = -1;

src/tr_languages.cpp

@@ -1084,6 +1084,7 @@ SetLengthMods(tr,3);  // all equal
 
 	case L('k','l'):   // Greenlandic
 		{
+			SetupTranslator(tr,stress_lengths_equal,stress_amps_equal);
 			tr->langopts.stress_rule = 12;
 			tr->langopts.stress_flags = S_NO_AUTO_2;
 			tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_SWAP_TENS | NUM_HUNDRED_AND | NUM_OMIT_1_HUNDRED | NUM_ORDINAL_DOT | NUM_1900 | NUM_ROMAN | NUM_ROMAN_CAPITALS | NUM_ROMAN_ORDINAL;