Revision: 8835
          
http://languagetool.svn.sourceforge.net/languagetool/?rev=8835&view=rev
Author:   jaumeortola
Date:     2013-01-04 00:01:08 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
[ca] Simplifying disambiguation pattern rules. 

Modified Paths:
--------------
    
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
    
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/multiwords.txt

Modified: 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
===================================================================
--- 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
      2013-01-03 22:56:26 UTC (rev 8834)
+++ 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
      2013-01-04 00:01:08 UTC (rev 8835)
@@ -2354,7 +2354,7 @@
                 <token regexp="yes">més|menys</token>
                 <token postag="AQ.*|V.P.*" postag_regexp="yes"/>
             </pattern>
-            <disambig action="add"><wd pos="LOC_ADV"/><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
+            <disambig action="replace"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/><wd pos="LOC_ADV"/></disambig>
         </rule>
         <!-- <rule>
             <pattern>
@@ -2385,7 +2385,7 @@
                 <token regexp="yes">més|menys</token>
                 <token postag="AQ.*|V.P.*" postag_regexp="yes"/>
             </pattern>
-            <disambig action="add"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
+            <disambig action="replace"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
         </rule>
         <rule>
             <pattern>
@@ -2396,7 +2396,7 @@
                 <token regexp="yes">més|menys</token>
                 <token postag="AQ.*|V.P.*" postag_regexp="yes"/>
             </pattern>
-            <disambig action="add"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
+            <disambig action="replace"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
         </rule>
         <rule>
             <pattern>
@@ -2410,7 +2410,7 @@
                 </unify>
                 <token regexp="yes">majors?|menors?</token>
             </pattern>
-            <disambig action="add"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
+            <disambig action="replace"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
         </rule>
         <!-- <rule>
             <pattern>
@@ -2455,7 +2455,7 @@
                 <token regexp="yes">més|menys</token>
                 <token postag="AQ.*|V.P.*" postag_regexp="yes"/>
             </pattern>
-            <disambig action="add"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
+            <disambig action="replace"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
         </rule> 
         <rule>
             <pattern>
@@ -2469,47 +2469,19 @@
                 </unify>
                 <token postag="AQ.*|V.P.*" postag_regexp="yes"/>
             </pattern>
-            <disambig action="add"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
+            <disambig action="replace"><wd pos="LOC_ADV"/><wd 
pos="LOC_ADV"/></disambig>
         </rule>
-        <rule id="loc_adv_filtra2" name="locució adverbial filtra">
-               <pattern>
-                   <marker>
-                       <token postag=".*LOC_ADV.*" 
postag_regexp="yes"><exception postag=".*LOC_PREP.*" 
postag_regexp="yes"/></token>
-                   </marker>
-               </pattern>
-               <disambig action="filter" postag=".*LOC_ADV.*"></disambig>
-           </rule>
     </rulegroup>   
     <rulegroup id="de_color_x" name="de color x: locució">
         <rule>
             <pattern>
-                <token>de</token>
-                <token>color</token>
                 <marker>
-                    <token regexp="yes">vermell|verd|blau|taronja</token>
-                </marker>
-            </pattern>
-            <disambig action="filter" postag="LOC_ADJ"></disambig>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
                     <token>de</token>
-                </marker>
-                <token>color</token>
-                <token regexp="yes">vermell|verd|blau|taronja</token>
-            </pattern>
-            <disambig action="filter" postag="LOC_ADJ"></disambig>
-        </rule>
-        <rule>
-            <pattern>
-                <token>de</token>
-                <marker>
                     <token>color</token>
+                    <token regexp="yes">vermell|verd|blau|taronja|groc</token>
                 </marker>
-                <token regexp="yes">vermell|verd|blau|taronja</token>
             </pattern>
-            <disambig action="filter" postag="LOC_ADJ"></disambig>
+            <disambig action="replace"><wd pos="LOC_ADJ"/><wd 
pos="LOC_ADJ"/><wd pos="LOC_ADJ"/></disambig>
         </rule>
     </rulegroup>
     <rule id="nVerb" name="no verb">
