From 79003ea0521193a23e31aab6a5d90a7b7b2caedb Mon Sep 17 00:00:00 2001 From: Thomas Guillory Date: Sun, 24 May 2015 23:58:47 +0200 Subject: [PATCH 1/6] ADD the phoneme j. to ph_french and correct fr_rules --- dictsource/fr_rules | 4 ++-- phsource/ph_french | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 658c2d4e..175351b4 100644 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -1351,8 +1351,8 @@ i) t (uneX _^_en .group u u y // cruel nuage brut ue (il W // orgueil - ui yi // nuit, fuite - uin (K yE~ // juin + ui j.i // nuit, fuite + uin (K j.E~ // juin _C) u (rfX W _bl) u (ff W _s) u (rfeX W diff --git a/phsource/ph_french b/phsource/ph_french index bd65828e..89683cf6 100644 --- a/phsource/ph_french +++ b/phsource/ph_french @@ -981,6 +981,11 @@ phoneme z3 // "six" and "dix". [s] before pause, [z] before vowel, else [] ENDIF endphoneme +phoneme j. + liquid + lengthmode 7 + ipa U+0265 +endphoneme // translate from English to French phonemes equivalents en From aead0b6ea385e4ffe09a13b2c11fcf0714c036fb Mon Sep 17 00:00:00 2001 From: Thomas Guillory Date: Mon, 25 May 2015 13:53:22 +0200 Subject: [PATCH 2/6] FIX some rules between o and O --- dictsource/fr_rules | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 175351b4..566332be 100644 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -970,6 +970,10 @@ _re) name _^_en _c) on (_ O~ // no comment _C) on (_ O~n2 // mon appui, mon histoire, mon havre + c) one on + g) one on + z) one on + alc) oo (l O // alcool z) oo o // zoo z) oo (C oo // zoologue @@ -996,10 +1000,16 @@ _re) name _^_en o (_ o // zorro allégro gr) oss os // grosse, grossir -C) o (me_ o // atome, chrome -_C) o (me_ O // Rome tome - o (sA o // position - o (zA o // Mozilla + o (Ce_ O // pote + o (CA o // otarie + o (Che_ O // poche, wisigothe, apostrophe + o (ChA o // rocher, orthophoniste + o (rr o // zorro + C) o (me_ o // atome, chrome + _C) o (me_ O // Rome tome + o (sA o // position + o (zA o // Mozilla + o (tr o // votre o (CC O // poste, votre o O From 1762fdb6f88598278851ce082839f38f03be7ebc Mon Sep 17 00:00:00 2001 From: Thomas Guillory Date: Mon, 25 May 2015 14:45:48 +0200 Subject: [PATCH 3/6] =?UTF-8?q?FIX=20=C9=B2,=20gn,=20and=20some=20more=20o?= =?UTF-8?q?=20O?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dictsource/fr_list | 1 - dictsource/fr_rules | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dictsource/fr_list b/dictsource/fr_list index 329e22a9..516d7e25 100644 --- a/dictsource/fr_list +++ b/dictsource/fr_list @@ -898,7 +898,6 @@ exit egzit from _^_en get _^_en google _^_en -gnome gnOm gnu $abbrev hamburger _|A~b@rgWr he _^_en diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 566332be..047a054b 100644 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -653,13 +653,18 @@ no) ë (_ e // canoë su) gg (Y gZ // suggérer suggestif gg g // agglomérer + _wa) gner (_ gnEr + _sta) gn ( gn + dia) gn ( gn + _) gn (om gn + _) gn (ou_ gn + gn (osie_ gn ai) gni n^ // craignions châtaignier - gn nj // agneau -_wa) gner (_ gnEr + gn n^ // agneau gni n^i // signifier gn (e_ n^ gn (_ n^ - gn (eCA nj@- + gn (eCA n^@- gn (ie n // compagnie dia) g (no g _a) g (no g @@ -1010,7 +1015,8 @@ _re) name _^_en o (sA o // position o (zA o // Mozilla o (tr o // votre - o (CC O // poste, votre + o (dr o // vélodrome + o (CC O // poste o O // group o: English section From 74be51929157a2a638b04a4ac0e0657b6ccdcddc Mon Sep 17 00:00:00 2001 From: Thomas Guillory Date: Mon, 25 May 2015 18:15:53 +0200 Subject: [PATCH 4/6] FIX o followed by gn --- dictsource/fr_rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dictsource/fr_rules b/dictsource/fr_rules index 047a054b..bf2a0ab5 100644 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -1009,6 +1009,8 @@ _re) name _^_en o (CA o // otarie o (Che_ O // poche, wisigothe, apostrophe o (ChA o // rocher, orthophoniste + o (gne_ O // rogne + o (gnA o // pognon o (rr o // zorro C) o (me_ o // atome, chrome _C) o (me_ O // Rome tome From 60ec80d5abadc209bd9acdafb113bf469f8ef05e Mon Sep 17 00:00:00 2001 From: Thomas Guillory Date: Mon, 25 May 2015 23:20:24 +0200 Subject: [PATCH 5/6] ADD general rule for ou = u --- dictsource/fr_rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dictsource/fr_rules b/dictsource/fr_rules index bf2a0ab5..ca5ad3e6 100644 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -991,6 +991,8 @@ _re) name _^_en _C) oup (_ u // coup, loup + ou (e_ u + ou (A w ou u // hibou brouillard groupe encouragé ou (in w // pingouin oue (mA u // dévouement From 260e146e03bcb44879441c2e5caf446af07f89a9 Mon Sep 17 00:00:00 2001 From: Thomas Guillory Date: Mon, 25 May 2015 23:25:56 +0200 Subject: [PATCH 6/6] FIX ouille = uj --- dictsource/fr_rules | 1 + 1 file changed, 1 insertion(+) diff --git a/dictsource/fr_rules b/dictsource/fr_rules index ca5ad3e6..c4aa13ff 100644 --- a/dictsource/fr_rules +++ b/dictsource/fr_rules @@ -992,6 +992,7 @@ _re) name _^_en ou (e_ u + ou (ill u ou (A w ou u // hibou brouillard groupe encouragé ou (in w // pingouin