commit 7e84327001037a28a23d8883ec7a6f37206c07cd
Author: hectoralos <hectoralos@gmail.com>
Date:   Mon Jul 27 16:07:20 2020 +0300

    +mots

diff --git a/apertium-fra-frp.fra-frp.dix b/apertium-fra-frp.fra-frp.dix
index 5ef3dac..924b5a0 100644
--- a/apertium-fra-frp.fra-frp.dix
+++ b/apertium-fra-frp.fra-frp.dix
@@ -132,7 +132,7 @@
   <e r="RL"><p><l><s n="mf"/></l><r><s n="m"/></r></p></e>
 </pardef>
 
-    <!-- com mf_GD, perô sempre es genera "m" -->
+<!-- com mf_GD, perô sempre es genera "m" -->
 <pardef n="mf_mGD">
   <e r="LR"><p><l><s n="mf"/></l><r><s n="m"/></r></p></e>
   <e r="RL"><p><l><s n="mf"/></l><r><s n="f"/></r></p></e>
@@ -3603,6 +3603,7 @@
 <e a="alanfavre"><p><l>avancée<s n="n"/><s n="f"/></l><r>avanciê<s n="n"/><s n="f"/></r></p></e>
 <e>       <p><l>avancer<s n="vblex"/></l>         <r>avanciér<s n="vblex"/></r></p></e>
 <e a="hector"><p><l>avant<s n="adv"/></l>         <r>avant<s n="adv"/></r></p></e>
+<e a="hector"><p><l>avant<s n="adv"/></l>         <r>devant<s n="adv"/></r></p></e>
 <e>       <p><l>avant<s n="pr"/></l>              <r>avant<s n="pr"/></r></p></e>
 <e>       <p><l>avant<s n="pr"/></l>              <r>devant<s n="pr"/></r></p></e>
 <e>       <p><l>avant<b/>de<s n="pr"/></l>        <r>devant<b/>que<b/>de<s n="pr"/></r></p></e>
@@ -45196,6 +45197,7 @@
 <e>       <p><l>Țurcanu<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Țurcanu<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
 <e>       <p><l>Țuțea<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Țuțea<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
 <e>       <p><l>Țăranu<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Țăranu<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
+<e>       <p><l>du<b/>Guesclin<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>du<b/>Guèsclin<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
 
 <e><p><l>Alès<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Alès<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
 <e><p><l>Alleins<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Alens<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
@@ -48098,7 +48100,7 @@
 <e a="alanfavro"><p><l>quart<g><b/>de<b/>finale</g><s n="n"/><s n="m"/></l><r>quârt<g><b/>de<b/>finâla</g><s n="n"/><s n="m"/></r></p></e>
 <e a="alanfavro"><p><l>juridiction<s n="n"/><s n="f"/></l><r>juridiccion<s n="n"/><s n="f"/></r></p></e>
 <e a="alanfavro"><p><l>fan<s n="n"/><s n="mf"/></l><r>fane<s n="n"/><s n="mf"/></r></p></e>
-<e r="LR" a="alanfavro"><p><l>ton<s n="n"/><s n="m"/></l><r>ton<s n="n"/><s n="m"/></r></p></e>
+<e a="alanfavro"><p><l>ton<s n="n"/><s n="m"/></l><r>ton<s n="n"/><s n="m"/></r></p></e>
 <e a="alanfavro"><p><l>podium<s n="n"/><s n="m"/></l><r>podion<s n="n"/><s n="m"/></r></p></e>
 <e a="alanfavro"><p><l>finance<s n="n"/><s n="f"/></l><r>finance<s n="n"/><s n="f"/></r></p></e>
 <e a="alanfavro"><p><l>lire<s n="n"/><s n="f"/></l><r>lira<s n="n"/><s n="f"/></r></p></e>
@@ -48212,8 +48214,6 @@
 <e r="LR" a="alanfavro"><p><l>conduit<s n="n"/><s n="m"/></l><r>tuyô<s n="n"/><s n="m"/></r></p></e>
 <e a="alanfavro"><p><l>trio<s n="n"/><s n="m"/></l><r>triô<s n="n"/><s n="m"/></r></p></e>
 <e a="alanfavro"><p><l>rituel<s n="n"/><s n="m"/></l><r>rituèl<s n="n"/><s n="m"/></r></p></e>
