Revision: 8586
http://languagetool.svn.sourceforge.net/languagetool/?rev=8586&view=rev
Author: jaumeortola
Date: 2012-12-18 18:19:48 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
[ca] fixed false alarms
Modified Paths:
--------------
trunk/JLanguageTool/src/main/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRule.java
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/ca/grammar.xml
trunk/JLanguageTool/src/test/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRuleTest.java
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRule.java
===================================================================
---
trunk/JLanguageTool/src/main/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRule.java
2012-12-18 16:12:42 UTC (rev 8585)
+++
trunk/JLanguageTool/src/main/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRule.java
2012-12-18 18:19:48 UTC (rev 8586)
@@ -76,8 +76,8 @@
private static final Pattern ADJECTIU_FP =
Pattern.compile("A..[FC][PN].*|V.P..PF|PX.FP.*");
private static final Pattern ADJECTIU_CP =
Pattern.compile("A..C[PN].*");
private static final Pattern ADJECTIU_CS =
Pattern.compile("A..C[SN].*");
- private static final Pattern ADJECTIU_M =
Pattern.compile("A..[MC].*|V.P...M|PX.M.*");
- private static final Pattern ADJECTIU_F =
Pattern.compile("A..[FC].*|V.P...F|PX.F.*");
+ //private static final Pattern ADJECTIU_M =
Pattern.compile("A..[MC].*|V.P...M|PX.M.*");
+ //private static final Pattern ADJECTIU_F =
Pattern.compile("A..[FC].*|V.P...F|PX.F.*");
private static final Pattern ADJECTIU_S =
Pattern.compile("A...[SN].*|V.P..S.|PX..S.*");
private static final Pattern ADJECTIU_P =
Pattern.compile("A...[PN].*|V.P..P.|PX..P.*");
private static final Pattern ADVERBI =
Pattern.compile("R.|.*LOC_ADV.*");
@@ -87,7 +87,7 @@
private static final Pattern UPPERCASE =
Pattern.compile("\\p{Lu}[\\p{Ll}\u00B7]*");
private static final Pattern COORDINACIO = Pattern.compile(",|i|o");
private static final Pattern COORDINACIO_IONI =
Pattern.compile("i|o|ni");
- private static final Pattern KEEP_COUNT =
Pattern.compile("A.*|N.*|D[NAID].*|SPS.*|.*LOC_ADV.*|V.P.*|_PUNCT.*|.*LOC_ADJ.*");
+ private static final Pattern KEEP_COUNT =
Pattern.compile("A.*|N.*|D[NAID].*|SPS.*|.*LOC_ADV.*|V.P.*|_PUNCT.*|.*LOC_ADJ.*|complement");
private static final Pattern KEEP_COUNT2 =
Pattern.compile(",|i|o|ni|\\d+%?|%");
private static final Pattern STOP_COUNT = Pattern.compile(";");
private static final Pattern PREPOSICIONS = Pattern.compile("SPS.*");
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-18 16:12:42 UTC (rev 8585)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
2012-12-18 18:19:48 UTC (rev 8586)
@@ -291,6 +291,15 @@
</pattern>
<disambig action="filter" postag="[^N].*"></disambig>
</rule>
+ <rule id="anys_enrere" name="anys enrere">
+ <pattern>
+ <marker>
+ <token
regexp="yes">dies|setmanes|mesos|anys|dècades|segles</token>
+ </marker>
+ <token regexp="yes">(en|ar|endar)(rer[ea])</token>
+ </pattern>
+ <disambig action="add"><wd pos="LOC_ADV"/></disambig>
+ </rule>
<rule id="mes_de_nou" name="més de nou (excepció)">
<pattern>
<token>més</token>
@@ -3176,8 +3185,7 @@
</marker>
</pattern>
<disambig action="add"><wd pos="_GN_FS"/><wd pos="_GN_FS"/><wd
pos="_GN_FS"/></disambig>
- </rule>
-
+ </rule>
<rule>
<pattern>
<marker>
@@ -5992,6 +6000,18 @@
</pattern>
<disambig action="filter" postag="[^V].*"></disambig>
</rule>
+ <rule id="sobre" name="sobre no verb">
+ <pattern>
+ <marker>
+ <and>
+ <token postag="V.*" postag_regexp="yes">sobre</token>
+ <token postag="SPS.*" postag_regexp="yes"></token>
+ </and>
+ </marker>
+ <token regexp="yes">de|d'</token>
+ </pattern>
+ <disambig action="filter" postag="[^V].*"></disambig>
+ </rule>
<rule id="GerAdj" name="gerundi i adj: gerundi">
<pattern>
<token><exception postag="SPS00|CC"
postag_regexp="yes"/><exception inflected="yes"
regexp="yes">ser|estar|semblar|parèixer|considerar</exception></token> <!-- en
calent -->
@@ -7073,7 +7093,7 @@
</rule>
<rule>
<pattern>
- <token regexp="yes"
inflected="yes">contrari|igual|similar|semblant|equivalent|alternatiu|superior|inferior|paral·lel|anterior|posterior</token>
+ <token regexp="yes"
inflected="yes">oposar|contrari|igual|similar|semblant|equivalent|alternatiu|superior|inferior|paral·lel|anterior|posterior</token>
<marker>
<token>a</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-18 16:12:42 UTC (rev 8585)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/ca/grammar.xml
2012-12-18 18:19:48 UTC (rev 8586)
@@ -2642,7 +2642,7 @@
<example type="correct">Casi'ns, mossèn.</example>
</rule>
</rulegroup>
- <rulegroup id="CAP_GENS" name="cap ganes/gens de ganes" default="on">
+ <rulegroup id="CAP_GENS" name="cap ganes/gens de ganes" default="off">
<!-- Alguns accepten 'cap' davant de nom no comptable abstracte -->
<rule>
<pattern>
@@ -15804,12 +15804,14 @@
</rule>
<rule>
<pattern>
- <token postag="V.S.*" postag_regexp="yes"
regexp="yes">.+às</token>
+ <token postag="V.S.*" postag_regexp="yes"
regexp="yes">.+às<exception postag="AQ.*|N.*" postag_regexp="yes"/></token>
</pattern>
<message>Forma verbal pròpia del balear o del
valencià.</message>
<short>Forma balear o valenciana.</short>
<example type="incorrect">Que no
<marker>pensàs</marker>.</example>
- <example type="correct">Que no
<marker>pensés</marker>.</example>
+ <example type="correct">Que no pensés.</example>
+ <example type="correct">Escàs de pèl</example>
+ <example type="correct">Tomàs sap la resposta</example>
</rule>
<rule>
<pattern>
Modified:
trunk/JLanguageTool/src/test/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRuleTest.java
===================================================================
---
trunk/JLanguageTool/src/test/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRuleTest.java
2012-12-18 16:12:42 UTC (rev 8585)
+++
trunk/JLanguageTool/src/test/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRuleTest.java
2012-12-18 18:19:48 UTC (rev 8586)
@@ -43,6 +43,7 @@
public void testRule() throws IOException {
// correct sentences:
+ assertCorrect("té una manera de jugar aquestes gires tan
femenina");
assertCorrect("des de la tradicional divisió en dos regnes
establida per Linnaeus");
assertCorrect("aquestes activitats avui residuals donada ja la
manca de territori");
assertCorrect("instruments de càlcul basats en boles anomenats
yupana.");
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
