diff -Nru apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.ca.dix apertium-oc-ca-1.0.7/apertium-oc-ca.ca.dix
--- apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.ca.dix	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/apertium-oc-ca.ca.dix	2021-01-03 15:34:23.000000000 +0000
@@ -13645,20 +13645,35 @@
         <par n="S__aneu"/>
       </e>
       
-      <e>
+      <e r="LR">
         <p>
           <l>vés</l>
           <r>anar<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/></r>
         </p>
       </e>
-      
+
       <e>
         <p>
+          <l>ves</l>
+          <r>anar<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/></r>
+        </p>
+      </e>
+      
+      <e r="LR">
+        <p>
           <l>vés</l>
           <r>anar<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/><j/></r>
         </p>
         <par n="S__aclareix"/>
       </e>
+
+      <e>
+        <p>
+          <l>ves</l>
+          <r>anar<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/><j/></r>
+        </p>
+        <par n="S__aclareix"/>
+      </e>
       
       <e>
         <p>
@@ -15873,7 +15888,7 @@
       </e>
     </pardef>
 
-    <pardef n="don/ar__vblex"> <!-- aquest no el poso al fitxer -->
+    <pardef n="don/ar__vblex">
       
       <e>
         <p>
@@ -16414,6 +16429,43 @@
           <r>ar<s n="vblex"/><s n="prs"/><s n="p3"/><s n="sg"/></r>
         </p>
       </e>
+
+      <e>
+        <p>
+          <l>a</l>
+          <r>ar<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/></r>
+        </p>
+      </e>
+      
+      <e>
+        <p>
+          <l>a</l>
+          <r>ar<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/><j/></r>
+        </p>
+        <par n="S__agafa"/>
+      </e>
+      
+      <e r="LR">
+        <p>
+          <l>es</l>
+          <r>ar<s n="vblex"/><s n="pri"/><s n="p2"/><s n="sg"/></r>
+        </p>
+      </e>
+      
+      <e>
+        <p>
+          <l>a</l>
+          <r>ar<s n="vblex"/><s n="pri"/><s n="p3"/><s n="sg"/></r>
+        </p>
+      </e>
+      
+      <e r="LR">
+        <p>
+          <l>es</l>
+          <r>ar<s n="vblex"/><s n="prs"/><s n="p2"/><s n="sg"/></r>
+        </p>
+      </e>
+
     </pardef>
 
     <pardef n="esglai/ar__vblex">
@@ -18284,14 +18336,14 @@
 
     <pardef n="dón/ar__vblex">
       
-      <e>
+      <e r="LR">
         <p>
           <l>a</l>
           <r>ar<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/></r>
         </p>
       </e>
       
-      <e>
+      <e r="LR">
         <p>
           <l>a</l>
           <r>ar<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/><j/></r>
@@ -18299,14 +18351,14 @@
         <par n="S__agafa"/>
       </e>
       
-      <e>
+      <e r="LR">
         <p>
           <l>es</l>
           <r>ar<s n="vblex"/><s n="pri"/><s n="p2"/><s n="sg"/></r>
         </p>
       </e>
       
-      <e>
+      <e r="LR">
         <p>
           <l>a</l>
           <r>ar<s n="vblex"/><s n="pri"/><s n="p3"/><s n="sg"/></r>
@@ -25307,7 +25359,7 @@
         </p>
       </e>
       
-      <e>
+      <e r="LR">
         <p>
           <l>éns</l>
           <r>enir<s n="vblex"/><s n="pri"/><s n="p2"/><s n="sg"/></r>
@@ -25316,10 +25368,25 @@
       
       <e>
         <p>
+          <l>ens</l>
+          <r>enir<s n="vblex"/><s n="pri"/><s n="p2"/><s n="sg"/></r>
+        </p>
+      </e>
+      
+
+      <e r="LR">
+        <p>
           <l>énen</l>
           <r>enir<s n="vblex"/><s n="pri"/><s n="p3"/><s n="pl"/></r>
         </p>
       </e>
+
+      <e>
+        <p>
+          <l>enen</l>
+          <r>enir<s n="vblex"/><s n="pri"/><s n="p3"/><s n="pl"/></r>
+        </p>
+      </e>
       
       <e>
         <p>
@@ -25400,7 +25467,7 @@
     </pardef>
 
 
-	 <pardef n="f/er__vblex"><!-- aquest no el poso al fitxer de paradigmes -->
+	 <pardef n="f/er__vblex">
       
       <e>
         <p>
@@ -25585,6 +25652,13 @@
         </p>
       </e>
       
+      <e r="LR">
+        <p>
+          <l>eu</l>
+          <r>er<s n="vblex"/><s n="ifi"/><s n="p3"/><s n="sg"/></r>
+        </p>
+      </e>
+      
       <e>
         <p>
           <l>em</l>
@@ -25658,6 +25732,13 @@
           <r>er<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/></r>
         </p>
       </e>
+
+      <e r="LR">
+        <p>
+          <l>e</l>
+          <r>er<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/></r>
+        </p>
+      </e>
       
       <e>
         <p>
@@ -25675,6 +25756,15 @@
         <par n="S__aclareix"/>
       </e>
       
+      <e r="LR">
+        <p>
+          <l>e</l>
+          <r>er<s n="vblex"/><s n="imp"/><s n="p2"/><s n="sg"/><j/></r>
+        </p>
+        <par n="S__aclareix"/>
+      </e>
+
+
       <e>
         <p>
           <l>acin</l>
@@ -26228,6 +26318,13 @@
           <r>er<s n="vblex"/><s n="ifi"/><s n="p3"/><s n="sg"/></r>
         </p>
       </e>
+
+      <e r="LR">
+        <p>
+          <l>eu</l>
+          <r>er<s n="vblex"/><s n="ifi"/><s n="p3"/><s n="sg"/></r>
+        </p>
+      </e>
       
       <e>
         <p>
@@ -30300,6 +30397,13 @@
           <r>eure<s n="vblex"/><s n="ifi"/><s n="p3"/><s n="sg"/></r>
         </p>
       </e>
+ 
+     <e r="LR">
+        <p>
+          <l>eu</l>
+          <r>eure<s n="vblex"/><s n="ifi"/><s n="p3"/><s n="sg"/></r>
+        </p>
+      </e>
       
       <e>
         <p>
@@ -70001,7 +70105,7 @@
       </e>
     </pardef>
 
-	 <pardef n="/ser__vbser"><!-- aquest no el poso al fitxer de paradigmes -->
+	 <pardef n="/ser__vbser">
       
       <e>
         <p>
@@ -70031,6 +70135,13 @@
         </p>
       </e>
       
+      <e r="LR">
+        <p>
+          <l>fora</l>
+          <r>ser<s n="vbser"/><s n="cni"/><s n="p1"/><s n="sg"/></r>
+        </p>
+      </e>
+      
       <e>
         <p>
           <l>seríeu</l>
@@ -70086,6 +70197,13 @@
           <r>ser<s n="vbser"/><s n="cni"/><s n="p3"/><s n="sg"/></r>
         </p>
       </e>
+
+      <e r="LR">
+        <p>
+          <l>fora</l>
+          <r>ser<s n="vbser"/><s n="cni"/><s n="p3"/><s n="sg"/></r>
+        </p>
+      </e>
       
       <e>
         <p>
@@ -70391,6 +70509,13 @@
         </p>
       </e>
       
+      <e r="LR">
+        <p>
+          <l>fora</l>
+          <r>ser<s n="vbser"/><s n="pis"/><s n="p1"/><s n="sg"/></r>
+        </p>
+      </e>
+      
       <e>
         <p>
           <l>fóssiu</l>
@@ -70446,6 +70571,13 @@
           <r>ser<s n="vbser"/><s n="pis"/><s n="p3"/><s n="sg"/></r>
         </p>
       </e>
+
+      <e r="LR">
+        <p>
+          <l>fora</l>
+          <r>ser<s n="vbser"/><s n="pis"/><s n="p3"/><s n="sg"/></r>
+        </p>
+      </e>
       
       <e>
         <p>
