commit fe27c32594f19e44ecbdcd90efefd3ee355c5faa
Author: hectoralos <hectoralos@gmail.com>
Date:   Sat Aug 22 21:58:21 2020 +0300

    +mots, corrections

diff --git a/apertium-fra-frp.fra-frp.dix b/apertium-fra-frp.fra-frp.dix
index e8c3be5..990261c 100644
--- a/apertium-fra-frp.fra-frp.dix
+++ b/apertium-fra-frp.fra-frp.dix
@@ -5149,6 +5149,7 @@
 <e r="LR" a="hector"><p><l>basket<s n="n"/><s n="f"/></l><r>grole<g><b/>de<b/>baskèt</g><s n="n"/><s n="f"/></r></p><par n="sp_ND"/></e>
 <e a="hector"><p><l>basket<s n="n"/><s n="m"/><s n="sg"/></l><r>baskèt<s n="n"/><s n="m"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>basket-ball<s n="n"/><s n="m"/><s n="sg"/></l><r>baskètbâl<s n="n"/><s n="m"/><s n="sg"/></r></p></e>
+<e r="LR" a="hector"><p><l>basketball<s n="n"/><s n="m"/><s n="sg"/></l><r>baskètbâl<s n="n"/><s n="m"/><s n="sg"/></r></p></e>
 <e a="hector"><p><l>basketteur<s n="n"/></l>      <r>jouyor<g><b/>de<b/>baskèt</g><s n="n"/></r></p></e>
 <e>       <p><l>Basma<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></l><r>Basma<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></r></p></e>
 <e>       <p><l>Basora<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Basora<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
@@ -19698,7 +19699,7 @@
 <e>       <p><l>fils<s n="n"/><s n="m"/></l>      <r>fily<s n="n"/><s n="m"/></r></p><par n="sp_ND"/></e>
 <e r="RL"><p><l>fils<s n="n"/><s n="m"/></l>      <r>fely<s n="n"/><s n="m"/></r></p><par n="sp_ND"/></e>
 <e r="RL"><p><l>fils<s n="n"/><s n="m"/></l>      <r>filys<s n="n"/><s n="m"/></r></p></e>
-<e i="yes"><p><l>fils<s n="n"/><s n="m"/></l>     <r>garçon<s n="n"/><s n="m"/></r></p><par n="sp_ND"/></e>
+<e r="RL"><p><l>fils<s n="n"/><s n="m"/></l>     <r>garçon<s n="n"/><s n="m"/></r></p><par n="sp_ND"/></e>
 <e>       <p><l>Filsaime<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Filsaime<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
 <e>       <p><l>Filteau<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Filteau<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
 <e>       <p><l>filtre<s n="n"/><s n="m"/></l>    <r>crèpena<s n="n"/><s n="f"/></r></p></e>
@@ -21260,7 +21261,7 @@
 <e>       <p><l>Garcilaso<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></l><r>Garcilaso<s n="np"/><s n="ant"/><s n="m"/><s n="sg"/></r></p></e>
 <e>       <p><l>garçon<s n="n"/><s n="m"/></l>    <r>menât<s n="n"/><s n="m"/></r></p></e>
 <e r="RL"><p><l>garçon<s n="n"/><s n="m"/></l>    <r>megnât<s n="n"/><s n="m"/></r></p></e>
-<e i="yes"><p><l>garçon<s n="n"/><s n="m"/></l>   <r>garçon<s n="n"/><s n="m"/></r></p></e>
+<e r="RL"><p><l>garçon<s n="n"/><s n="m"/></l>   <r>garçon<s n="n"/><s n="m"/></r></p><par n="sp_sp"/></e>
 <e r="RL"><p><l>garçonnet<s n="n"/><s n="m"/></l> <r>ragât<s n="n"/><s n="m"/></r></p></e>
 <e>       <p><l>Gard<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Gardon<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
 <e r="RL" a="Vouiquipèdia"><p><l>Gard<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Gard<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
@@ -24789,7 +24790,8 @@
 <e r="RL"><p><l>incendie<s n="n"/><s n="m"/></l>  <r>encendie<s n="n"/><s n="f"/></r></p></e>
 <e i="yes"><p><l>incendie<s n="n"/><s n="m"/></l> <r>broula<s n="n"/><s n="f"/></r></p></e>
 <e>       <p><l>incendier<s n="vblex"/></l>       <r>encendiyér<s n="vblex"/></r></p></e>
-<e r="RL" a="alanfavro"><p><l>incendier<s n="vblex"/></l><r>betar<g><b/>lo<b/>fuè</g><s n="vblex"/></r></p></e>
+<e a="hector"><p><l>incendier<s n="vblex"/></l><r>betar<g><b/>lo<b/>fuè<b/>a</g><s n="vblex"/></r></p></e>
+<e a="alanfavro"><p><l>incendier<s n="vblex"/></l><r>betar<g><b/>lo<b/>fuè</g><s n="vblex"/></r></p></e>
 <e>       <p><l>incertain<s n="adj"/></l>         <r>encèrtin<s n="adj"/></r></p></e>
 <e r="RL" a="alanfavro"><p><l>incertain<s n="adj"/></l><r>encèrten<s n="adj"/></r></p></e>
 <e>       <p><l>Incerti<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Incerti<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
@@ -40821,7 +40823,7 @@
 <e>       <p><l>repérer<s n="vblex"/></l>         <r>repèrar<s n="vblex"/></r></p></e>
 <e>       <p><l>répertoire<s n="n"/><s n="m"/></l><r>repèrtouèr<s n="n"/><s n="m"/></r></p></e>
 <e a="stich"><p><l>répertorier<s n="vblex"/></l>  <r>fâre<g><b/>la<b/>lista<b/>de</g><s n="vblex"/></r></p></e>
-<e r="LR" a="hector"><p><l>répertorier<s n="vblex"/></l><r>listar<s n="vblex"/></r></p></e>
+<e a="hector"><p><l>répertorier<s n="vblex"/></l><r>listar<s n="vblex"/></r></p></e>
 <e>       <p><l>repeser<s n="vblex"/></l>         <r>repesar<s n="vblex"/></r></p></e>
 <e>       <p><l>répéter<s n="vblex"/></l>         <r>rèpètar<s n="vblex"/></r></p></e>
 <e r="LR" a="alanfavro"><p><l>répétitif<s n="adj"/></l><r>a<b/>rèpèticion<s n="adj"/></r></p><par n="GD_mf"/><par n="ND_sp"/></e>
@@ -43959,7 +43961,7 @@
 <e>       <p><l>Servello<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Servello<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
 <e>       <p><l>Serveriana<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></l><r>Serveriana<s n="np"/><s n="ant"/><s n="f"/><s n="sg"/></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 r="LR" a="alanfavro"><p><l>serveur<s n="n"/><s n="m"/></l><r>garçon<s n="n"/><s n="m"/></r></p></e>
+<e a="alanfavro"><p><l>serveur<s n="n"/><s n="m"/></l><r>garçon<s n="n"/><s n="m"/></r></p></e>
 <e>       <p><l>Servi<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Servi<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
 <e>       <p><l>serviable<s n="adj"/></l>         <r>sèrviâblo<s n="adj"/></r></p><par n="mf_GD"/></e>
 <e>       <p><l>service<s n="n"/><s n="m"/></l>   <r>sèrvicio<s n="n"/><s n="m"/></r></p></e>
