Revision: 8507
          
http://languagetool.svn.sourceforge.net/languagetool/?rev=8507&view=rev
Author:   jaumeortola
Date:     2012-12-05 22:17:27 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
[ca] New rules: acabar amb. Rules improved: apostrophation, liderat/lideratge.

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

Modified: 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
===================================================================
--- 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
      2012-12-05 18:46:45 UTC (rev 8506)
+++ 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
      2012-12-05 22:17:27 UTC (rev 8507)
@@ -1637,7 +1637,7 @@
         <rule>
             <pattern>
                 <marker>
-                    <token inflected="yes" skip="5">haver<exception 
scope="next" 
postag="_GV_|PUNCT_CONT|R.*|.*LOC_ADV.*|V.*|SENT_END|[NAS].*|complement" 
postag_regexp="yes" negate_pos="yes"/></token>
+                    <token inflected="yes" skip="5">haver<exception 
scope="next" 
postag="_GV_|PUNCT_CONT|P.*|R.*|.*LOC_ADV.*|V.*|SENT_END|[NAS].*|complement" 
postag_regexp="yes" negate_pos="yes"/></token>
                 </marker>
                 <token postag="V.P.*" postag_regexp="yes"></token>
             </pattern>
@@ -1645,7 +1645,7 @@
         </rule>
         <rule>
             <pattern>
-                <token inflected="yes" skip="5">haver<exception scope="next" 
postag="_GV_|PUNCT_CONT|R.*|.*LOC_ADV.*|V.*|SENT_END|[NAS].*|complement" 
postag_regexp="yes" negate_pos="yes"/></token>
+                <token inflected="yes" skip="5">haver<exception scope="next" 
postag="_GV_|PUNCT_CONT|P.*|R.*|.*LOC_ADV.*|V.*|SENT_END|[NAS].*|complement" 
postag_regexp="yes" negate_pos="yes"/></token>
                 <marker>
                     <token postag="V.P.*" postag_regexp="yes"></token>
                 </marker>
@@ -1655,7 +1655,7 @@
         <rule>
             <pattern>
                 <marker>
-                    <token inflected="yes" skip="5">haver<exception 
scope="next" 
postag="_GV_|PUNCT_CONT|R.*|.*LOC_ADV.*|V.*|SENT_END|[NAS].*|complement" 
postag_regexp="yes" negate_pos="yes"/></token>
+                    <token inflected="yes" skip="5">haver<exception 
scope="next" 
postag="_GV_|PUNCT_CONT|P.*|R.*|.*LOC_ADV.*|V.*|SENT_END|[NAS].*|complement" 
postag_regexp="yes" negate_pos="yes"/></token>
                 </marker>
                 <token postag="V.P.*" postag_regexp="yes"></token>
             </pattern>
@@ -1663,7 +1663,7 @@
         </rule>
         <rule>
             <pattern>
-                <token inflected="yes" skip="5">haver<exception scope="next" 
postag="_GV_|PUNCT_CONT|R.*|.*LOC_ADV.*|V.*|SENT_END|[NAS].*|complement" 
postag_regexp="yes" negate_pos="yes"/></token>
+                <token inflected="yes" skip="5">haver<exception scope="next" 
postag="_GV_|PUNCT_CONT|P.*|R.*|.*LOC_ADV.*|V.*|SENT_END|[NAS].*|complement" 
postag_regexp="yes" negate_pos="yes"/></token>
                 <marker>
                     <token postag="V.P.*" postag_regexp="yes"></token>
                 </marker>
@@ -7528,7 +7528,7 @@
         </rule>
         <rule>
             <pattern>
-                <token inflected="yes" skip="5" 
regexp="yes">fet|possibilitat|conclusió|evidència|prova</token>
+                <token inflected="yes" skip="5" 
regexp="yes">fet|possibilitat|conclusió|evidència|prova|acord</token>
                 <marker>
                     <token>que</token>
                 </marker>