@@ -70507,12 +70639,19 @@
         </p>
       </e>
       
-      <e>
+      <e r="LR">
         <p>
           <l>sóc</l>
           <r>ser<s n="vbser"/><s n="pri"/><s n="p1"/><s n="sg"/></r>
         </p>
       </e>
+
+      <e>
+        <p>
+          <l>soc</l>
+          <r>ser<s n="vbser"/><s n="pri"/><s n="p1"/><s n="sg"/></r>
+        </p>
+      </e>
       
       <e>
         <p>
@@ -71208,9 +71347,13 @@
 <e lm="vés amb compte"><i>vés<b/>amb<b/>compte</i> <par n="a_reveure__ij"/></e>
 <e lm="no t'ho creguis"><i>no<b/>t'ho<b/>creguis</i> <par n="a_reveure__ij"/></e>
 <e lm="no us ho cregueu"><i>no<b/>us<b/>ho<b/>cregueu</i> <par n="a_reveure__ij"/></e>
-<e lm="adéu"><i>adéu</i> <par n="a_reveure__ij"/></e>
+<e lm="adéu" r="LR"><p><l>adéu</l><r>adeu</r></p><par n="a_reveure__ij"/></e>
+<e lm="adéu"><i>adeu</i> <par n="a_reveure__ij"/></e>
+
 <e lm="fins aviat"><i>fins<b/>aviat</i> <par n="a_reveure__ij"/></e>
 <e r="LR" lm="adéu-siau"><i>adéu-siau</i> <par n="a_reveure__ij"/></e>
+<e r="LR" lm="adeu-siau"><p><l>adéu-siau</l><r>adeu-siau</r></p><par n="a_reveure__ij"/></e>
+
 <e lm="passi-ho bé"><i>passi-ho<b/>bé</i> <par n="a_reveure__ij"/></e>
 <e lm="fins demà"><i>fins<b/>demà</i> <par n="a_reveure__ij"/></e>
 <e lm="fins després"><i>fins<b/>després</i> <par n="a_reveure__ij"/></e>
@@ -71299,8 +71442,6 @@
 	  
 <e lm="exalcalde"><i>exalcalde</i> <par n="alcalde__n"/></e>
 	  
-<e r="LR" lm="ex-alcalde"><i>ex-alcalde</i> <par n="alcalde__n"/></e>
-	  
 <e lm="Alcántara"><i>Alcántara</i> <par n="Abad__np"/></e>
 	  
 <e lm="Alcaraz"><i>Alcaraz</i> <par n="Abad__np"/></e>
@@ -73713,7 +73854,9 @@
 <e lm="cor"><i>cor</i> <par n="abric__n"/></e>
 	  
 <e lm="Corea"><i>Corea</i> <par n="Afganistan__np"/></e>
-<e lm="coreferent"><i>coreferent</i> <par n="abdominal__adj"/></e>
+
+<e lm="correferent"><i>correferent</i> <par n="abdominal__adj"/></e>
+<e lm="correferent" r="LR"><p><l>coreferent</l><r>correferent</r></p> <par n="abdominal__adj"/></e>
 	  
 <e lm="Còria"><i>Còria</i> <par n="Afganistan__np"/></e>
 <e lm="Corilha"><i>Corilha</i> <par n="Afganistan__np"/></e>
@@ -76584,8 +76727,8 @@
 	  
 <e lm="infracció"><i>infracci</i> <par n="acci/ó__n"/></e>
 	  
-<e r="LR" lm="infraestructura"><i>infraestructur</i> <par n="abell/a__n"/></e>
-<e lm="infrastructura"><i>infrastructur</i> <par n="abell/a__n"/></e>
+<e r="LR" lm="infrastructura"><p><l>infrastructur</l><r>infraestructura</r></p> <par n="abell/a__n"/></e>
+<e lm="infraestructura"><i>infraestructur</i> <par n="abell/a__n"/></e>
 	  
 <e lm="ingrés"><i>ingr</i> <par n="acc/és__n"/></e>
 	  
@@ -78104,7 +78247,8 @@
 	  
 <e lm="Nepal"><i>Nepal</i> <par n="Afganistan__np"/></e>
 	  
-<e lm="nét"><i>nét</i> <par n="senyor__n"/></e>
+<e lm="nét" r="LR"><p><l>nét</l><r>net</r></p> <par n="senyor__n"/></e>
+<e lm="net"><i>net</i> <par n="senyor__n"/></e>
 	  
 <e lm="neteja"><i>nete</i> <par n="barre/ja__n"/></e>
 	  
@@ -78481,7 +78625,8 @@
 	  
 <e lm="os"><i>os</i> <par n="cos__n"/></e>
 	  
-<e lm="ós"><i>ós</i> <par n="gos__n"/></e>
+<e lm="ós" r="LR"><p><l>ós</l><r>os</r></p> <par n="gos__n"/></e>
+<e lm="os"><i>os</i> <par n="gos__n"/></e>
 	  
 <e lm="Oslo"><i>Oslo</i> <par n="Afganistan__np"/></e>
 	  
@@ -81007,7 +81152,8 @@
 <e lm="telefònic"><i>telefòni</i> <par n="acadèmi/c__adj"/></e>
 <e lm="telemàticament"><i>telemàticament</i> <par n="ahir__adv"/></e>
 <e lm="telemàtic"><i>telemàti</i> <par n="acadèmi/c__adj"/></e>
-<e lm="telesquí"><i>telesquí</i> <par n="abric__n"/></e>
+<e lm="telesquí" r="LR"><p><l>telesquí</l><r>teleesquí</r></p> <par n="abric__n"/></e>
+<e lm="teleesquí" r="LR"><i>teleesquí</i> <par n="abric__n"/></e>
 	  
 <e lm="televisió"><i>televisi</i> <par n="acci/ó__n"/></e>
 	  
@@ -83126,7 +83272,10 @@
 <e lm="respiració"><i>respiraci</i> <par n="acci/ó__n"/></e>
 <e lm="retenció"><i>retenci</i> <par n="acci/ó__n"/></e>
 <e lm="set"><i>set</i> <par n="accessibilitat__n"/></e>
-<e lm="sèu"><i>sèu</i> <par n="abric__n"/></e>
+
+<e lm="sèu" r="LR"><p><l>sèu</l><r>seu</r></p><par n="abric__n"/></e>
+<e lm="seu"><i>seu</i> <par n="abric__n"/></e>
+
 <e lm="sobres"><i>sobres</i> <par n="escombraries__n"/></e>
 <e lm="ulleres"><i>ulleres</i> <par n="escombraries__n"/></e>
 <e lm="verbositat"><i>verbositat</i> <par n="accessibilitat__n"/></e>
@@ -83519,7 +83668,9 @@
 <e lm="desmanyotat"><i>desmanyota</i> <par n="afortuna/t__adj"/></e>
 <e lm="gras"><i>gras</i> <par n="ros__adj"/></e>
 		
-<e lm="rodamón"><i>rodamón</i> <par n="abdominal__adj"/></e>
+<e lm="rodamón" r="LR"><p><l>rodamón</l><r>rodamon</r></p> <par n="abdominal__adj"/></e>
+<e lm="rodamón"><i>rodamon</i> <par n="abdominal__adj"/></e>
+
 <e lm="quadrúpede"><i>quadrúped</i> <par n="abstract/e__adj"/></e>
 <e lm="beneit"><i>beneit</i> <par n="absolut__adj"/></e>
 		
@@ -84521,10 +84672,9 @@
 <e lm="estirar"><i>estir</i> <par n="abander/ar__vblex"/></e>
 	
 <e lm="seure"><i>se</i> <par n="asse/ure__vblex"/></e>
-	
 <e lm="seure"><p><l>sè</l> <r>se</r> </p><par n="assè/ure__vblex"/></e>
-	
 <e lm="seure"><p><l>sé</l> <r>se</r> </p><par n="assé/ure__vblex"/></e>
