Skip to content

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

Fix variety of false-positives (#1614)

Elijah Potter1214bd8e1c65
diff --git a/harper-core/dictionary.dict b/harper-core/dictionary.dict
index ef27418b8..eba078426 100644
--- a/harper-core/dictionary.dict
+++ b/harper-core/dictionary.dict
@@ -12100,7 +12100,7 @@ almanac/~NSg
almighty/~J
almond/~NJgS
almoner/NSg
-almost/~N
+almost/~R
alms/~Ng
almshouse/NgS
aloe/NSg
@@ -35757,7 +35757,7 @@ nostrum/NgS
nosy/JNV>p^
not/~CNB
notability/~NSg
-notable/~JNSg
+notable/~J
notably/~R
notarial/J
notarisation/N!_
diff --git a/harper-core/src/linting/closed_compounds.rs b/harper-core/src/linting/closed_compounds.rs
index a5378edfd..3936c3eee 100644
--- a/harper-core/src/linting/closed_compounds.rs
+++ b/harper-core/src/linting/closed_compounds.rs
@@ -23,7 +23,6 @@ pub fn lint_group() -> LintGroup {
add_compound_mappings!(group, {
"Anybody" => ("any body", "anybody"),
"Anyhow" => ("any how", "anyhow"),
- "Anyone" => ("any one", "anyone"),
"Anywhere" => ("any where", "anywhere"),
"Backplane" => ("back plane", "backplane"),
"Desktop" => ("desk top", "desktop"),
diff --git a/harper-core/src/linting/compound_nouns/compound_noun_after_det_adj.rs b/harper-core/src/linting/compound_nouns/compound_noun_after_det_adj.rs
index 1ef6afec8..087a10fb2 100644
--- a/harper-core/src/linting/compound_nouns/compound_noun_after_det_adj.rs
+++ b/harper-core/src/linting/compound_nouns/compound_noun_after_det_adj.rs
@@ -60,6 +60,15 @@ impl ExprLinter for CompoundNounAfterDetAdj {
}
fn match_to_lint(&self, matched_tokens: &[Token], source: &[char]) -> Option<Lint> {
+ if matched_tokens
+ .first()?
+ .span
+ .get_content(source)
+ .eq_ignore_ascii_case_str("that")
+ {
+ return None;
+ }
+
let span = matched_tokens[2..].span()?;
let orig = span.get_content(source);
// If the pattern matched, this will not return `None`.
diff --git a/harper-core/src/linting/compound_nouns/mod.rs b/harper-core/src/linting/compound_nouns/mod.rs
index c7243c5a6..46a099e1e 100644
--- a/harper-core/src/linting/compound_nouns/mod.rs
+++ b/harper-core/src/linting/compound_nouns/mod.rs
@@ -30,7 +30,7 @@ merge_linters!(CompoundNouns => CompoundNounAfterDetAdj, CompoundNounBeforeAuxVe
#[cfg(test)]
mod tests {
use super::CompoundNouns;
- use crate::linting::tests::{assert_lint_count, assert_suggestion_result};
+ use crate::linting::tests::{assert_lint_count, assert_no_lints, assert_suggestion_result};
#[test]
fn web_cam() {
@@ -361,4 +361,28 @@ mod tests {
0,
);
}
+
+ #[test]
+ fn allow_issue_1553() {
+ assert_no_lints(
+ "I'm not sure if there's anyone else that may be interested in more fine-grained control, but as it stands, having the domain level toggle is sufficient for me.",
+ CompoundNouns::default(),
+ );
+ }
+
+ #[test]
+ fn allow_issue_1496() {
+ assert_no_lints(
+ "I am not able to respond to messages.",
+ CompoundNouns::default(),
+ );
+ }
+
+ #[test]
+ fn allow_issue_1298() {
+ assert_no_lints(
+ "A series of tests that cover all possible cases.",
+ CompoundNouns::default(),
+ );
+ }
}
diff --git a/harper-core/src/linting/how_to.rs b/harper-core/src/linting/how_to.rs
index 09e0d34f1..2f1d08f89 100644
--- a/harper-core/src/linting/how_to.rs
+++ b/harper-core/src/linting/how_to.rs
@@ -4,6 +4,7 @@ use crate::expr::All;
use crate::expr::Expr;
use crate::expr::OwnedExprExt;
use crate::expr::SequenceExpr;
+use crate::patterns::UPOSSet;
use crate::{
Token, TokenStringExt,
linting::{ExprLinter, Lint, LintKind, Suggestion},
@@ -18,22 +19,28 @@ impl Default for HowTo {
fn default() -> Self {
let mut pattern = All::default();
- let pos_pattern = SequenceExpr::default().t_aco("how").then_whitespace().then(
- |tok: &Token, _: &[char]| {
+ let pos_pattern = SequenceExpr::default()
+ .then_anything()
+ .then_anything()
+ .t_aco("how")
+ .then_whitespace()
+ .then(|tok: &Token, _: &[char]| {
tok.kind.is_upos(UPOS::VERB)
|| (tok.kind.is_verb() && tok.kind.is_likely_homograph())
- },
- );
+ });
pattern.add(pos_pattern);
let exceptions = SequenceExpr::default()
+ .then_unless(UPOSSet::new(&[UPOS::PART]))
+ .then_anything()
.then_anything()
.then_anything()
- .then(
+ .then_unless(
InflectionOfBe::new().or(Box::new(|tok: &Token, src: &[char]| {
if tok.kind.is_auxiliary_verb()
|| tok.kind.is_adjective()
|| tok.kind.is_verb_progressive_form()
+ || tok.kind.is_conjunction()
{
true
} else {
@@ -43,7 +50,7 @@ impl Default for HowTo {
})),
);
- pattern.add(SequenceExpr::default().then_unless(exceptions));
+ pattern.add(SequenceExpr::default().then(exceptions));
Self {
expr: Box::new(pattern),
@@ -57,7 +64,7 @@ impl ExprLinter for HowTo {
}
fn match_to_lint(&self, toks: &[Token], _src: &[char]) -> Option<Lint> {
- let span = toks[0..2].span()?;
+ let span = toks[2..4].span()?;
let fix: Vec<char> = "to ".chars().collect();
Some(Lint {
@@ -77,7 +84,7 @@ impl ExprLinter for HowTo {
#[cfg(test)]
mod tests {
use super::HowTo;
- use crate::linting::tests::{assert_lint_count, assert_suggestion_result};
+ use crate::linting::tests::{assert_lint_count, assert_no_lints, assert_suggestion_result};
#[test]
fn flags_missing_to() {
@@ -265,4 +272,20 @@ mod tests {
fn allows_how_has() {
assert_lint_count("How Has This Been Tested?", HowTo::default(), 0);
}
+
+ #[test]
+ fn issue_1492() {
+ assert_no_lints(
+ "I hope to provide some insight into correct HTML formatting, in addition to how authors can avoid these issues.",
+ HowTo::default(),
+ );
+ }
+
+ #[test]
+ fn allow_issue_1298() {
+ assert_no_lints(
+ "The story of how and why things came to this point.",
+ HowTo::default(),
+ );
+ }
}
diff --git a/harper-core/src/linting/possessive_your.rs b/harper-core/src/linting/possessive_your.rs
index 7b2f102f7..75249f3d5 100644
--- a/harper-core/src/linting/possessive_your.rs
+++ b/harper-core/src/linting/possessive_your.rs
@@ -58,7 +58,7 @@ impl ExprLinter for PossessiveYour {
#[cfg(test)]
mod tests {
use crate::linting::tests::{
- assert_lint_count, assert_suggestion_result, assert_top3_suggestion_result,
+ assert_lint_count, assert_no_lints, assert_suggestion_result, assert_top3_suggestion_result,
};
use super::PossessiveYour;
@@ -127,4 +127,12 @@ mod tests {
0,
);
}
+
+ #[test]
+ fn allows_issue_1583() {
+ assert_no_lints(
+ "Note that in a world with modules everywhere, you almost never need an IIFE",
+ PossessiveYour::default(),
+ );
+ }
}
diff --git a/harper-core/src/linting/pronoun_contraction/should_contract.rs b/harper-core/src/linting/pronoun_contraction/should_contract.rs
index 45d6c2a91..41c6cd26a 100644
--- a/harper-core/src/linting/pronoun_contraction/should_contract.rs
+++ b/harper-core/src/linting/pronoun_contraction/should_contract.rs
@@ -21,7 +21,9 @@ impl Default for ShouldContract {
SequenceExpr::default()
.then(WordSet::new(&["your", "were"]))
.then_whitespace()
- .then(|tok: &Token, _: &[char]| tok.kind.is_non_quantifier_determiner())
+ .then(|tok: &Token, _: &[char]| {
+ tok.kind.is_non_quantifier_determiner() && !tok.kind.is_pronoun()
+ })
.then_whitespace()
.then_adjective(),
),
@@ -67,8 +69,10 @@ impl ExprLinter for ShouldContract {
#[cfg(test)]
mod tests {
+ use std::default;
+
use super::ShouldContract;
- use crate::linting::tests::{assert_lint_count, assert_suggestion_result};
+ use crate::linting::tests::{assert_lint_count, assert_no_lints, assert_suggestion_result};
#[test]
fn contracts_your_correctly() {
@@ -116,4 +120,10 @@ mod tests {
0,
);
}
+
+ #[test]
+ fn allow_issue_1508() {
+ assert_no_lints("Were any other toys fun?", ShouldContract::default());
+ assert_no_lints("You were his closest friend.", ShouldContract::default());
+ }
}
diff --git a/harper-core/src/linting/pronoun_knew.rs b/harper-core/src/linting/pronoun_knew.rs
index c9f7c325d..97aae7d37 100644
--- a/harper-core/src/linting/pronoun_knew.rs
+++ b/harper-core/src/linting/pronoun_knew.rs
@@ -27,7 +27,7 @@ impl Default for PronounKnew {
return false;
}
- if tok.kind.is_possessive_determiner() {
+ if tok.kind.is_possessive_determiner() || !tok.kind.is_pronoun() {
return false;
}
@@ -89,7 +89,7 @@ impl ExprLinter for PronounKnew {
#[cfg(test)]
mod tests {
use super::PronounKnew;
- use crate::linting::tests::{assert_lint_count, assert_suggestion_result};
+ use crate::linting::tests::{assert_lint_count, assert_no_lints, assert_suggestion_result};
#[test]
fn simple_pronoun_new() {
@@ -188,4 +188,9 @@ mod tests {
fn flags_she_new_danger() {
assert_lint_count("She new danger lurked nearby.", PronounKnew::default(), 1);
}
+
+ #[test]
+ fn allows_issue_1518() {
+ assert_no_lints("If you're new to GitHub, welcome.", PronounKnew::default());
+ }
}
diff --git a/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml b/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml
index f6b525f7d..ed927aa94 100644
--- a/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml
+++ b/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml
@@ -437,16 +437,6 @@ Message: |
-Lint: Miscellaneous (31 priority)
-Message: |
- 227 | I’ve kept her waiting!” Alice felt so desperate that she was ready to ask help
- 228 | of any one; so, when the Rabbit came near her, she began, in a low, timid voice,
- | ^~~~~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Spelling (63 priority)
Message: |
229 | “If you please, sir—” The Rabbit started violently, dropped the white kid gloves
@@ -1829,15 +1819,6 @@ Message: |
-Lint: Miscellaneous (31 priority)
-Message: |
- 1840 | people here; the great wonder is, that there’s any one left alive!”
- | ^~~~~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Readability (127 priority)
Message: |
1842 | She was looking about for some way of escape, and wondering whether she could
@@ -3287,15 +3268,6 @@ Message: |
-Lint: Miscellaneous (31 priority)
-Message: |
- 2891 | “If any one of them can explain it,” said Alice, (she had grown so large in the
- | ^~~~~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Readability (127 priority)
Message: |
2907 | “All right, so far,” said the King, and he went on muttering over the verses to
diff --git a/harper-core/tests/text/linters/The Great Gatsby.snap.yml b/harper-core/tests/text/linters/The Great Gatsby.snap.yml
index 8c8faf5ca..eefb521a8 100644
--- a/harper-core/tests/text/linters/The Great Gatsby.snap.yml
+++ b/harper-core/tests/text/linters/The Great Gatsby.snap.yml
@@ -36,16 +36,6 @@ Suggest:
-Lint: Miscellaneous (31 priority)
-Message: |
- 10 | “Whenever you feel like criticising any one,” he told me, “just remember that
- | ^~~~~~~ Did you mean the closed compound `anyone`?
- 11 | all the people in this world haven’t had the advantages that you’ve had.”
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Redundancy (31 priority)
Message: |
15 | consequence, I’m inclined to reserve all judgments, a habit that has opened up
@@ -4803,17 +4793,6 @@ Suggest:
-Lint: Miscellaneous (31 priority)
-Message: |
- 3568 | My commutation ticket came back to me with a dark stain from his hand. That any
- | ^~~~
- 3569 | one should care in this heat whose flushed lips he kissed, whose head made damp
- | ~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Spelling (63 priority)
Message: |
3572 | . . . Through the hall of the Buchanans’ house blew a faint wind, carrying the
@@ -5026,17 +5005,6 @@ Suggest:
-Lint: Miscellaneous (31 priority)
-Message: |
- 3754 | “Are we just going to go?” she objected. “Like this? Aren’t we going to let any
- | ^~~~
- 3755 | one smoke a cigarette first?”
- | ~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Spelling (63 priority)
Message: |
3809 | “Well, you take my coupé and let me drive your car to town.”
@@ -5433,16 +5401,6 @@ Suggest:
-Lint: Miscellaneous (31 priority)
-Message: |
- 4182 | was poor and she was tired of waiting for me. It was a terrible mistake, but in
- 4183 | her heart she never loved any one except me!”
- | ^~~~~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Readability (127 priority)
Message: |
4185 | At this point Jordan and I tried to go, but Tom and Gatsby insisted with
@@ -5632,16 +5590,6 @@ Suggest:
-Lint: Miscellaneous (31 priority)
-Message: |
- 4405 | stared at the people and the cars that passed along the road. When any one spoke
- | ^~~~~~~ Did you mean the closed compound `anyone`?
- 4406 | to him he invariably laughed in an agreeable, colorless way. He was his wife’s
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Spelling (63 priority)
Message: |
4409 | So naturally Michaelis tried to find out what had happened, but Wilson wouldn’t
@@ -6545,26 +6493,6 @@ Suggest:
-Lint: Miscellaneous (31 priority)
-Message: |
- 5185 | At two o’clock Gatsby put on his bathing-suit and left word with the butler that
- 5186 | if any one phoned word was to be brought to him at the pool. He stopped at the
- | ^~~~~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
-Lint: Miscellaneous (31 priority)
-Message: |
- 5197 | for it until four o’clock—until long after there was any one to give it to if it
- | ^~~~~~~ Did you mean the closed compound `anyone`?
- 5198 | came. I have an idea that Gatsby himself didn’t believe it would come, and
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Formatting (63 priority)
Message: |
5204 | where poor ghosts, breathing dreams like air, drifted fortuitously about . . .
@@ -6604,16 +6532,6 @@ Suggest:
-Lint: Miscellaneous (31 priority)
-Message: |
- 5210 | station directly to Gatsby’s house and my rushing anxiously up the front steps
- 5211 | was the first thing that alarmed any one. But they knew then, I firmly believe.
- | ^~~~~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Readability (127 priority)
Message: |
5230 | and out of Gatsby’s front door. A rope stretched across the main gate and a
@@ -7015,16 +6933,6 @@ Suggest:
-Lint: Miscellaneous (31 priority)
-Message: |
- 5466 | advice of an elevator boy, was marked “The Swastika Holding Company,” and at
- 5467 | first there didn’t seem to be any one inside. But when I’d shouted “hello”
- | ^~~~~~~ Did you mean the closed compound `anyone`?
-Suggest:
- - Replace with: “anyone”
-
-
-
Lint: Spelling (63 priority)
Message: |
5472 | “Nobody’s in,” she said. “Mr. Wolfshiem’s gone to Chicago.”
@@ -7115,17 +7023,6 @@ Suggest:
-Lint: WordChoice (31 priority)
-Message: |
- 5528 | “Now he’s dead,” I said after a moment. “You were his closest friend, so I know
- | ^~~~ Use the contraction or separate the words instead.
- 5529 | you'll want to come to his funeral this afternoon.”
-Suggest:
- - Replace with: “we're”
- - Replace with: “we are”
-
-
-
Lint: Spelling (63 priority)
Message: |
5552 | For a moment I thought he was going to suggest a “gonnegtion,” but he only
diff --git a/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md b/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md
index 6f0b1f166..dce16cc7d 100644
--- a/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md
+++ b/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md
@@ -267,7 +267,7 @@
> bleeds ; and she had never forgotten that , if you drink much from a bottle marked
# NPl/V . V/C ISg+ V R NSg/V/J NSg/I/C/Ddem+ . NSg/C ISgPl+ NSg/V+ NSg/I/J/Dq P D/P+ NSg/V+ V/J
> “ poison , ” it is almost certain to disagree with you , sooner or later .
-# . NSg/V+ . . NPr/ISg+ VL NSg I/J P V P ISgPl . JC+ NPr/C+ JC .
+# . NSg/V+ . . NPr/ISg+ VL R I/J P V P ISgPl . JC+ NPr/C+ JC .
>
#
> However , this bottle was not marked “ poison , ” so Alice ventured to taste it , and
@@ -381,7 +381,7 @@
> the largest telescope that ever was ! Good - bye , feet ! ” ( for when she looked down
# D+ JS+ NSg/V+ NSg/I/C/Ddem+ J V . NPr/V/J . NSg/J/P . NPl+ . . . C/P NSg/I/C ISg+ V/J NSg/V/J/P
> at her feet , they seemed to be almost out of sight , they were getting so far
-# NSg/P ISg/D$+ NPl+ . IPl+ V/J P NSg/VX NSg NSg/V/J/R/P P NSg/V+ . IPl+ NSg/V NSg/V NSg/I/J/C NSg/V/J
+# NSg/P ISg/D$+ NPl+ . IPl+ V/J P NSg/VX R NSg/V/J/R/P P NSg/V+ . IPl+ NSg/V NSg/V NSg/I/J/C NSg/V/J
> off ) . “ Oh , my poor little feet , I wonder who will put on your shoes and
# NSg/V/J/P+ . . . NPr/V . D$+ NSg/V/J+ NPr/I/J/Dq+ NPl+ . ISg+ NSg/V NPr/I+ NPr/VX NSg/V J/P D$+ NPl/V V/C
> stockings for you now , dears ? I’m sure I shan’t be able ! I shall be a great deal
@@ -469,7 +469,7 @@
> I’ve been changed in the night ? Let me think : was I the same when I got up this
# W? NSg/V V/J NPr/J/P D+ N🅪Sg/V+ . NSg/V NPr/ISg+ NSg/V . V ISg+ D I/J NSg/I/C ISg+ V NSg/V/J/P I/Ddem+
> morning ? I almost think I can remember feeling a little different . But if I’m
-# N🅪Sg/V+ . ISg+ NSg NSg/V ISg+ NPr/VX NSg/V NSg/V/J D/P+ NPr/I/J/Dq+ NSg/J+ . NSg/C/P NSg/C W?
+# N🅪Sg/V+ . ISg+ R NSg/V ISg+ NPr/VX NSg/V NSg/V/J D/P+ NPr/I/J/Dq+ NSg/J+ . NSg/C/P NSg/C W?
> not the same , the next question is , Who in the world am I ? Ah , that’s the great
# NSg/C D I/J . D+ NSg/J/P+ NSg/V+ VL . NPr/I NPr/J/P D+ NSg/V+ NPr/V/J ISg+ . NSg/I/V . NSg$ D NSg/J
> puzzle ! ” And she began thinking over all the children she knew that were of the
@@ -1243,7 +1243,7 @@
> growing larger and smaller , and being ordered about by mice and rabbits . I
# NSg/V JC V/C NSg/JC . V/C NSg/V/C V/J J/P NSg/J/P NSg/V V/C NPl/V+ . ISg+
> almost wish I hadn’t gone down that rabbit - hole — and yet — and yet — it’s rather
-# NSg NSg/V ISg+ V V/J/P NSg/V/J/P NSg/I/C/Ddem NSg/V+ . NSg/V . V/C NSg/V/C . V/C NSg/V/C . W? NPr/V/J
+# R NSg/V ISg+ V V/J/P NSg/V/J/P NSg/I/C/Ddem NSg/V+ . NSg/V . V/C NSg/V/C . V/C NSg/V/C . W? NPr/V/J
> curious , you know , this sort of life ! I do wonder what can have happened to me !
# J . ISgPl+ NSg/V . I/Ddem NSg/V P NSg/V+ . ISg+ NSg/VX NSg/V NSg/I+ NPr/VX NSg/VX V/J P NPr/ISg+ .
> When I used to read fairy - tales , I fancied that kind of thing never happened ,
@@ -2703,7 +2703,7 @@
> towards it rather timidly , saying to herself “ Suppose it should be raving mad
# P NPr/ISg+ NPr/V/J R . NSg/V P ISg+ . V NPr/ISg+ VX NSg/VX NSg/V/J NSg/V/J
> after all ! I almost wish I’d gone to see the Hatter instead ! ”
-# JC/P NSg/I/J/C/Dq . ISg+ NSg NSg/V W? V/J/P P NSg/V D NSg/V W? . .
+# JC/P NSg/I/J/C/Dq . ISg+ R NSg/V W? V/J/P P NSg/V D NSg/V W? . .
>
#
> CHAPTER VII : A Mad Tea - Party
@@ -2963,7 +2963,7 @@
> “ Ah ! that accounts for it , ” said the Hatter . “ He won’t stand beating . Now , if
# . NSg/I/V . NSg/I/C/Ddem+ NPl/V C/P NPr/ISg+ . . V/J D+ NSg/V . . NPr/ISg+ V NSg/V NSg/V . NPr/V/J/C . NSg/C
> you only kept on good terms with him , he’d do almost anything you liked with the
-# ISgPl+ J/R/C V J/P NPr/V/J NPl/V P ISg+ . W? NSg/VX NSg NSg/I/V+ ISgPl+ V/J P D+
+# ISgPl+ J/R/C V J/P NPr/V/J NPl/V P ISg+ . W? NSg/VX R NSg/I/V+ ISgPl+ V/J P D+
> clock . For instance , suppose it were nine o’clock in the morning , just time to
# NSg/V+ . C/P NSg/V+ . V NPr/ISg+ NSg/V NSg W? NPr/J/P D+ N🅪Sg/V+ . V/J N🅪Sg/V/J+ P
> begin lessons : you’d only have to whisper a hint to Time , and round goes the
diff --git a/harper-core/tests/text/tagged/Computer science.md b/harper-core/tests/text/tagged/Computer science.md
index 14ce62a27..0e22882cb 100644
--- a/harper-core/tests/text/tagged/Computer science.md
+++ b/harper-core/tests/text/tagged/Computer science.md
@@ -275,7 +275,7 @@
>
#
> A folkloric quotation , often attributed to — but almost certainly not first
-# D/P J NSg . R V/J P . NSg/C/P NSg R NSg/C NSg/V/J
+# D/P J NSg . R V/J P . NSg/C/P R R NSg/C NSg/V/J
> formulated by — Edsger Dijkstra , states that " computer science is no more about
# V/J NSg/J/P . ? NSg . NPrPl/V+ NSg/I/C/Ddem+ . NSg/V+ N🅪Sg/V+ VL NPr/P NPr/I/V/J/Dq J/P
> computers than astronomy is about telescopes . " [ note 3 ] The design and deployment
@@ -673,7 +673,7 @@
> habitats , among many others . Modern computers enable optimization of such
# NPl . P NSg/I/J/Dq+ NPl/V+ . NSg/J NPl/V+ V N🅪Sg P NSg/I
> designs as complete aircraft . Notable in electrical and electronic circuit
-# NPl/V NSg/R NSg/V/J+ NSgPl+ . NSg/J NPr/J/P NSg/J V/C J NSg/V+
+# NPl/V NSg/R NSg/V/J+ NSgPl+ . J NPr/J/P NSg/J V/C J NSg/V+
> design are SPICE , as well as software for physical realization of new ( or
# N🅪Sg/V+ V N🅪Sg/V . NSg/R NSg/V/J NSg/R NᴹSg C/P NSg/J NSg/NoAm P NSg/V/J . NPr/C
> modified ) designs . The latter includes essential design software for integrated
diff --git a/harper-core/tests/text/tagged/The Great Gatsby.md b/harper-core/tests/text/tagged/The Great Gatsby.md
index 368c8c3f0..514f4b9a7 100644
--- a/harper-core/tests/text/tagged/The Great Gatsby.md
+++ b/harper-core/tests/text/tagged/The Great Gatsby.md
@@ -421,7 +421,7 @@
> if she were balancing something on it which was quite likely to fall . If she saw
# NSg/C ISg+ NSg/V V NSg/I/V/J J/P NPr/ISg+ I/C+ V NSg NSg/J P NSg/V . NSg/C ISg+ NSg/V
> me out of the corner of her eyes she gave no hint of it — indeed , I was almost
-# NPr/ISg+ NSg/V/J/R/P P D NSg/V P ISg/D$+ NPl/V+ ISg+ V NPr/P NSg/V P NPr/ISg . W? . ISg+ V NSg
+# NPr/ISg+ NSg/V/J/R/P P D NSg/V P ISg/D$+ NPl/V+ ISg+ V NPr/P NSg/V P NPr/ISg . W? . ISg+ V R
> surprised into murmuring an apology for having disturbed her by coming in .
# V/J P NSg/V D/P NSg C/P V V/J ISg/D$+ NSg/J/P NSg/V/J NPr/J/P .
>
@@ -453,13 +453,13 @@
>
#
> At any rate , Miss Baker’s lips fluttered , she nodded at me almost imperceptibly ,
-# NSg/P I/R/Dq+ NSg/V . NSg/V NSg$ NPl/V+ V/J . ISg+ V NSg/P NPr/ISg+ NSg R .
+# NSg/P I/R/Dq+ NSg/V . NSg/V NSg$ NPl/V+ V/J . ISg+ V NSg/P NPr/ISg+ R R .
> and then quickly tipped her head back again — the object she was balancing had
# V/C NSg/J/C R V ISg/D$+ NPr/V/J+ NSg/V/J P . D+ NSg/V+ ISg+ V V+ V
> obviously tottered a little and given her something of a fright . Again a sort of
# R V/J D/P NPr/I/J/Dq V/C NSg/V/J/P ISg/D$+ NSg/I/V/J P D/P NSg/V/J+ . P D/P NSg/V P
> apology arose to my lips . Almost any exhibition of complete self - sufficiency
-# NSg+ V P D$ NPl/V+ . NSg I/R/Dq NSg P NSg/V/J NSg/I/V/J+ . NSg
+# NSg+ V P D$ NPl/V+ . R I/R/Dq NSg P NSg/V/J NSg/I/V/J+ . NSg
> draws a stunned tribute from me .
# NPl/V D/P V/J NSg/V P NPr/ISg+ .
>
@@ -793,7 +793,7 @@
> There was something pathetic in his concentration , as if his complacency , more
# + V NSg/I/V/J J NPr/J/P ISg/D$+ NSg+ . NSg/R NSg/C ISg/D$+ NSg . NPr/I/V/J/Dq
> acute than of old , was not enough to him any more . When , almost immediately , the
-# NSg/V/J C/P P NSg/J . V NSg/C NSg/I P ISg+ I/R/Dq NPr/I/V/J/Dq+ . NSg/I/C . NSg R . D+
+# NSg/V/J C/P P NSg/J . V NSg/C NSg/I P ISg+ I/R/Dq NPr/I/V/J/Dq+ . NSg/I/C . R R . D+
> telephone rang inside and the butler left the porch Daisy seized upon the
# NSg/V+ V NSg/J/P V/C D NPr/V NPr/V/J D+ NSg+ NPr+ V/J P D+
> momentary interruption and leaned toward me .
@@ -919,7 +919,7 @@
>
#
> Almost before I had grasped her meaning there was the flutter of a dress and the
-# NSg C/P ISg+ V V/J ISg/D$+ N🅪Sg/V/J+ + V D NSg/V P D/P+ NSg/V+ V/C D
+# R C/P ISg+ V V/J ISg/D$+ N🅪Sg/V/J+ + V D NSg/V P D/P+ NSg/V+ V/C D
> crunch of leather boots , and Tom and Daisy were back at the table .
# NSg/V P NSg/V/J+ NPl/V+ . V/C NPr/V V/C NPr+ NSg/V NSg/V/J NSg/P D+ NSg/V+ .
>
@@ -1635,7 +1635,7 @@
>
#
> We drove over to Fifth Avenue , warm and soft , almost pastoral , on the summer
-# IPl+ NSg/V NSg/V/J/P P NSg/V/J+ NSg . NSg/V/J V/C NSg/J . NSg NSg/J . J/P D+ NPr/V+
+# IPl+ NSg/V NSg/V/J/P P NSg/V/J+ NSg . NSg/V/J V/C NSg/J . R NSg/J . J/P D+ NPr/V+
> Sunday afternoon . I wouldn’t have been surprised to see a great flock of white
# NSg/V+ N🅪Sg+ . ISg+ VX NSg/VX NSg/V V/J P NSg/V D/P NSg/J NSg/V P NPr/V/J
> sheep turn the corner .
@@ -2071,7 +2071,7 @@
>
#
> “ I almost made a mistake , too , ” she declared vigorously . “ I almost married a
-# . ISg+ NSg V D/P+ NSg/V+ . W? . . ISg+ V/J+ R . . ISg+ NSg NSg/V/J D/P
+# . ISg+ R V D/P+ NSg/V+ . W? . . ISg+ V/J+ R . . ISg+ R NSg/V/J D/P
> little kyke who’d been after me for years . I knew he was below me . Everybody
# NPr/I/J/Dq ? W? NSg/V JC/P NPr/ISg+ C/P NPl+ . ISg+ V NPr/ISg+ V P NPr/ISg+ . NSg/I+
> kept saying to me : ‘ Lucille , that man’s ’ way below you ! ’ But if I hadn’t met
@@ -2215,7 +2215,7 @@
>
#
> It was nine o’clock — almost immediately afterward I looked at my watch and found
-# NPr/ISg+ V NSg W? . NSg R R/Am ISg+ V/J NSg/P D$+ NSg/V V/C NSg/V
+# NPr/ISg+ V NSg W? . R R R/Am ISg+ V/J NSg/P D$+ NSg/V V/C NSg/V
> it was ten . Mr . McKee was asleep on a chair with his fists clenched in his lap ,
# NPr/ISg+ V+ NSg+ . NSg+ . NPr V J J/P D/P NSg/V P ISg/D$+ NPl/V+ V/J NPr/J/P ISg/D$+ NSg/V/J+ .
> like a photograph of a man of action . Taking out my handkerchief I wiped from
@@ -2939,7 +2939,7 @@
>
#
> Almost at the moment when Mr . Gatsby identified himself a butler hurried toward
-# NSg NSg/P D NSg+ NSg/I/C NSg+ . NPr V/J ISg+ D/P NPr/V V/J J/P
+# R NSg/P D NSg+ NSg/I/C NSg+ . NPr V/J ISg+ D/P NPr/V V/J J/P
> him with the information that Chicago was calling him on the wire . He excused
# ISg P D+ NᴹSg+ NSg/I/C/Ddem+ NPr+ V NSg/V ISg+ J/P D+ NSg/V+ . NPr/ISg+ V/J
> himself with a small bow that included each of us in turn .
@@ -3101,7 +3101,7 @@
>
#
> I was alone and it was almost two . For some time confused and intriguing sounds
-# ISg+ V J V/C NPr/ISg+ V NSg+ NSg . C/P I/J/R/Dq+ N🅪Sg/V/J+ V/J V/C NSg/V/J NPl/V
+# ISg+ V J V/C NPr/ISg+ V R+ NSg . C/P I/J/R/Dq+ N🅪Sg/V/J+ V/J V/C NSg/V/J NPl/V
> had issued from a long , many - windowed room which overhung the terrace . Eluding
# V V/J P D/P NPr/V/J . NSg/I/J/Dq . V/J NSg/V/J I/C+ V/J D+ NSg/V+ . V
> Jordan’s undergraduate , who was now engaged in an obstetrical conversation with
@@ -3181,7 +3181,7 @@
>
#
> “ Well , we’re almost the last to - night , ” said one of the men sheepishly . “ The
-# . NSg/V/J . W? NSg D NSg/V/J+ P . N🅪Sg/V . . V/J NSg/I/V/J P D+ NSg+ R+ . . D+
+# . NSg/V/J . W? R D NSg/V/J+ P . N🅪Sg/V . . V/J NSg/I/V/J P D+ NSg+ R+ . . D+
> orchestra left half an hour ago . ”
# NSg+ NPr/V/J N🅪Sg/V/J/P+ D/P+ NSg+ J/P+ . .
>
@@ -4255,7 +4255,7 @@
> night they shot Rosy Rosenthal there . It was six of us at the table , and Rosy
# N🅪Sg/V+ IPl+ NSg/V/J+ NSg/V/J+ NPr+ W? . NPr/ISg+ V NSg P NPr/IPl+ NSg/P D+ NSg/V+ . V/C NSg/V/J
> had eat and drunk a lot all evening . When it was almost morning the waiter came
-# V V V/C NSg/V/J D/P+ NPr/V+ NSg/I/J/C/Dq N🅪Sg/V+ . NSg/I/C NPr/ISg+ V NSg N🅪Sg/V D+ NSg/V+ NSg/V/P
+# V V V/C NSg/V/J D/P+ NPr/V+ NSg/I/J/C/Dq N🅪Sg/V+ . NSg/I/C NPr/ISg+ V R N🅪Sg/V D+ NSg/V+ NSg/V/P
> up to him with a funny look and says somebody wants to speak to him outside .
# NSg/V/J/P P ISg P D/P NSg/J NSg/V+ V/C NPl/V NSg/I+ NPl/V P NSg/V P ISg+ NSg/V/J/P+ .
> ‘ All right , ’ says Rosy , and begins to get up , and I pulled him down in his
@@ -5791,7 +5791,7 @@
> that light had now vanished forever . Compared to the great distance that had
# NSg/I/C/Ddem NSg/V/J+ V NPr/V/J/C V/J NSg/J . V/J P D+ NSg/J+ NSg/V+ NSg/I/C/Ddem+ V
> separated him from Daisy it had seemed very near to her , almost touching her . It
-# V/J ISg+ P NPr+ NPr/ISg+ V V/J J/R NSg/V/J/P P ISg/D$+ . NSg NSg/V/J/P ISg/D$+ . NPr/ISg+
+# V/J ISg+ P NPr+ NPr/ISg+ V V/J J/R NSg/V/J/P P ISg/D$+ . R NSg/V/J/P ISg/D$+ . NPr/ISg+
> had seemed as close as a star to the moon . Now it was again a green light on a
# V V/J NSg/R NSg/V/J NSg/R D/P NSg/V P D NPr/V+ . NPr/V/J/C NPr/ISg+ V P D/P NPr/V/J NSg/V/J J/P D/P+
> dock . His count of enchanted objects had diminished by one .
@@ -5967,7 +5967,7 @@
> back into Gatsby’s face , as though a faint doubt had occurred to him as to the
# NSg/V/J P NSg$+ NSg/V+ . NSg/R V/C D/P+ NSg/V/J+ NSg/V+ V V P ISg+ NSg/R P D
> quality of his present happiness . Almost five years ! There must have been
-# NSg/J P ISg/D$+ NSg/V/J NᴹSg+ . NSg NSg NPl+ . + NSg/V NSg/VX NSg/V
+# NSg/J P ISg/D$+ NSg/V/J NᴹSg+ . R NSg NPl+ . + NSg/V NSg/VX NSg/V
> moments even that afternoon when Daisy tumbled short of his dreams — not through
# NPl+ NSg/V/J NSg/I/C/Ddem+ N🅪Sg+ NSg/I/C NPr+ V/J NPr/V/J/P P ISg/D$+ NPl/V+ . NSg/C NSg/J/P
> her own fault , but because of the colossal vitality of his illusion . It had gone
@@ -6315,7 +6315,7 @@
>
#
> “ I know your wife , ” continued Gatsby , almost aggressively .
-# . ISg+ NSg/V D$+ NSg/V/J+ . . V/J NPr . NSg+ R+ .
+# . ISg+ NSg/V D$+ NSg/V/J+ . . V/J NPr . R+ R+ .
>
#
> “ That so ? ”
@@ -6663,7 +6663,7 @@
> “ Anything I hate is to get my head stuck in a pool , ” mumbled Miss Baedeker .
# . NSg/I/V+ ISg+ N🅪Sg/V VL P NSg/V D$+ NPr/V/J+ NSg/V/J NPr/J/P D/P+ NSg/V+ . . V/J NSg/V+ NPr .
> “ They almost drowned me once over in New Jersey . ”
-# . IPl+ NSg V/J NPr/ISg+ NSg/C NSg/V/J/P NPr/J/P NSg/V/J+ NPr+ . .
+# . IPl+ R V/J NPr/ISg+ NSg/C NSg/V/J/P NPr/J/P NSg/V/J+ NPr+ . .
>
#
> “ Then you ought to leave it alone , ” countered Doctor Civet .
@@ -6677,7 +6677,7 @@
>
#
> It was like that . Almost the last thing I remember was standing with Daisy and
-# NPr/ISg+ V NSg/V/J/C/P NSg/I/C/Ddem+ . NSg D+ NSg/V/J+ NSg/V+ ISg+ NSg/V V NSg/V/J P NPr+ V/C
+# NPr/ISg+ V NSg/V/J/C/P NSg/I/C/Ddem+ . R D+ NSg/V/J+ NSg/V+ ISg+ NSg/V V NSg/V/J P NPr+ V/C
> watching the moving - picture director and his Star . They were still under the
# V D NSg/V/J+ . NSg/V NSg V/C ISg/D$+ NSg/V+ . IPl+ NSg/V NSg/V/J NSg/J/P D
> white - plum tree and their faces were touching except for a pale , thin ray of
@@ -6977,7 +6977,7 @@
> and my lips parted like a dumb man’s , as though there was more struggling upon
# V/C D$+ NPl/V+ V/J NSg/V/J/C/P D/P+ V/J+ NPr$/I/V/J . NSg/R V/C + V NPr/I/V/J/Dq V P
> them than a wisp of startled air . But they made no sound , and what I had almost
-# NSg/IPl+ C/P D/P NSg/V P V/J+ NSg/V+ . NSg/C/P IPl+ V NPr/P+ NSg/V/J+ . V/C NSg/I+ ISg+ V NSg
+# NSg/IPl+ C/P D/P NSg/V P V/J+ NSg/V+ . NSg/C/P IPl+ V NPr/P+ NSg/V/J+ . V/C NSg/I+ ISg+ V R
> remembered was uncommunicable forever .
# V/J V ? NSg/J+ .
>
@@ -7099,7 +7099,7 @@
>
#
> The next day was broiling , almost the last , certainly the warmest , of the
-# D+ NSg/J/P NPr🅪 V V . NSg D NSg/V/J . R D JS . P D+
+# D+ NSg/J/P NPr🅪 V V . R D NSg/V/J . R D JS . P D+
> summer . As my train emerged from the tunnel into sunlight , only the hot whistles
# NPr/V+ . NSg/R D$+ NSg/V+ V/J P D+ NSg/V+ P NSg/V+ . J/R/C D NSg/V/J NPl/V
> of the National Biscuit Company broke the simmering hush at noon . The straw
@@ -7681,7 +7681,7 @@
> “ You think I’m pretty dumb , don’t you ? ” he suggested . “ Perhaps I am , but I have
# . ISgPl+ NSg/V W? NSg/V/J V/J . V ISgPl+ . . NPr/ISg+ V/J+ . . NSg ISg+ NPr/V/J . NSg/C/P ISg+ NSg/VX
> a — almost a second sight , sometimes , that tells me what to do . Maybe you don’t
-# D/P . NSg D/P+ NSg/V/J+ NSg/V+ . R . NSg/I/C/Ddem+ NPl/V NPr/ISg+ NSg/I+ P NSg/VX . NSg/J/R ISgPl+ V
+# D/P . R D/P+ NSg/V/J+ NSg/V+ . R . NSg/I/C/Ddem+ NPl/V NPr/ISg+ NSg/I+ P NSg/VX . NSg/J/R ISgPl+ V
> believe that , but science — — — ”
# V NSg/I/C/Ddem+ . NSg/C/P N🅪Sg/V+ . . . .
>
@@ -10277,7 +10277,7 @@
>
#
> This was a forlorn hope — he was almost sure that Wilson had no friend : there was
-# I/Ddem+ V D/P NSg/V/J NPr🅪/V . NPr/ISg+ V NSg J NSg/I/C/Ddem NPr+ V NPr/P+ NPr/V/J+ . + V
+# I/Ddem+ V D/P NSg/V/J NPr🅪/V . NPr/ISg+ V R J NSg/I/C/Ddem NPr+ V NPr/P+ NPr/V/J+ . + V
> not enough of him for his wife . He was glad a little later when he noticed a
# NSg/C NSg/I P ISg+ C/P ISg/D$+ NSg/V/J+ . NPr/ISg+ V NSg/V/J D/P NPr/I/J/Dq JC NSg/I/C NPr/ISg+ V/J D/P
> change in the room , a blue quickening by the window , and realized that dawn