Reorganize MAU rules

amperser · Sep 28, 2015 · c5c5916 · c5c5916
1 parent 78b2912
commit c5c5916
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 156 deletions.
diff --git a/proselint/checks/mau_abbetor.py b/proselint/checks/mau_abbetor.py
diff --git a/proselint/checks/mau_abbreviable.py b/proselint/checks/mau_abbreviable.py
diff --git a/proselint/checks/mau_academically.py b/proselint/checks/mau_academically.py
diff --git a/proselint/checks/mau_acquirer.py b/proselint/checks/mau_acquirer.py
diff --git a/proselint/checks/mau_addable.py b/proselint/checks/mau_addable.py
diff --git a/proselint/checks/mau_adducible.py b/proselint/checks/mau_adducible.py
diff --git a/proselint/checks/mau_preferred_forms.py b/proselint/checks/mau_preferred_forms.py
@@ -0,0 +1,83 @@
+# -*- coding: utf-8 -*-
+"""MAU102: Preferred forms, needless variants.
+
+---
+layout:     post
+error_code: MAU102
+source:     Garner's Modern American Usage
+source_url: http://amzn.to/15wF76r
+title:      abbetor
+date:       2014-06-10 12:31:19
+categories: writing
+---
+
+Points out use of needless variants and less preferred forms.
+
+"""
+import re
+
+
+def check(text):
+    """Suggest the preferred forms."""
+    err = "MAU102"
+    msg = "{} is the preferred form."
+
+    preferences = [
+
+        # Needless variants
+        ["abbreviable",      ["abbreviatable"]],
+        ["abolition",        ["abolishment"]],
+        ["accessory",        ["accessary"]],
+        ["accrual",          ["accruement"]],
+        ["accumulate",       ["cumulate"]],
+        ["accused",          ["accusee"]],
+        ["acquaintance",     ["acquaintanceship"]],
+        ["acquittal",        ["acquitment"]],
+        ["administer",       ["administrate"]],
+        ["administered",     ["administrated"]],
+        ["administering",    ["administrating"]],
+        ["adulterous",       ["adulterate"]],
+        ["advisory",         ["advisatory"]],
+        ["advocate",         ["advocator"]],
+        ["alleger",          ["allegator"]],
+        ["allusive",         ["allusory"]],
+        ["ameliorate",       ["meliorate"]],
+        ["amorous",          ["amative"]],
+        ["amortization",     ["amortizement"]],
+        ["amphibology",      ["amphiboly"]],
+        ["anachronism",      ["parachronism"]],
+        ["anecdotist",       ["anecdotalist"]],
+        ["anilingus",        ["anilinctus"]],
+        ["anticipatory",     ["anticipative"]],
+        ["convertible",      ["conversible"]],
+        ["neglectful",       ["neglective"]],
+        ["transposition",    ["transposal"]],
+
+        # Misc. misspellings
+        ["academically",     ["academicly"]],
+        ["anilingus",        ["analingus"]],
+
+        # Hyphenated words
+        ["tortfeasor",       ["tort feasor", "tort-feasor"]],
+        ["transship",        ["tranship", "trans-ship"]],
+        ["transshipped",     ["transhipped", "trans-shipped"]],
+        ["transshipping",    ["transhipping", "trans-shipping"]],
+
+        # able vs. ible
+        ["addable",          ["addible"]],
+        ["adducible",        ["adduceable"]],
+
+        # er vs. or
+        ["abettor",          ["abbeter"]],
+        ["acquirer",         ["acquiror"]],
+
+        # TODO, entries that are a bit complicated
+        # announce
+    ]
+    errors = []
+    for p in preferences:
+        for r in p[1]:
+            for m in re.finditer(r, text, flags=re.IGNORECASE):
+                errors.append((m.start(), m.end(), err, msg.format(p[0])))
+
+    return errors
diff --git a/proselint/checks/mau_redundancy.py b/proselint/checks/mau_redundancy.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+"""MAU103: Redundancy.
+
+---
+layout:     post
+error_code: MAU103
+source:     Garner's Modern American Usage
+source_url: http://amzn.to/15wF76r
+title:      abbetor
+date:       2014-06-10 12:31:19
+categories: writing
+---
+
+Points out use redundant phrases.
+
+"""
+import re
+
+
+def check(text):
+    """Suggest the preferred forms."""
+    err = "MAU103"
+    msg = "'{}' is redundant, try '{}'."
+
+    redundancies = [
+        ["antithetical",      ["directly antithetical"]],
+        ["ATM",               ["ATM machine"]],
+        ["approximately",     ["approximately about"]],
+        ["associate",         ["associate together"]],
+        ["associate",         ["associate together in groups"]],
+        ["vocation",          ["professional vocation"]],
+        ["bivouac",           ["temporary bivouac", "bivouac camp"]],
+        ["obvious",           ["blatantly obvious"]],
+        ["but",               ["but nevertheless"]],
+        ["charged with ...",  ["accused of a charge"]],
+        ["circumstances",     ["surrounding circumstances"]],
+        ["circumstances of",  ["circumstances surrounding"]],
+        ["close",             ["close proximity"]],
+        ["collaborator",      ["fellow collaborator"]],
+        ["collaborators",     ["fellow collaborators"]]
+    ]
+
+    errors = []
+    for p in redundancies:
+        for r in p[1]:
+            for m in re.finditer(r, text, flags=re.IGNORECASE):
+                errors.append((m.start(), m.end(), err, msg.format(r, p[0])))
+
+    return errors
diff --git a/proselint/checks/mau_tortfeasor.py b/proselint/checks/mau_tortfeasor.py
diff --git a/proselint/tools.py b/proselint/tools.py
@@ -3,20 +3,6 @@
 import shelve
 import inspect
 import functools
-import re
-
-
-def supersede(new, old, error_code):
-    """Replace one word with another."""
-    def check(text):
-        msg = "It's '{}', not '{}'.".format(new, old)
-        errors = []
-        for m in re.finditer(old, text, flags=re.IGNORECASE):
-            errors.append((m.start(), m.end(), error_code, msg))
-
-        return errors
-
-    return check
 
 
 def memoize(f):