@@ -44195,6 +44197,9 @@
 <e>       <p><l>siège<s n="n"/><s n="m"/></l>     <r>sièta<s n="n"/><s n="f"/></r></p></e>
 <e>       <p><l>Siegel<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></l><r>Siegel<s n="np"/><s n="cog"/><s n="mf"/><s n="sp"/></r></p></e>
 <e r="LR" a="stich"><p><l>siéger<s n="vblex"/></l><r>étre<g><b/>assetâ</g><s n="vblex"/></r></p></e>
+<e r="LR" a="stich"><p><l>siéger<s n="vblex"/></l><r>étre<g><b/>assetâye</g><s n="vblex"/></r></p></e>
+<e r="LR" a="stich"><p><l>siéger<s n="vblex"/></l><r>étre<g><b/>assetâs</g><s n="vblex"/></r></p></e>
+<e r="LR" a="stich"><p><l>siéger<s n="vblex"/></l><r>étre<g><b/>assetâyes</g><s n="vblex"/></r></p></e>
 <e a="stich" i="yes"><p><l>siéger<s n="vblex"/></l><r>assistar<g><b/>a</g><s n="vblex"/></r></p></e>
 <e a="stich" i="yes"><p><l>siéger<s n="vblex"/></l><r>étre<g><b/>present</g><s n="vblex"/></r></p></e>
 <e>       <p><l>Siemens<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></l><r>Siemens<s n="np"/><s n="al"/><s n="m"/><s n="sg"/></r></p></e>
@@ -51104,6 +51109,9 @@
 <e r="LR" a="stich"><p><l>exhiber<s n="vblex"/></l><r>montrar<s n="vblex"/></r></p></e>
 <e i="yes" a="stich"><p><l>exhiber<s n="vblex"/></l><r>afichiér<s n="vblex"/></r></p></e>
 <e r="LR" a="stich"><p><l>exceller<s n="vblex"/></l><r>étre<g><b/>lo<b/>mèlyor</g><s n="vblex"/></r></p></e>
+<e r="LR" a="stich"><p><l>exceller<s n="vblex"/></l><r>étre<g><b/>la<b/>mèlyora</g><s n="vblex"/></r></p></e>
+<e r="LR" a="stich"><p><l>exceller<s n="vblex"/></l><r>étre<g><b/>los<b/>mèlyors</g><s n="vblex"/></r></p></e>
+<e r="LR" a="stich"><p><l>exceller<s n="vblex"/></l><r>étre<g><b/>les<b/>mèlyores</g><s n="vblex"/></r></p></e>
 <e r="LR" a="stich"><p><l>contrecarrer<s n="vblex"/></l><r>empachiér<s n="vblex"/></r></p></e>
 <e a="stich"><p><l>cartographier<s n="vblex"/></l><r>cartografiar<s n="vblex"/></r></p></e>
 <e r="LR" a="stich"><p><l>cadrer<s n="vblex"/></l><r>alar<s n="vblex"/></r></p></e>
@@ -51229,6 +51237,7 @@
 <e r="LR" a="stich"><p><l>maximiser<s n="vblex"/></l><r>mèlyorar<s n="vblex"/></r></p></e>
 <e r="LR" a="hector"><p><l>maximiser<s n="vblex"/></l><r>portar<g><b/>u<b/>maximon</g><s n="vblex"/></r></p></e>
 <e a="stich"><p><l>inventorier<s n="vblex"/></l><r>fâre<g><b/>l'enventèro</g><s n="vblex"/></r></p></e>
+<e a="hector"><p><l>inventorier<s n="vblex"/></l><r>fâre<g><b/>l'enventèro<b/>de</g><s n="vblex"/></r></p></e>
 <e a="stich"><p><l>informatiser<s n="vblex"/></l><r>informatisar<s n="vblex"/></r></p></e>
 <e r="RL" a="hector"><p><l>rejeter<s n="vblex"/></l><r>rejetar<s n="vblex"/></r></p></e>
 <e r="LR" a="stich"><p><l>infirmer<s n="vblex"/></l><r>rejetar<s n="vblex"/></r></p></e>
@@ -52980,6 +52989,29 @@
 <e a="hector"><p><l>interférométrie<s n="n"/><s n="f"/></l><r>enterfèromètrie<s n="n"/><s n="f"/></r></p></e>
 <e a="hector"><p><l>redevable<s n="adj"/></l><r>redevâblo<s n="adj"/></r></p><par n="mf_GD"/></e> <!-- PRO FORMA -->
 
+<e a="hector"><p><l>Helsinki<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Hèlsinki<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="Vouiquipèdia"><p><l>Bratislava<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></l><r>Bratislava<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
+<e a="Vouiquipèdia"><p><l>Belgrade<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Bèlgrade<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="Vouiquipèdia"><p><l>Zagreb<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Zagrèbe<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+<e a="Vouiquipèdia"><p><l>Sofia<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></l><r>Sofia<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
+<e a="Vouiquipèdia"><p><l>Tirana<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></l><r>Tirana<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
+<e a="hector"><p><l>Champs<b/>Élysées<s n="np"/><s n="top"/><s n="m"/><s n="pl"/></l><r>Champs<b/>Èlisês<s n="np"/><s n="top"/><s n="m"/><s n="pl"/></r></p></e>
+<e a="hector"><p><l>Champs-Élysées<s n="np"/><s n="top"/><s n="m"/><s n="pl"/></l><r>Champs-Èlisês<s n="np"/><s n="top"/><s n="m"/><s n="pl"/></r></p></e>
+<e><p><l>Tignes<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></l><r>Tignes<s n="np"/><s n="top"/><s n="m"/><s n="sg"/></r></p></e>
+<e><p><l>la<b/>Gurraz<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></l><r>la<b/>Gura<s n="np"/><s n="top"/><s n="f"/><s n="sg"/></r></p></e>
+<e><p><l>tignard<s n="adj"/></l><r>tignârd<s n="adj"/></r></p></e>
+<e a="corpus"><p><l>latino-américain<s n="adj"/></l><r>latino-amèriquen<s n="adj"/></r></p></e>
+<e a="hector"><p><l>multisport<s n="adj"/></l><r>multisport<s n="adj"/></r></p></e>
+<e a="hector"><p><l>Latino-Américain<s n="adj"/></l><r>Latino-Amèriquen<s n="adj"/></r></p></e>
+<e><p><l>Tignard<s n="n"/></l><r>Tignârd<s n="n"/></r></p></e>
+<e a="hector"><p><l>ethnomusicologie<s n="n"/><s n="f"/></l><r>ètnomusicologie<s n="n"/><s n="f"/></r></p></e>
+<e a="hector"><p><l>ethnomusicologue<s n="n"/></l><r>ètnomusicologo<s n="n"/></r></p><par n="mf_GD"/></e>
+<e a="hector"><p><l>relativisation<s n="n"/><s n="f"/></l><r>relativisacion<s n="n"/><s n="f"/></r></p></e>
+<e a="hector"><p><l>chador<s n="n"/><s n="m"/></l><r>chador<s n="n"/><s n="m"/></r></p></e>
+<e a="hector"><p><l>Hispanique<s n="n"/></l><r>Hispanico<s n="n"/></r></p><par n="mf_GD"/></e>
+<e a="hector"><p><l>datagramme<s n="n"/><s n="m"/></l><r>datagramo<s n="n"/><s n="m"/></r></p></e>
+<e a="hector"><p><l>propylène<s n="n"/><s n="m"/></l><r>propilèno<s n="n"/><s n="m"/></r></p></e>
+<e a="hector"><p><l>harmonisation<s n="n"/><s n="f"/></l><r>harmonisacion<s n="n"/><s n="f"/></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>,</re><p><l><s n="cm"/></l>         <r><s n="cm"/></r></p></e>
diff --git a/apertium-fra-frp.fra-frp.metalrx b/apertium-fra-frp.fra-frp.metalrx
index 04e007c..9ab3fd0 100644
--- a/apertium-fra-frp.fra-frp.metalrx
+++ b/apertium-fra-frp.fra-frp.metalrx
@@ -2,366 +2,373 @@
 <lrx>
 
   <def-macros>