@@ -3114,8 +3086,8 @@
               <feature id="genere"/>
               <marker>
                        <token postag="D[^R].*" postag_regexp="yes"/>    
-                <token postag="A.*" postag_regexp="yes"/>
-                       <token postag="A.*" postag_regexp="yes"/>
+                <token postag="A.*|V.P.*" postag_regexp="yes"/>
+                       <token postag="A.*|V.P.*" postag_regexp="yes"/>
                        <token postag="N.*" postag_regexp="yes"/>
               </marker>        
           </unify>
@@ -3129,7 +3101,7 @@
         <feature id="genere"/>
             <marker>
                <token postag="D[^R].*" postag_regexp="yes"/>
-               <token postag="A.*" postag_regexp="yes"/>
+               <token postag="A.*|V.P.*" postag_regexp="yes"/>
                 <token postag="DN.*" postag_regexp="yes"/>
                 <token postag="N.*" postag_regexp="yes"/>
             </marker>
@@ -3137,55 +3109,26 @@
         </pattern>
         <disambig action="filterall"/>
     </rule>
-    <rulegroup id="DPAN" name="Det + Possessiu  + AdjNom + Nom"> 
+    <rulegroup id="DPAN" name="Det + Possessiu  + Adj + Nom"> 
     <!-- La seva mala intenció -->
-       <rule>
-            <pattern>
-                <marker>
-                       <token postag="D[^R].[MC][SN].*" postag_regexp="yes"/>
-                       <token postag="PX.[MC][SN].*" postag_regexp="yes"/>
-                       <token postag="A..[MC][SN].*|V.P.*SM" 
postag_regexp="yes"/>
-                       <token postag="N.[MC][SN].*" postag_regexp="yes"/>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
         <rule>
             <pattern>
-                <marker>
-                       <token postag="D[^R].[FC][SN].*" postag_regexp="yes"/>
-                       <token postag="PX.[FC][SN].*" postag_regexp="yes"/>
-                       <token postag="A..[FC][SN].*|V.P.*SF" 
postag_regexp="yes"/>
-                       <token postag="N.[FC][SN].*" 
postag_regexp="yes"><exception regexp="yes">era|mira|queda</exception></token>
-                </marker>
+                <unify>
+                <feature id="nombre"/>
+                <feature id="genere"/>
+                    <marker>
+                        <token postag="D[^R].*" postag_regexp="yes"/>
+                        <token postag="PX.*" postag_regexp="yes"/>
+                        <token postag="A.*|V.P.*" postag_regexp="yes"/>
+                        <token postag="N.*" postag_regexp="yes"><exception 
regexp="yes">era|mira|queda</exception></token>
+                    </marker>
+                </unify>    
             </pattern>
             <disambig action="filterall"/>
         </rule>
         <rule>
             <pattern>
                 <marker>
-                       <token postag="D[^R].[MC][PN].*" postag_regexp="yes"/>
-                       <token postag="PX.[MC][PN].*" postag_regexp="yes"/>
-                       <token postag="A..[MC][PN].*|V.P.*PM" 
postag_regexp="yes"/>
-                       <token postag="N.[MC][PN].*" postag_regexp="yes"/>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                       <token postag="D[^R].[FC][PN].*" postag_regexp="yes"/>
-                       <token postag="PX.[FC][PN].*" postag_regexp="yes"/>
-                       <token postag="A..[FC][PN].*|V.P.*PF" 
postag_regexp="yes"/>
-                       <token postag="N.[FC][PN].*" postag_regexp="yes"/>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>       
-        <rule>
-            <pattern>
-                <marker>
                 <token postag="D[^R].[MC][SN].*" postag_regexp="yes"/>
                 <token postag="PX.[MC][SN].*" postag_regexp="yes"/>
                 <token postag="A..[MC][SN].*|V.P.*SM" postag_regexp="yes"/>
@@ -3228,16 +3171,20 @@
             <disambig action="add"><wd pos="_GN_FP"/><wd pos="_GN_FP"/><wd 
pos="_GN_FP"/><wd pos="_GN_FP"/></disambig>
         </rule>       
     </rulegroup>