Modified: 
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/ca/grammar.xml
===================================================================
--- 
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/ca/grammar.xml    
    2012-12-05 18:46:45 UTC (rev 8506)
+++ 
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/ca/grammar.xml    
    2012-12-05 22:17:27 UTC (rev 8507)
@@ -306,7 +306,7 @@
                     <token 
postag="A..F[SP].*|V.P..[SP]F|PX.F[SP].*|A..MP.*|V.P..PM|PX.MP.*" 
postag_regexp="yes"><exception postag="A..[MC][SN0].*|V.P..SM|PX.[MC][SN0].*" 
postag_regexp="yes"></exception></token>
                 </marker>
             </pattern>
-            <message>Error de concordança. Podria ser <suggestion><match 
no="2" postag="A..[MC][SN0].*" postag_regexp="yes" /></suggestion></message>
+            <message>Error de concordança. Podria ser: <suggestion><match 
no="2" postag="A..[MC][SN0].*" postag_regexp="yes" /></suggestion></message>
             <short>Error de concordança.</short>
             <example type="incorrect">Això <marker>vermells</marker>.</example>
             <example type="correct">Això vermell.</example>
@@ -3714,6 +3714,18 @@
         </rulegroup>
     </category>
     <category name="Confusions">
+        <rule id="UN_ABONA_UNA_BONA" name="un abona/una bona">
+            <pattern>
+                <marker>
+                    <token>un</token>
+                    <token>abona</token>
+                </marker>
+                <token postag="N.FS.*" postag_regexp="yes"/>
+            </pattern>
+            <message>¿Volíeu dir <suggestion>una bona</suggestion>?</message>
+            <example type="incorrect"><marker>un abona</marker> 
relació</example>
+            <example type="correct">una bona relació</example>
+        </rule>
         <rule id="ENTRE_MIG_ENTREMIG" name="entre mig / entremig">
             <pattern>
                 <marker>
@@ -5377,6 +5389,16 @@
                 <example type="incorrect">Una altra manera <marker>de 
d'</marker>analitzar .</example>
                 <example type="correct">No volia res més que mirar i mirar i 
mirar.</example>
             </rule>
+             <rule>
+                <pattern>
+                    <token>amb</token>
+                    <token>a</token>
+                </pattern>
+                <message>Combinació impossible de preposicions. Podeu 
escriure: <suggestion><match no="2"/> o <match no="1"/></suggestion>.</message>
+                <short>Element repetit</short>
+                <example type="incorrect">que volíem deixar enrere <marker>amb 
a</marker>l procés</example>
+                <example type="correct">que volíem deixar enrere amb el 
procés</example>
+            </rule>
             <!-- <rule>
                 <pattern>
                     <token postag="SPS00" 
regexp="yes">per|cap|fins|com</token> 
@@ -5390,14 +5412,16 @@
         </rulegroup>   
         <rule id="ELEMENTS_REPETITS" name="elements repetits: ja...ja, 
no...no">
             <pattern>
-                <token skip="15" regexp="yes">ja|no<exception scope="next" 
postag="PUNCT.*|PR.*|PT.*|DT.*|.*LOC_CONJ.*|CS" postag_regexp="yes"/></token>
+                <token skip="15" 
regexp="yes">ja|no|vaig|vas|va|vam|vàrem|vau|vàreu|van<exception scope="next" 
postag="PUNCT.*|PR.*|PT.*|DT.*|.*LOC_CONJ.*|C.*" postag_regexp="yes"/></token>
                 <token><match no="0"/></token>
             </pattern>
             <message>Atenció: element repetit.</message>
             <short>Element repetit</short>
             <example type="incorrect"><marker>Ja hi érem tots 
ja</marker>.</example>
+            <example type="incorrect">que <marker>va també va</marker> 
recordar la trajectòria editorial</example>
+            <example type="correct">van cantar i van riure</example>
             <example type="correct">Ja hi érem tots, ja.</example>
