Merge branch 'master' of github.com:lwinmoe/espeak-burmese

Makefile.am

@@ -148,7 +148,7 @@ lib_LTLIBRARIES += src/libespeak.la
 
 src_libespeak_la_LDFLAGS  = -version-info $(SHARED_VERSION) $(wave_LIBS) -lpthread
 src_libespeak_la_CXXFLAGS = $(common_FLAGS) $(libespeak_FLAGS) $(wave_FLAGS) \
-	-fpic -fvisibility=hidden -D LIBRARY \
+	-fPIC -fvisibility=hidden -D LIBRARY \
 	-pedantic -fno-exceptions -D PATH_ESPEAK_DATA=\"$(DATADIR)\"
 src_libespeak_la_SOURCES  = $(common_SOURCE) $(libespeak_SOURCE) $(wave_SOURCE)
 

dictsource/it_list

@@ -1,6 +1,6 @@
 
 // This file is UTF-8 encoded
-// Updated 2015 october 4 by Chris, Christian Leo M, <[email protected]>
+// Updated 2015 november 4 by Chris, Christian Leo M, <[email protected]>
 
 //  $alt   change [e] or [o] in the stressed syllable to [E] or [O]
 //  $alt2  change [E] or [O] in the stressed syllable to [e] or [o]
@@ -22,12 +22,12 @@ j	'i||l'unga
 k	kap:a
 l	Elle
 m	Emme
-n	Enne
+n	Enne/
 _o	o:
 p	pi
 q	ku
 r	ER*e
-s	esse
+s	Esse/
 t	t'I
 _u	u:
 v	vu
@@ -506,6 +506,7 @@ nessun	$u2+
 // conjunctions and Adverbs
 
 anche	$u+
+ancora	$alt2
 attraverso 	$alt
 benchè		$u+	$brk
 che	ke	$u+ $verbf
@@ -519,6 +520,7 @@ durante	$brk
 e		$u+ $brk
 eccetto    $pause
 ed		$u+ $brk $only
+forse	$alt2
 ma	$u+ $brk
 mai	$u+ $verbf
 mentre	$u+
@@ -540,7 +542,7 @@ si	si: $atend
 sopra	   $alt2
 sotto	$alt2
 tuttavia	tut:av'ia
-verso      $u+
+verso	$u+
 
 // prepositions
 
@@ -640,7 +642,7 @@ sarebbero	$u2+
 
 avere	av'eRe
 ho	$alt $u+ $verbf
-hai	'aj	$u+ $verbf
+hai	aj	$u+ $verbf
 ha	a	$u+ $verbf
 abbiamo	$u+ $verbf
 avete	$u2+ $verbf
@@ -703,7 +705,8 @@ application	_^_EN
 authority	$3	$alt2
 avances	av'ans
 amway	_^_EN
-austerity	aUst'e*itI
+auchan	'o:San $only
+austerity	aUst'ERitI
 baby	b'EbI
 backup	bek'ap
 bancomat	$1
@@ -806,6 +809,7 @@ desktop	d'Eskt,op
 detector	$2
 designer	d,ez'aIne@-*
 design	d,ez'aIn	$only
+devolution	devol'uSon
 disney	$1
 disneyland	$1
 display	displ'ei
@@ -845,6 +849,7 @@ fiction	f'ikS@n
 first	f'@:rst[
 flipper	$1
 folder	$1	$onlys
+(folder view)	f'Olde@-*||vj'U_
 follower	$1 $alt
 following	f'O:l:ow2iN
 forfait	fo@-*f'e
@@ -869,12 +874,13 @@ gmail	dZI||m'eil
 girl	_^_EN
 google		_^_EN
 green	g@-*i:n $onlys
+greenpeace	g@-*,iN||p'i:s
 guinness	g'ines:
 hacker	'ake@-*
 hall	h'O:l: $only
 hamburger	hamb'u@-*ge@-*
 happy	_^_EN 
-hardware	'a:rd[we@-*
+hardware	'a:*d[||we@-*
 highlander	aIl'a/Nde@-*
 hi	h'aI	$only
 hitler	$1