-	<def-macro name="noms_propres">
-	  <rule weight="0.6">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p1}}"/></match>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <match lemma="de" tags="pr"/>
-		 <or><match tags="np.loc"/><match tags="np.top.*"/></or>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.ant.*"><select lemma="{{p2}}"/></match>
-		 <match tags="np.ant.*"/>
-		 <match lemma="de" tags="pr"/>
-		 <or><match tags="np.loc"/><match tags="np.top.*"/></or>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <match tags="det.*"/>
-		 <match tags="adj.*"/>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <match tags="np.ant.*"/>
-		 <match tags="det.*"/>
-		 <match tags="adj.*"/>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <or>
-		   <match tags="num.*"/>
-		   <match lemma="Ier" tags="adj.*"/>
-		   <match lemma="II" tags="num.*"/>
-		   <match lemma="III" tags="num.*"/>
-		   <match lemma="IV" tags="num.*"/>
-		   <match lemma="V" tags="num.*"/>
-		   <match lemma="VI" tags="num.*"/>
-		   <match lemma="VII" tags="num.*"/>
-		   <match lemma="VIII" tags="num.*"/>
-		   <match lemma="IX" tags="num.*"/>
-		   <match lemma="X" tags="num.*"/>
-		   <match lemma="XI" tags="num.*"/>
-		   <match lemma="XII" tags="num.*"/>
-		   <match lemma="XIII" tags="num.*"/>
-		   <match lemma="XIV" tags="num.*"/>
-		   <match lemma="XV" tags="num.*"/>
-		   <match lemma="XVI" tags="num.*"/>
-		   <match lemma="XVII" tags="num.*"/>
-		   <match lemma="XVIII" tags="num.*"/>
-		   <match lemma="XIX" tags="num.*"/>
-		   <match lemma="XX" tags="num.*"/>
-		   <match lemma="XXI" tags="num.*"/>
-		   <match lemma="XXII" tags="num.*"/>
-		   <match lemma="XXIII" tags="num.*"/>
-		   <match lemma="XXIV" tags="num.*"/>
-		   <match lemma="XXV" tags="num.*"/>
-		   <match lemma="XXVI" tags="num.*"/>
-		   <match lemma="XXVII" tags="num.*"/>
-		   <match lemma="XXVIII" tags="num.*"/>
-		   <match lemma="XXIX" tags="num.*"/>
-		   <match lemma="XXX" tags="num.*"/>
-		   <match lemma="premier" tags="adj.*"/>
-		   <match lemma="second" tags="adj.*"/>
-		   <match lemma="deuxième" tags="adj.*"/>
-		   <match lemma="troisième" tags="adj.*"/>
-		   <match lemma="quatrième" tags="adj.*"/>
-		   <match lemma="cinquième" tags="adj.*"/>
-		   <match lemma="quint" tags="adj.*"/>
-		   <match lemma="sixième" tags="adj.*"/>
-		   <match lemma="septième" tags="adj.*"/>
-		   <match lemma="huitième" tags="adj.*"/>
-		   <match lemma="neuvième" tags="adj.*"/>
-		   <match lemma="dixième" tags="adj.*"/>
-		 </or>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <match tags="np.ant.*"/>
-		 <or>
-		   <match tags="num.*"/>
-		   <match lemma="Ier" tags="adj.*"/>
-		   <match lemma="II" tags="num.*"/>
-		   <match lemma="III" tags="num.*"/>
-		   <match lemma="IV" tags="num.*"/>
-		   <match lemma="V" tags="num.*"/>
-		   <match lemma="VI" tags="num.*"/>
-		   <match lemma="VII" tags="num.*"/>
-		   <match lemma="VIII" tags="num.*"/>
-		   <match lemma="IX" tags="num.*"/>
-		   <match lemma="X" tags="num.*"/>
-		   <match lemma="XI" tags="num.*"/>
-		   <match lemma="XII" tags="num.*"/>
-		   <match lemma="XIII" tags="num.*"/>
-		   <match lemma="XIV" tags="num.*"/>
-		   <match lemma="XV" tags="num.*"/>
-		   <match lemma="XVI" tags="num.*"/>
-		   <match lemma="XVII" tags="num.*"/>
-		   <match lemma="XVIII" tags="num.*"/>
-		   <match lemma="XIX" tags="num.*"/>
-		   <match lemma="XX" tags="num.*"/>
-		   <match lemma="XXI" tags="num.*"/>
-		   <match lemma="XXII" tags="num.*"/>
-		   <match lemma="XXIII" tags="num.*"/>
-		   <match lemma="XXIV" tags="num.*"/>
-		   <match lemma="XXV" tags="num.*"/>
-		   <match lemma="XXVI" tags="num.*"/>
-		   <match lemma="XXVII" tags="num.*"/>
-		   <match lemma="XXVIII" tags="num.*"/>
-		   <match lemma="XXIX" tags="num.*"/>
-		   <match lemma="XXX" tags="num.*"/>
-		   <match lemma="premier" tags="adj.*"/>
-		   <match lemma="second" tags="adj.*"/>
-		   <match lemma="deuxième" tags="adj.*"/>
-		   <match lemma="troisième" tags="adj.*"/>
-		   <match lemma="quatrième" tags="adj.*"/>
-		   <match lemma="cinquième" tags="adj.*"/>
-		   <match lemma="quint" tags="adj.*"/>
-		   <match lemma="sixième" tags="adj.*"/>
-		   <match lemma="septième" tags="adj.*"/>
-		   <match lemma="huitième" tags="adj.*"/>
-		   <match lemma="neuvième" tags="adj.*"/>
-		   <match lemma="dixième" tags="adj.*"/>
-		 </or>
-	  </rule>
-	  <rule weight="1.0">
-		 <or>
-		   <match lemma="pape" tags="n.*"/>
-		   <match lemma="patriarche" tags="n.*"/>
-		   <match lemma="évêque" tags="n.*"/>
-		   <match lemma="archevêque" tags="n.*"/>
-		   <match lemma="saint" tags="n.*"/>
-		   <match lemma="saint" tags="adj.*"/>
-		   <match lemma="apôtre" tags="n.*"/>
-		   <match lemma="empereur" tags="n.*"/>
-		   <match lemma="roi" tags="n.*"/>
-		   <match lemma="tsar" tags="n.*"/>
-		   <match lemma="vice-roi" tags="n.*"/>
-		   <match lemma="régent" tags="n.*"/>
-		   <match lemma="prince" tags="n.*"/>
-		   <match lemma="infant" tags="n.*"/>
-		   <match lemma="dauphin" tags="n.*"/>
-		   <match lemma="comte" tags="n.*"/>
-		   <match lemma="comtesse" tags="n.*"/>
-		   <match lemma="vicomte" tags="n.*"/>
-		   <match lemma="vicomtesse" tags="n.*"/>
-		   <match lemma="duc" tags="n.*"/>
-		   <match lemma="duchesse" tags="n.*"/>
-		   <match lemma="grand-duc" tags="n.*"/>
-		   <match lemma="grande-duchesse" tags="n.*"/>
-		   <match lemma="archiduc" tags="n.*"/>
-		   <match lemma="archiduchesse" tags="n.*"/>
-		   <match lemma="marquis" tags="n.*"/>
-		   <match lemma="baron" tags="n.*"/>
-		   <match lemma="dieu" tags="n.*"/>
-		   <match lemma="déesse" tags="n.*"/>
-		 </or>
-		 <match tags="np.ant.*"/>
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-	  </rule>
-	  <rule weight="1.0">
-		 <or>
-		   <match lemma="pape" tags="n.*"/>
-		   <match lemma="patriarche" tags="n.*"/>
-		   <match lemma="évêque" tags="n.*"/>
-		   <match lemma="archevêque" tags="n.*"/>
-		   <match lemma="saint" tags="n.*"/>
-		   <match lemma="saint" tags="adj.*"/>
-		   <match lemma="apôtre" tags="n.*"/>
-		   <match lemma="empereur" tags="n.*"/>
-		   <match lemma="roi" tags="n.*"/>
-		   <match lemma="tsar" tags="n.*"/>
-		   <match lemma="vice-roi" tags="n.*"/>
-		   <match lemma="régent" tags="n.*"/>
-		   <match lemma="prince" tags="n.*"/>
-		   <match lemma="infant" tags="n.*"/>
-		   <match lemma="dauphin" tags="n.*"/>
-		   <match lemma="comte" tags="n.*"/>
-		   <match lemma="comtesse" tags="n.*"/>
-		   <match lemma="vicomte" tags="n.*"/>
-		   <match lemma="vicomtesse" tags="n.*"/>
-		   <match lemma="duc" tags="n.*"/>
-		   <match lemma="duchesse" tags="n.*"/>
-		   <match lemma="grand-duc" tags="n.*"/>
-		   <match lemma="grande-duchesse" tags="n.*"/>
-		   <match lemma="archiduc" tags="n.*"/>
-		   <match lemma="archiduchesse" tags="n.*"/>
-		   <match lemma="marquis" tags="n.*"/>
-		   <match lemma="baron" tags="n.*"/>
-		   <match lemma="dieu" tags="n.*"/>
-		   <match lemma="déesse" tags="n.*"/>
-		 </or>
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <match tags="cm"/>
-		 <or>
-		   <match lemma="pape" tags="n.*"/>
-		   <match lemma="patriarche" tags="n.*"/>
-		   <match lemma="évêque" tags="n.*"/>
-		   <match lemma="archevêque" tags="n.*"/>
-		   <match lemma="saint" tags="n.*"/>
-		   <match lemma="saint" tags="adj.*"/>
-		   <match lemma="apôtre" tags="n.*"/>
-		   <match lemma="empereur" tags="n.*"/>
-		   <match lemma="roi" tags="n.*"/>
-		   <match lemma="tsar" tags="n.*"/>
-		   <match lemma="vice-roi" tags="n.*"/>
-		   <match lemma="régent" tags="n.*"/>
-		   <match lemma="prince" tags="n.*"/>
-		   <match lemma="infant" tags="n.*"/>
-		   <match lemma="dauphin" tags="n.*"/>
-		   <match lemma="comte" tags="n.*"/>
-		   <match lemma="comtesse" tags="n.*"/>
-		   <match lemma="vicomte" tags="n.*"/>
-		   <match lemma="vicomtesse" tags="n.*"/>
-		   <match lemma="duc" tags="n.*"/>
-		   <match lemma="duchesse" tags="n.*"/>
-		   <match lemma="grand-duc" tags="n.*"/>
-		   <match lemma="grande-duchesse" tags="n.*"/>
-		   <match lemma="archiduc" tags="n.*"/>
-		   <match lemma="archiduchesse" tags="n.*"/>
-		   <match lemma="marquis" tags="n.*"/>
-		   <match lemma="baron" tags="n.*"/>
-		   <match lemma="dieu" tags="n.*"/>
-		   <match lemma="déesse" tags="n.*"/>
-		 </or>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <match tags="np.ant.*"/>
-		 <match tags="cm"/>
-		 <or>
-		   <match lemma="pape" tags="n.*"/>
-		   <match lemma="patriarche" tags="n.*"/>
-		   <match lemma="évêque" tags="n.*"/>
-		   <match lemma="archevêque" tags="n.*"/>
-		   <match lemma="saint" tags="n.*"/>
-		   <match lemma="saint" tags="adj.*"/>
-		   <match lemma="apôtre" tags="n.*"/>
-		   <match lemma="empereur" tags="n.*"/>
-		   <match lemma="roi" tags="n.*"/>
-		   <match lemma="tsar" tags="n.*"/>
-		   <match lemma="vice-roi" tags="n.*"/>
-		   <match lemma="régent" tags="n.*"/>
-		   <match lemma="prince" tags="n.*"/>
-		   <match lemma="infant" tags="n.*"/>
-		   <match lemma="dauphin" tags="n.*"/>
-		   <match lemma="comte" tags="n.*"/>
-		   <match lemma="comtesse" tags="n.*"/>
-		   <match lemma="vicomte" tags="n.*"/>
-		   <match lemma="vicomtesse" tags="n.*"/>
-		   <match lemma="duc" tags="n.*"/>
-		   <match lemma="duchesse" tags="n.*"/>
-		   <match lemma="grand-duc" tags="n.*"/>
-		   <match lemma="grande-duchesse" tags="n.*"/>
-		   <match lemma="archiduc" tags="n.*"/>
-		   <match lemma="archiduchesse" tags="n.*"/>
-		   <match lemma="marquis" tags="n.*"/>
-		   <match lemma="baron" tags="n.*"/>
-		   <match lemma="dieu" tags="n.*"/>
-		   <match lemma="déesse" tags="n.*"/>
-		 </or>
-	  </rule>
-	  <rule weight="1.0">
-		 <or>
-		   <match lemma="papauté" tags="n.*"/>
-		   <match lemma="pontificat" tags="n.*"/>
-		   <match lemma="empire" tags="n.*"/>
-		   <match lemma="règne" tags="n.*"/>
-		   <match lemma="régence" tags="n.*"/>
-		   <match lemma="vice-royauté" tags="n.*"/>
-		 </or>
-		 <match lemma="de" tags="pr"/>
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-	  </rule>
-	  <rule weight="1.0">
-		 <or>
-		   <match lemma="papauté" tags="n.*"/>
-		   <match lemma="pontificat" tags="n.*"/>
-		   <match lemma="empire" tags="n.*"/>
-		   <match lemma="règne" tags="n.*"/>
-		   <match lemma="régence" tags="n.*"/>
-		   <match lemma="vice-royauté" tags="n.*"/>
-		 </or>
-		 <match lemma="de" tags="pr"/>
-		 <match tags="np.ant.*"/>
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <or>
-		   <match lemma="régner" tags="vblex.*"/>
-		   <match lemma="gouverner" tags="vblex.*"/>
-		 </or>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
-		 <match tags="np.ant.*"/>
-		 <or>
-		   <match lemma="régner" tags="vblex.*"/>
-		   <match lemma="gouverner" tags="vblex.*"/>
-		 </or>
-	  </rule>
-	</def-macro>
-
-	<!-- p1 verb fra, p2 verb cat estandard, p3 prep fra, p3 verb cat alternatiufra -->
- 	<!-- <macro name="verb_prep" p1="chasser" p2="caçar" p3="de" p4="expulsar" /> -->
-	<def-macro name="verb_prep">
-	  <rule weight="0.6">
-		 <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p2}}"/></match>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p4}}"/></match>
-		 <match lemma="{{p3}}" tags="pr"/>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p4}}"/></match>
-		 <match tags="adv"/>
-		 <match lemma="{{p3}}" tags="pr"/>
-	  </rule>
-	  <rule weight="1.0">
-		 <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p4}}"/></match>
-		 <match tags="adv"/>
-		 <match tags="adv"/>
-		 <match lemma="{{p3}}" tags="pr"/>
-		  </rule>
-	</def-macro>
-
-	<!-- p1 verbe fra, p2 locution verbale frp par défault terminée par une préposition, p3 verbe frp quand on a "p1.pp par" (ou bien une autre situation dans laquelle ne pas pas précéder une préposition) -->
- 	<!-- <macro name="verb_locprep" p1="insérer" p2="betar# dens" p3="betar" /> -->
-	<def-macro name="verb_locprep">
-		<rule weight="0.8">
-			<match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p2}}"/></match>
-		</rule>
-		<rule weight="1.0">
-			<match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p3}}"/></match>
-			<repeat from="0" upto="2">
-				<or>
-					<match tags="adv"/>
-					<match tags="cnjadv"/>
-				</or>
-			</repeat>
-			<or>
-				<match tags="pr"/>
-				<match tags="cnjsub"/>
-				<match tags="sent"/>
-			</or>
-		</rule>
-		<rule weight="1.2">
-			<match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p2}}"/></match>
-			<repeat from="0" upto="2">
-				<or>
-					<match tags="adv"/>
-					<match tags="cnjadv"/>
-				</or>
-			</repeat>
-			<match lemma="de" tags="pr"/>
-			<match tags="det.def.*"/>
-		</rule>
-	</def-macro>
+    <def-macro name="noms_propres">
+      <rule weight="0.6">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p1}}"/></match>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <match lemma="de" tags="pr"/>
+       <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.ant.*"><select lemma="{{p2}}"/></match>
+       <match tags="np.ant.*"/>
+       <match lemma="de" tags="pr"/>
+       <or><match tags="np.loc"/><match tags="np.top.*"/></or>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <match tags="det.*"/>
+       <match tags="adj.*"/>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <match tags="np.ant.*"/>
+       <match tags="det.*"/>
+       <match tags="adj.*"/>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <or>
+         <match tags="num.*"/>
+         <match lemma="Ier" tags="adj.*"/>
+         <match lemma="II" tags="num.*"/>
+         <match lemma="III" tags="num.*"/>
+         <match lemma="IV" tags="num.*"/>
+         <match lemma="V" tags="num.*"/>
+         <match lemma="VI" tags="num.*"/>
+         <match lemma="VII" tags="num.*"/>
+         <match lemma="VIII" tags="num.*"/>
+         <match lemma="IX" tags="num.*"/>
+         <match lemma="X" tags="num.*"/>
+         <match lemma="XI" tags="num.*"/>
+         <match lemma="XII" tags="num.*"/>
+         <match lemma="XIII" tags="num.*"/>
+         <match lemma="XIV" tags="num.*"/>
+         <match lemma="XV" tags="num.*"/>
+         <match lemma="XVI" tags="num.*"/>
+         <match lemma="XVII" tags="num.*"/>
+         <match lemma="XVIII" tags="num.*"/>
+         <match lemma="XIX" tags="num.*"/>
+         <match lemma="XX" tags="num.*"/>
+         <match lemma="XXI" tags="num.*"/>
+         <match lemma="XXII" tags="num.*"/>
+         <match lemma="XXIII" tags="num.*"/>
+         <match lemma="XXIV" tags="num.*"/>
+         <match lemma="XXV" tags="num.*"/>
+         <match lemma="XXVI" tags="num.*"/>
+         <match lemma="XXVII" tags="num.*"/>
+         <match lemma="XXVIII" tags="num.*"/>
+         <match lemma="XXIX" tags="num.*"/>
+         <match lemma="XXX" tags="num.*"/>
+         <match lemma="premier" tags="adj.*"/>
+         <match lemma="second" tags="adj.*"/>
+         <match lemma="deuxième" tags="adj.*"/>
+         <match lemma="troisième" tags="adj.*"/>
+         <match lemma="quatrième" tags="adj.*"/>
+         <match lemma="cinquième" tags="adj.*"/>
+         <match lemma="quint" tags="adj.*"/>
+         <match lemma="sixième" tags="adj.*"/>
+         <match lemma="septième" tags="adj.*"/>
+         <match lemma="huitième" tags="adj.*"/>
+         <match lemma="neuvième" tags="adj.*"/>
+         <match lemma="dixième" tags="adj.*"/>
+       </or>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <match tags="np.ant.*"/>
+       <or>
+         <match tags="num.*"/>
+         <match lemma="Ier" tags="adj.*"/>
+         <match lemma="II" tags="num.*"/>
+         <match lemma="III" tags="num.*"/>
+         <match lemma="IV" tags="num.*"/>
+         <match lemma="V" tags="num.*"/>
+         <match lemma="VI" tags="num.*"/>
+         <match lemma="VII" tags="num.*"/>
+         <match lemma="VIII" tags="num.*"/>
+         <match lemma="IX" tags="num.*"/>
+         <match lemma="X" tags="num.*"/>
+         <match lemma="XI" tags="num.*"/>
+         <match lemma="XII" tags="num.*"/>
+         <match lemma="XIII" tags="num.*"/>
+         <match lemma="XIV" tags="num.*"/>
+         <match lemma="XV" tags="num.*"/>
+         <match lemma="XVI" tags="num.*"/>
+         <match lemma="XVII" tags="num.*"/>
+         <match lemma="XVIII" tags="num.*"/>
+         <match lemma="XIX" tags="num.*"/>
+         <match lemma="XX" tags="num.*"/>
+         <match lemma="XXI" tags="num.*"/>
+         <match lemma="XXII" tags="num.*"/>
+         <match lemma="XXIII" tags="num.*"/>
+         <match lemma="XXIV" tags="num.*"/>
+         <match lemma="XXV" tags="num.*"/>
+         <match lemma="XXVI" tags="num.*"/>
+         <match lemma="XXVII" tags="num.*"/>
+         <match lemma="XXVIII" tags="num.*"/>
+         <match lemma="XXIX" tags="num.*"/>
+         <match lemma="XXX" tags="num.*"/>
+         <match lemma="premier" tags="adj.*"/>
+         <match lemma="second" tags="adj.*"/>
+         <match lemma="deuxième" tags="adj.*"/>
+         <match lemma="troisième" tags="adj.*"/>
+         <match lemma="quatrième" tags="adj.*"/>
+         <match lemma="cinquième" tags="adj.*"/>
+         <match lemma="quint" tags="adj.*"/>
+         <match lemma="sixième" tags="adj.*"/>
+         <match lemma="septième" tags="adj.*"/>
+         <match lemma="huitième" tags="adj.*"/>
+         <match lemma="neuvième" tags="adj.*"/>
+         <match lemma="dixième" tags="adj.*"/>
+       </or>
+      </rule>
+      <rule weight="1.0">
+       <or>
+         <match lemma="pape" tags="n.*"/>
+         <match lemma="patriarche" tags="n.*"/>
+         <match lemma="évêque" tags="n.*"/>
+         <match lemma="archevêque" tags="n.*"/>
+         <match lemma="saint" tags="n.*"/>
+         <match lemma="saint" tags="adj.*"/>
+         <match lemma="apôtre" tags="n.*"/>
+         <match lemma="empereur" tags="n.*"/>
+         <match lemma="roi" tags="n.*"/>
+         <match lemma="tsar" tags="n.*"/>
+         <match lemma="vice-roi" tags="n.*"/>
+         <match lemma="régent" tags="n.*"/>
+         <match lemma="prince" tags="n.*"/>
+         <match lemma="infant" tags="n.*"/>
+         <match lemma="dauphin" tags="n.*"/>
+         <match lemma="comte" tags="n.*"/>
+         <match lemma="comtesse" tags="n.*"/>
+         <match lemma="vicomte" tags="n.*"/>
+         <match lemma="vicomtesse" tags="n.*"/>
+         <match lemma="duc" tags="n.*"/>
+         <match lemma="duchesse" tags="n.*"/>
+         <match lemma="grand-duc" tags="n.*"/>
+         <match lemma="grande-duchesse" tags="n.*"/>
+         <match lemma="archiduc" tags="n.*"/>
+         <match lemma="archiduchesse" tags="n.*"/>
+         <match lemma="marquis" tags="n.*"/>
+         <match lemma="baron" tags="n.*"/>
+         <match lemma="dieu" tags="n.*"/>
+         <match lemma="déesse" tags="n.*"/>
+       </or>
+       <match tags="np.ant.*"/>
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+      </rule>
+      <rule weight="1.0">
+       <or>
+         <match lemma="pape" tags="n.*"/>
+         <match lemma="patriarche" tags="n.*"/>
+         <match lemma="évêque" tags="n.*"/>
+         <match lemma="archevêque" tags="n.*"/>
+         <match lemma="saint" tags="n.*"/>
+         <match lemma="saint" tags="adj.*"/>
+         <match lemma="apôtre" tags="n.*"/>
+         <match lemma="empereur" tags="n.*"/>
+         <match lemma="roi" tags="n.*"/>
+         <match lemma="tsar" tags="n.*"/>
+         <match lemma="vice-roi" tags="n.*"/>
+         <match lemma="régent" tags="n.*"/>
+         <match lemma="prince" tags="n.*"/>
+         <match lemma="infant" tags="n.*"/>
+         <match lemma="dauphin" tags="n.*"/>
+         <match lemma="comte" tags="n.*"/>
+         <match lemma="comtesse" tags="n.*"/>
+         <match lemma="vicomte" tags="n.*"/>
+         <match lemma="vicomtesse" tags="n.*"/>
+         <match lemma="duc" tags="n.*"/>
+         <match lemma="duchesse" tags="n.*"/>
+         <match lemma="grand-duc" tags="n.*"/>
+         <match lemma="grande-duchesse" tags="n.*"/>
+         <match lemma="archiduc" tags="n.*"/>
+         <match lemma="archiduchesse" tags="n.*"/>
+         <match lemma="marquis" tags="n.*"/>
+         <match lemma="baron" tags="n.*"/>
+         <match lemma="dieu" tags="n.*"/>
+         <match lemma="déesse" tags="n.*"/>
+       </or>
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <match tags="cm"/>
+       <or>
+         <match lemma="pape" tags="n.*"/>
+         <match lemma="patriarche" tags="n.*"/>
+         <match lemma="évêque" tags="n.*"/>
+         <match lemma="archevêque" tags="n.*"/>
+         <match lemma="saint" tags="n.*"/>
+         <match lemma="saint" tags="adj.*"/>
+         <match lemma="apôtre" tags="n.*"/>
+         <match lemma="empereur" tags="n.*"/>
+         <match lemma="roi" tags="n.*"/>
+         <match lemma="tsar" tags="n.*"/>
+         <match lemma="vice-roi" tags="n.*"/>
+         <match lemma="régent" tags="n.*"/>
+         <match lemma="prince" tags="n.*"/>
+         <match lemma="infant" tags="n.*"/>
+         <match lemma="dauphin" tags="n.*"/>
+         <match lemma="comte" tags="n.*"/>
+         <match lemma="comtesse" tags="n.*"/>
+         <match lemma="vicomte" tags="n.*"/>
+         <match lemma="vicomtesse" tags="n.*"/>
+         <match lemma="duc" tags="n.*"/>
+         <match lemma="duchesse" tags="n.*"/>
+         <match lemma="grand-duc" tags="n.*"/>
+         <match lemma="grande-duchesse" tags="n.*"/>
+         <match lemma="archiduc" tags="n.*"/>
+         <match lemma="archiduchesse" tags="n.*"/>
+         <match lemma="marquis" tags="n.*"/>
+         <match lemma="baron" tags="n.*"/>
+         <match lemma="dieu" tags="n.*"/>
+         <match lemma="déesse" tags="n.*"/>
+       </or>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <match tags="np.ant.*"/>
+       <match tags="cm"/>
+       <or>
+         <match lemma="pape" tags="n.*"/>
+         <match lemma="patriarche" tags="n.*"/>
+         <match lemma="évêque" tags="n.*"/>
+         <match lemma="archevêque" tags="n.*"/>
+         <match lemma="saint" tags="n.*"/>
+         <match lemma="saint" tags="adj.*"/>
+         <match lemma="apôtre" tags="n.*"/>
+         <match lemma="empereur" tags="n.*"/>
+         <match lemma="roi" tags="n.*"/>
+         <match lemma="tsar" tags="n.*"/>
+         <match lemma="vice-roi" tags="n.*"/>
+         <match lemma="régent" tags="n.*"/>
+         <match lemma="prince" tags="n.*"/>
+         <match lemma="infant" tags="n.*"/>
+         <match lemma="dauphin" tags="n.*"/>
+         <match lemma="comte" tags="n.*"/>
+         <match lemma="comtesse" tags="n.*"/>
+         <match lemma="vicomte" tags="n.*"/>
+         <match lemma="vicomtesse" tags="n.*"/>
+         <match lemma="duc" tags="n.*"/>
+         <match lemma="duchesse" tags="n.*"/>
+         <match lemma="grand-duc" tags="n.*"/>
+         <match lemma="grande-duchesse" tags="n.*"/>
+         <match lemma="archiduc" tags="n.*"/>
+         <match lemma="archiduchesse" tags="n.*"/>
+         <match lemma="marquis" tags="n.*"/>
+         <match lemma="baron" tags="n.*"/>
+         <match lemma="dieu" tags="n.*"/>
+         <match lemma="déesse" tags="n.*"/>
+       </or>
+      </rule>
+      <rule weight="1.0">
+       <or>
+         <match lemma="papauté" tags="n.*"/>
+         <match lemma="pontificat" tags="n.*"/>
+         <match lemma="empire" tags="n.*"/>
+         <match lemma="règne" tags="n.*"/>
+         <match lemma="régence" tags="n.*"/>
+         <match lemma="vice-royauté" tags="n.*"/>
+       </or>
+       <match lemma="de" tags="pr"/>
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+      </rule>
+      <rule weight="1.0">
+       <or>
+         <match lemma="papauté" tags="n.*"/>
+         <match lemma="pontificat" tags="n.*"/>
+         <match lemma="empire" tags="n.*"/>
+         <match lemma="règne" tags="n.*"/>
+         <match lemma="régence" tags="n.*"/>
+         <match lemma="vice-royauté" tags="n.*"/>
+       </or>
+       <match lemma="de" tags="pr"/>
+       <match tags="np.ant.*"/>
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <or>
+         <match lemma="régner" tags="vblex.*"/>
+         <match lemma="gouverner" tags="vblex.*"/>
+       </or>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="np.*"><select lemma="{{p2}}"/></match>
+       <match tags="np.ant.*"/>
+       <or>
+         <match lemma="régner" tags="vblex.*"/>
+         <match lemma="gouverner" tags="vblex.*"/>
+       </or>
+      </rule>
+    </def-macro>
+
+    <!-- p1 verb fra, p2 verb cat estandard, p3 prep fra, p3 verb cat alternatiufra -->
+   <!-- <macro name="verb_prep" p1="chasser" p2="caçar" p3="de" p4="expulsar" /> -->
+    <def-macro name="verb_prep">
+      <rule weight="0.6">
+       <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p2}}"/></match>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p4}}"/></match>
+       <match lemma="{{p3}}" tags="pr"/>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p4}}"/></match>
+       <match tags="adv"/>
+       <match lemma="{{p3}}" tags="pr"/>
+      </rule>
+      <rule weight="1.0">
+       <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p4}}"/></match>
+       <match tags="adv"/>
+       <match tags="adv"/>
+       <match lemma="{{p3}}" tags="pr"/>
+        </rule>
+    </def-macro>
+
+    <!-- p1 verbe fra, p2 locution verbale frp par défault terminée par une préposition, p3 verbe frp quand on a "p1.pp par" (ou bien une autre situation dans laquelle ne pas pas précéder une préposition) -->
+   <!-- <macro name="verb_locprep" p1="insérer" p2="betar# dens" p3="betar" /> -->
+    <def-macro name="verb_locprep">
+      <rule weight="0.8">
+        <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p2}}"/></match>
+      </rule>
+      <rule weight="1.0">
+        <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p3}}"/></match>
+        <repeat from="0" upto="2">
+          <or>
+            <match tags="adv"/>
+            <match tags="cnjadv"/>
+          </or>
+        </repeat>
+        <or>
+          <match tags="pr"/>
+          <match tags="cnjsub"/>
+          <match tags="sent"/>
+        </or>
+      </rule>
+      <rule weight="1.0">
+        <or>
+          <match tags="n.*"/>
+          <match tags="adj.*"/>
+        </or>
+        <match lemma="{{p1}}" tags="vblex.pp.*"><select lemma="{{p3}}"/></match>
+      </rule>
+      <rule weight="1.2">
+        <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p2}}"/></match>
+        <repeat from="0" upto="2">
+          <or>
+            <match tags="adv"/>
+            <match tags="cnjadv"/>
+          </or>
+        </repeat>
+        <match lemma="de" tags="pr"/>
+        <match tags="det.def.*"/>
+      </rule>
+    </def-macro>
 
     <!-- Aquesta macro tria el verb p2 si p1 és intransitiu i p3 si p1 és transitiu -->
     <!-- p1 = verb fra, p2 = verb cat intransitiu, p3 = verb cat transitiu -->