-            <example type="correct">No podia ser que no escoltessin.</example>
+            <example type="correct">No podia ser que no escoltessin.</example> 
           
         </rule> 
 <!--         <rulegroup id="paraula_repetida" name="Revisa: paraula repetida." 
default="off">
             Cal restringir la regla a un grup de paraules: mai, mateix,
@@ -5787,6 +5811,39 @@
                 <example type="correct">cal ampliar la victòria</example>
             </rule>
         </rulegroup>
+        <rulegroup id="APOSTROFACIO_ESPECIAL" name="casos especials 
d'apostrofació">
+            <rule id="EL_STATU" name="*el statu/l'statu">
+                <pattern>
+                    <token>el</token>
+                    <token regexp="yes">statu|scherzo|ftalat</token>
+                </pattern>
+                <message>Per a alguns cal escriure: <suggestion>l'<match 
no="2"/></suggestion>. Per a altres és opcional.</message>
+                <short>Error d'apostrofació</short>
+                <example type="incorrect" correction="l'statu"><marker>el 
statu</marker> quo</example>
+                <example type="correct">l'statu quo</example>
+            </rule>
+            <rule id="LA_SCHOLA" name="*l'schola/la schola">
+                <pattern>
+                    <token>l'</token>
+                    <token regexp="yes">schola|ftiriasi</token>
+                </pattern>
+                <message>Cal escriure: <suggestion>la <match 
no="2"/></suggestion>.</message>
+                <short>Error d'apostrofació</short>
+                <example type="incorrect" correction="la 
schola"><marker>l'schola</marker> cantorum</example>
+                <example type="correct">la schola cantorum</example>
+            </rule>
+            <rule id="DE_SCHOLA" name="*d'schola/de schola">
+                <pattern>
+                    <token>d'</token>
+                    <token regexp="yes">[qwrtypsdfgjklñzxcvbnmç].*</token>
+                </pattern>
+                <message>Cal escriure: <suggestion>de <match 
no="2"/></suggestion>.</message>
+                <short>Error d'apostrofació</short>
+                <example type="incorrect" correction="de 
schola"><marker>d'schola</marker> cantorum</example>
+                <example type="incorrect" correction="de 
ftiriasi"><marker>d'ftiriasi</marker></example>
+                <example type="correct">de schola cantorum</example>
+            </rule>
+        </rulegroup>
     </category>
     <category name="Errors ortogràfics">
         <rule id="noFreeling" name="Mots que no apareixen en el diccionari 
Freeling" default="off">
@@ -8493,6 +8550,17 @@
                 <example type="incorrect">Cal <marker>acabar amb els 
abusos</marker>.</example>
                 <example type="correct">Cal posar fi als abusos.</example>
             </rule>
+            <rule>
+                <pattern>
+                    <token skip="2" inflected="yes">acabar</token>
+                    <token>amb</token>
+                    <token regexp="yes" inflected="yes">això|açò|allò</token>
+                </pattern>
+                <message>Expressió incorrecta si vol dir: <suggestion>(posar 
fi a)</suggestion>, <suggestion>(eliminar)</suggestion>, 
<suggestion>(destruir)</suggestion>, <suggestion>(acabar)</suggestion>, 
<suggestion>(desfer)</suggestion>, <suggestion>(acabar)</suggestion>, 
<suggestion>(fer acabar)</suggestion>, <suggestion>(acabar)</suggestion>, 
<suggestion>(fer cessar)</suggestion>, <suggestion>(acabar)</suggestion>, 
<suggestion>(exterminar)</suggestion>, <suggestion>(acabar)</suggestion>, 
<suggestion>(aniquilar)</suggestion></message>
+                <short>Expressió incorrecta</short>
+                <example type="incorrect">Cal <marker>acabar immediatament amb 
això</marker>.</example>
+                <example type="correct">Cal posar-hi fi.</example>
+            </rule>
         </rulegroup>
         <rule id="FER_UN_LLEIG" name="fer un lleig">
             <pattern>
