Merge branch 'upstream' into development

Conflicts: dictsource/dict_phonemes phsource/compile_report
2026-11-02 22:07:12 +00:00 · 2013-01-19 13:23:25 +00:00
parent 2c0829d6cf b590876def
commit 851dfd38e5
20 changed files with 11836 additions and 40 deletions
@@ -0,0 +1,24 @@
+
+// based on Spanish
+
+phoneme t#
+  vls dnt stop
+  IF NOT prevVowel(isStressed) THEN
+    ChangePhoneme(t)
+  ENDIF
+endphoneme
+
+
+phoneme E
+  vowel starttype #e endtype #e
+  length 170
+  FMT(vowel/ee_1)
+endphoneme
+
+
+phoneme O
+  vowel starttype #o endtype #o
+  length 170
+  FMT(vowel/oo_4)
+endphoneme
+
@@ -1781,6 +1781,9 @@ include ph_spanish_la
 phonemetable ca es
 include ph_catalan

+phonemetable an es
+include ph_aragon
+
 phonemetable pt base2
 include ph_pt_brazil