@@ -567,6 +574,40 @@
         <match lemma="{{p1}}" tags="vblex.pp.*"><select lemma="{{p3}}"/></match>
       </rule>
     </def-macro>
+
+    <!-- Dans le cas où un verbe se traduit par verbe + adj, l'adjectif doit s'accorder en genre et nombre. Cette macro est pour des adjectifs a 4 formes différentes -->
+    <!-- p1 = vblex langue source, p2 = vblex + adj msg, p3 = vblex + adj mpl, p4 = vblex + adj fsg, p5 = vblex + adj fpl -->
+    <def-macro name="verb_adj4">
+      <rule weight="0.8">
+        <match lemma="{{p1}}" tags="vblex.*"><select lemma="{{p2}}"/></match>
+      </rule>
+      <rule weight="1.0">
+        <match lemma="{{p1}}" tags="vblex.*.pl"><select lemma="{{p3}}"/></match>
+      </rule>
+      <rule weight="1.2">
+        <or>
+          <match tags="n.f.sg"/>
+          <match tags="adj.f.sg"/>
+          <match tags="prn.tn.p3.f.sg"/>
+        </or>
+        <repeat from="0" upto="1">
+          <match tags="adv"/>
+        </repeat>
+        <match lemma="{{p1}}" tags="vblex.*.sg"><select lemma="{{p4}}"/></match>
+      </rule>
+      <rule weight="1.2">
+        <or>
+          <match tags="n.f.pl"/>
+          <match tags="adj.f.pl"/>
+          <match tags="prn.tn.p3.f.pl"/>
+        </or>
+        <repeat from="0" upto="1">
+          <match tags="adv"/>
+        </repeat>
+        <match lemma="{{p1}}" tags="vblex.*.pl"><select lemma="{{p5}}"/></match>
+      </rule>
+    </def-macro>
+
   </def-macros>
 
   <def-seqs>
