mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-10 08:13:55 +00:00
[1.48.01]
Language changes: bn, en, da, it, pt. Started new language, gd (Scottish Gaelic). git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@371 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
+1
-1
@@ -7,7 +7,7 @@ BINDIR=$(PREFIX)/bin
|
||||
INCDIR=$(PREFIX)/include/espeak
|
||||
LIBDIR=$(PREFIX)/lib
|
||||
|
||||
RELEASE = 1.47
|
||||
RELEASE = 1.48
|
||||
BIN_NAME = speak
|
||||
BIN2_NAME = espeak
|
||||
LIB_NAME = libespeak.so
|
||||
|
||||
+2
-1
@@ -1,5 +1,5 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2005 to 2013 by Jonathan Duddington *
|
||||
* Copyright (C) 2005 to 2014 by Jonathan Duddington *
|
||||
* email: jonsd@users.sourceforge.net *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@@ -124,6 +124,7 @@ static keywtab_t k_properties[] = {
|
||||
{"isVFricative", 0, phVFRICATIVE},
|
||||
|
||||
{"isPalatal", 0, i_isPalatal},
|
||||
{"isLong", 0, i_isLong},
|
||||
{"isRhotic", 0, i_isRhotic},
|
||||
{"isSibilant", 0, i_isSibilant},
|
||||
{"isFlag1", 0, i_isFlag1},
|
||||
|
||||
+1
-1
@@ -517,7 +517,7 @@ void DecodePhonemes(const char *inptr, char *outptr)
|
||||
|
||||
// using Kirschenbaum to IPA translation, ascii 0x20 to 0x7f
|
||||
unsigned short ipa1[96] = {
|
||||
0x20,0x21,0x22,0x2b0,0x24,0x25,0x0e6,0x2c8,0x28,0x27e,0x2a,0x2b,0x2cc,0x2d,0x2e,0x2f,
|
||||
0x20,0x21,0x22,0x2b0,0x24,0x25,0x0e6,0x2c8,0x28,0x29,0x27e,0x2b,0x2cc,0x2d,0x2e,0x2f,
|
||||
0x252,0x31,0x32,0x25c,0x34,0x35,0x36,0x37,0x275,0x39,0x2d0,0x2b2,0x3c,0x3d,0x3e,0x294,
|
||||
0x259,0x251,0x3b2,0xe7,0xf0,0x25b,0x46,0x262,0x127,0x26a,0x25f,0x4b,0x26b,0x271,0x14b,0x254,
|
||||
0x3a6,0x263,0x280,0x283,0x3b8,0x28a,0x28c,0x153,0x3c7,0xf8,0x292,0x32a,0x5c,0x5d,0x5e,0x5f,
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2005 to 2013 by Jonathan Duddington *
|
||||
* Copyright (C) 2005 to 2014 by Jonathan Duddington *
|
||||
* email: jonsd@users.sourceforge.net *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
+2
-2
@@ -35,8 +35,8 @@
|
||||
#include "translate.h"
|
||||
#include "wave.h"
|
||||
|
||||
const char *version_string = "1.47.17 28.Jan.14";
|
||||
const int version_phdata = 0x014709;
|
||||
const char *version_string = "1.48.01 01.Feb.14";
|
||||
const int version_phdata = 0x014801;
|
||||
|
||||
int option_device_number = -1;
|
||||
FILE *f_logespeak = NULL;
|
||||
|
||||
@@ -350,6 +350,7 @@ typedef struct {
|
||||
// phflags
|
||||
#define i_isSibilant 0x45 // bit 5 in phflags
|
||||
#define i_isPalatal 0x49 // bit 9 in phflags
|
||||
#define i_isLong 0x55 // bit 21 in phflags
|
||||
#define i_isRhotic 0x57 // bit 23 in phflags
|
||||
#define i_isFlag1 0x5c
|
||||
#define i_isFlag2 0x5d
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2005 to 2013 by Jonathan Duddington *
|
||||
* Copyright (C) 2005 to 2014 by Jonathan Duddington *
|
||||
* email: jonsd@users.sourceforge.net *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@@ -851,11 +851,14 @@ Translator *SelectTranslator(const char *name)
|
||||
break;
|
||||
|
||||
case L('g','a'): // irish
|
||||
case L('g','d'): // scots gaelic
|
||||
{
|
||||
tr->langopts.stress_rule = STRESSPOSN_1L;
|
||||
tr->langopts.numbers = 1;
|
||||
tr->langopts.stress_flags = S_NO_AUTO_2; // don't use secondary stress
|
||||
tr->langopts.numbers = NUM_OMIT_1_HUNDRED | NUM_OMIT_1_THOUSAND;
|
||||
tr->langopts.accents = 2; // 'capital' after letter name
|
||||
tr->langopts.param[LOPT_UNPRONOUNCABLE] = 3; // don't count apostrophe
|
||||
tr->langopts.param[LOPT_IT_LENGTHEN] = 1; // remove [:] phoneme from non-stressed syllables (Lang=gd)
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1308,6 +1311,7 @@ SetLengthMods(tr,3); // all equal
|
||||
tr->langopts.stress_flags = S_FINAL_DIM_ONLY | S_FINAL_NO_2 | S_INITIAL_2 | S_PRIORITY_STRESS;
|
||||
tr->langopts.numbers = NUM_DECIMAL_COMMA | NUM_DFRACTION_2 | NUM_HUNDRED_AND | NUM_AND_UNITS | NUM_ROMAN_CAPITALS;
|
||||
tr->langopts.numbers2 = NUM2_MULTIPLE_ORDINAL | NUM2_NO_TEEN_ORDINALS | NUM2_ORDINAL_NO_AND;
|
||||
tr->langopts.max_roman = 5000;
|
||||
SetLetterVowel(tr,'y');
|
||||
ResetLetterBits(tr,0x2);
|
||||
SetLetterBits(tr,1,"bcdfgjkmnpqstvxz"); // B hard consonants, excluding h,l,r,w,y
|
||||
|
||||
Reference in New Issue
Block a user