+
 <e lm="sobreseure"><i>sobrese</i> <par n="asse/ure__vblex"/></e>
 	
 <e lm="sobreseure"><p><l>sobresè</l> <r>sobrese</r> </p><par n="assè/ure__vblex"/></e>
@@ -85873,7 +86023,7 @@
 <e lm="interlineat" a="carmentano"><i>interlineat</i> <par n="abric__n"/></e>
 <e lm="Word" a="carmentano"><i>Word</i> <par n="ABC__np"/></e>
 <e lm="inèdit" a="carmentano"><i>inèdit</i> <par n="absolut__adj"/></e>
-<e lm="europeïsme" a="carmentano"><i>europeïsme</i> <par n="abric__n"/></e>
+<e lm="europeisme" a="carmentano"><i>europeisme</i> <par n="abric__n"/></e>
 <e lm="completament" a="carmentano"><i>completament</i> <par n="ahir__adv"/></e>
 <e lm="voluntariat" a="carmentano"><i>voluntariat</i> <par n="atletisme__n"/></e>
 <e lm="viable" a="carmentano"><i>viable</i> <par n="abdominal__adj"/></e>
@@ -87674,7 +87824,6 @@
 <e lm="datar" a="carmentano"><i>dat</i> <par n="abander/ar__vblex"/></e>
 <e lm="Romà" a="carmentano"><i>Romà</i> <par n="Abad__np"/></e>
 <e lm="Cadafalch" a="carmentano"><i>Cadafalch</i> <par n="Abad__np"/></e>
-<e r="LR" lm="vice-president" a="mmonge"><i>vice-president</i> <par n="senyor__n"/></e>
 <e lm="processar" a="mmonge"><i>process</i> <par n="abander/ar__vblex"/></e>
 <e r="LR" lm="ensems" a="mmonge"><i>ensems</i> <par n="ahir__adv"/></e>
 <!--<e lm="fullet" r="LR" a="mmonge">
@@ -87732,9 +87881,20 @@
 <e lm="ofimàtica" a="mmonge"><i>ofimàti</i> <par n="acústi/ca__n"/></e>
 <e lm="teletreball" a="mmonge"><i>teletreball</i> <par n="abric__n"/></e>
 <e lm="multimèdia" a="mmonge"><i>multimèdia</i> <par n="multimèdia__adj"/></e>
+
 <e lm="ex"><i>ex</i> <par n="multimèdia__adj"/></e>
-<e lm="macro"><i>macro</i> <par n="multimèdia__adj"/></e>
+<e lm="ex-" r="RL"><p><l><a/>ex-</l><r>ex-</r></p><par n="multimèdia__adj"/></e>
+
+<e lm="vice"><i>vice</i> <par n="multimèdia__adj"/></e>
+<e lm="vice-" r="RL"><p><l><a/>vice-</l><r>vice-</r></p><par n="multimèdia__adj"/></e>
+
 <e lm="anti"><i>anti</i> <par n="multimèdia__adj"/></e>
+<e lm="anti-" r="RL"><p><l><a/>anti-</l><r>anti-</r></p><par n="multimèdia__adj"/></e>
+
+<e lm="macro"><i>macro</i> <par n="multimèdia__adj"/></e>
+<e lm="macro-" r="RL"><p><l><a/>macro-</l><r>macro-</r></p><par n="multimèdia__adj"/></e>
+
+
 <e lm="d'ensenyament"><i>d'ensenyament</i> <par n="multimèdia__adj"/></e>
 <e lm="dels estudis"><i>dels<b/>estudis</i> <par n="multimèdia__adj"/></e>
 <e lm="que ve"><i>que<b/>ve</i> <par n="multimèdia__adj"/></e>
@@ -88886,7 +89046,10 @@
 <e lm="excap" a=" mmonge"><i>excap</i> <par n="acompanyant__n"/></e>
 <e lm="Leslie" a=" mmonge"><i>Leslie</i> <par n="Abad__np"/></e>
 <e lm="Kurdistan" a=" mmonge"><i>Kurdistan</i> <par n="Afganistan__np"/></e>
-<e lm="eradicar" a=" mmonge"><i>eradi</i> <par n="abo/car__vblex"/></e>
+
+<e lm="eradicar" a=" mmonge" r="LR"><p><l>eradi</l><r>erradicar</r></p><par n="abo/car__vblex"/></e>
+<e lm="erradicar" a="mmonge"><i>erradi</i> <par n="abo/car__vblex"/></e>
+
 <e lm="crac" a=" mmonge"><i>crac</i> <par n="abric__n"/></e>
 <e lm="Scorsese" a=" mmonge"><i>Scorsese</i> <par n="Abad__np"/></e>
 <e lm="redactor" a=" mmonge"><i>redactor</i> <par n="senyor__n"/></e>
@@ -89108,7 +89271,11 @@
 <e lm="faula" a=" mmonge" c="també es pot dir FAULA"><i>faul</i> <par n="abell/a__n"/></e>
 <e lm="mer" a=" mmonge"><i>mer</i> <par n="absolut__adj"/></e>
 <e lm="formigó" a=" mmonge"><i>formig</i> <par n="aband/ó__n"/></e>
-<e lm="subsòl" a=" mmonge"><i>subsòl</i> <par n="abric__n"/></e>
+
+<e lm="subsòl" a="mmonge" r="LR"><p><l>subsòl</l><r>subsol</r></p><par n="abric__n"/></e>
+<e lm="subsol"><i>subsol</i> <par n="abric__n"/></e>
+
+
 <e r="LR" lm="recolzament" a=" mmonge"><i>recolzament</i> <par n="abric__n"/></e>
 <e lm="esbossar" a=" mmonge"><i>esboss</i> <par n="abander/ar__vblex"/></e>
 <e lm="reafirmar" a=" mmonge"><i>reafirm</i> <par n="abander/ar__vblex"/></e>
@@ -89220,8 +89387,8 @@
 <e lm="Bachelet" a="carmentano"><i>Bachelet</i> <par n="Abad__np"/></e>
 <e lm="poloni" a=" mmonge"><i>poloni</i> <par n="abric__n"/></e>
 <e lm="Hamburg" a=" mmonge"><i>Hamburg</i> <par n="Afganistan__np"/></e>
-<e lm="ex-espia" a=" mmonge"><i>ex-espi</i> <par n="accionist/a__n"/></e>
-<e lm="ex-dona" a=" mmonge"><i>ex-don</i> <par n="abell/a__n"/></e>
+<e lm="exespia" a=" mmonge"><i>exespi</i> <par n="accionist/a__n"/></e>
+<e lm="exdona" a=" mmonge"><i>exdon</i> <par n="abell/a__n"/></e>
 <e r="LR" lm="enverinar" a=" mmonge"><i>enverin</i> <par n="abander/ar__vblex"/></e>
 <e lm="transvasar" a=" mmonge"><i>transvas</i> <par n="abander/ar__vblex"/></e>
 <e lm="radioactivitat" a=" mmonge"><i>radioactivitat</i> <par n="accessibilitat__n"/></e>
diff -Nru apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.oc-ca.dix apertium-oc-ca-1.0.7/apertium-oc-ca.oc-ca.dix
--- apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.oc-ca.dix	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/apertium-oc-ca.oc-ca.dix	2021-01-03 15:34:23.000000000 +0000
@@ -12,7 +12,7 @@
     <sdef n="al"/>
     <sdef n="atn"/>
     <sdef n="pro"/>
-	 <sdef n="enc"/>
+    <sdef n="enc"/>
     <sdef n="tn"/>
     <sdef n="n"/>
     <sdef n="np"/>
@@ -255,13 +255,13 @@
 <e r="LR" alt="oc">
 			<p>
 				<l>adiu<s n="ij"/></l>
-				<r>adéu<s n="ij"/></r>
+				<r>adeu<s n="ij"/></r>
 			</p>
 		</e>
 <e alt="oc@aran">
 			<p>
 				<l>adiu<s n="ij"/></l>
