Skip to content

Commit

Permalink
Merge branch 'master' into topic/java9-module-system
Browse files Browse the repository at this point in the history
  • Loading branch information
miurahr committed Oct 5, 2023
2 parents b216907 + ff7f7ee commit f83b76b
Show file tree
Hide file tree
Showing 61 changed files with 67,020 additions and 1,724 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,10 @@ static class SpecificIdRule extends ConfusionProbabilityRule {
(id.equals("CONFUSION_RULE_DISCREET_DISCRETE") || id.equals("CONFUSION_RULE_DISCRETE_DISCREET"))) {
this.setUrl(Tools.getUrl("https://languagetool.org/insights/post/discrete-vs-discreet/"));
}
if (lang.getShortCode().equals("en") &&
(id.equals("CONFUSION_RULE_PRECEDENTS_PRECEDENCE") || id.equals("CONFUSION_RULE_PRECEDENCE_PRECEDENTS"))) {
this.setUrl(Tools.getUrl("https://languagetool.org/insights/post/precedence-or-precedent/"));
}
}
@Override
public String getId() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5864,7 +5864,6 @@ Martin Luther King
West Virginia
Lord Byron
Sung Jae-ki
John Paul II
Adam Smith
Marco Polo
Blaise Pascal
Expand Down Expand Up @@ -6936,6 +6935,7 @@ Busta Rhymes
Mary J Blige
Henry Cavil
Henry Kissinger
Kissinger
Bill Cosby
Walter Reed
Walter Reed Hospital
Expand Down Expand Up @@ -6970,10 +6970,6 @@ Jeff Weiner
Washington Boulevard
Harvard Business Review
Kill Van Kull
Contenidos ocultar
Inicio
Historia
Sinopsis completa
Keyser Söze
Travis Scott
Prenzlauer Berg
Expand Down Expand Up @@ -8311,7 +8307,7 @@ José Agustín
José Angel Gerónimo Jiménez
José Angel Mañas
José Antonio Dias
José Antonio Nuñez
José Antonio Núñez
José Carlos Matias
José Colina
José Filomeno
Expand Down Expand Up @@ -8803,4 +8799,40 @@ United States Postal Service
United States Naval Institute
Wichita State University
Free Press
The Free Press
The Free Press
Mehmet Ali Ağca
Ali Ağca
Milliyet
Stena Line
Laphonza Butler
Robert Fico
Keefe D
Duane Davis
Mette-Marit Tjessem Høiby
Katalin Karikó
Drew Weissman
BigQuery
Data Studio
AdGuard
Birkenstock
Twilight
Pim Fortuyn
Linnean Society of London
Transactions of the Linnean Society of London
Royal Society of London
Proceedings of the Royal Society of London
Daniel Cohn-Bendit
Cohn-Bendit
Andreu Mas-Colell
Mas-Colell
Giulio Andreotti
Andreotti
Indro Montanelli
Montanelli
Pierre Agostini
Ferenc Krausz
Anne L’Huillier
Anne L'Huillier
Grafana
Grafana Labs
Xiaomi Redmi
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ protected int getPriorityForId(String id) {
case "REPETITIONS_STYLE": return -50;
case "MUNDAR": return -50;
case "NOMBRES_ROMANS": return -90;
case "CA_MULTITOKEN_SPELLING": return -95;
case "MORFOLOGIK_RULE_CA_ES": return -100;
case "EXIGEIX_ACCENTUACIO_VALENCIANA": return -120;
//case "APOSTROFACIO_MOT_DESCONEGUT": return -120; // lesser than MORFOLOGIK_RULE_CA_ES
Expand All @@ -284,6 +283,9 @@ protected int getPriorityForId(String id) {
case "MAJUSCULA_IMPROBABLE": return -500;
case "ELA_GEMINADA_WIKI": return -200;
}
if (id.startsWith("CA_MULTITOKEN_SPELLING")) {
return -95;
}
if (id.startsWith("CA_SIMPLE_REPLACE_MULTIWORDS")) {
return 70;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Catan Catan NPMSO00
Catràdio Catràdio NPFSO00
Cecabank Cecabank NPMSO00
Challenger Challenger NPCNO00
Cohn-Bendit Cohn-Bendit NPCNSP0
Collboni Collboni NPCNSP0
Cynthia Cynthia NPFSSP0
Cărtărescu Cărtărescu NPCNSP0
Expand All @@ -64,6 +65,7 @@ Duchamp Duchamp NPCNSP0
EPA EPA NCCN000
ESS ESS NCCN000
ETT ETT NCFN000
EUR EUR NCMN000
Enderrock Enderrock NPCSO00
Eswatini Eswatini NPCSG00
Eötvös Eötvös NPCNSP0
Expand Down Expand Up @@ -263,6 +265,7 @@ afrovalencians afrovalencià AQ0MP0
afrovalencià afrovalencià AQ0MS0
ajudeta ajudeta NCFS000
ajudetes ajudeta NCFP000
al-Hussein al-Hussein NPCNSP0
alabardera alabarder NCFS000
alabarderes alabarder NCFP000
alisis alisis NCMP000
Expand Down Expand Up @@ -1454,8 +1457,14 @@ ludicitat ludicitat NCFS000
ludicitats ludicitat NCFP000
macrocentre macrocentre NCMS000
macrocentres macrocentre NCMP000
macrodistribuïdor macrodistribuïdor NCMS000
macrodistribuïdora macrodistribuïdor NCFS000
macrodistribuïdores macrodistribuïdor NCFP000
macrodistribuïdors macrodistribuïdor NCMP000
macroinnovacions macroinnovació NCFP000
macroinnovació macroinnovació NCFS000
macromagatzem macromagatzem NCMS000
macromagatzems macromagatzem NCMP000
mahleriana mahlerià AQ0FS0
mahlerianes mahlerià AQ0FP0
mahlerians mahlerià AQ0MP0
Expand Down Expand Up @@ -2076,6 +2085,7 @@ subvaloracions subvaloració NCFP000
subvaloració subvaloració NCFS000
supercompetitivitat supercompetitivitat NCFS000
supercompetitivitats supercompetitivitat NCFP000
supercool supercool AQ0CN0
superincendi superincendi NCMS000
superincendis superincendi NCMP000
superroí superroí AQ0MS0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!ENTITY exceptions_multitoken_spell "[^\p{L}]|[\p{P}\+@©\|#_].*|you|the|they|are|and|will|love|in|it|is|let|make|may|by|at|su|sus|this|that|my|your|his|her|ours|theirs|all|time|dr|jr">
<!ENTITY exceptions_multitoken_spell2 "sa|de|l'|a|el|la|les|les|.">
<!ENTITY exceptions_multitoken_spell2 "sa|l'|el|la|les|els|.">
<!ENTITY particles_of "de|von|van|of|d'|di|du|da">
<!ENTITY names_in_other_languages "Carlos|Juan|Felipe|Yolanda">
<!ENTITY abreviacions_punt "Jr|Ltd|intr|assoc|abr|abs|acad|add|adj|adm|admdor|admdora|admtiu|admtiva|adv|ag|agl|agr|agron|agròn|aj|alim|ampl|ap|apmt|apnt|apr|aprox|apt|arq|arqueol|arquit|atm|aut|aux|batx|bda|bibl|bl|bnc|butll|bxs|calef|cartogr|catedr|catol|cf|climat|col·l|constr|contr|conv|corp|corr|cpl|cpt|cra|cró|ct|cte|ctra|cts|dc|dept|desp|dg|dip|disp|distr|div|dj|Dr|Dra|Dres|Drs|drec|ds|dt|dta|dte|dupl|dv|econ|ed|Emm|entl|esp|espf|esq|etc|exc|Excm|Excma|exp|exped|ext|fac|fca|febr|gov|gr|gral|hab|Hble|Il·lm|Il·lma|Il·ltre|Im|Ima|imp|impr|impt|inc|insp|int|inv|jul|jurispr|leg|llic|loc|ltda|làm|Mgfc|Mgfca|mil·l|Mn|màx|mín|nov|nre|núm|oct|op|paq|pda|pg|pl|ppda|ppt|pral|prev|prof|progr|prov|pta|ptes|ptge|pvt|pàg|rbla|ref|rev|secr|sgt|sotsp|Sr|Sra|Srta|Sres|Srs|St|Sta|subsp|supl|supt|telegr|trad|transcr|transf|tripl|trv|tt|tèc|univ|urb|veg|vid|vig|vocab|vs|àt|íd">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#Catalan multiwords file used for chunking
#separatorRegExp=[\t;]
Ramón Jáuregui;NPMSSP0
Carmen Calvo;NPFSSP0
Emiliano García-Page;NPMSSP0
Juan Cruz;NPMSSP0
Royal Society;NPFSO00
Royal Society of London;NPFSO00
Expand Down Expand Up @@ -1438,7 +1441,9 @@ Antonio Luis NPMSSP0
Juan Luis NPMSSP0
Joventut de Badalona NPMSO00
Juan José NPMSSP0
José Antonio NPMSSP0
Juan Carlos NPMSSP0
Juan Martín NPMSSP0
Carlos María NPMSSP0
Luis María NPMSSP0
Juan Ramón NPMSSP0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Catan
Catràdio
Cecabank
Challenger
Cohn-Bendit
Collboni
Cynthia
Cărtărescu
Expand All @@ -59,6 +60,7 @@ Duchamp
EPA
ESS
ETT
EUR
Enderrock
Eswatini
Eötvös
Expand Down Expand Up @@ -258,6 +260,7 @@ afrovalencians
afrovalencià
ajudeta
ajudetes
al-Hussein
alabardera
alabarderes
alisis
Expand Down Expand Up @@ -1198,8 +1201,14 @@ ludicitat
ludicitats
macrocentre
macrocentres
macrodistribuïdor
macrodistribuïdora
macrodistribuïdores
macrodistribuïdors
macroinnovacions
macroinnovació
macromagatzem
macromagatzems
mahleriana
mahlerianes
mahlerians
Expand Down Expand Up @@ -1686,6 +1695,7 @@ subvaloracions
subvaloració
supercompetitivitat
supercompetitivitats
supercool
superincendi
superincendis
superroí
Expand Down
Loading

0 comments on commit f83b76b

Please sign in to comment.