Merge branch 'upstream' into development

Conflicts: dictsource/dict_phonemes phsource/compile_report
2026-10-31 05:35:35 +00:00 · 2015-04-01 16:52:48 +01:00
parent e4a4ca28e1 065a0e8f03
commit 24f15196c4
37 changed files with 2904 additions and 1124 deletions
@@ -1,167 +1,167 @@
-
-//====================================================
-//  Basque  - based on Base2
-//====================================================
-
-phoneme a
-  vowel starttype #a endtype #a
-  length 200
-  FMT(vowel/a_4)
-endphoneme
-
-
-phoneme a2  // delete if the next vowel is 'a'. Used for numbers.
-  vowel starttype #a endtype #a
-
-  length 200
-
-  IF nextPh(#a) THEN
-    ChangePhoneme(NULL)   // merge consecutive 'a'
-  ENDIF
-
-  FMT(vowel/a_4)
-endphoneme
-
-
-phoneme e
-  vowel starttype #e endtype #e
-  length 200
-  FMT(vowel/e_mid2)
-endphoneme
-
-
-phoneme i
-  vowel starttype #i endtype #i
-  length 190
-  IfNextVowelAppend(;)
-  FMT(vowel/i)
-endphoneme
-
-
-phoneme o
-  vowel starttype #o endtype #o
-  length 200
-  FMT(vowel/oo)
-endphoneme
-
-
-phoneme u
-  vowel starttype #u endtype #u
-  length 200
-  FMT(vowel/u_bck2)
-endphoneme
-
-
-phoneme Y
-  vowel  starttype #@  endtype #@
-  length 200
-  FMT(vowel/y#)
-endphoneme
-
-
-phoneme s
-import_phoneme es/s
-endphoneme
-
-
-phoneme z
-  vls alv frc sibilant
-  ipa s
-  lengthmod 3
-  Vowelin  f1=0  f2=1700 -300 300  f3=-100 80
-  Vowelout f1=0  f2=1700 -300 250  f3=-100 80  rms=20  
-  IF nextPh(isPause) THEN
-    WAV(ufric/z_eu, 60)
-  ENDIF
-  WAV(ufric/z_eu, 90)
-endphoneme
-
-
-phoneme ts
-  vls alv afr sibilant
-  ipa t?
-  lengthmod 2
-  Vowelin f1=0  f2=1700 -300 300  f3=-100 80
-  Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
-  IF nextPh(isPause2) THEN
-    WAV(ufric/ts_eu, 60)
-  ENDIF
-  WAV(ufric/ts_eu, 90)
-endphoneme
-
-
-phoneme tz
-  vls alv afr sibilant
-  ipa ts
-  lengthmod 2
-  Vowelin f1=0  f2=1700 -300 300  f3=-100 80
-  Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
-  IF nextPh(isPause2) THEN
-    WAV(ufric/tz_eu, 90)
-  ENDIF
-  WAV(ufric/tz_eu, 60)
-endphoneme
-
-
-phoneme t
-  vls dnt stop
-  lengthmod 2  
-  CALL base2/t
-endphoneme
-
-
-phoneme r
-  vcd alv flp rhotic
-  brkafter
-  ipa ?
-  lengthmod 3
-
-  IF nextPhW(isVowel) THEN
-    ChangePhoneme(**)
-  ENDIF
-
-  CALL base/*
-endphoneme
-
-
-phoneme b
-  import_phoneme es/b
-endphoneme
-
-phoneme d
-  import_phoneme es/d
-endphoneme
-
-phoneme g
-  import_phoneme es/g
-endphoneme
-
-phoneme n
-  vcd alv nasal
-  lengthmod 4
-
-  IF prevPhW(#i) AND nextPhW(isVowel) THEN
-    ChangePhoneme(n^)
-  ENDIF
-  
-  CALL base/n
-endphoneme
-
-phoneme n2  // doesn't palatalise, used for exceptions
-  vcd alv nasal
-  lengthmod 4
-  CALL base/n
-endphoneme
-
-phoneme l
-  liquid
-  IF prevPhW(#i) AND nextPhW(isVowel) THEN
-    ChangePhoneme(l^)
-  ENDIF
-  CALL base/l
-endphoneme
-
-phoneme l2 // same as l2
-  liquid
-  CALL base/l
-endphoneme
+
+//====================================================
+//  Basque  - based on Base2
+//====================================================
+
+phoneme a
+  vowel starttype #a endtype #a
+  length 200
+  FMT(vowel/a_4)
+endphoneme
+
+
+phoneme a2  // delete if the next vowel is 'a'. Used for numbers.
+  vowel starttype #a endtype #a
+
+  length 200
+
+  IF nextPh(#a) THEN
+    ChangePhoneme(NULL)   // merge consecutive 'a'
+  ENDIF
+
+  FMT(vowel/a_4)
+endphoneme
+
+
+phoneme e
+  vowel starttype #e endtype #e
+  length 200
+  FMT(vowel/e_mid2)
+endphoneme
+
+
+phoneme i
+  vowel starttype #i endtype #i
+  length 190
+  IfNextVowelAppend(;)
+  FMT(vowel/i)
+endphoneme
+
+
+phoneme o
+  vowel starttype #o endtype #o
+  length 200
+  FMT(vowel/oo)
+endphoneme
+
+
+phoneme u
+  vowel starttype #u endtype #u
+  length 200
+  FMT(vowel/u_bck2)
+endphoneme
+
+
+phoneme Y
+  vowel  starttype #@  endtype #@
+  length 200
+  FMT(vowel/y#)
+endphoneme
+
+
+phoneme s
+  CALL es/s
+  ipa s̺
+endphoneme
+
+
+phoneme z
+  vls alv frc sibilant
+  ipa s̻
+  lengthmod 3
+  Vowelin  f1=0  f2=1700 -300 300  f3=-100 80
+  Vowelout f1=0  f2=1700 -300 250  f3=-100 80  rms=20  
+  IF nextPh(isPause) THEN
+    WAV(ufric/z_eu, 60)
+  ENDIF
+  WAV(ufric/z_eu, 90)
+endphoneme
+
+
+phoneme ts
+  vls alv afr sibilant
+  ipa ts̺
+  lengthmod 2
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 80
+  Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
+  IF nextPh(isPause2) THEN
+    WAV(ufric/ts_eu, 60)
+  ENDIF
+  WAV(ufric/ts_eu, 90)
+endphoneme
+
+
+phoneme tz
+  vls alv afr sibilant
+  ipa ts̻
+  lengthmod 2
+  Vowelin f1=0  f2=1700 -300 300  f3=-100 80
+  Vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
+  IF nextPh(isPause2) THEN
+    WAV(ufric/tz_eu, 90)
+  ENDIF
+  WAV(ufric/tz_eu, 60)
+endphoneme
+
+
+phoneme t
+  vls dnt stop
+  lengthmod 2  
+  CALL base2/t
+endphoneme
+
+
+phoneme r
+  vcd alv flp rhotic
+  brkafter
+  ipa ɾ
+  lengthmod 3
+
+  IF nextPhW(isVowel) THEN
+    ChangePhoneme(**)
+  ENDIF
+
+  CALL base/*
+endphoneme
+
+
+phoneme b
+  import_phoneme es/b
+endphoneme
+
+phoneme d
+  import_phoneme es/d
+endphoneme
+
+phoneme g
+  import_phoneme es/g
+endphoneme
+
+phoneme n
+  vcd alv nasal
+  lengthmod 4
+
+  IF prevPhW(#i) AND nextPhW(isVowel) THEN
+    ChangePhoneme(n^)
+  ENDIF
+  
+  CALL base/n
+endphoneme
+
+phoneme n2  // doesn't palatalise, used for exceptions
+  vcd alv nasal
+  lengthmod 4
+  CALL base/n
+endphoneme
+
+phoneme l
+  liquid
+  IF prevPhW(#i) AND nextPhW(isVowel) THEN
+    ChangePhoneme(l^)
+  ENDIF
+  CALL base/l
+endphoneme
+phoneme l2 // same as n2
+  liquid
+  CALL base/l
+endphoneme