-				<r>adéu<s n="ij"/></r>
+				<r>adeu<s n="ij"/></r>
 			</p>
 		</e>
 		
@@ -269,13 +269,13 @@
 <e r="LR" alt="oc@aran">
 			<p>
 				<l>adieu<s n="ij"/></l>
-				<r>adéu<s n="ij"/></r>
+				<r>adeu<s n="ij"/></r>
 			</p>
 		</e>
 <e alt="oc">
 			<p>
 				<l>adieu<s n="ij"/></l>
-				<r>adéu<s n="ij"/></r>
+				<r>adeu<s n="ij"/></r>
 			</p>
 		</e>
 <e alt="oc" r="RL">
@@ -300,14 +300,14 @@
 <e r="LR">
 			<p>
 				<l>adishatz<s n="ij"/></l>
-				<r>adéu<s n="ij"/></r>
+				<r>adeu<s n="ij"/></r>
 			</p>
 		</e>
 		
 <e r="RL">
 			<p>
 				<l>adishatz<s n="ij"/></l>
-				<r>adéu-siau<s n="ij"/></r>
+				<r>adeu-siau<s n="ij"/></r>
 			</p>
 		</e>
 		<e>
@@ -29532,8 +29532,12 @@
 </e>
 
 <e>
-	<i>telesquí<s n="n"/></i>
+	<p>
+		<l>telesquí<s n="n"/></l>
+		<r>teleesquí<s n="n"/></r>
+	</p>
 </e>
+
 <e>
 	<i>temple<s n="n"/></i>
 </e>
@@ -32575,73 +32579,74 @@
 	</p>
 </e>
 
+
 <e r="LR">
 	<p>
-		<l>exalcalde<s n="n"/></l>
-		<r>exalcalde<s n="n"/></r>
+		<l>conse<s n="n"/></l>
+		<r>alcalde<s n="n"/></r>
 	</p>
 </e>
 
-<e r="RL" alt="oc">
-	<p>
-		<l>excònsol<s n="n"/></l>
-		<r>ex-alcalde<s n="n"/></r>
-	</p>
-</e>
 
-<e r="RL" alt="oc@aran">
+<e alt="oc@aran">
 	<p>
-		<l>exbaile<s n="n"/></l>
-		<r>ex-alcalde<s n="n"/></r>
+		<l>baile<s n="n"/></l>
+		<r>alcalde<s n="n"/></r>
 	</p>
 </e>
 
-<e r="LR">
+<e r="LR" alt="oc@aran">
 	<p>
-		<l>conse<s n="n"/></l>
+		<l>cònsol<s n="n"/></l>
 		<r>alcalde<s n="n"/></r>
 	</p>
 </e>
 
-
 <e r="LR" alt="oc">
 	<p>
 		<l>baile<s n="n"/></l>
 		<r>alcalde<s n="n"/></r>
 	</p>
 </e>
-<e alt="oc@aran">
+
+<e alt="oc">
 	<p>
-		<l>baile<s n="n"/></l>
+		<l>cònsol<s n="n"/></l>
 		<r>alcalde<s n="n"/></r>
 	</p>
 </e>
 
 
-<e r="LR" alt="oc">
+
+<e r="LR">
 	<p>
-		<l>exbaile<s n="n"/></l>
+		<l>exalcalde<s n="n"/></l>
 		<r>exalcalde<s n="n"/></r>
 	</p>
 </e>
-<e alt="oc@aran">
+
+
+
+
+<e alt="oc">
 	<p>
-		<l>exbaile<s n="n"/></l>
+		<l>excònsol<s n="n"/></l>
 		<r>exalcalde<s n="n"/></r>
 	</p>
 </e>
 
 
-<e r="LR" alt="oc@aran">
+<e r="LR" alt="oc">
 	<p>
-		<l>cònsol<s n="n"/></l>
-		<r>alcalde<s n="n"/></r>
+		<l>exbaile<s n="n"/></l>
+		<r>exalcalde<s n="n"/></r>
 	</p>
 </e>
-<e alt="oc">
+
+<e alt="oc@aran">
 	<p>
-		<l>cònsol<s n="n"/></l>
-		<r>alcalde<s n="n"/></r>
+		<l>exbaile<s n="n"/></l>
+		<r>exalcalde<s n="n"/></r>
 	</p>
 </e>
 
@@ -32652,12 +32657,7 @@
 		<r>exalcalde<s n="n"/></r>
 	</p>
 </e>
-<e alt="oc">
-	<p>
-		<l>excònsol<s n="n"/></l>
-		<r>exalcalde<s n="n"/></r>
-	</p>
-</e>
+
 
 <e r="LR">
 	<p>
@@ -33628,7 +33628,7 @@
 		<e>
 			<p>
 				<l>infrastructura<s n="n"/></l>
-				<r>infrastructura<s n="n"/></r>
+				<r>infraestructura<s n="n"/></r>
 			</p>
 		</e>
 		<e>
@@ -33647,17 +33647,10 @@
 <e r="LR">
 			<p>
 				<l>infraestructura<s n="n"/></l>
-				<r>infrastructura<s n="n"/></r>
-			</p>
-		</e>
-		
-<e r="RL">
-			<p>
-				<l>infrastructura<s n="n"/></l>
 				<r>infraestructura<s n="n"/></r>
 			</p>
 		</e>
-		
+				
 		
 
 <e r="LR" alt="oc">
@@ -44237,13 +44230,13 @@
 <e r="LR" alt="oc">
 			<p>
 				<l>arrèhilh<s n="n"/></l>
-				<r>nét<s n="n"/></r>
+				<r>net<s n="n"/></r>
 			</p>
 		</e>
 <e alt="oc@aran">
 			<p>
 				<l>arrèhilh<s n="n"/></l>
-				<r>nét<s n="n"/></r>
+				<r>net<s n="n"/></r>
 			</p>
 		</e>
 		
@@ -44251,20 +44244,20 @@
 <e r="LR" alt="oc@aran">
 			<p>
 				<l>felen<s n="n"/></l>
-				<r>nét<s n="n"/></r>
+				<r>net<s n="n"/></r>
 			</p>
 		</e>
 <e alt="oc">
 			<p>
 				<l>felen<s n="n"/></l>
-				<r>nét<s n="n"/></r>
+				<r>net<s n="n"/></r>
 			</p>
 		</e>
 		
 <e r="LR">
 			<p>
 				<l>rèire-filh<s n="n"/></l>
-				<r>nét<s n="n"/></r>
+				<r>net<s n="n"/></r>
 			</p>
 		</e>
 		<e>
@@ -44372,14 +44365,14 @@
 		<e r="LR">
 			<p>
 				<l>os<s n="n"/></l>
-				<r>ós<s n="n"/></r>
+				<r>os<s n="n"/></r>
 			</p>
 		</e>
 		
 <e>
 			<p>
 				<l>ors<s n="n"/></l>
-				<r>ós<s n="n"/></r>
+				<r>os<s n="n"/></r>
 			</p>
 		</e>
 		<e r="LR">
@@ -54319,21 +54312,21 @@
 <e r="LR">
 			<p>
 				<l>coreferent<s n="adj"/><s n="m"/></l>
-				<r>coreferent<s n="adj"/><s n="mf"/></r>
+				<r>correferent<s n="adj"/><s n="mf"/></r>
 			</p>
 		</e>
 		
 <e r="LR">
 			<p>
 				<l>coreferent<s n="adj"/><s n="f"/></l>
-				<r>coreferent<s n="adj"/><s n="mf"/></r>
+				<r>correferent<s n="adj"/><s n="mf"/></r>
 			</p>
 		</e>
 		
 <e r="RL">
 			<p>
 				<l>coreferent<s n="adj"/><s n="GD"/></l>
-				<r>coreferent<s n="adj"/><s n="mf"/></r>
+				<r>correferent<s n="adj"/><s n="mf"/></r>
 			</p>
 		</e>
 		
@@ -79113,6 +79106,9 @@
 	<e>
 		  <i>anti<s n="adj"/></i>
 	  </e>