-    <rulegroup id="DNumN" name="Det + Numeral + Nom/Adj">      
+    <rulegroup id="DNumN" name="Det + Numeral + Nom/Adj">
         <rule>
             <pattern>
+                <unify>
+                <feature id="nombre"/>
+                <feature id="genere"/>
                 <marker>
-                    <token postag="D[AID].[MC][PN0].*" 
postag_regexp="yes"></token>
+                    <token postag="D[AID].*" postag_regexp="yes"></token>
+                    <token postag="DN0CP0" />
+                    <token postag="A.*|V.P.*|N.*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
                 </marker>
-                <token postag="DN0CP0" />
-                <token postag="A..[MC][PN0].*|V.P..PM|N.[MC][PN0].*" 
postag_regexp="yes"></token>
+                </unify>
             </pattern>
-            <disambig action="filter" postag="D.*"></disambig>
+            <disambig action="filterall" />
         </rule>
         <rule>
             <pattern>
@@ -3251,26 +3198,6 @@
         </rule>
         <rule>
             <pattern>
-                <token postag="D[AID].[MC][PN0].*" postag_regexp="yes"></token>
-                <token postag="DN0CP0" />
-                <marker>
-                    <token postag="A..[MC][PN0].*|V.P..PM|N.[MC][PN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                </marker>
-            </pattern>
-            <disambig action="filter" 
postag="A..[MC][PN0].*|V.P..PM|N.[MC][PN0].*"></disambig>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="D[AID].[FC][PN0].*" 
postag_regexp="yes"></token>
-                </marker>
-                <token postag="DN0CP0" />
-                <token postag="A..[FC][PN0].*|V.P..PF|N.[FC][PN0].*" 
postag_regexp="yes"></token>
-            </pattern>
-            <disambig action="filter" postag="D.*"></disambig>
-        </rule>
-        <rule>
-            <pattern>
                 <token postag="D[AID].[FC][PN0].*" postag_regexp="yes"></token>
                 <marker>
                     <token postag="DN0CP0" />
@@ -3281,17 +3208,7 @@
         </rule>
         <rule>
             <pattern>
-                <token postag="D[AID].[FC][PN0].*" postag_regexp="yes"></token>
-                <token postag="DN0CP0" />
                 <marker>
-                    <token postag="A..[FC][PN0].*|V.P..PF|N.[FC][PN0].*" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filter" 
postag="A..[FC][PN0].*|V.P..PF|N.[FC][PN0].*"></disambig>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
                     <token postag="D[AID].[MC][PN0].*" postag_regexp="yes"/>
                     <token postag="DN0MP0" />
                     <token postag="A..[MC][PN0].*|V.P..PM|N.[MC][PN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
@@ -3314,47 +3231,21 @@
         <!--Falla amb nom neutre?: Aquest art expressa  -->
         <rule>
             <pattern>
-                <marker>
-                    <token postag="D[^R].[MC][SN0].*" postag_regexp="yes"/>
-                    <token postag="N.[MC][SN0].*" postag_regexp="yes"/>
-                    <token postag="A..[MC][SN0].*|V.P..SM|PX.[MC][SN0].*" 
postag_regexp="yes"><exception postag="V[MA]IP3S0" postag_regexp="yes"/></token>
-                </marker>
+                <unify>
+                    <feature id="nombre"/>
+                    <feature id="genere"/>
+                    <marker>
+                        <token postag="D[^R].*" postag_regexp="yes"></token>
+                        <token postag="N.*" postag_regexp="yes"><exception 
inflected="yes" regexp="yes">numeral|meu</exception></token>
+                        <token postag="A.*|V.P.*|PX.*" 
postag_regexp="yes"><exception postag="V[MA]IP3S0" postag_regexp="yes"/></token>
+                    </marker>
+                </unify>    
             </pattern>
             <disambig action="filterall"/>
         </rule>
         <rule>
             <pattern>
                 <marker>
