Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

fix: capitalization and other fixes spotted by Elijah

hippietrailbd8d559e3721
diff --git a/harper-core/dictionary.dict b/harper-core/dictionary.dict
index 3ce7cbba9..b339be37f 100644
--- a/harper-core/dictionary.dict
+++ b/harper-core/dictionary.dict
@@ -683,7 +683,8 @@ Astoria/2M
Astrakhan/21M
AstroTurf/1M
Asturias/2M
-Asuncion/M
+Asuncion/2M
+Asunción/2M
Aswan/2M
Atacama/2M
Atahualpa/M
@@ -1271,6 +1272,7 @@ Boer/12SM
Boethius/2M
Bogart/2M
Bogota/2M
+Bogotá/2M
Bohemia/21M
Bohemian/152SM
Bohr/2M
@@ -2040,6 +2042,7 @@ Chiquita/M
Chirico/2M
Chisholm/2M
Chisinau/2M
+Chișinău/2M
Chittagong/2M
Chivas/M
Chloe/2M
@@ -2427,6 +2430,7 @@ Cunard/2M
Cunningham/2M
Cupid/2M
Curacao/2M
+Curaçao/2M
Curie/2M
Curitiba/2M
Currier/2M
@@ -5831,7 +5835,8 @@ Lollobrigida/2M
Lombard/125M
Lombardi/2M
Lombardy/2M
-Lome/M
+Lome/2M
+Lomé/2M
Lompoc/2M
Lon/2M
London/2MRZ
@@ -6126,6 +6131,7 @@ Maldives/2M
Maldivian/15MS
Maldonado/2M
Male/2M
+Malé/2M
Mali/21M
Malian/15SM
Malibu/2M
@@ -7250,7 +7256,8 @@ Nosferatu/1M
Nostradamus/21M
Nottingham/2M
Nouakchott/2M
-Noumea/M
+Noumea/2M
+Nouméa/2M
Nov/2M
Nova/21M
Novartis/M
@@ -8300,6 +8307,7 @@ Revlon/2M
Rex/2M
Reyes/2M
Reykjavik/2M
+Reykjavík/2M
Reyna/M
Reynaldo/M
Reynolds/2M
@@ -9813,6 +9821,7 @@ Torrance/2M
Torrens/2M
Torres/2M
Torricelli/2M
+Tórshavn/2M
Tortola/2M
Tortuga/2M
Torvalds/2M
@@ -9923,6 +9932,7 @@ Turkestan/2M
Turkey/215M
Turkic/52MS
Turkish/25M
+Türkiye/2M
Turkmenistan/2M
Turlock/2M
Turner/21M
@@ -10612,6 +10622,7 @@ Yank/1SM
Yankee/14SM
Yaobang/M
Yaounde/2M
+Yaoundé/2M
Yaqui/12M
Yaren/2
Yaroslavl/2M
diff --git a/harper-core/src/linting/matcher.rs b/harper-core/src/linting/matcher.rs
index d3012f4dd..1606cadfb 100644
--- a/harper-core/src/linting/matcher.rs
+++ b/harper-core/src/linting/matcher.rs
@@ -279,51 +279,37 @@ impl Matcher {
// countries and capitals with accents and diacritics
triggers.extend(pt! {
"asuncion" => "Asunción",
- "asunción" => "Asunción",
"Asuncion" => "Asunción",
"chisinau" => "Chișinău",
- "chișinău" => "Chișinău",
"Chisinau" => "Chișinău",
"bogota" => "Bogotá",
- "bogotá" => "Bogotá",
"Bogota" => "Bogotá",
"curacao" => "Curaçao",
- "curaçao" => "Curaçao",
"curacao" => "Curaçao",
"lome" => "Lomé",
- "lomé" => "Lomé",
"Lome" => "Lomé",
"male" => "Malé",
- "malé" => "Malé",
"Male" => "Malé",
"noumea" => "Nouméa",
- "nouméa" => "Nouméa",
"Noumea" => "Nouméa",
"nukualofa" => "Nukuʻalofa",
"Nukualofa" => "Nukuʻalofa",
"nuku'alofa" => "Nukuʻalofa",
"Nuku'alofa" => "Nukuʻalofa",
"reykjavik" => "Reykjavík",
- "reykjavík" => "Reykjavík",
"Reykjavik" => "Reykjavík",
"san","jose" => "San José",
- "san","josé" => "San José",
"San","jose" => "San José",
"sao","tome" => "São Tomé",
- "são","tomé" => "São Tomé",
"Sao","Tome" => "São Tomé",
"sao","tome","and","principe" => "São Tomé and Príncipe",
- "são","tomé","and","príncipe" => "São Tomé and Príncipe",
"Sao","Tome","and","Principe" => "São Tomé and Príncipe",
"Sao","Tome","And","Principe" => "São Tomé and Príncipe",
"torshavn" => "Tórshavn",
- "tórshavn" => "Tórshavn",
"Torshavn" => "Tórshavn",
"turkiye" => "Türkiye",
- "türkiye" => "Türkiye",
"Turkiye" => "Türkiye",
"yaounde" => "Yaoundé",
- "yaoundé" => "Yaoundé",
"Yaounde" => "Yaoundé"
});
diff --git a/harper-core/src/linting/proper_noun_capitalization_linters.rs b/harper-core/src/linting/proper_noun_capitalization_linters.rs
index 742e1fbba..176ef4912 100644
--- a/harper-core/src/linting/proper_noun_capitalization_linters.rs
+++ b/harper-core/src/linting/proper_noun_capitalization_linters.rs
@@ -285,7 +285,7 @@ create_linter_for!(
.then_whitespace()
.t_aco("and")
.then_whitespace()
- .t_aco("herzegovina")
+ .t_aco("Herzegovina")
),
Box::new(
SequencePattern::aco("Burkina")
@@ -305,13 +305,13 @@ create_linter_for!(
Box::new(
SequencePattern::aco("Democratic")
.then_whitespace()
- .t_aco("republic")
+ .t_aco("Republic")
.then_whitespace()
.t_aco("of")
.then_whitespace()
.t_aco("the")
.then_whitespace()
- .t_aco("congo")
+ .t_aco("Congo")
),
Box::new(
SequencePattern::aco("East")
@@ -351,6 +351,15 @@ create_linter_for!(
.then_whitespace()
.t_aco("Rico")
),
+ Box::new(
+ SequencePattern::aco("São")
+ .then_whitespace()
+ .t_aco("Tomé")
+ .then_whitespace()
+ .t_aco("and")
+ .then_whitespace()
+ .t_aco("Príncipe")
+ ),
Box::new(
SequencePattern::aco("Saudi")
.then_whitespace()
@@ -444,7 +453,7 @@ create_linter_for!(
Box::new(
SequencePattern::aco("San")
.then_whitespace()
- .then(Box::new(WordSet::all(&["Juan", "Marino", "Salvador"])))
+ .then(Box::new(WordSet::all(&["José", "Juan", "Marino", "Salvador"])))
),
// St. ... TODO the period should be optional but this doesn't match even when it's not optional
// Box::new(
@@ -512,6 +521,7 @@ create_linter_for!(
.then_whitespace()
.t_aco("Domingo")
),
+ Box::new(SequencePattern::aco("São").then_whitespace().t_aco("Tomé")),
Box::new(
SequencePattern::aco("The")
.then_whitespace()