+	<e>
+		  <i>vice<s n="adj"/></i>
+	  </e>
 	  
 <e r="LR">
 		  <p>
@@ -88185,7 +88181,7 @@
 	  <e>
 		  <p>
 			  <l>seu<s n="n"/><s n="f"/></l>
-			  <r>sèu<s n="n"/><s n="m"/></r>
+			  <r>seu<s n="n"/><s n="m"/></r>
 		  </p>
 	  </e>
 	  <e>
@@ -89257,7 +89253,7 @@
 		<e>
 			<p>
 				<l>pòrc-gandièr<s n="adj"/></l>
-				<r>rodamón<s n="adj"/></r>
+				<r>rodamon<s n="adj"/></r>
 			</p>
 		</e>
 		
@@ -105248,7 +105244,7 @@
 <e a="carmentano">
 	<p>
 		<l>europeisme<s n="n"/></l>
-		<r>europeïsme<s n="n"/></r>
+		<r>europeisme<s n="n"/></r>
 	</p>
 </e>
 
@@ -123258,13 +123254,6 @@
 
 <e r="RL" a="mmonge">
 	<p>
-		<l>vice-president<s n="n"/></l>
-		<r>vice-president<s n="n"/></r>
-	</p>
-</e>
-
-<e r="RL" a="mmonge">
-	<p>
 		<l>tractar<s n="vblex"/></l>
 		<r>processar<s n="vblex"/></r>
 	</p>
@@ -135326,7 +135315,7 @@
 <e a=" mmonge">
 		<p>
 			<l>eradicar<s n="vblex"/></l>
-			<r>eradicar<s n="vblex"/></r>
+			<r>erradicar<s n="vblex"/></r>
 		</p>
 	</e>
 	
@@ -137894,7 +137883,7 @@
 <e a=" mmonge">
 		<p>
 			<l>subsòu<s n="n"/></l>
-			<r>subsòl<s n="n"/></r>
+			<r>subsol<s n="n"/></r>
 		</p>
 	</e>
 	
@@ -139025,14 +139014,14 @@
 <e a=" mmonge">
 		<p>
 			<l>exespia<s n="n"/></l>
-			<r>ex-espia<s n="n"/></r>
+			<r>exespia<s n="n"/></r>
 		</p>
 	</e>
 	
 <e a=" mmonge">
 		<p>
 			<l>exhemna<s n="n"/></l>
-			<r>ex-dona<s n="n"/></r>
+			<r>exdona<s n="n"/></r>
 		</p>
 	</e>
 	<e>
diff -Nru apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.oc-ca.t1x apertium-oc-ca-1.0.7/apertium-oc-ca.oc-ca.t1x
--- apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.oc-ca.t1x	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/apertium-oc-ca.oc-ca.t1x	2021-01-03 15:34:23.000000000 +0000
@@ -5252,9 +5252,227 @@
 		</action>
 	</rule>
 
+	<rule comment="REGLA: ADJ ADJ NOM">
+		<pattern>
+			<pattern-item n="adjec"/>
+			<pattern-item n="adjec"/>
+			<pattern-item n="nom"/>
+		</pattern>
+		<action>
+			<call-macro n="firstWord">
+				<with-param pos="1"/>
+			</call-macro>
+			<call-macro n="f_concord3">
+				<with-param pos="3"/>
+				<with-param pos="2"/>
+				<with-param pos="1"/>
+			</call-macro>	
+			<call-macro n="tipus_nom">
+				<with-param pos="3"/>
+			</call-macro>
+			<call-macro n="f_lexicadj">
+				<with-param pos="2"/>
+			</call-macro>
+			<call-macro n="tipus_verb">
+				<with-param pos="1"/>
+			</call-macro>
+			<call-macro n="tipus_verb">
+				<with-param pos="2"/>
+			</call-macro>
+
+                     <choose>
+	                <when>
+			  <test>
+			
+					<equal caseless="yes">
+						<clip pos="1" side="sl" part="lem"/>
+						<lit v="ex"/>
+					</equal>
+				
+			  </test>
+			  <let>
+				<clip pos="1" side="tl" part="lem"/>
+				<lit v="ex-"/>
+			  </let>
+		       </when>
+                      </choose>
+		   <choose>
+	                <when>
+			  <test>
+			
+					<equal caseless="yes">
+						<clip pos="1" side="sl" part="lem"/>
+						<lit v="vice"/>
+					</equal>
+				
+			  </test>
+			  <let>
+				<clip pos="1" side="tl" part="lem"/>
+				<lit v="vice-"/>
+			  </let>
+		       </when>
+                      </choose>
+			<out>
+				<chunk name="adj_adj_nom" case="caseFirstWord">
+					<tags>
+						<tag><lit-tag v="SN"/></tag>
+						<tag><var n="genero"/></tag>
+						<tag><var n="numero"/></tag>
+						<tag><var n="tipusnom"/></tag>
+					</tags>
+					<lu>
+						<clip pos="1" side="tl" part="lemh"/> 
+						<clip pos="1" side="tl" part="a_adj"/>
+						<clip pos="1" side="tl" part="gen_sense_mf" link-to="2"/>
+						<clip pos="1" side="tl" part="gen_mf"/>	 
+						<clip pos="1" side="tl" part="nbr_sense_sp" link-to="3"/>
+						<clip pos="1" side="tl" part="nbr_sp"/>	 
+						<clip pos="1" side="tl" part="lemq"/>
+					</lu>
+					<b pos="1"/>
+					<lu>
+						<clip pos="2" side="tl" part="lemh"/> 
+						<clip pos="2" side="tl" part="a_adj"/>
+						<clip pos="2" side="tl" part="gen_sense_mf" link-to="2"/>
+						<clip pos="2" side="tl" part="gen_mf"/>	 
+						<clip pos="2" side="tl" part="nbr_sense_sp" link-to="3"/>
+						<clip pos="2" side="tl" part="nbr_sp"/>	 
+						<clip pos="2" side="tl" part="lemq"/>
+					</lu>
+					<b pos="2"/>
+					<lu>
+						<clip pos="3" side="tl" part="lemh"/>
+						<clip pos="3" side="tl" part="a_nom"/>
+						<clip pos="3" side="tl" part="gen_sense_mf" link-to="2"/>
+						<clip pos="3" side="tl" part="gen_mf"/>	 
+						<clip pos="3" side="tl" part="nbr_sense_sp" link-to="3"/>
+						<clip pos="3" side="tl" part="nbr_sp"/>	 
+						<clip pos="3" side="tl" part="lemq"/>
+					</lu> 
+				</chunk>
+			</out>
+			<let>
+				<var n="caseFirstWord"/>
+				<lit v="aa"/>
+			</let>
+		</action>
+	</rule>
+
 	<rule comment="REGLA: DET ADJ ADJ NOM">
 		<pattern>
 			<pattern-item n="det"/>