@@ -9781,34 +9849,34 @@
             <rule>
                 <pattern>
                     <token>a</token>
-                    <token>corre</token>
-                    <token>cuita</token>
+                    <token regexp="yes">corre|cuita</token>
+                    <token regexp="yes">cuita|corrents</token>
                 </pattern>
-                <message>¿Volíeu dir <suggestion>a 
corre-cuita</suggestion>?</message>
-                <example type="incorrect">se'n va anar <marker>a corre 
cuita</marker></example>
+                <message>¿Volíeu dir <suggestion>a <match no="2"/>-<match 
no="3"/></suggestion>?</message>
+                <example type="incorrect" correction="a corre-cuita">se'n va 
anar <marker>a corre cuita</marker></example>
                 <example type="correct">se'n va anar a corre-cuita</example>
             </rule>
             <rule>
                 <pattern>
                     <token negate="yes">a</token>
                     <marker>
-                        <token>corre</token>
-                        <token>cuita</token>
+                        <token regexp="yes">corre|cuita</token>
+                        <token regexp="yes">cuita|corrents</token>
                     </marker>
                 </pattern>
-                <message>¿Volíeu dir <suggestion>a 
corre-cuita</suggestion>?</message>
-                <example type="incorrect">se'n va anar <marker>corre 
cuita</marker></example>
+                <message>¿Volíeu dir <suggestion>a <match no="2"/>-<match 
no="3"/></suggestion>?</message>
+                <example type="incorrect" correction="a corre-cuita">se'n va 
anar <marker>corre cuita</marker></example>
                 <example type="correct">se'n va anar a corre-cuita</example>
             </rule>
             <rule>
                 <pattern>
                     <token negate="yes">a</token>
                     <marker>
-                        <token>corre-cuita</token>
+                        <token regexp="yes">corre-cuita|cuita-corrents</token>
                     </marker>
                 </pattern>
-                <message>¿Volíeu dir <suggestion>a 
corre-cuita</suggestion>?</message>
-                <example type="incorrect">se'n va anar 
<marker>corre-cuita</marker></example>
+                <message>¿Volíeu dir <suggestion>a <match 
no="2"/></suggestion>?</message>
+                <example type="incorrect" correction="a corre-cuita">se'n va 
anar <marker>corre-cuita</marker></example>
                 <example type="correct">se'n va anar a corre-cuita</example>
             </rule>
         </rulegroup>
@@ -11566,7 +11634,7 @@
         <rulegroup id="LIDERAT_LIDERATGE" name="liderat/lideratge, 
filtrat/filtratge...">
             <rule>
                 <pattern>
-                    <token><exception postag="RG_anteposat|N.M.*" 
postag_regexp="yes"/><exception inflected="yes">tenir</exception></token>
+                    <token><exception postag="RG_anteposat|N.*|CC|PUNCT.*" 
postag_regexp="yes"/><exception inflected="yes">tenir</exception></token>
                     <marker>
                         <token 
regexp="yes">etiquetats?|liderats?|filtrats?|empaquetats?|equilibrats?|embotellats?<exception
 postag="_GV_" /></token>
                     </marker>
@@ -11589,23 +11657,56 @@
                 <example type="correct">L'equip, liderat pel capità, aconseguí 
la victòria.</example>
                 <example type="correct">L'equip, ben liderat, podria arribar 
lluny.</example>
                 <example type="correct">Els tinc empaquetats</example>
+                <example type="correct">amb tractament unitari i 
equilibrat</example>
             </rule>
             <rule>
                 <pattern>
-                    <token regexp="yes">emmotll?at<exception 
postag="_GV_|_GN_MS" postag_regexp="yes"/></token>
+                    <token><exception postag="RG_anteposat|N.*|CC|PUNCT.*" 
postag_regexp="yes"/><exception inflected="yes">tenir</exception></token>
+                    <marker>
+                        <token regexp="yes">emmotll?at<exception 
postag="_GV_|_GN_MS" postag_regexp="yes"/></token>
+                    </marker>
                 </pattern>