@@ -2345,8 +2386,8 @@
     <match tags="vbhaver.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <or>
@@ -2362,8 +2403,8 @@
     <match tags="vbhaver.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <or>
@@ -2378,8 +2419,8 @@
     <match lemma="aller" tags="vblex.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <or>
@@ -2395,8 +2436,8 @@
     <match lemma="aller" tags="vblex.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <or>
@@ -2443,8 +2484,8 @@
     <match tags="vbhaver.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <match lemma="faire" tags="vblex.pp.*"/>
@@ -2461,8 +2502,8 @@
     <match tags="vbhaver.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <match lemma="faire" tags="vblex.pp.*"/>
@@ -2484,8 +2525,8 @@
     <match tags="vbhaver.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <match lemma="faire" tags="vblex.pp.*"/>
@@ -2503,8 +2544,8 @@
     <match tags="vbhaver.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <match lemma="faire" tags="vblex.pp.*"/>
@@ -2525,8 +2566,8 @@
     <match lemma="aller" tags="vblex.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <match lemma="faire" tags="vblex.inf"/>
@@ -2543,8 +2584,8 @@
     <match lemma="aller" tags="vblex.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <match lemma="faire" tags="vblex.inf"/>
@@ -2566,8 +2607,8 @@
     <match lemma="aller" tags="vblex.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <match lemma="faire" tags="vblex.inf"/>