+			<pattern-item n="adjec"/>
+			<pattern-item n="adjec"/>
+			<pattern-item n="nom"/>
+		</pattern>
+		<action>
+			<call-macro n="firstWord">
+				<with-param pos="1"/>
+			</call-macro>
+			<call-macro n="f_concord4">
+				<with-param pos="4"/>
+				<with-param pos="3"/>
+				<with-param pos="2"/>
+				<with-param pos="1"/>
+			</call-macro>	
+			<call-macro n="tipus_nom">
+				<with-param pos="4"/>
+			</call-macro>
+			<call-macro n="f_lexicadj">
+				<with-param pos="2"/>
+			</call-macro>
+			<call-macro n="f_lexicadj">
+				<with-param pos="3"/>
+			</call-macro>
+			<call-macro n="tipus_verb">
+				<with-param pos="3"/>
+			</call-macro>
+                     <choose>
+	                <when>
+			  <test>
+			
+					<equal caseless="yes">
+						<clip pos="2" side="sl" part="lem"/>
+						<lit v="ex"/>
+					</equal>
+				
+			  </test>
+			  <let>
+				<clip pos="2" side="tl" part="lem"/>
+				<lit v="ex-"/>
+			  </let>
+		       </when>
+                      </choose>
+                   <choose>
+	                <when>
+			  <test>
+			
+					<equal caseless="yes">
+						<clip pos="2" side="sl" part="lem"/>
+						<lit v="vice"/>
+					</equal>
+				
+			  </test>
+			  <let>
+				<clip pos="2" side="tl" part="lem"/>
+				<lit v="vice-"/>
+			  </let>
+		       </when>
+                      </choose>
+		
+			<out>
+				<chunk name="det_adj_adj_nom" case="caseFirstWord">
+					<tags>
+						<tag><lit-tag v="SN"/></tag>
+						<tag><var n="genero"/></tag>
+						<tag><var n="numero"/></tag>
+						<tag><var n="tipusnom"/></tag>
+					</tags>
+					<lu>
+						<clip pos="1" side="tl" part="lem"/> 
+						<clip pos="1" side="tl" part="a_det"/>
+						<clip pos="1" side="tl" part="gen_sense_mf" link-to="2"/>
+						<clip pos="1" side="tl" part="gen_mf"/>	 
+						<clip pos="1" side="tl" part="nbr_sense_sp" link-to="3"/>
+						<clip pos="1" side="tl" part="nbr_sp"/>	 
+					</lu>
+					<b pos="1"/>
+					<lu>
+						<clip pos="2" side="tl" part="whole"/>
+					</lu>
+					<b pos="2"/>
+					<lu>
+						<clip pos="3" side="tl" part="lemh"/>
+						<clip pos="3" side="tl" part="a_adj"/>
+						<clip pos="3" side="tl" part="gen_sense_mf" link-to="2"/>
+						<clip pos="3" side="tl" part="gen_mf"/>	 
+						<clip pos="3" side="tl" part="nbr_sense_sp" link-to="3"/>
+						<clip pos="3" side="tl" part="nbr_sp"/>	 
+						<clip pos="3" side="tl" part="lemq"/>
+					</lu> 
+					<b pos="3"/>
+					<lu>
+						<clip pos="4" side="tl" part="lemh"/> 
+						<clip pos="4" side="tl" part="a_nom"/>
+						<clip pos="4" side="tl" part="gen_sense_mf" link-to="2"/>
+						<clip pos="4" side="tl" part="gen_mf"/>	 
+						<clip pos="4" side="tl" part="nbr_sense_sp" link-to="3"/>
+						<clip pos="4" side="tl" part="nbr_sp"/>	 
+						<clip pos="4" side="tl" part="lemq"/>
+					</lu>
+				</chunk>
+			</out>
+			<let>
+				<var n="caseFirstWord"/>
+				<lit v="aa"/>
+			</let>
+		</action>
+	</rule>
+
+
+	<rule comment="REGLA: DET ADV ADJ NOM">
+		<pattern>
+			<pattern-item n="det"/>
 			<pattern-item n="adv_preadv"/>
 			<pattern-item n="adjec"/>
 			<pattern-item n="nom"/>
diff -Nru apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.oc.metadix apertium-oc-ca-1.0.7/apertium-oc-ca.oc.metadix
--- apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.oc.metadix	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/apertium-oc-ca.oc.metadix	2021-01-03 15:34:23.000000000 +0000
@@ -180194,6 +180194,10 @@
 	<i>macro</i>
 	<par n="post__adj"/>
 </e>
+<e lm="vice">
+	<i>vice</i>
+	<par n="post__adj"/>
+</e>
 <e lm="anti">
 	<i>anti</i>
 	<par n="post__adj"/>
diff -Nru apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.post-ca.dix apertium-oc-ca-1.0.7/apertium-oc-ca.post-ca.dix
--- apertium-oc-ca-1.0.6~r57551/apertium-oc-ca.post-ca.dix	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/apertium-oc-ca.post-ca.dix	2021-01-03 15:34:23.000000000 +0000
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dictionary>
   <alphabet/>
-<!--  <sdefs>
-  </sdefs>-->
-
   <pardefs>
     <pardef n="caracter_general">
       <e>
@@ -2029,6 +2026,20 @@
       </e>
       <e>
         <p>
+          <l><b/><a/>ex-<b/></l>
+          <r>l'ex-</r>
+        </p>
+        <par n="vocals"/>
+      </e>
+      <e>
+        <p>
+          <l><b/><a/>ex-<b/></l>
+          <r>l'ex-</r>
+        </p>
+        <par n="consonant"/>
+      </e>
+      <e>
+        <p>
           <l><b/><a/></l>
           <r>la<b/></r>
         </p>
@@ -2900,6 +2911,63 @@
           <r>ho</r>
         </p>
       </e>
+      <e>
+        <p>
+          <l><a/>ex-<b/></l>
+          <r>ex-</r>
+        </p>
+       <par n="vocals"/>
+      </e>
+      <e>
+        <p>
+          <l><a/>ex-<b/></l>
+          <r>ex-</r>
+        </p>
+       <par n="consonant"/>
+      </e>
+      <e>
+        <p>
+          <l><a/>vice-<b/></l>
+          <r>vice-</r>
+        </p>
+       <par n="vocals"/>
+      </e>
+      <e>
+        <p>
+          <l><a/>vice-<b/></l>
+          <r>vice-</r>
+        </p>
+       <par n="consonant"/>
+      </e>
+      <e>
+        <p>
+          <l><a/>anti-<b/></l>
+          <r>anti-</r>
+        </p>
+       <par n="vocals"/>
+      </e>
+      <e>
+        <p>
+          <l><a/>anti-<b/></l>
+          <r>anti-</r>
+        </p>
+       <par n="consonant"/>
+      </e>
+      <e>
+        <p>
+          <l><a/>macro-<b/></l>
+          <r>macro-</r>
+        </p>
+       <par n="vocals"/>
+      </e>
+      <e>
+        <p>
+          <l><a/>macro-<b/></l>
+          <r>macro-</r>
+        </p>
+       <par n="consonant"/>
+      </e>
+
   </section>
 
 </dictionary>
diff -Nru apertium-oc-ca-1.0.6~r57551/autogen.sh apertium-oc-ca-1.0.7/autogen.sh
--- apertium-oc-ca-1.0.6~r57551/autogen.sh	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/autogen.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-#! /bin/sh
-
-# $Id: autogen.sh,v 1.1 2006/07/19 15:20:33 sortiz Exp $
-#
-# Copyright (c) 2002  Daniel Elstner  <daniel.elstner@gmx.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License VERSION 2 as
-# published by the Free Software Foundation.  You are not allowed to
-# use any other version of the license; unless you got the explicit
-# permission from the author to do so.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-dir=`echo "$0" | sed 's,[^/]*$,,'`
-test "x${dir}" = "x" && dir='.'
-
-if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
-then
-    echo "This script must be executed directly from the source directory."
-    exit 1
-fi
-
-rm -f config.cache acconfig.h
-
-echo "- aclocal."		&& \
-aclocal				&& \
-echo "- autoconf."		&& \
-autoconf			&& \
-echo "- autoheader."		&& \
-autoheader			&& \
-echo "- automake."		&& \
-automake --add-missing --gnu	&& \
-echo				&& \
-./configure "$@"		&& exit 0
-
-exit 1
-
diff -Nru apertium-oc-ca-1.0.6~r57551/ca-tagger-data/README apertium-oc-ca-1.0.7/ca-tagger-data/README
--- apertium-oc-ca-1.0.6~r57551/ca-tagger-data/README	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/ca-tagger-data/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-In order to train the Catalan part-of-speech tagger yo need to place here
-some corpora:
-* For supervised training: 
-  - A file called 'ca.tagged' should contain the hand-tagged corpus.
-  - A file called 'ca.tagged.txt' should contain the same corpus that
-    'ca.tagged' contains, but in RAW format.
-
-* For unsupervised training:
-  - A file called 'ca.crp.txt' should contain large corpus in RAW format
diff -Nru apertium-oc-ca-1.0.6~r57551/configure.ac apertium-oc-ca-1.0.7/configure.ac
--- apertium-oc-ca-1.0.6~r57551/configure.ac	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/configure.ac	2021-01-03 15:34:23.000000000 +0000
@@ -1,30 +1,11 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
 AC_PREREQ(2.52)
 