-                <message>Quan indica un procés cal dir: <suggestion><match 
no="1" regexp_match="(.+)t(s?)" 
regexp_replace="$1ment$2"/></suggestion>.</message>
-                <short>Forma preferible</short>
+                <message>Quan indica un procés cal dir: <suggestion><match 
no="2" regexp_match="(.+)t(s?)" 
regexp_replace="$1ment$2"/></suggestion>.</message>
+                <short>Possible error</short>
                 <example type="incorrect" correction="emmotllament">El procés 
d'<marker>emmotllat</marker>.</example>
                 <example type="correct">l'emmotllament</example>
             </rule>
+            <rule>
+                <pattern>
+                    <token><exception postag="RG_anteposat|N.*|CC|PUNCT.*" 
postag_regexp="yes"/><exception inflected="yes">tenir</exception></token>
+                    <marker>
+                        <token>processat<exception postag="_GV_" /></token>
+                    </marker>
+                    <token><exception 
regexp="yes">per|pe|des</exception></token>
+                    <!-- <token 
regexp="yes">de|d'|digital|homomòrfic|multicanal|cognitiu</token> -->
+                </pattern>
+                <message>Quan indica un procés cal dir: <suggestion><match 
no="2" regexp_match="(.+)t(s?)" 
regexp_replace="$1ment$2"/></suggestion>.</message>
+                <short>Possible error</short>
+                <example type="incorrect" correction="processament">El 
<marker>processat</marker> de les imatges.</example>
+                <example type="correct">Han processat l'acusat.</example>
+                <example type="correct">greix processat de pollastre</example>
+            </rule>
+            <rule>
+                <pattern>
+                    <token><exception postag="RG_anteposat|N.*" 
postag_regexp="yes"/><exception inflected="yes">tenir</exception></token>
+                    <marker>
+                        <token regexp="yes">processats?<exception 
postag="_GV_" /></token>
+                    </marker>
+                    <token 
regexp="yes">de|d'|digitals?|homomòrfics?|multicanals?|cognitius?|necessaris?</token>
+                </pattern>
+                <message>Quan indica un procés cal dir: <suggestion><match 
no="2" regexp_match="(.+)t(s?)" 
regexp_replace="$1ment$2"/></suggestion>.</message>
+                <short>Possible error</short>
+                <example type="incorrect" correction="processament">El 
<marker>processat</marker> de les imatges.</example>
+                <example type="correct">Han processat l'acusat.</example>
+                <example type="correct">greix processat de pollastre</example>
+            </rule>
         </rulegroup>
         <rule id="MELENA" name="melena / cabellera">
             <pattern>
                 <token regexp="yes">melen(a|es)</token>
             </pattern>
             <message>¿Volíeu dir <suggestion><match no="1" postag="(NC.*)" 
postag_regexp="yes" postag_replace="$1">cabellera</match></suggestion>, 
<suggestion><match no="1" postag="(NC.*)" postag_regexp="yes" 
postag_replace="$1">grenyar</match></suggestion>, <suggestion><match no="1" 
postag="(NC.*)" postag_regexp="yes" 
postag_replace="$1">crinera</match></suggestion>, <suggestion><match no="1" 
postag="(NC.*)" postag_regexp="yes" 
postag_replace="$1">pelussera</match></suggestion> en comptes de "melena" 
(terme mèdic)?</message>
-            <short>Possible confusió</short>
+            <short>Possible error</short>
             <example type="incorrect">Tenia una <marker>melena</marker> 
preciosa.</example>
             <example type="correct">Tenia una cabellera preciosa</example>
         </rule>
@@ -11614,7 +11715,7 @@
                 <token regexp="yes">espessors?</token>
             </pattern>
             <message>¿Volíeu dir <suggestion><match no="1" postag="NCF(S)000" 