-                    <token postag="D[^R].[FC][SN0].*" postag_regexp="yes"/>
-                    <token postag="N.[FC][SN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[FC][SN0].*|V.P..SF|PX.[FC][SN0].*" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>    
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="D[^R].[MC][PN0].*" 
postag_regexp="yes"></token>
-                    <token postag="N.[MC][PN0].*" 
postag_regexp="yes"><exception inflected="yes" 
regexp="yes">numeral|meu</exception></token>
-                    <token postag="A..[MC][PN0].*|V.P..PM|PX.[MC][PN0].*" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="D[^R].[FC][PN0].*" 
postag_regexp="yes"></token>
-                    <token postag="N.[FC][PN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[FC][PN0].*|V.P..PF|PX.[FC][PN0].*" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
                     <token postag="D[^R].[MC][SN0].*" postag_regexp="yes"/>
                     <token postag="N.[MC][SN0].*" postag_regexp="yes"/>
                     <token postag="A..[MC][SN0].*|V.P..SM|PX.[MC][SN0].*" 
postag_regexp="yes"><exception postag="V[MA]IP3S0" postag_regexp="yes"/></token>
@@ -3396,47 +3287,21 @@
     <rulegroup id="DAN" name="Det + Adj + Nom">
         <rule>
             <pattern>
-                <marker>
-                    <token postag="D..[MC][SN0].*" postag_regexp="yes"/>
-                    <token postag="A..[MC][SN0].*|V.P..SM|PX.[MC][SN0].*" 
postag_regexp="yes"/>
-                    <token postag="N.[MC][SN0].*" 
postag_regexp="yes"><exception 
regexp="yes">si|però|escull|creix</exception></token>
-                </marker>
+                <unify>
+                    <feature id="nombre"/>
+                    <feature id="genere"/>
+                        <marker>
+                            <token postag="D.*" postag_regexp="yes"/>
+                            <token postag="A.*|V.P.*|PX.*" 
postag_regexp="yes"/>
+                            <token postag="N.*" postag_regexp="yes"><exception 
regexp="yes">si|però|escull|creix|era|mira|queda|estima</exception><exception 
inflected="yes">numeral</exception></token>
+                        </marker>
+                </unify>            
             </pattern>
             <disambig action="filterall"/>
         </rule>
         <rule>
             <pattern>
                 <marker>
-                    <token postag="D..[FC][SN0].*" postag_regexp="yes"/>
-                    <token postag="A..[FC][SN0].*|V.P..SF|PX.[FC][SN0].*" 
postag_regexp="yes"/>
-                    <token postag="N.[FC][SN0].*" 
postag_regexp="yes"><exception 
regexp="yes">era|mira|queda|estima</exception></token>
-                </marker>    
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="D..[MC][PN0].*" postag_regexp="yes"/>
-                    <token postag="A..[MC][PN0].*|V.P..PM|PX.[MC][PN0].*" 
postag_regexp="yes"/>
-                    <token postag="N.[MC][PN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="D..[FC][PN0].*" postag_regexp="yes"/>
-                    <token postag="A..[FC][PN0].*|V.P..PF|PX.[FC][PN0].*" 
postag_regexp="yes"/>
-                    <token postag="N.[FC][PN0].*" postag_regexp="yes"/>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
                     <token postag="D..[MC][SN0].*" postag_regexp="yes"/>
                     <token postag="A..[MC][SN0].*|V.P..SM|PX.[MC][SN0].*" 
postag_regexp="yes"/>
                     <token postag="N.[MC][SN0].*" 
postag_regexp="yes"><exception 
regexp="yes">si|però|escull|creix</exception></token>
@@ -3478,48 +3343,22 @@
     <rulegroup id="ANA" name=" Adj + Nom + Adj">
         <rule>
             <pattern>
-                <marker>
-                    <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"><exception postag="AQ0CN0|_GV_" 
postag_regexp="yes"/></token>
-                    <token postag="N.[MC][SN0].*" 
postag_regexp="yes"><exception postag="V.[MIS].*" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"></token>
-                </marker>
+                <unify>
+                    <feature id="nombre"/>
+                    <feature id="genere"/>
+                        <marker>
+                            <token postag="A.*|V.P.*" 
postag_regexp="yes"><exception postag="A.0CN0|_GV_" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
+                            <token postag="N.*" postag_regexp="yes"><exception 
postag="V.[MIS].*" postag_regexp="yes"/><exception 
inflected="yes">numeral</exception></token>
+                            <token postag="A.*|V.P.*" 
postag_regexp="yes"></token>
+                        </marker>
+                </unify>
             </pattern>
             <disambig action="filterall"/>
         </rule>
         <rule>
             <pattern>
                 <marker>