-m4_define([required_apertium_version], [1.9.0])
-
-AC_INIT([apertium-oc-ca], [1.0.6], [sortiz@users.sourceforge.net])
-AM_INIT_AUTOMAKE([apertium-oc-ca], [1.0.6], no-define)
-AC_PROG_LN_S
+AC_INIT([apertium-oc-ca], [1.0.7], [apertium-stuff@lists.sourceforge.net])
+AM_INIT_AUTOMAKE
 AC_PROG_AWK
-AC_CONFIG_HEADER([config])
-
-PKG_CHECK_MODULES(APERTIUM,   apertium >= required_apertium_version, [], [PKG_CHECK_MODULES(APERTIUM,   apertium-3.2 >= required_apertium_version)])
-
-
 
-if test $APERTIUM_VER = 10;
-then MODES="";
-else MODES="modes";
-fi
+PKG_CHECK_MODULES(APERTIUM, apertium >= 3.7.1)
 
-AC_SUBST(MODES)
+AP_MKINCLUDE
 
-if test -d .deps
-then echo "";
-else mkdir .deps
-fi
- 
 AC_OUTPUT([Makefile])
diff -Nru apertium-oc-ca-1.0.6~r57551/debian/changelog apertium-oc-ca-1.0.7/debian/changelog
--- apertium-oc-ca-1.0.6~r57551/debian/changelog	2020-03-26 03:24:46.000000000 +0000
+++ apertium-oc-ca-1.0.7/debian/changelog	2022-06-10 05:17:13.000000000 +0000
@@ -1,3 +1,15 @@
+apertium-oc-ca (1.0.7-1) unstable; urgency=medium
+
+  [ Tino Didriksen ]
+  * Update to latest upstream release (Closes: #1005655)
+  * debian/:
+    + Standards-Version: 4.6.0.1
+    + Removed all patches, as they're now superfluous.
+    + Adjusted watch.
+    + Updated copyright.
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 10 Jun 2022 10:47:13 +0530
+
 apertium-oc-ca (1.0.6~r57551-4) unstable; urgency=medium
 
   * Added patch to fix FTBFS with apertium 3.6 (Closes: #950155)
diff -Nru apertium-oc-ca-1.0.6~r57551/debian/control apertium-oc-ca-1.0.7/debian/control
--- apertium-oc-ca-1.0.6~r57551/debian/control	2020-03-26 03:23:38.000000000 +0000
+++ apertium-oc-ca-1.0.7/debian/control	2022-06-10 05:16:34.000000000 +0000
@@ -1,14 +1,14 @@
 Source: apertium-oc-ca
 Section: science
 Priority: optional
-Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
+Maintainer: Debian Science Team <debian-science-maintainers@alioth-lists.debian.net>
 Uploaders: Tino Didriksen <tino@didriksen.cc>,
            Kartik Mistry <kartik@debian.org>
-Build-Depends: apertium-dev (>= 3.4),
-               debhelper-compat (= 12),
+Build-Depends: apertium-dev (>= 3.8.1),
+               debhelper-compat (= 13),
                gawk,
-               pkg-config (>= 0.21)
-Standards-Version: 4.5.0
+               pkg-config
+Standards-Version: 4.6.0.1
 Homepage: https://apertium.org/
 Vcs-Git: https://salsa.debian.org/science-team/apertium-oc-ca.git
 Vcs-Browser: https://salsa.debian.org/science-team/apertium-oc-ca
@@ -16,9 +16,9 @@
 
 Package: apertium-oc-ca
 Architecture: all
-Depends: apertium (>= 3.4), ${misc:Depends}
-Provides: apertium-ca-oc
-Conflicts: apertium-ca-oc
+Depends: apertium (>= 3.8.1), ${misc:Depends}, ${shlibs:Depends}
+Provides: apertium-ca-oc, apertium-cat-oci, apertium-oci-cat
+Conflicts: apertium-ca-oc, apertium-cat-oci, apertium-oci-cat
 Description: Apertium translation data for the Occitan-Catalan pair
  Data package providing Apertium language resources for translating
  between the Occitan and Catalan languages.
diff -Nru apertium-oc-ca-1.0.6~r57551/debian/copyright apertium-oc-ca-1.0.7/debian/copyright
--- apertium-oc-ca-1.0.6~r57551/debian/copyright	2018-07-28 08:50:52.000000000 +0000
+++ apertium-oc-ca-1.0.7/debian/copyright	2022-06-10 05:17:07.000000000 +0000
@@ -2,9 +2,9 @@
 Source: https://apertium.org/
 
 Files: *
-Copyright: 2005, Universitat d'Alacant (Transducens group)
+Copyright:      2005, Universitat d'Alacant (Transducens group)
            2005-2008, Generalitat de Catalunya
-           2005, Universitat Pompeu Fabra (IULA)
+                2005, Universitat Pompeu Fabra (IULA)
            2007-2008, Prompsit Language Engineering S.L.
 License: GPL-2
 
@@ -12,10 +12,6 @@
 Copyright: 2005, Universitat d'Alacant / Universidad de Alicante
 License: GPL-2
 
-Files: autogen.sh
-Copyright: 2002, Daniel Elstner  <daniel.elstner@gmx.net>
-License: GPL-2
-
 License: GPL-2
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -27,13 +23,15 @@
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 Files: debian/*
-Copyright: 2014-2018, Apertium Project Management Committee <apertium-pmc@dlsi.ua.es>
+Copyright: 2014-2022, Apertium Project Management Committee <apertium-pmc@dlsi.ua.es>
+License: GPL-2+
+
 License: GPL-2+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -46,7 +44,7 @@
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff -Nru apertium-oc-ca-1.0.6~r57551/debian/docs apertium-oc-ca-1.0.7/debian/docs
--- apertium-oc-ca-1.0.6~r57551/debian/docs	2018-07-28 08:46:43.000000000 +0000
+++ apertium-oc-ca-1.0.7/debian/docs	2022-06-10 05:16:34.000000000 +0000
@@ -1,3 +1,2 @@
 AUTHORS
-NEWS
 README
diff -Nru apertium-oc-ca-1.0.6~r57551/debian/patches/001-Remove_copying_modes.patch apertium-oc-ca-1.0.7/debian/patches/001-Remove_copying_modes.patch
--- apertium-oc-ca-1.0.6~r57551/debian/patches/001-Remove_copying_modes.patch	2020-03-25 14:18:47.000000000 +0000
+++ apertium-oc-ca-1.0.7/debian/patches/001-Remove_copying_modes.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-Description: Patch to fix FTBFS with apertium 3.6
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -238,7 +238,6 @@ EXTRA_DIST=$(BASENAME).$(PREFIX1).dix \
- modes/$(PREFIX1).mode: modes.xml 
- 	apertium-validate-modes modes.xml
- 	apertium-gen-modes modes.xml
--	cp *.mode modes/
- 
- # All modes are created by the same goal, listing several will just give problems with make -j2
- noinst_DATA=modes/$(PREFIX1).mode
diff -Nru apertium-oc-ca-1.0.6~r57551/debian/patches/series apertium-oc-ca-1.0.7/debian/patches/series
--- apertium-oc-ca-1.0.6~r57551/debian/patches/series	2020-03-25 15:50:33.000000000 +0000
+++ apertium-oc-ca-1.0.7/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-001-Remove_copying_modes.patch
diff -Nru apertium-oc-ca-1.0.6~r57551/debian/rules apertium-oc-ca-1.0.7/debian/rules
--- apertium-oc-ca-1.0.6~r57551/debian/rules	2018-07-28 08:46:43.000000000 +0000
+++ apertium-oc-ca-1.0.7/debian/rules	2022-06-10 05:16:34.000000000 +0000
@@ -6,7 +6,7 @@
 export LC_ALL=C.UTF-8
 
 %:
-	dh $@ --fail-missing --with autoreconf
+	dh $@
 
-override_dh_installchangelogs:
-	dh_installchangelogs -k NEWS
+override_dh_missing:
+	dh_missing --fail-missing
diff -Nru apertium-oc-ca-1.0.6~r57551/debian/watch apertium-oc-ca-1.0.7/debian/watch
--- apertium-oc-ca-1.0.6~r57551/debian/watch	2018-07-28 08:51:49.000000000 +0000
+++ apertium-oc-ca-1.0.7/debian/watch	2022-06-10 05:16:34.000000000 +0000
@@ -1,2 +1,3 @@
-version=3
-http://sf.net/apertium/apertium-oc-ca-(\d\S+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+version=4
+https://github.com/apertium/apertium-oc-ca/releases \
+ .*/@PACKAGE@-(\d[\d.]*)\.tar\.(?:xz|bz2) debian uupdate
diff -Nru apertium-oc-ca-1.0.6~r57551/Makefile.am apertium-oc-ca-1.0.7/Makefile.am
--- apertium-oc-ca-1.0.6~r57551/Makefile.am	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/Makefile.am	2021-01-03 15:34:23.000000000 +0000
@@ -1,4 +1,3 @@
-VERSION=1.0.6
 LANG1=oc
 LANG2=ca
 LANG1b=oc@aran
@@ -29,48 +28,53 @@
           $(PREFIX2).t1x $(PREFIX2).t2x $(PREFIX2).t3x \
           $(PREFIX2b).t1x $(PREFIX2b).t2x $(PREFIX2b).t3x
 
-.deps/$(LANG1).metadix: $(BASENAME).$(LANG1).metadix
+@ap_include@
+
+.deps:
+	mkdir -p .deps
+
+.deps/$(LANG1).metadix: $(BASENAME).$(LANG1).metadix .deps
 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).$(LANG1).metadix >$@
 
-.deps/$(LANG1).dix: .deps/$(LANG1).metadix
+.deps/$(LANG1).dix: .deps/$(LANG1).metadix .deps
 	xsltproc buscaPar.xsl .deps/$(LANG1).metadix | uniq >$$$$tmp1 && \
 	xsltproc $$$$tmp1 .deps/$(LANG1).metadix > $@ && rm $$$$tmp1
 
-.deps/$(LANG1b).metadix: $(BASENAME).$(LANG1).metadix
+.deps/$(LANG1b).metadix: $(BASENAME).$(LANG1).metadix .deps
 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).$(LANG1).metadix >$@
 