postag_regexp="yes" postag_replace="NCM$1000">gruix</match></suggestion> en 
comptes de "espessor" (= qualitat d'espès)?</message>
-            <short>Possible confusió</short>
+            <short>Possible error</short>
             <example type="incorrect" correction="gruix">30 cm 
d'<marker>espessor</marker></example>
             <example type="correct">Dos pams de gruix</example>
         </rule>
@@ -11650,6 +11751,7 @@
                 <token regexp="yes">explanad(a|es)</token>
             </pattern>
             <message>¿Volíeu dir <suggestion><match no="1" 
regexp_match="explanad(.*)" regexp_replace="esplanad$1"/></suggestion> en 
comptes de "explanada" (del v. "explanar")?</message>
+            <short>Possible error</short>
             <example type="incorrect" correction="esplanades">Hi havia dues 
grans <marker>explanades</marker></example>
             <example type="correct">esplanada</example>
         </rule>
@@ -11658,6 +11760,7 @@
                 <token regexp="yes">borregos?</token>
             </pattern>
             <message>¿Volíeu dir <suggestion><match no="1" 
regexp_match="borrego(.*)" regexp_replace="xai$1"/></suggestion>, 
<suggestion><match no="1" regexp_match="borrego(.*)" 
regexp_replace="borrec$1"/></suggestion>, <suggestion><match no="1" 
regexp_match="borrego(.*)" regexp_replace="anyell$1"/></suggestion> en comptes 
de 'borrego' (= tipus de pastís)?</message>
+            <short>Possible error</short>
             <example type="incorrect"><marker>borrego</marker></example>
             <example type="correct">xai</example>
         </rule>
@@ -12684,13 +12787,13 @@
         </rule>
         <rule id="COMPLERT_COMPLET" name="complert/complet">
             <pattern>
-                <token><exception inflected="yes" 
regexp="yes">haver|considerar</exception><exception 
regexp="yes">pronòstics?|deures?|obligaci(ó|ons)|promes(a|es)|objectius?|anys?|missió|desigs?|desitjos|mes|mesos|setman(a|es)|tràmits?</exception></token>
+                <token><exception inflected="yes" 
regexp="yes">haver|considerar</exception><exception 
regexp="yes">terminis?|pronòstics?|deures?|obligaci(ó|ons)|promes(a|es)|objectius?|anys?|missió|desigs?|desitjos|mes|mesos|setman(a|es)|tràmits?</exception></token>
                 <marker>
-                    <token regexp="yes" 
skip="-1">(in)?complert(a|s|es)?<exception regexp="yes" 
scope="next">pronòstics?|deures?|obligaci(ó|ons)|promes(a|es)|objectius?|anys?|missió|desigs?|desitjos|mes|mesos|setman(a|es)|tràmits</exception></token>
+                    <token regexp="yes" 
skip="-1">(in)?complert(a|s|es)?<exception regexp="yes" 
scope="next">terminis?|pronòstics?|deures?|obligaci(ó|ons)|promes(a|es)|objectius?|anys?|missió|desigs?|desitjos|mes|mesos|setman(a|es)|tràmits</exception></token>
                 </marker>
                 <token postag="SENT_END"/>
             </pattern>
-            <message>Si no és del verb <match no="2" postag="(V.+)" 
postag_regexp="yes" postag_replace="V.N.*"/>, cal dir <suggestion><match no="2" 
regexp_match="(.*)complert(.*)" 
regexp_replace="$1complet$2"></match></suggestion>.</message>
+            <message>Si no és del verb <match no="2" postag="(V.+)" 
postag_regexp="yes" postag_replace="V.N.*"/>, cal dir <suggestion><match no="2" 
regexp_match="(.*)omplert(.*)" 
regexp_replace="$1omplet$2"></match></suggestion>.</message>
             <example type="incorrect" correction="completa">La família 
<marker>complerta</marker>.</example>
             <example type="incorrect" correction="incomplet">és un llibre 
<marker>incomplert</marker>.</example>
             <example type="correct">que no hagin complert vuitanta 
anys.</example>

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


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits

Reply via email to