@@ -922,10 +928,12 @@ leadership	l'idE@-*Sip
 league	_^_en
 leasing	l'i:ziN
 line	l'aIn	$only
-live	l'aIv
-login	l'Og||In
+lingerie	liNZeR'i
+live	l'a:Iv
+login	l'Og||in
 logging	l'Oging
 lord	$alt $only
+love	l'O:v $onlys
 lover	$1
 my	_^_EN
 myspace	m'aI||sp'Eis
@@ -985,6 +993,7 @@ play	pl'EI
 player	pl'eIE@-*
 playroom	pl'Ei||R'um
 playstation	pl,Ei||st'E:Son
+please	_^_en
 pointer	$1
 poker	$1 $alt
 portacontainer	$4
@@ -1011,6 +1020,7 @@ reportage	@-*epo@-*t'a:Z
 residence	@-*'Ezidens	$onlys
 retriever	@-*et@-*'i:ve@-*
 revolver	$2 $onlys
+rhapsody	$1
 rockefeller	@-*Okf'el:e@-*
 rocker	$1
 round	@-*'awnd $onlys
@@ -1051,7 +1061,7 @@ smile	zmaIl
 smiley	_^_EN
 snack	sn'E:k
 software	s'Oft[_we@-*
-sonar	$1	$only
+sonar	$1	$alt $only
 stage	st'EidZ $onlys
 standby	st'End||b'aI
 station	st'ESon	$only
@@ -1169,10 +1179,9 @@ aerei	a'E:REi
 aereo	a'E:REo
 aereoplan	aeReopl'an
 aeroplano	aERopl'ano
-agenzie	adZents'ie
 alcoolici	alk'o:litSI
 alcoolico	alk'o:liko
-algebra	$1
+algebra	'a:ldZeb@-*a/
 alterigia	alteR'i:dZa
 alveoli	$2
 amarognol	$3
@@ -1331,11 +1340,6 @@ filosofie	filozof'ie
 filovia	filov'i#a
 fischiettio	fiskiet:'io
 fischio	f'iskio
-follie	$2
-formaggini	$3
-formiche	$2
-formici	$1
-formicolio	$4
 fotocamera	$3
 frastuon	$3
 fraticid	$3
@@ -1584,7 +1588,6 @@ sottotitoli	$3
 sottopotere	$4
 sottotono	$3
 sovratono	$3
-spazioausili	sp,atsjo||aUz'ilI
 specifici	$2
 spie	sp'ie
 sproposit	$2
@@ -2004,6 +2007,7 @@ ponzano	$2
 prascorsano	$3
 pratesi	$2
 regano	$2
+regini	$2
 resuttano	$3
 ricciano	$2
 rimini	$1
@@ -2147,6 +2151,7 @@ annamaria	$4
 annapaola	$3
 annibale $2
 antioc	ant'iok
+anthony	'E:NtonI
 antony	'E:ntonI
 arafat	$3 $only
 archimede  $alt
@@ -2173,6 +2178,7 @@ boeing	b'O:ing
 brandon	b@-*'Endon
 brian	b@-*'aian
 brigitte	b@-*iZ'it[
+brown	b@-*'a:w2n	$onlys
 bruce	b@-*'Us $only
 buffon	$2 $only
 caino	ka'i:nO
@@ -2202,6 +2208,7 @@ cimabue  tSimab'u:e
 collodi		$2 $alt $only
 consoli	$1 $capital $only
 corine	k'ORIn $capital
+corrias	$2
 cristofor $2
 danilo	$2
 davidson	$1
@@ -2234,7 +2241,7 @@ fabiola	$3
 fahrenheit	f'aRenaIt
 federic	$3
 felicita	$2
-ferrero	$2
+ferrer	$2	$alt2
 françois	f@-*,a/NsU'a
 francisco	f@-*ans'isko
 frederic	$1
@@ -2244,6 +2251,7 @@ garcía	_^_ES
 gavino	$2
 genesia	$2
 george	dZ'O@-*dZ	$onlys