-.deps/$(LANG1b).dix: .deps/$(LANG1b).metadix
+.deps/$(LANG1b).dix: .deps/$(LANG1b).metadix .deps
 	xsltproc buscaPar.xsl .deps/$(LANG1b).metadix | uniq >$$$$tmp1 && \
 	xsltproc $$$$tmp1 .deps/$(LANG1b).metadix > $@ && rm $$$$tmp1
 
-.deps/$(LANG2).dix: $(BASENAME).$(LANG2).dix
+.deps/$(LANG2).dix: $(BASENAME).$(LANG2).dix .deps
 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).$(LANG2).dix >$@
 
-.deps/$(LANG2b).dix: $(BASENAME).$(LANG2).dix
+.deps/$(LANG2b).dix: $(BASENAME).$(LANG2).dix .deps
 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).$(LANG2).dix >$@
 
-.deps/$(PREFIX1).dix: $(BASENAME).$(PREFIX1).dix
+.deps/$(PREFIX1).dix: $(BASENAME).$(PREFIX1).dix .deps
 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).$(PREFIX1).dix >$@
 
-.deps/$(PREFIX1b).dix: $(BASENAME).$(PREFIX1).dix
+.deps/$(PREFIX1b).dix: $(BASENAME).$(PREFIX1).dix .deps
 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).$(PREFIX1).dix >$@
 
-.deps/$(PREFIX1).post.dix: $(BASENAME).post-$(LANG2).dix
+.deps/$(PREFIX1).post.dix: $(BASENAME).post-$(LANG2).dix .deps
 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).post-$(LANG2).dix >$@
 
-.deps/$(PREFIX1b).post.dix: $(BASENAME).post-$(LANG2).dix
+.deps/$(PREFIX1b).post.dix: $(BASENAME).post-$(LANG2).dix .deps
 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).post-$(LANG2).dix >$@
 
-.deps/$(LANG1).post.dix: $(BASENAME).post-$(LANG1).dix
+.deps/$(LANG1).post.dix: $(BASENAME).post-$(LANG1).dix .deps
 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).post-$(LANG1).dix >$@
 
-.deps/$(LANG1b).post.dix: $(BASENAME).post-$(LANG1).dix
+.deps/$(LANG1b).post.dix: $(BASENAME).post-$(LANG1).dix .deps
 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).post-$(LANG1).dix >$@
 
-.deps/$(LANG2).post.dix: $(BASENAME).post-$(LANG2).dix
+.deps/$(LANG2).post.dix: $(BASENAME).post-$(LANG2).dix .deps
 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).post-$(LANG2).dix >$@
 
-.deps/$(LANG2b).post.dix: $(BASENAME).post-$(LANG2).dix
+.deps/$(LANG2b).post.dix: $(BASENAME).post-$(LANG2).dix .deps
 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).post-$(LANG2).dix >$@
 
 $(PREFIX1).automorf.bin: .deps/$(LANG1).dix
@@ -235,17 +239,11 @@
            $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t3x 
 
 
-modes/$(PREFIX1).mode: modes.xml 
-	apertium-validate-modes modes.xml
-	apertium-gen-modes modes.xml
-	cp *.mode modes/
-
 # All modes are created by the same goal, listing several will just give problems with make -j2
 noinst_DATA=modes/$(PREFIX1).mode
 
 
 apertium_oc_cadir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
-apertium_oc_camodesdir=$(prefix)/share/apertium/modes/
 
 apertium_oc_ca_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
                     $(PREFIX1).autobil.bin $(PREFIX2).autobil.bin \
@@ -265,15 +263,6 @@
                     $(PREFIX2).t1x $(PREFIX2).t2x $(PREFIX2).t3x \
                     $(PREFIX2b).t1x $(PREFIX2b).t2x $(PREFIX2b).t3x
 
-install-data-local:
-	mv modes modes.bak
-	apertium-gen-modes modes.xml apertium-$(PREFIX1)
-	rm -rf modes
-	mv modes.bak modes
-	test -d $(DESTDIR)$(apertium_oc_camodesdir) || mkdir $(DESTDIR)$(apertium_oc_camodesdir)
-	$(INSTALL_DATA) oc-ca.mode $(DESTDIR)$(apertium_oc_camodesdir)
-	$(INSTALL_DATA) ca-oc.mode $(DESTDIR)$(apertium_oc_camodesdir)
-	$(INSTALL_DATA) oc_aran-ca.mode $(DESTDIR)$(apertium_oc_camodesdir)
-	$(INSTALL_DATA) ca-oc_aran.mode $(DESTDIR)$(apertium_oc_camodesdir)
+install-data-local: install-modes
 
 CLEANFILES = -r $(TARGETS)
diff -Nru apertium-oc-ca-1.0.6~r57551/oc-tagger-data/README apertium-oc-ca-1.0.7/oc-tagger-data/README
--- apertium-oc-ca-1.0.6~r57551/oc-tagger-data/README	2014-10-12 20:15:26.000000000 +0000
+++ apertium-oc-ca-1.0.7/oc-tagger-data/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-In order to train the Occitan part-of-speech tagger yo need to place here
-some corpora:
-* For supervised training: 
-  - A file called 'ca.tagged' should contain the hand-tagged corpus.
-  - A file called 'ca.tagged.txt' should contain the same corpus that
-    'ca.tagged' contains, but in RAW format.
-
-* For unsupervised training:
-  - A file called 'ca.crp.txt' should contain large corpus in RAW format