-                    <token postag="A..[FC][SN0].*|V.P..SF" 
postag_regexp="yes"><exception postag="AQ0CN0|_GV_" 
postag_regexp="yes"/></token>
-                    <token postag="N.[FC][SN0].*" 
postag_regexp="yes"><exception postag="V.[MIS].*" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[FC][SN0].*|V.P..SF" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"><exception postag="AQ0CN0|_GV_" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
-                    <token postag="N.[MC][PN0].*" 
postag_regexp="yes"><exception postag="V.[MIS].*" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="A..[FC][PN0].*|V.P..PF" 
postag_regexp="yes"><exception postag="AQ0CN0|_GV_" 
postag_regexp="yes"/></token>
-                    <token postag="N.[FC][PN0].*" 
postag_regexp="yes"><exception postag="V.[MIS].*" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[FC][PN0].*|V.P..PF" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"><exception postag="AQ0CN0|_GV_" 
postag_regexp="yes"/></token>
+                    <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"><exception postag="A.0CN0|_GV_" 
postag_regexp="yes"/></token>
                     <token postag="N.[MC][SN0].*" 
postag_regexp="yes"><exception postag="V.[MIS].*" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
                     <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"></token>
                 </marker>
@@ -3529,7 +3368,7 @@
         <rule>
             <pattern>
                 <marker>
-                    <token postag="A..[FC][SN0].*|V.P..SF" 
postag_regexp="yes"><exception postag="AQ0CN0|_GV_" 
postag_regexp="yes"/></token>
+                    <token postag="A..[FC][SN0].*|V.P..SF" 
postag_regexp="yes"><exception postag="A.0CN0|_GV_" 
postag_regexp="yes"/></token>
                     <token postag="N.[FC][SN0].*" 
postag_regexp="yes"><exception postag="V.[MIS].*" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
                     <token postag="A..[FC][SN0].*|V.P..SF" 
postag_regexp="yes"></token>
                 </marker>
@@ -3539,7 +3378,7 @@
         <rule>
             <pattern>
                 <marker>
-                    <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"><exception postag="AQ0CN0|_GV_" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
+                    <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"><exception postag="A.0CN0|_GV_" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
                     <token postag="N.[MC][PN0].*" 
postag_regexp="yes"><exception postag="V.[MIS].*" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
                     <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"></token>
                 </marker>
@@ -3549,7 +3388,7 @@
         <rule>
             <pattern>
                 <marker>
-                    <token postag="A..[FC][PN0].*|V.P..PF" 
postag_regexp="yes"><exception postag="AQ0CN0|_GV_" 
postag_regexp="yes"/></token>
+                    <token postag="A..[FC][PN0].*|V.P..PF" 
postag_regexp="yes"><exception postag="A.0CN0|_GV_" 
postag_regexp="yes"/></token>
                     <token postag="N.[FC][PN0].*" 
postag_regexp="yes"><exception postag="V.[MIS].*" 
postag_regexp="yes"/><exception inflected="yes">numeral</exception></token>
                     <token postag="A..[FC][PN0].*|V.P..PF" 
postag_regexp="yes"></token>
                 </marker>
@@ -3574,47 +3413,21 @@
     <rulegroup id="NAA" name="Nom + Adj + Adj">
         <rule>
             <pattern>
-                <marker>
-                    <token postag="N.[MC][SN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"></token>
-                    <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"></token>
-                </marker>
+                 <unify>
+                    <feature id="nombre"/>
+                    <feature id="genere"/>
+                        <marker>
+                            <token postag="N.*" postag_regexp="yes"><exception 
inflected="yes">numeral</exception></token>
+                            <token postag="A.*|V.P.*" 
postag_regexp="yes"></token>
+                            <token postag="A.*|V.P.*" 
postag_regexp="yes"></token>
+                        </marker>
+                  </unify>      
             </pattern>
             <disambig action="filterall"/>
         </rule>
         <rule>
             <pattern>
                 <marker>