+geremy	$1
 gerolam $2
 gesu $2
 giacom $1
@@ -2286,6 +2294,7 @@ james	_^_EN
 jane	_^_EN
 jarno	j'a:@-*no
 jennifer	$1
+jeremy	dZ'E*emI
 jolanda	jol'anda
 jole	j'Ole
 jolie	Zol'i $only
@@ -2340,6 +2349,7 @@ michael	m'aIkOl
 michelangel	$3
 michelle	m,iS'el	$only
 mike	_^_EN
+mowgli	m'o:glI
 mogol $2
 mondadori  $alt2
 monika	$1
@@ -2361,6 +2371,7 @@ ollie	'Ol:i
 omero	om'E:Ro	$capital
 paol $1
 parkinson	$1
+parmalat	$1 $only
 parodi  $2	$alt
 pascal	$2
 paul	p'O:l	$only
@@ -2375,9 +2386,11 @@ pierpaol	pje@-*p'aol
 pioneer	p'aIoni@-* $only
 piscopo	$1
 pisistrat $2
+pitagora	$2
 poirot	puaR'o
 potter	$1	$onlys
 presley	p@-*'e:zleI
+rafael	$3
 ray	@-*'eI
 renault	@-*en'o
 rizzoli $2
@@ -2548,6 +2561,7 @@ adagia	$2
 adagiano	$2
 adagino	$2
 adattino	$2
+adempiere	ad'e:mpjeRe
 addensano	$2
 addensino	$2
 addentrano	$2	$alt
@@ -2755,6 +2769,7 @@ azzer	,a|dz:'eR
 azzuffino	$2
 badano	$1
 bagnano	$1
+(si bagnino)	si||_b'a:n^ino
 ballano	$1
 ballino	$1
 balzino	$1
@@ -2762,6 +2777,7 @@ barino	$1
 basano	$1
 bastino	$1
 bastono	$2
+battezzat	bat:edz:'at
 battezzino	bat:'edz:ino
 bendano	$1
 bendino	$1
@@ -3137,6 +3153,8 @@ esportino	$2
 esprimano	$2
 espugnano	$2
 estendano	$2
+estirpano	$2
+estrapol	$2
 esultano	$2
 esultino	$2
 evacuano	$2
@@ -3621,6 +3639,7 @@ operino	$1
 orbitano	$1
 organizzino	o@-*gan'itsino
 oscillano	$2
+oscurano	$2
 oscurino	$2
 osino	$1
 ospitano	$1	$alt
@@ -4038,6 +4057,7 @@ scassin	$2
 scatenino	$2
 scavalcano	$2
 scegliere $1
+scendano	$1
 scherzano	$1
 schiaccino	$1
 schiaffeggino	$2
@@ -4210,7 +4230,8 @@ speculano	$1
 speculino	$1
 spellano	$1
 spellino	$1
-sperano	$1
+sper	sp'eR
+sperano	$1 $alt2
 sperimentino	$3
 sperino	$1
 sperono	$2
@@ -4504,6 +4525,7 @@ zuccherano	$1
 // pronominal verbs
 
 accadutomi	$3
+accertati	$2 $atstart
 affrettati	$2
 aiutaci	$2
 aiutal	aj'utal

dictsource/it_listx

@@ -49,10 +49,7 @@ aculei	$2
 aculeo $2
 adamas $3
 addebit $2  $alt2
-addi $2
 addom	$2 $alt
-adeline  $alt2
-adempiere	ad'e:mpjeRe
 adenoipofisi $5
 adenomer $3
 aderbale $2
@@ -64,8 +61,7 @@ aeree	$2
 aerogel $3
 aerosol $4
 aerostat $2
-aerovia $3
-aet  $alt
+aerovia	$4
 affett  $alt
 affori $1
 afonie	afon'i;e
@@ -74,6 +70,7 @@ agadez $3
 agapit $2
 agave $1
 agenzia $3
+agenzie	adZents'ie
 agerol $2
 agesilao $4
 agnati $1
