Revision: 8598
http://languagetool.svn.sourceforge.net/languagetool/?rev=8598&view=rev
Author: jaumeortola
Date: 2012-12-20 00:48:39 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
[ca] Fixed false alarms.
Modified Paths:
--------------
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/catalan.dict
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/catalan_synth.dict
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/multiwords.txt
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/ca/grammar.xml
Modified:
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/catalan.dict
===================================================================
(Binary files differ)
Modified:
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/catalan_synth.dict
===================================================================
(Binary files differ)
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-20 00:19:44 UTC (rev 8597)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/disambiguation.xml
2012-12-20 00:48:39 UTC (rev 8598)
@@ -22,6 +22,17 @@
<token postag="(PX.|N.|[ADP].{2}|V.{5})[FC].*|RG.*"
postag_regexp="yes"></token>
</equivalence>
</unification>
+ <unification feature="persona">
+ <equivalence type="primera">
+ <token postag="(P.|V.{3})[10].*" postag_regexp="yes"></token>
+ </equivalence>
+ <equivalence type="segona">
+ <token postag="(P.|V.{3})[20].*" postag_regexp="yes"></token>
+ </equivalence>
+ <equivalence type="tercera">
+ <token postag="(P.|V.{3})[30].*" postag_regexp="yes"></token>
+ </equivalence>
+ </unification>
<rulegroup id="PUNTUACIO" name="signes de puntuació">
<rule>
<pattern>
@@ -295,11 +306,21 @@
<pattern>
<marker>
<token
regexp="yes">dies|setmanes|mesos|anys|dècades|segles</token>
+ <token regexp="yes">(en|ar|endar)(rer[ea])</token>
</marker>
- <token regexp="yes">(en|ar|endar)(rer[ea])</token>
</pattern>
- <disambig action="add"><wd pos="LOC_ADV"/></disambig>
+ <disambig action="add"><wd pos="LOC_ADV"/><wd
pos="LOC_ADV"/></disambig>
</rule>
+ <rule id="anys_i_anys" name="anys i anys">
+ <pattern>
+ <marker>
+ <token
regexp="yes">hores|anys|dies|setmanes|mesos|anys|dècades|segles</token>
+ <token>i</token>
+ <token><match no="0"/></token>
+ </marker>
+ </pattern>
+ <disambig action="add"><wd pos="LOC_ADV"/><wd pos="LOC_ADV"/><wd
pos="LOC_ADV"/></disambig>
+ </rule>
<rule id="mes_de_nou" name="més de nou (excepció)">
<pattern>
<token>més</token>
@@ -1513,6 +1534,15 @@
</rule>
<rule>
<pattern>
+ <marker>
+ <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"><exception
inflected="yes">haver</exception></token>
+ </pattern>
+ <disambig action="add"><wd pos="_perfet"
lemma="haver"></wd></disambig>
+ </rule>
+ <rule>
+ <pattern>
<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>
@@ -2537,7 +2567,7 @@
<token postag="V.N.*" postag_regexp="yes"><exception
regexp="yes">poder|saber</exception></token>
</marker>
</pattern>
- <disambig action="filter" postag="V.N.*|complement"></disambig>
+ <disambig action="filter"
postag="V.N.*|complement|_GV_|_perfet"></disambig>
</rule>
<rule id="de_vas" name="de vas"> <!-- excepció a la regla "Anar" -->
<pattern>
@@ -3938,13 +3968,13 @@
<disambig action="filter" postag="N.*"></disambig>
</rule>
-->
- <rule id="causa" name="no nom darere de relariu. Ex: que causa, que
pensa">
+ <rule id="causa" name="no nom darere de relatiu. Ex: que causa, que
pensa">
<pattern>
<token postag="PR.*" postag_regexp="yes"/>
<marker>
<and>
<token postag="N.*" postag_regexp="yes" regexp="yes"/>
- <token postag="V.*" postag_regexp="yes" regexp="yes"/>
+ <token postag="V.*" postag_regexp="yes"
regexp="yes"><exception postag="VMIP1S0"/></token>
</and>
</marker>
</pattern>
@@ -4858,7 +4888,7 @@
<pattern>
<marker>
<and>
- <token postag="N.*" postag_regexp="yes"
regexp="yes">creix|fem|res|si|bé|perquè|però|dins|sobre|real|era|eres|dius?<exception
postag="_GN.*" postag_regexp="yes" /></token>
+ <token postag="N.*" postag_regexp="yes"
regexp="yes">amples?|creix|fem|res|si|bé|perquè|però|dins|sobre|real|era|eres|dius?<exception
postag="_GN.*" postag_regexp="yes" /></token>
<token postag="N.*" postag_regexp="yes"
negate_pos="yes"></token>
</and>
</marker>
@@ -5637,7 +5667,7 @@
</rulegroup>
<rule id="verb_verbadj" name="verb + verb/adj">
<pattern>
- <token postag="V.[MSI].*|_GV_" postag_regexp="yes"><exception
postag="PP.*|P0.*" postag_regexp="yes"/></token>
+ <token postag="V.[MSI].*|_GV_" postag_regexp="yes"><exception
postag="PP.*|P0.*|N.*" postag_regexp="yes"/></token>
<marker>
<and>
<token postag="A.*|V.P.*" postag_regexp="yes"><exception
postag="_GN.*" postag_regexp="yes" /></token>
@@ -7414,4 +7444,19 @@
<disambig action="add"><wd pos="hac_aspirada"></wd></disambig>
</rule>
</rulegroup>
+ <rulegroup id="verb_reflexiu" name="verb acomopanyat de pronom reflexiu">
+ <rule>
+ <pattern>
+ <unify>
+ <feature id="nombre"/>
+ <feature id="persona"/>
+ <token postag="P0.0.*" postag_regexp="yes"/>
+ <marker>
+ <token postag="V.[SI].*" postag_regexp="yes"/>
+ </marker>
+ </unify>
+ </pattern>
+ <disambig action="add"><wd pos="_reflexiu"></wd></disambig>
+ </rule>
+ </rulegroup>
</rules>
\ No newline at end of file
Modified:
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/multiwords.txt
===================================================================
---
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/multiwords.txt
2012-12-20 00:19:44 UTC (rev 8597)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/ca/multiwords.txt
2012-12-20 00:48:39 UTC (rev 8598)
@@ -403,6 +403,7 @@
Llevat de LOC_PREP
Lluny d' LOC_PREP
Lluny de LOC_PREP
+Manta vegada LOC_ADV
Millor dit LOC_ADV
Molt i molt LOC_ADV
Mutatis mutandis LOC_ADV
@@ -892,6 +893,7 @@
llevat de LOC_PREP
lluny d' LOC_PREP
lluny de LOC_PREP
+manta vegada LOC_ADV
millor dit LOC_ADV
molt i molt LOC_ADV
mutatis mutandis LOC_ADV
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-20 00:19:44 UTC (rev 8597)
+++
trunk/JLanguageTool/src/main/resources/org/languagetool/rules/ca/grammar.xml
2012-12-20 00:48:39 UTC (rev 8598)
@@ -582,7 +582,7 @@
<feature id="nombre" />
<feature id="genere" />
<token postag="A.*|PX.*"
postag_regexp="yes"><exception postag="complement.*|ignore_concordance"
postag_regexp="yes"/></token>
- <token postag="N.M.*" postag_regexp="yes"><exception
postag="A.*|V.[PIS].*|ignore_concordance" postag_regexp="yes" /><exception
inflected="yes">numeral</exception></token>
+ <token postag="N.M.*" postag_regexp="yes"><exception
postag="A.*|V.[PIS].*|ignore_concordance|.*LOC_ADV.*" postag_regexp="yes"
/><exception inflected="yes">numeral</exception></token>
</unify>
</pattern>
<message>Error de concordança.</message><!-- Podria ser:
@@ -604,7 +604,7 @@
<feature id="nombre" />
<feature id="genere" />
<token postag="A.*|PX.*"
postag_regexp="yes"><exception postag="complement.*|ignore_concordance"
postag_regexp="yes"/></token>
- <token postag="N.F.*" postag_regexp="yes"><exception
postag="A.*|V.[PIS].*|ignore_concordance" postag_regexp="yes" /><exception
inflected="yes">numeral</exception><exception>ca</exception></token>
+ <token postag="N.F.*" postag_regexp="yes"><exception
postag="A.*|V.[PIS].*|ignore_concordance|.*LOC_ADV.*" postag_regexp="yes"
/><exception
inflected="yes">numeral</exception><exception>ca</exception></token>
</unify>
</pattern>
<message>Error de concordança.</message> <!-- Podria ser:
@@ -632,7 +632,7 @@
<feature id="genere" />
<marker>
<token postag="V.P.*"
postag_regexp="yes"><exception postag="_GV_|V.[MIS].*|RG"
postag_regexp="yes"/><exception inflected="yes"
regexp="yes">titular|anomenar|dir|denominar</exception><exception>mes</exception></token>
- <token postag="N.M.*"
postag_regexp="yes"><exception postag="_GN_.*|A.*|ignore_concordance"
postag_regexp="yes" /></token>
+ <token postag="N.M.*"
postag_regexp="yes"><exception
postag="_GN_.*|A.*|ignore_concordance|.*LOC_ADV.*" postag_regexp="yes"
/></token>
</marker>
</unify>
</pattern>
@@ -651,7 +651,7 @@
<feature id="genere" />
<marker>
<token postag="V.P.*"
postag_regexp="yes"><exception postag="_GV_|V.[MIS].*|RG" postag_regexp="yes"
/><exception inflected="yes"
regexp="yes">titular|anomenar|dir|denominar</exception><exception>mes</exception></token>
- <token postag="N.F.*"
postag_regexp="yes"><exception postag="_GN_.*|A.*|ignore_concordance"
postag_regexp="yes" /></token>
+ <token postag="N.F.*"
postag_regexp="yes"><exception
postag="_GN_.*|A.*|ignore_concordance|.*LOC_ADV.*" postag_regexp="yes"
/></token>
</marker>
</unify>
</pattern>
@@ -2254,7 +2254,7 @@
<marker>
<token inflected="yes" skip="3">donar</token>
</marker>
- <token
regexp="yes">vergonya|fàstic|ràbia|por|llàstima|set|calor|pena</token>
+ <token
regexp="yes">fàstic|ràbia|por|llàstima|set|calor|pena</token>
</pattern>
<message>Cal dir: <suggestion><match no="1" postag="(V.*)"
postag_regexp="yes" postag_replace="$1">fer</match></suggestion></message>
<url>http://esadir.cat/lexic/entrades/entry_20030820190348_41</url>
@@ -2265,6 +2265,18 @@
<rule>
<pattern>
<marker>
+ <token inflected="yes" skip="3">donar<exception
postag="_reflexiu"/></token>
+ </marker>
+ <token>vergonya</token>
+ </pattern>
+ <message>Cal dir: <suggestion><match no="1" postag="(V.*)"
postag_regexp="yes" postag_replace="$1">fer</match></suggestion></message>
+
<url>http://esadir.cat/lexic/entrades/entry_20030820190348_41</url>
+ <example type="incorrect"
correction="Feia"><marker>Donava</marker> vergonya</example>
+ <example type="correct">jo em dono vergonya</example>
+ </rule>
+ <rule>
+ <pattern>
+ <marker>
<token inflected="yes" skip="3">donar</token>
</marker>
<token regexp="yes"
inflected="yes">salt|tombarella|passejada|petó|bes|besada|pessic|abraçada|gir|pel·lícula|batxillerat|concert|recital|impressió</token>
@@ -2280,7 +2292,7 @@
<marker>
<token inflected="yes">donar</token>
</marker>
- <token skip="2"></token>
+ <token skip="2"></token>
<token inflected="yes">pas</token>
</pattern>
<message>Cal dir: <suggestion><match no="1" postag="(V.*)"
postag_regexp="yes" postag_replace="$1">fer</match></suggestion></message>
@@ -2867,7 +2879,7 @@
<rule>
<pattern>
<marker>
- <token skip="3">tan<exception
postag="PP.*|P0.*|V.*|SENT_END|_GV_" scope="next" postag_regexp="yes"
negate_pos="yes" /></token>
+ <token skip="3">tan<exception
postag="PP.*|P0.*|V.*|SENT_END|_GV_|_reflexiu|_perfet" scope="next"
postag_regexp="yes" negate_pos="yes" /></token>
</marker>
<token postag="V.[^P].*" postag_regexp="yes"><exception
postag="A.*" postag_regexp="yes"></exception></token>
</pattern>
@@ -3190,7 +3202,7 @@
<rule id="SI_QUE" name="*sí m'agrada/sí que m'agrada">
<pattern>
<marker>
- <token skip="3">sí<exception postag="_GN_MS"/><exception
postag="PP.*|P0.*|V.*|_GV_|SENT_END" scope="next" postag_regexp="yes"
negate_pos="yes"/></token>
+ <token skip="3">sí<exception postag="_GN_MS"/><exception
postag="PP.*|P0.*|V.*|_GV_|_perfet|SENT_END" scope="next" postag_regexp="yes"
negate_pos="yes"/></token>
</marker>
<token postag="V.[MIS].*" postag_regexp="yes"/>
</pattern>
@@ -8109,9 +8121,9 @@
<pattern>
<token postag="SENT_START" skip="-1"><exception
postag="PP3CN000" scope="next" inflected="yes">hi</exception><exception
postag="PP3..A00" scope="next" postag_regexp="yes" /></token>
<marker>
- <token postag="V.[GN].*" postag_regexp="yes"
regexp="yes">haver|havent<exception postag="_GN_MS"/></token>
+ <token postag="V.[GN].*" postag_regexp="yes"
regexp="yes">haver|havent<exception postag="_GN_MS|_perfet"
postag_regexp="yes"/></token>
</marker>
- <token><exception
postag="V.P.*|P0.{6}|PP3CN000|PP3NN000|PP3..A00|PP3CP000|PP3CSD00|RG"
postag_regexp="yes"/><exception regexp="yes">de|d'</exception></token>
+ <token><exception
postag="V.P.*|P0.{6}|PP3CN000|PP3NN000|PP3..A00|PP3CP000|PP3CSD00"
postag_regexp="yes"/><exception regexp="yes">de|d'</exception></token>
</pattern>
<message>Falta el pronom 'hi'. <suggestion><match
no="2"/>-hi</suggestion></message>
<example type="incorrect" correction="haver-hi">Va
<marker>haver</marker> una reunió.</example>
@@ -8122,6 +8134,8 @@
<example type="correct">després d'haver finalment abandonat la
teoria</example>
<example type="correct">la guineu, quan no les pot haver, diu
que són verdes</example>
<example type="correct">tots els casos haguts i per
haver</example>
+ <example type="incorrect" correction="haver-hi">després
d'<marker>haver</marker> finalment sentència</example>
+ <example type="correct">després d'haver finalment abandonat la
teoria</example>
</rule>
<rule>
<pattern>
@@ -8155,12 +8169,12 @@
<pattern>
<token negate="yes">hi</token>
<marker>
- <token>ha</token>
+ <token regexp="yes">ha|havia</token>
<token>hagut</token>
</marker>
<token negate="yes" regexp="yes">de|d'</token>
</pattern>
- <message>¿Volíeu dir <suggestion>hi ha
hagut</suggestion>?</message>
+ <message>¿Volíeu dir <suggestion>hi <match no="2"/>
hagut</suggestion>?</message>
<example type="incorrect" correction="hi ha hagut"><marker>ha
hagut</marker> un xoc de trens</example>
<example type="correct">hi ha hagut un xoc</example>
<example type="correct">ha hagut de fer-ho</example>
@@ -10208,7 +10222,7 @@
<pattern>
<token postag="SENT_START"/>
<marker>
- <token skip="4">com<exception
postag="RN|PP.*|P0.*|V.*|SENT_END|DA.*|_GV_" scope="next" postag_regexp="yes"
negate_pos="yes" /></token>
+ <token skip="4">com<exception
postag="RN|PP.*|P0.*|V.*|SENT_END|DA.*|_GV_|_reflexiu|_perfet" scope="next"
postag_regexp="yes" negate_pos="yes" /></token>
<token postag="V.S.*" postag_regexp="yes"><exception
inflected="yes" regexp="yes">poder|voler</exception><exception postag="V.I.*"
postag_regexp="yes"/></token>
</marker>
</pattern>
@@ -11102,7 +11116,7 @@
<pattern>
<token>no</token>
<marker>
- <token postag="PP.*|P0.*" postag_regexp="yes"
skip="1"><exception postag="PP.*|P0.*|V.*|SENT_END" scope="next"
postag_regexp="yes" negate_pos="yes" /></token>
+ <token postag="PP.*|P0.*" postag_regexp="yes"
skip="1"><exception postag="PP.*|P0.*|V.*|SENT_END|_reflexiu" scope="next"
postag_regexp="yes" negate_pos="yes" /></token>
<token postag="VM.*" postag_regexp="yes"
inflected="yes">cabre</token>
</marker>
<token>dubte</token>
@@ -14864,6 +14878,22 @@
</rule>
<rule>
<pattern>
+ <token inflected="yes">despedir</token>
+ </pattern>
+ <message>Paraula admesa en alguns diccionaris. També es pot
dir: <suggestion><match no="1" postag="(V.+)" postag_regexp="yes"
postag_replace="$1">acomiadar</match></suggestion>, <suggestion><match no="1"
postag="(V.+)" postag_regexp="yes"
postag_replace="$1">despatxar</match></suggestion>, <suggestion><match no="1"
postag="(V.+)" postag_regexp="yes" postag_replace="$1">dir</match>
adéu</suggestion>.</message>
+ <example type="incorrect">es <marker>despedí</marker></example>
+ <example type="correct">s'acomiadà</example>
+ </rule>
+ <rule>
+ <pattern>
+ <token inflected="yes">disfrutar</token>
+ </pattern>
+ <message>Paraula admesa en alguns diccionaris. També es pot
dir: <suggestion><match no="1" postag="(V.+)" postag_regexp="yes"
postag_replace="$1">gaudir</match></suggestion>, <suggestion><match no="1"
postag="(V.+)" postag_regexp="yes"
postag_replace="$1">fruir</match></suggestion>, <suggestion><match no="1"
postag="(V.+)" postag_regexp="yes" postag_replace="$1">sentir</match>
goig</suggestion>, <suggestion>(passar-ho bé)</suggestion>,
<suggestion>(divertir-se)</suggestion>.</message>
+ <example type="incorrect"><marker>disfrutar</marker></example>
+ <example type="correct">gaudir</example>
+ </rule>
+ <rule>
+ <pattern>
<token inflected="yes">explosionar</token>
</pattern>
<message>Paraula admesa en alguns diccionaris. També es pot
dir: <suggestion><match no="1" postag="(V.+)" postag_regexp="yes"
postag_replace="$1">fer</match> explotar</suggestion>, <suggestion><match
no="1" postag="(V.+)" postag_regexp="yes" postag_replace="$1">fer</match>
esclatar</suggestion>.</message>
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
