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.dictindex 3ce7cbba9..b339be37f 100644--- a/harper-core/dictionary.dict+++ b/harper-core/dictionary.dict@@ -683,7 +683,8 @@ Astoria/2MAstrakhan/21MAstroTurf/1MAsturias/2M-Asuncion/M+Asuncion/2M+Asunción/2MAswan/2MAtacama/2MAtahualpa/M@@ -1271,6 +1272,7 @@ Boer/12SMBoethius/2MBogart/2MBogota/2M+Bogotá/2MBohemia/21MBohemian/152SMBohr/2M@@ -2040,6 +2042,7 @@ Chiquita/MChirico/2MChisholm/2MChisinau/2M+Chișinău/2MChittagong/2MChivas/MChloe/2M@@ -2427,6 +2430,7 @@ Cunard/2MCunningham/2MCupid/2MCuracao/2M+Curaçao/2MCurie/2MCuritiba/2MCurrier/2M@@ -5831,7 +5835,8 @@ Lollobrigida/2MLombard/125MLombardi/2MLombardy/2M-Lome/M+Lome/2M+Lomé/2MLompoc/2MLon/2MLondon/2MRZ@@ -6126,6 +6131,7 @@ Maldives/2MMaldivian/15MSMaldonado/2MMale/2M+Malé/2MMali/21MMalian/15SMMalibu/2M@@ -7250,7 +7256,8 @@ Nosferatu/1MNostradamus/21MNottingham/2MNouakchott/2M-Noumea/M+Noumea/2M+Nouméa/2MNov/2MNova/21MNovartis/M@@ -8300,6 +8307,7 @@ Revlon/2MRex/2MReyes/2MReykjavik/2M+Reykjavík/2MReyna/MReynaldo/MReynolds/2M@@ -9813,6 +9821,7 @@ Torrance/2MTorrens/2MTorres/2MTorricelli/2M+Tórshavn/2MTortola/2MTortuga/2MTorvalds/2M@@ -9923,6 +9932,7 @@ Turkestan/2MTurkey/215MTurkic/52MSTurkish/25M+Türkiye/2MTurkmenistan/2MTurlock/2MTurner/21M@@ -10612,6 +10622,7 @@ Yank/1SMYankee/14SMYaobang/MYaounde/2M+Yaoundé/2MYaqui/12MYaren/2Yaroslavl/2Mdiff --git a/harper-core/src/linting/matcher.rs b/harper-core/src/linting/matcher.rsindex 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 diacriticstriggers.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.rsindex 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()