@@ -82,12 +79,11 @@ agonie	agon'i;e
 agora $3
 agord $1
 agost  $alt2
-agosta		$1
 agrifogli  $alt
 agronomi	$2
 agrosistem  $alt
+aikido	$2
 ailoche  $alt
-aime $2  $alt
 airol $2
 airole  $alt
 alabastron $2
@@ -108,18 +104,16 @@ alea $1
 alen  $alt2
 alenia  $alt
 aleria $2  $alt2
-ales  $alt
 alesia $2  $alt
 alessia $3
 alfabet  $alt
 algebric  $alt
 algenib  $alt
 algovia  $alt
-alibi $1
+alibi	'alibI
 alimen  $alt2
 aliquot $2
 alit $1
-alleghe $1
 allegorie	$4
 allegria $3
 allegrie	$3
@@ -129,9 +123,8 @@ allobrogi $2
 allodol $2
 alloggi  $alt
 allora	al:'oRa
-alluce $1
+alluce	'al:utSe
 almen  $alt2
-aloe  $alt
 alope $1
 alopecia  alopetS'i:a
 altair $2
@@ -142,7 +135,7 @@ altrui	alt@-*'ui
 alveo $1
 amalgam $2
 amarcord $3
-amazzone $2
+amazzone	am'ats:one/
 amazzoni $2
 ambita	$2
 ambite	$2
@@ -161,7 +154,7 @@ ammine	$2
 amniocentesi $4  $alt
 amor $2  $alt2
 amorgos $3
-amorosi  $alt2
+amoros	$alt2
 ampoll  $alt2
 amulet  $alt
 anabasi $2
@@ -177,7 +170,6 @@ anarchie	ana@-*k'ie
 anatem  $alt
 anatr	'anat@-*
 anatroccol  $alt
-ancora	$alt2
 andine	$2
 androgin $2
 aneddot $2  $alt
@@ -674,8 +666,8 @@ calolziocorte  $alt2
 caloria $3
 calorie	$3
 calorimetr $3
-calumet $3  $alt2
 calpestio	$3
+calumet $3  $alt2
 camar $1
 cambodia  $alt
 cambri $2
@@ -773,6 +765,7 @@ cassal $1
 cassar $1
 cassol $2
 castagnole	$3
+castel	$2 $only
 castelcivit $3
 castellar $3
 castellon $3
@@ -781,7 +774,6 @@ castelsepri  $alt
 casteltermini $3
 castelverde  $alt2
 castelvetere  $alt
-castel	$2 $only
 castin $1
 castore $1
 castroliber $3
@@ -1100,6 +1092,7 @@ costumanz	kostum'an|ts
 cot  $alt
 cottim  $alt
 coyote  $alt
+cozzoli	k'o_tsolI
 cratere $2
 cred  $alt
 credit $1  $alt2
@@ -1240,8 +1233,8 @@ diplomazie	diplomats'ie/
 dipol $2
 dipylon $1
 dirett  $alt
-disarmonie	diza@-*mon'ie
 disarmonia	$4
+disarmonie	diza@-*mon'ie
 disartrie	$3
 discapit $2
 discors  $alt2
@@ -1325,6 +1318,7 @@ ecceter $2  $alt
 ecij $1  $alt2
 economy	$2
 ecosistem  $alt
+ecstasy	'EkstazI
 ecub $1  $alt
 eczem  $alt
 edea  $alt2
@@ -1475,7 +1469,6 @@ esantem  $alt
 eschil  $alt
 eschim  $alt
 eschine  $alt
-ecstasy	'EkstazI
 esedr  $alt
 esegesi  $alt
 esempi  $alt
@@ -1649,6 +1642,7 @@ folgaria $3
 folgor	$1
 folgorio	$3
 follia $2
+follie	$2
 fomori $1
 fon  $alt
 fondine	$2
@@ -1665,10 +1659,13 @@ forcine	$2
 forcol  $alt2
 forfor $1  $alt2
 forgia $1
+formaggini	$3
 formic $2
