Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

dictsource/hy_list

@@ -106,8 +106,8 @@ $	dolar
 =	հավասար $text
 
 _-	gits
-_«	tSak,ert#@||b'ats#
-_»	tSak,ert#@||p#'ak
+_«	tS#ak,ert#@||b'ats#
+_»	tS#ak,ert#@||p#'ak
 _(	p#akag,its@||b'ats#
 _)	p#akag,its@||p#'ak
 
@@ -119,7 +119,7 @@ _:	verdZak'et
 _,	storak'et
 _.	midZak'et
 _֊	jent#amn'a  // hyphen
-_՜	bats#akantSak'an
+_՜	bats#akantS#ak'an
 _՟	pat'iw
 
 
@@ -128,7 +128,7 @@ _0	z@**'o
 _1	m'ek
 _2	jerk'u
 _3	jer'ek#
-_4	tS'ors
+_4	tS#'ors
 _5	h'ing
 _6	v'ets#
 _7	j'ot#

dictsource/sl_list

@@ -44,63 +44,66 @@ y	'ipsilon
 ü	$accent
 
 // accent names  (please fix)
-_dia	'umlawt
+_dia	prEgl'asa
 
 
 // numbers
-_0	n'itS
-_1	'Ena
-_2	dv#'a
-_3	tR'i
-_4	St'i*i
-_5	p'et
-_6	S'est
-_7	s'ed@m
-_8	'os@m
-_9	dEv'et
-_10	dEs'et
-_11	'E'najst
-_12	dv#'anajst
-_13	tR'inajst
-_14	St'iRinajst
-_15	p'etnajst
-_16	S'estnajst
-_17	s'ed@mnajst
-_18	'os@mnajst
-_19	d'evEtnajst
-_2X	dv#'ajset
-_3X	tR'idEset
-_4X	St'i*idEset
-_5X	p'etdEset
-_6X	S'estdEset
-_7X	s'ed@mdEset
-_8X	'os@mdEset
-_9X	dEv'etdEset
-_2C	dv'esto
-_0C	sto
-_0M1	t'isotS
-_1M1	t'isotS
+_0	n'i:tS
+_1	'E:na
+_2	dv#'a:
+_3	tR'i:
+_4	St'i:Ri
+_5	p'e:t
+_6	S'e:st
+_7	s'e:d@m
+_8	'o:s@m
+_9	dEv'e:t
+_10	dEs'e:t
+_11	En'a:jst
+_12	dv#'a:najst
+_13	tR'i:najst
+_14	St'i:Rinajst
+_15	p'e:tnajst
+_16	S'e:stnajst
+_17	s'e:d@mnajst
+_18	'o@s@mnajst
+_19	d'Ev'e:tnajst
+_2X	dv#'a:jsEt
+_3X	tR'i:dEsEt
+_4X	St'i:RidEsEt
+_5X	p'e:tdEsEt
+_6X	S'e:stdEsEt
+_7X	s'e:d@mdEsEt
+_8X	'o:s@mdEsEt
+_9X	dEv'e:tdEsEt
 
-_1M2	'Enmilij'on
-_2M2	dv#'amilij'ona
-_3M2	tR'ijemilij'oni
-_4M2	St'iRijemilij'oni
-_0M2	milij'onow
+_1C	st'o:
+_2C	dv'e:stO
+_0C	stO
 
-_1M3	'Enamilij'aRda
-_2M3	dv#'emilij'aRdi
-_3M3	tR'imilij'aRde
-_4M3	St'iRimilij'aRde
-_0M3	milij'aRd
+_0M1	t'i:sOtS
+_1M1	t'i:sOtS
 
-_1M4	'Enbilij'on
-_2M4	dv#'abilij'ona
-_3M4	tR'ijebilij'oni
-_4M4	St'iRijebilij'oni
-_0M4	bilij'onow
+_1M2	'Enmilij'o:n
+_2M2	dv#'a:milij'o:na
+_3M2	tR'i:jEmilij'o:ni
+_4M2	St'i:Rijemilij'o:ni
+_0M2	milij'o:now
+
+_1M3	'E:namilij'a:Rda
+_2M3	dv#'emilij'a:Rdi
+_3M3	tR'i:milij'a:Rde
+_4M3	St'i:Rimilij'a:Rde
+_0M3	milij'a:Rd
+
+_1M4	'Enbilij'o:n
+_2M4	dv#'a:bilij'o:na
+_3M4	tR'i:jebilij'o:ni
+_4M4	St'i:Rijebilij'o:ni
+_0M4	bilij'o:now
 
 _0and	in
-_dpt	_tselih
+_dpt	_ts,e:lih_
 
 // Single letter words (speak as letter name if at end-of-clause)
 
@@ -146,11 +149,14 @@ bili	$u
 
 
 // exceptions
+// (these are just a few example exceptions)
 
 deset	$2
 devet	$2
 dim	$alt3
+ena	$alt1
 oba	$2
-žena	$alt1
 šel	S@w
+tisoč	$1
+žena	$alt1
 

dictsource/sl_rules

@@ -11,6 +11,8 @@
         a        a:
         a (X$w_alt3+  'a
 
+        a (č_    'a:
+
 .group b
         b        b
 
@@ -36,7 +38,7 @@
      @) e (n_    E#
     @C) e (r_    E#
 
-     _) e (m@    E
+     _) e (r     E:
 
 
 .group f
@@ -57,8 +59,9 @@
         i        i:
         i (X$w_alt3+  'i
         i (A     j
+        
      @) i (ja_   =i
-
+     r) i (ja_   i:
 
 .group j
         j        j
@@ -106,6 +109,7 @@
         o (CCo   O:
         o (L04+  o:
 
+        o (č_    'o:
         
 .group p
         p        p

phsource/ph_slovenian

@@ -2,7 +2,7 @@
 
 phoneme : //  lengthen previous vowel by "length"
   virtual
-  length 40   // only a small increase for "long stress" because we probably put the stress on the wrong syllable
+  length 50   // only a small increase for "long stress" because we probably put the stress on the wrong syllable
 endphoneme
 
 
@@ -15,10 +15,10 @@ endphoneme
 phoneme i
   vowel starttype #i endtype #i
   length 160
-  IfNextVowelAppend(;)
-  IF thisPh(isStressed) AND NOT nextPhW(isRhotic) THEN
-    FMT(vowel/ii_6)
-  ENDIF
+//  IfNextVowelAppend(;)
+//  IF thisPh(isStressed) AND NOT nextPhW(isRhotic) THEN
+//    FMT(vowel/ii_6)
+//  ENDIF
   FMT(vowel/ii_3)
 endphoneme
 

phsource/phonemes

@@ -829,6 +829,9 @@ phoneme N
 
   IF KlattSynth THEN
     Vowelin f1=0 f2=2100 50 300 f3=0 80
+    IF nextPh(isPause2) THEN
+      FMT(klatt/nn_)
+    ENDIF
     FMT(klatt/nn)
   ENDIF
 

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.47.10b  03.May.13";
+const char *version_string = "1.47.11  03.May.13";
 const int version_phdata  = 0x014709;
 
 int option_device_number = -1;