-<e i="yes" a="alanfavro"><p><l>ranger<s n="n"/><s n="mf"/></l><r>gouârda-parc<s n="n"/><s n="mf"/></r></p></e>
-<e a="alanfavro"><p><l>garde<b/>forestier<s n="n"/><s n="m"/></l><r>gouârda-parc<s n="n"/><s n="mf"/></r></p></e>
 <e r="RL" a="alanfavro"><p><l>armoiries<s n="n"/><s n="f"/><s n="pl"/></l><r>ârmeries<s n="n"/><s n="f"/><s n="pl"/></r></p></e>
 <e a="alanfavro"><p><l>téléspectateur<s n="n"/></l><r>tèlèspèctator<s n="n"/></r></p></e>
 <e a="alanfavro"><p><l>robot<s n="n"/><s n="m"/></l><r>robot<s n="n"/><s n="m"/></r></p></e>
@@ -48833,6 +48833,7 @@
 <e a="hector"><p><l>iPhone<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>iPhone<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>Eurovision<s n="np"/><s n="al"/><s n="f"/><s n="sg"/></l><r>Eurovision<s n="np"/><s n="al"/><s n="f"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>Euribor<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Euribor<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>Marks<b/>&amp;<b/>Spencer<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Marks<b/>&amp;<b/>Spencer<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
 <e><p><l>VW<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></l><r>VW<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></r></p></e>
 <e><p><l>RAI<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></l><r>RAI<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>AFI<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></l><r>AFE<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></r></p></e>
@@ -48869,6 +48870,7 @@
 <e a="hector"><p><l>VIH<s n="n"/><s n="acr"/><s n="m"/><s n="sp"/></l><r>VIH<s n="n"/><s n="acr"/><s n="m"/><s n="sp"/></r></p></e>
 <e a="hector"><p><l>SIDA<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></l><r>SIDA<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>EZLN<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></l><r>EZLN<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>J.C.<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></l><r>J.C.<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>Oxbridge<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Oxbridge<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>Tchétchénie<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></l><r>Tchètchènie<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>Ingouchie<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></l><r>Ingouchie<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
@@ -48979,7 +48981,7 @@
 <e r="RL" a="stich"><p><l>miséricorde<s n="n"/><s n="f"/></l><r>misèricorde<s n="n"/><s n="f"/></r></p></e>
 <e r="RL" a="hector"><p><l>valeur<s n="n"/><s n="f"/></l><r>valyent<s n="n"/><s n="m"/></r></p></e>
 <e a="corpus"><p><l>météo<s n="n"/><s n="f"/></l><r>mètèô<s n="n"/><s n="f"/></r></p><par n="sp_ND"/></e>
-<e r="RL" a="stich/use_sub"><p><l>misère<s n="n"/><s n="f"/></l><r>misèra<s n="n"/><s n="f"/></r></p></e>
+<e r="RL" a="stich"><p><l>misère<s n="n"/><s n="f"/></l><r>misèra<s n="n"/><s n="f"/></r></p></e>
 <e a="hector"><p><l>ubérisation<s n="n"/><s n="f"/></l><r>ubèrisacion<s n="n"/><s n="f"/></r></p></e>
 <e><p><l>cour<g><b/>d'assises</g><s n="n"/><s n="f"/></l><r>cort<g><b/>d'asséses</g><s n="n"/><s n="f"/></r></p></e>
 <e a="hector"><p><l>carélien<s n="n"/></l><r>carèlien<s n="n"/></r></p></e>
@@ -49040,6 +49042,53 @@
 <e a="hector"><p><l>nano<s n="pref"/></l><r>nano<s n="pref"/></r></p></e>
 <e a="hector"><p><l>ultra<s n="pref"/></l><r>ultra<s n="pref"/></r></p></e>
 <e a="hector"><p><l>méga<s n="pref"/></l><r>mèga<s n="pref"/></r></p></e>