+formiche	$2
+formici	$1
+formicolio	$4
 forn  $alt2
 forr  $alt2
-forse  $alt2
 fortuit	f,O@-*t'uit
 foscari $1
 foschia $2
@@ -2094,6 +2091,7 @@ laureo	$1
 lauria $3
 lavorio	$3
 lazzar l'adz:aR
+lazzarett	ladz:aR'et:
 lecc  $alt2
 leccacul	$3
 leccornia	$3
@@ -2400,8 +2398,8 @@ miserere $3
 miseria	$2
 miserie	$2
 misia $1
-misoginia $4
 misogin	$2
+misoginia $4
 mistral $2
 mitocondri  $alt
 mixtechi  $alt
@@ -2501,8 +2499,8 @@ multietnic  $alt
 multigaranzia	$5
 multigaranzie	multigaRa/Nts'ie
 multipl $1
-multiplexer  $alt
 muntaz $2
+musik	$1
 muster $2
 mutagen $2
 mutagenesi $3
@@ -2797,10 +2795,10 @@ partenope $2  $alt
 passafili	$3
 passatemp  $alt
 pasten $1
-pastiche	$2
+pasticcer	$3 $alt2
 pastor  $alt2
 pater $1
-patin $1
+patin	$1
 patogenesi $3
 patricidi	$3
 pattin $1
@@ -3116,8 +3114,8 @@ profezia $3
 profil $2
 profondimetr $3
 profug	$1
-profughi	$1 $alt
 profughe	$1 $alt
+profughi	$1 $alt
 progenie  $alt
 progett  $alt
 prognosi $1  $alt
@@ -3694,6 +3692,7 @@ spadaccine	$3
 spalat $1
 spandiconcim	$4
 spatol $1
+spazioausili	sp,atsio||a|Uz'ilI
 specchi  $alt
 specchia  $alt
 specie  $alt
@@ -3701,8 +3700,8 @@ specol  $alt
 speculum $1
 speot  $alt
 spermicid $3
-sperperio	$3
 sperper	$1
+sperperio	$3
 spessimetr $2
 spettr  $alt
 spettri  $alt
@@ -4241,4 +4240,6 @@ zoppol  $alt
 zozz	ts'O:ts:
 zozzon	tsots:'on
 zuccari $1
-zuccher	ts;'U_k:eR
+zuccher	tz'uk:e*
+
+

src/readclause.cpp

@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2005 to 2015 by Jonathan Duddington                     *
  *   email: [email protected]                                    *
+ *   Copyright (C) 2015 by Reece H. Dunn                                   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -1789,6 +1790,10 @@ static int ProcessSsmlTag(wchar_t *xml_buf, char *outbuf, int *outix, int n_outb
 	PARAM_STACK *sp;
 	SSML_STACK *ssml_sp;
 
+	static const MNEM_TAB mnem_phoneme_alphabet[] = {
+		{"espeak",1},
+		{NULL, -1}};
+
 	static const MNEM_TAB mnem_punct[] = {
 		{"none", 1},
 		{"all", 2},
@@ -1938,6 +1943,20 @@ static int ProcessSsmlTag(wchar_t *xml_buf, char *outbuf, int *outix, int n_outb
 		PopParamStack(tag_type, outbuf, outix);
 		break;
 
+	case SSML_PHONEME:
+		attr1 = GetSsmlAttribute(px,"alphabet");
+		attr2 = GetSsmlAttribute(px,"ph");
+		value = attrlookup(attr1,mnem_phoneme_alphabet);
+		if (value == 1) // alphabet="espeak"
+		{
+			outbuf[(*outix)++] = '[';
+			outbuf[(*outix)++] = '[';
+			*outix += attrcopy_utf8(&outbuf[*outix],attr2,n_outbuf-*outix);
+			outbuf[(*outix)++] = ']';
+			outbuf[(*outix)++] = ']';
+		}
+		break;
+
 	case SSML_SAYAS:
 		attr1 = GetSsmlAttribute(px,"interpret-as");
 		attr2 = GetSsmlAttribute(px,"format");