@@ -2585,8 +2626,8 @@
     <match lemma="aller" tags="vblex.*.p3.sg"/>
     <repeat from="0" upto="2">
       <or>
-      	<match tags="adv"/>
-      	<match tags="cnjadv"/>
+        <match tags="adv"/>
+        <match tags="cnjadv"/>
       </or>
     </repeat>
     <match lemma="faire" tags="vblex.inf"/>
@@ -3155,8 +3196,8 @@
     </or>
     <repeat from="0" upto="1">
       <or>
-      	<match tags="adv"/>
-      	<match tags="preadv"/>
+        <match tags="adv"/>
+        <match tags="preadv"/>
       </or>
     </repeat>
     <match lemma="excentrique" tags="adj.*"><select lemma="èxcentrico"/></match>
@@ -3467,8 +3508,8 @@
     </or>
     <repeat from="0" upto="1">
       <or>
-      	<match tags="adv"/>
-      	<match tags="preadv"/>
+        <match tags="adv"/>
+        <match tags="preadv"/>
       </or>
     </repeat>
     <match lemma="quelconque" tags="adj.*"><select lemma="come les ôtres"/></match>
@@ -3865,34 +3906,7 @@
   </rule>
 
   <!-- différer >> étre# difèrent, retardar -->
-  <rule weight="0.8">
-    <match lemma="différer" tags="vblex.*"><select lemma="étre# difèrent"/></match>
-  </rule>
-  <rule weight="1.0">
-    <match lemma="différer" tags="vblex.*.pl"><select lemma="étre# difèrents"/></match>
-  </rule>
-  <rule weight="1.2">
-    <or>
-      <match tags="n.f.sg"/>
-      <match tags="adj.f.sg"/>
-      <match tags="prn.tn.p3.f.sg"/>
-    </or>
-    <repeat from="0" upto="1">
-      <match tags="adv"/>
-    </repeat>
-    <match lemma="différer" tags="vblex.*.sg"><select lemma="étre# difèrente"/></match>
-  </rule>
-  <rule weight="1.2">
-    <or>
-      <match tags="n.f.pl"/>
-      <match tags="adj.f.pl"/>
-      <match tags="prn.tn.p3.f.pl"/>
-    </or>
-    <repeat from="0" upto="1">
-      <match tags="adv"/>
-    </repeat>
-    <match lemma="différer" tags="vblex.*.pl"><select lemma="étre# difèrentes"/></match>
-  </rule>
+  <macro name="verb_adj4" p1="différer" p2="étre# difèrent" p3="étre# difèrents" p4="étre# difèrente" p5="étre# difèrentes" />
   <rule weight="2.0">
     <match lemma="différer" tags="vblex.*"><select lemma="retardar"/></match>
     <repeat from="0" upto="2">