-                    <token postag="N.[FC][SN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[FC][SN0].*|V.P..SF" 
postag_regexp="yes"></token>
-                    <token postag="A..[FC][SN0].*|V.P..SF" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="N.[MC][PN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"></token>
-                    <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
-                    <token postag="N.[FC][PN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
-                    <token postag="A..[FC][PN0].*|V.P..PF" 
postag_regexp="yes"></token>
-                    <token postag="A..[FC][PN0].*|V.P..PF" 
postag_regexp="yes"></token>
-                </marker>
-            </pattern>
-            <disambig action="filterall"/>
-        </rule>
-        <rule>
-            <pattern>
-                <marker>
                     <token postag="N.[MC][SN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
                     <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"></token>
                     <token postag="A..[MC][SN0].*|V.P..SM" 
postag_regexp="yes"></token>
@@ -3637,7 +3450,7 @@
                 <marker>
                     <token postag="N.[MC][PN0].*" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
                     <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"></token>
-                    <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"><exception inflected="yes">numeral</exception></token>
+                    <token postag="A..[MC][PN0].*|V.P..PM" 
postag_regexp="yes"></token>
                 </marker>
             </pattern>
             <disambig action="add"><wd pos="_GN_MP"/><wd pos="_GN_MP"/><wd 
pos="_GN_MP"/></disambig>
@@ -3797,25 +3610,13 @@
             <pattern>
                 <unify>
                 <feature id="nombre"/>
-                    <token postag="V.[NISM].*" postag_regexp="yes" 
inflected="yes" regexp="yes">quedar|restar</token>
                     <marker>
+                        <token postag="V.*" postag_regexp="yes" 
inflected="yes" regexp="yes">quedar|restar</token>
                         <token postag="V.P.*" postag_regexp="yes"></token>
                     </marker>
-                </unify>    
-            </pattern>
-            <disambig action="filter" postag="V.P.*"/>
-        </rule>
-        <rule>
-            <pattern>
-                <unify>
-                <feature id="nombre"/>
-                    <marker>
-                        <token postag="V.*" postag_regexp="yes" 
inflected="yes" regexp="yes">quedar|restar</token>
-                    </marker>
-                    <token postag="V.P.*" postag_regexp="yes"></token>
                 </unify>
             </pattern>
-            <disambig action="filter" postag="V.*"/>
+            <disambig action="filterall"/>
         </rule>
         <rule>
             <pattern>

Modified: 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/multiwords.txt
===================================================================
--- 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/multiwords.txt
  2013-01-03 22:56:26 UTC (rev 8834)
+++ 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/multiwords.txt
  2013-01-04 00:01:08 UTC (rev 8835)
@@ -375,8 +375,6 @@
 Enfront d'     LOC_ADV
 Enfront de     LOC_ADV
 Enfront de     LOC_PREP
-Enfront del    LOC_ADV
-Enfront dels   LOC_ADV
 Enmig d'       LOC_PREP
 Enmig de       LOC_PREP
 Entorn d'      LOC_PREP
@@ -397,6 +395,7 @@
 Gran Bretanya  NPFSG00
 Gràcies a      LOC_PREP
 Honoris causa  LOC_ADV
+In extremis    LOC_ADV
 Junt amb       LOC_PREP
 Juntament amb  LOC_PREP
 Llevat d'      LOC_PREP
@@ -863,8 +862,6 @@
 enfront d'     LOC_ADV
 enfront de     LOC_ADV
 enfront de     LOC_PREP
-enfront del    LOC_ADV
-enfront dels   LOC_ADV
 enmig d'       LOC_PREP
 enmig de       LOC_PREP
 entorn d'      LOC_PREP
@@ -887,6 +884,7 @@
 hagudes i per haver    AQ0FP0
 haguts i per haver     AQ0MP0
 honoris causa  LOC_ADV
+in extremis    LOC_ADV
 junt amb       LOC_PREP
 juntament amb  LOC_PREP
 llevat d'      LOC_PREP

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and
much more. Get web development skills now with LearnDevNow -
350+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122812
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits

Reply via email to