+<e a="LoTrèsor"><p><l>poète<s n="n"/><s n="m"/></l><r>poèto<s n="n"/><s n="m"/></r></p></e>
+<e a="hector"><p><l>poète<s n="n"/><s n="f"/></l><r>poètèssa<s n="n"/><s n="f"/></r></p></e>
+
+<e r="LR" a="alanfavro"><p><l>ranger<s n="n"/><s n="mf"/></l><r>gouârda-parc<s n="n"/><s n="mf"/></r></p></e>
+<e a="alanfavro"><p><l>garde<g><b/>de<b/>parc<b/>naturel</g><s n="n"/><s n="mf"/></l><r>gouârda-parc<s n="n"/><s n="mf"/></r></p></e>
+<e r="LR" a="alanfavro"><p><l>garde<g><b/>de<b/>réserve<b/>naturelle</g><s n="n"/><s n="mf"/></l><r>gouârda-parc<s n="n"/><s n="mf"/></r></p></e>
+<e a="alanfavro"><p><l>garde<b/>champêtre<s n="n"/><s n="m"/></l><r>gouârda-champagne<s n="n"/><s n="mf"/></r></p></e>
+<e a="alanfavro"><p><l>garde<b/>forestier<s n="n"/><s n="m"/></l><r>gouârda-jor<s n="n"/><s n="mf"/></r></p></e>
+<e a="alanfavro"><p><l>ONG<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></l><r>ONG<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></r></p></e>
+<e><p><l>OMS<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></l><r>OMS<s n="n"/><s n="acr"/><s n="f"/><s n="sg"/></r></p></e>
+<e><p><l>MS<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></l><r>MS<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>ANSI<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></l><r>ANSI<s n="n"/><s n="acr"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>ASCII<s n="n"/><s n="acr"/><s n="mf"/><s n="sp"/></l><r>ASCII<s n="n"/><s n="acr"/><s n="mf"/><s n="sp"/></r></p></e>
+<e a="hector"><p><l>non<b/>governemental<s n="adj"/></l><r>nan<b/>govèrnemental<s n="adj"/></r></p></e>
+<e><p><l>Auchan<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Auchan<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>Carrefour<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Carrefour<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>IKEA<s n="np"/><s n="al"/><s n="f"/><s n="sg"/></l><r>IKEA<s n="np"/><s n="al"/><s n="f"/><s n="sg"/></r></p></e>
+<e><p><l>Decathlon<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Decathlon<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>Lidl<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Lidl<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>Intermarché<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Intermarché<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>Metro<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Metro<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>Migros<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Migros<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>Système<b/>U<s n="np"/><s n="al"/><s n="f"/><s n="sg"/></l><r>Système<b/>U<s n="np"/><s n="al"/><s n="f"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>Oxfam<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Oxfam<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>Unicode<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Unicode<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>Ranger<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Ranger<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="stich"><p><l>Inn<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Ine<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>Pô<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Pô<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+<e r="LR" a="Vouiquipèdia"><p><l>Pô<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Po<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>julien<s n="adj"/></l><r>julien<s n="adj"/></r></p></e>
+<e a="hector"><p><l>socioculturel<s n="adj"/></l><r>socioculturèl<s n="adj"/></r></p></e>
+<e a="stich"><p><l>miséricordieux<s n="adj"/></l><r>misèricordiox<s n="adj"/></r></p></e>
+<e a="stich"><p><l>sadducéen<s n="adj"/></l><r>saducèen<s n="adj"/></r></p></e>
+<e a="hector"><p><l>byte<s n="n"/><s n="m"/></l><r>byte<s n="n"/><s n="m"/></r></p></e>
+<e a="alanfavro"><p><l>octet<s n="n"/><s n="m"/></l><r>octèt<s n="n"/><s n="m"/></r></p></e>
+<e r="LR" a="alanfavro"><p><l>bite<s n="n"/><s n="f"/></l><r>broca<s n="n"/><s n="f"/></r></p></e>
+<e a="alanfavro"><p><l>serveur<s n="n"/><s n="m"/></l><r>sèrvor<s n="n"/><s n="m"/></r></p></e>
+<e a="stich"><p><l>sadducéen<s n="n"/></l><r>saducèen<s n="n"/></r></p></e>
+<e r="RL" a="stich"><p><l>fusil<s n="n"/><s n="m"/></l><r>fusil<s n="n"/><s n="m"/></r></p></e>
+<e a="stich"><p><l>directoire<s n="n"/><s n="m"/></l><r>dirèctouère<s n="n"/><s n="m"/></r></p></e>
+<e r="RL" a="stich"><p><l>soulèvement<s n="n"/><s n="m"/></l><r>solèvement<s n="n"/><s n="m"/></r></p></e>
+<e a="stich"><p><l>flatterie<s n="n"/><s n="f"/></l><r>fllateria<s n="n"/><s n="f"/></r></p></e>
+<e a="stich"><p><l>mécontenter<s n="vblex"/></l><r>mâlcontentar<s n="vblex"/></r></p></e>
+<e a="stich"><p><l>contredire<s n="vblex"/></l><r>contredére<s n="vblex"/></r></p></e>
+<e a="hector"><p><l>Rangers<s n="np"/><s n="al"/><s n="m"/><s n="pl"/></l><r>Rangers<s n="np"/><s n="al"/><s n="m"/><s n="pl"/></r></p></e>
+<e a="hector"><p><l>Power<b/>Rangers<s n="np"/><s n="al"/><s n="m"/><s n="pl"/></l><r>Power<b/>Rangers<s n="np"/><s n="al"/><s n="m"/><s n="pl"/></r></p></e>
+
 
 <e>       <re>[0-9]+([.,][0-9]+)?</re><p><l><s n="num"/></l><r><s n="num"/></r></p></e>
 <e>       <re>[0-9][0-9]+</re><p><l>ème<s n="adj"/></l><r>o<s n="adj"/><s n="ord"/></r></p><par n="mf_GD"/></e>