@@ -4029,6 +4043,9 @@
     <match lemma="excéder" tags="vblex.*"><select lemma="surpassar"/></match>
   </rule>
 
+  <!-- exceller >> étre# lo mèlyor, étre# los mèlyors, étre# la mèlyora, étre# les mèlyores -->
+  <macro name="verb_adj4" p1="exceller" p2="étre# lo mèlyor" p3="étre# los mèlyors" p4="étre# la mèlyora" p5="étre# les mèlyores" />
+
   <!-- exclure >> betar# defôr, ècartar -->
   <macro name="verb_locprep" p1="exclure" p2="betar# defôr" p3="ècartar" />
 
@@ -4062,6 +4079,23 @@
     <match lemma="impliquer" tags="vblex.*"><select lemma="emplicar"/></match>
   </rule>
 
+  <!-- incendier >> betar# lo fuè, encendiyér -->
+  <macro name="verb_intrans_trans" p1="incendier" p2="betar# lo fuè" p3="betar# lo fuè a" />
+  <rule weight="1.4">
+    <match tags="vbser.*"/>
+    <repeat from="0" upto="2">
+      <match tags="adv"/>
+    </repeat>
+    <match lemma="incendier" tags="vblex.pp.*"><select lemma="encendiyér"/></match>
+  </rule>
+  <rule weight="1.4">
+    <or>
+      <match tags="n.*"/>
+      <match tags="adj.*"/>
+    </or>
+    <match lemma="incendier" tags="vblex.pp.*"><select lemma="encendiyér"/></match>
+  </rule>
+
   <!-- inclure >> betar# dedens, apondre -->
   <rule weight="0.8">
     <match lemma="inclure" tags="vblex.*"><select lemma="betar# dedens"/></match>
