Revision: 8619
          
http://languagetool.svn.sourceforge.net/languagetool/?rev=8619&view=rev
Author:   jaumeortola
Date:     2012-12-21 20:14:29 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
[ca] Improved suggestions in rule APOSTROFACIO

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-21 19:50:12 UTC (rev 8618)
+++ 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
      2012-12-21 20:14:29 UTC (rev 8619)
@@ -46,7 +46,9 @@
             </pattern>
             <disambig action="add"><wd pos="_PUNCT_CONT"></wd></disambig>
         </rule>
-        <rule id="coma_decimal" name="coma decimal">
+    </rulegroup>
+    <rulegroup id="coma_decimal" name="coma decimal">
+        <rule>
             <pattern>
                 <token regexp="yes">\d+</token>
                 <marker>
@@ -56,17 +58,27 @@
             </pattern>
             <disambig action="remove"><wd pos="_PUNCT_CONT"></wd></disambig>
         </rule>
-        <rule id="coma_decimal2" name="coma decimal">
+        <rule>
             <pattern>
                 <token regexp="yes">\d+</token>
                 <marker>
-                    <token spacebefore="no">,</token>
+                    <token spacebefore="no">.</token>
                 </marker>
                 <token spacebefore="no" regexp="yes">\d+</token>
             </pattern>
+            <disambig action="remove"><wd pos="_PUNCT"></wd></disambig>
+        </rule>
+        <rule>
+            <pattern>
+                <token regexp="yes">\d+</token>
+                <marker>
+                    <token spacebefore="no" regexp="yes">[,.]</token>
+                </marker>
+                <token spacebefore="no" regexp="yes">\d+</token>
+            </pattern>
             <disambig action="add"><wd pos="decimal_comma"></wd></disambig>
         </rule>
-    </rulegroup>
+    </rulegroup>    
     <rule id="no_noms_error_diccionari" name="no haurien de ser noms, error 
del diccionari">
         <pattern>
             <token regexp="yes">empaquetat|emmotll?at</token>

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-21 19:50:12 UTC (rev 8618)
+++ 
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/ca/grammar.xml    
    2012-12-21 20:14:29 UTC (rev 8619)
@@ -5648,11 +5648,12 @@
                         <token>de</token>
                         <token regexp="yes">1|11</token>
                     </marker>
-                    <token><exception regexp="yes">[.,]</exception></token>
+                    <token><exception postag="decimal_comma"/></token>
                 </pattern>
                 <message>Cal escriure: <suggestion>d'<match 
no="2"></match></suggestion>.</message>
                 <short>Error ortogràfic</short>
                 <example type="incorrect" correction="d'1"><marker>de 
1</marker> a 3</example>
+                <example type="incorrect" correction="d'1"><marker>de 
1</marker>, de 3</example>
                 <example type="correct">de 1.400 habitants</example>
             </rule>
             <rule>
@@ -5661,67 +5662,42 @@
                         <token>el</token>
                         <token regexp="yes">1|11</token>
                     </marker>
-                    <token><exception regexp="yes">[.,]</exception></token>
+                    <token><exception postag="decimal_comma"/></token>
                 </pattern>
                 <message>Cal escriure: <suggestion>l'<match 
no="2"></match></suggestion>.</message>
                 <short>Error ortogràfic</short>
                 <example type="incorrect" correction="l'1"><marker>el 
1</marker> de febrer</example>
-                <example type="correct">els 1.400 habitants</example>
+                <example type="incorrect" correction="l'1"><marker>el 
1</marker>, el 2 i el 3 de febrer</example>
+                <example type="correct">el 1.400</example>
             </rule>
             <rule>
                 <pattern>
                     <marker>
+                        <token regexp="yes">a|de</token>
                         <token spacebefore="no">l</token>
                         <token regexp="yes">1|11</token>
                     </marker>
-                    <token><exception regexp="yes">[.,]</exception></token>
+                    <token><exception postag="decimal_comma"/></token>
                 </pattern>
-                <message>Cal escriure: <suggestion> l'<match 
no="2"></match></suggestion>.</message>
+                <message>Cal escriure: <suggestion><match no="1"/> l'<match 
no="3"></match></suggestion>.</message>
                 <short>Error ortogràfic</short>
-                <example type="incorrect" correction=" l'1">fins a<marker>l 
1</marker> de febrer</example>
-                <example type="correct">fins a 1.400 habitants</example>
+                <example type="incorrect" correction="a l'1">fins <marker>al 
1</marker> de febrer</example>
+                <example type="incorrect" correction="a l'1">fins <marker>al 
1</marker>, al 2 i al 3 de febrer</example>
+                <example type="correct">del 1.400 al 1.500</example>
             </rule>
             <rule>
                 <pattern>
                     <marker>
-                        <token>de</token>
-                        <token regexp="yes">1|11</token>
-                    </marker>
-                    <token regexp="yes">[.,]</token>
-                    <token><exception spacebefore="no" 
regexp="yes">\d+</exception></token>
-                </pattern>
-                <message>Cal escriure: <suggestion>d'<match 
no="2"></match></suggestion>.</message>
-                <short>Error ortogràfic</short>
-                <example type="incorrect" correction="d'1"><marker>de 
1</marker>, de 3</example>
-                <example type="correct">de 1.400 habitants</example>
-            </rule>
-            <rule>
-                <pattern>
-                    <marker>
-                        <token>el</token>
-                        <token regexp="yes">1|11</token>
-                    </marker>
-                    <token regexp="yes">[.,]</token>
-                    <token><exception spacebefore="no" 
regexp="yes">\d+</exception></token>
-                </pattern>
-                <message>Cal escriure: <suggestion>l'<match 
no="2"></match></suggestion>.</message>
-                <short>Error ortogràfic</short>
-                <example type="incorrect" correction="l'1"><marker>el 
1</marker>, el 2 i el 3 de febrer</example>
-                <example type="correct">els 1.400 habitants</example>
-            </rule>
-            <rule>
-                <pattern>
-                    <marker>
+                        <token>pe</token>
                         <token spacebefore="no">l</token>
                         <token regexp="yes">1|11</token>
                     </marker>
-                    <token regexp="yes">[.,]</token>
-                    <token><exception spacebefore="no" 
regexp="yes">\d+</exception></token>
+                    <token><exception postag="decimal_comma"/></token>
                 </pattern>
-                <message>Cal escriure: <suggestion> l'<match 
no="2"></match></suggestion>.</message>
+                <message>Cal escriure: <suggestion>per l'<match 
no="3"></match></suggestion>.</message>
                 <short>Error ortogràfic</short>
-                <example type="incorrect" correction=" l'1">fins a<marker>l 
1</marker>, al 2 i al 3 de febrer</example>
-                <example type="correct">fins a 1.400 habitants</example>
+                <example type="incorrect" correction="per l'1"><marker>pel 
1</marker> de febrer</example>
+                <example type="correct">anem pel 1.400</example>
             </rule>
             <rule>
                 <pattern>

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