diff --git a/apertium-fra-frp.fra-frp.metalrx b/apertium-fra-frp.fra-frp.metalrx
index f4a1cdc..f095514 100644
--- a/apertium-fra-frp.fra-frp.metalrx
+++ b/apertium-fra-frp.fra-frp.metalrx
@@ -1361,6 +1361,11 @@
     </or>
   </rule>
 
+  <!-- serveur >> sèrvor, garçon -->
+  <rule weight="0.8">
+    <match lemma="serveur" tags="n.m.*"><select lemma="sèrvor"/></match>
+  </rule>
+
   <!-- siège >> èscabél, sièta, sièjo -->
   <rule weight="0.8">
     <match lemma="siège" tags="n.*"><select lemma="èscabél"/></match>
diff --git a/apertium-fra-frp.frp-fra.metalrx b/apertium-fra-frp.frp-fra.metalrx
index b45d110..e1d3aaf 100644
--- a/apertium-fra-frp.frp-fra.metalrx
+++ b/apertium-fra-frp.frp-fra.metalrx
@@ -719,10 +719,19 @@
     <match lemma="devant" tags="pr"><select lemma="devant"/></match>
   </rule>
   <rule weight="1.0">
+    <match lemma="devant" tags="pr"><select lemma="avant"/></match>
+    <match lemma="J.C." tags="n.*"/>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="devant" tags="pr"><select lemma="avant"/></match>
+    <or>
+      <match tags="det.*"/>
+      <match tags="num.*"/>
+      <match tags="num"/>
+      </or>
     <or>
       <seq n="temps"/>
     </or>
-    <match lemma="devant" tags="pr"><select lemma="avant"/></match>
   </rule>
 
   <!-- aprés >> après, en train de -->
@@ -1003,6 +1012,17 @@
     <match lemma="adés" tags="adv"><select lemma="encore"/></match>
   </rule>
 
+  <!-- devant >> devant, avant -->
+  <rule weight="0.8">
+    <match lemma="devant" tags="adv"><select lemma="devant"/></match>
+  </rule>
+  <rule weight="1.0">
+    <or>
+      <seq n="temps"/>
+    </or>
+    <match lemma="devant" tags="adv"><select lemma="avant"/></match>
+  </rule>
+
   <!-- lé-en >> là-dedans, là-bas -->
   <rule weight="0.8">
     <match lemma="lé-en" tags="adv"><select lemma="là-dedans"/></match>
@@ -1518,6 +1538,51 @@
     <match lemma="scolèro" tags="adj.*"/>
   </rule>
 
+  <!-- ton >> ton, thon -->
+  <rule weight="0.8">
+    <match lemma="ton" tags="n.*"><select lemma="ton"/></match>
+  </rule>
+  <rule weight="1.0">
+    <or>
+      <match lemma="megiér" tags="vblex.*"/>
+      <match lemma="mengiér" tags="vblex.*"/>
+      <match lemma="gôtar" tags="vblex.*"/>
+      <match lemma="couére" tags="vblex.*"/>
+      <match lemma="prèparar" tags="vblex.*"/>
+      <match lemma="denar" tags="vblex.*"/>
+      <match lemma="dèjonar" tags="vblex.*"/>
+      <match lemma="cusenar" tags="vblex.*"/>
+      <match lemma="frire" tags="vblex.*"/>
+      <match lemma="pèchiér" tags="vblex.*"/>
+    </or>
+    <repeat from="0" upto="6">
+      <match/>
+    </repeat>
+    <match lemma="ton" tags="n.*"><select lemma="thon"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="ton" tags="n.*"><select lemma="thon"/></match>
+    <repeat from="0" upto="6">
+      <match/>
+    </repeat>
+    <or>
+      <match lemma="sôça" tags="n.*"/>
+      <match lemma="tomata" tags="n.*"/>
+      <match lemma="tarteflla" tags="n.*"/>
+      <match lemma="catrolye" tags="n.*"/>
+      <match lemma="perét# de tèrra" tags="n.*"/>
+      <match lemma="poma# de tèrra" tags="n.*"/>
+      <match lemma="trufa" tags="n.*"/>
+      <match lemma="truflla" tags="n.*"/>
+      <match lemma="cortelyâjo" tags="n.*"/>
+      <match lemma="jardenâjo" tags="n.*"/>
+      <match lemma="hortolâjo" tags="n.*"/>
+      <match lemma="vèrdura" tags="n.*"/>
+      <match lemma="vèrdior" tags="n.*"/>
+      <match lemma="lègumo" tags="n.*"/>
+    </or>
+  </rule>
+
   <!-- volontèro >> volontaire, bénévole -->
   <rule weight="0.8">
     <match lemma="volontèro" tags="n.*"><select lemma="volontaire"/></match>