@@ -4114,6 +4148,9 @@
   <!-- insérer >> betar# dens, betar -->
   <macro name="verb_locprep" p1="insérer" p2="betar# dens" p3="betar" />
 
+  <!-- inventorier >> fâre# l'enventèro, fâre# l'enventèro de -->
+  <macro name="verb_intrans_trans" p1="inventorier" p2="fâre# l'enventèro" p3="fâre# l'enventèro de" />
+
   <!-- jouer >> jouyér, menar -->
   <rule weight="0.8">
     <match lemma="jouer" tags="vblex.*"><select lemma="jouyér"/></match>
@@ -4348,6 +4385,9 @@
     <match tags="adj.*"/>
   </rule>
 
+  <!-- répertorier >> fâre# la lista de, listar -->
+  <macro name="verb_locprep" p1="répertorier" p2="fâre# la lista de" p3="listar" />
+
   <!-- répliquer >> rabatre, recopiyér -->
   <rule weight="0.8">
     <match lemma="répliquer" tags="vblex.*"><select lemma="rabatre"/></match>
@@ -4461,6 +4501,9 @@
   <!-- sévir >> punir, agir -->
   <macro name="verb_prep" p1="sévir" p2="punir" p3="contre" p4="agir" />
 
+  <!-- siéger >> étre# assetâ, étre# assetâs, étre# assetâye, étre# assetâyes   -->
+  <macro name="verb_adj4" p1="siéger" p2="étre# assetâ" p3="étre# assetâs" p4="étre# assetâye" p5="étre# assetâyes" />
+
   <!-- subdiviser >> divisar, redivisar -->
   <rule weight="0.8">
     <match lemma="subdiviser" tags="vblex.*"><select lemma="divisar"/></match>
@@ -4572,16 +4615,7 @@
   </rule>
 
   <!-- terroriser >> fâre# pouer, fâre# pouer a -->
-  <rule weight="0.8">
-    <match lemma="terroriser" tags="vblex.*"><select lemma="fâre# pouer"/></match>
-  </rule>
-  <rule weight="1.0">
-    <match lemma="terroriser" tags="vblex.*"><select lemma="fâre# pouer a"/></match>
-    <or>
-      <match tags="det.*"/>
-      <match tags="np.*"/>
-    </or>
-  </rule>
+  <macro name="verb_intrans_trans" p1="terroriser" p2="fâre# pouer" p3="fâre# pouer a" />
 
   <!-- transcrire >> transcrire, copiyér -->
   <rule weight="0.8">
diff --git a/apertium-fra-frp.frp-fra.metalrx b/apertium-fra-frp.frp-fra.metalrx
index 26c91c3..4466f64 100644
--- a/apertium-fra-frp.frp-fra.metalrx
+++ b/apertium-fra-frp.frp-fra.metalrx
@@ -1585,6 +1585,33 @@
     <match lemma="forchèta" tags="n.*"><select lemma="fourchette"/></match>
   </rule>
 
+  <!-- garçon >> garçon, fils, serveur -->
+  <rule weight="0.8">
+    <match lemma="garçon" tags="n.*"><select lemma="garçon"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match tags="det.pos.*"/>
+    <match lemma="garçon" tags="n.*"><select lemma="fils"/></match>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="garçon" tags="n.*"><select lemma="fils"/></match>
+    <match lemma="de" tags="pr"/>
+    <or>
+      <match tags="np.ant.*"/>
+      <match tags="np.cog.*"/>
+    </or>
+  </rule>
+  <rule weight="1.0">
+    <match lemma="garçon" tags="n.*"><select lemma="fils"/></match>
+    <match lemma="de" tags="pr"/>
+    <match tags="det.*"/>
+    <or>
+      <match lemma="fèna" tags="n.*"/>
+      <seq n="personne"/>
+      <seq n="parent"/>
+    </or>
+  </rule>
+
   <!-- homo, home >> homme, mari -->
   <rule weight="0.8">
     <or>