Merge branch 'amperser:main' into fix/misc-but

Author: drainpixie

proselint/checks/cliches/hell.py

@@ -14,13 +14,12 @@
 
 """
 
-from proselint.registry.checks import Check, CheckFlags, types
+from proselint.registry.checks import Check, types
 
 check = Check(
     check_type=types.ExistenceSimple(pattern="all hell broke loose"),
     path="cliches.hell",
     message="Never use the phrase 'all hell broke loose'.",
-    flags=CheckFlags(results_limit=1),
 )
 
 __register__ = (check,)

proselint/checks/misc/capitalization.py

@@ -19,10 +19,10 @@
 check_terms = Check(
     check_type=types.PreferredFormsSimple(
         items={
-            "stone age": "Stone Age",
+            "mother nature": "Mother Nature",
             "Space Age": "space age",
+            "stone age": "Stone Age",
             "the American west": "the American West",
-            "mother nature": "Mother Nature",
         }
     ),
     path="misc.capitalization.terms",
@@ -34,8 +34,8 @@
     check_type=types.PreferredFormsSimple(
         items={
             "Winter": "winter",
-            # "Fall": "fall",
             "Summer": "summer",
+            # "Fall": "fall",
             # "Spring": "spring",
         }
     ),
@@ -49,16 +49,16 @@
         items={
             "january": "January",
             "february": "February",
-            # "march": "March",
             "april": "April",
-            # "may": "May",
             "june": "June",
             "july": "July",
             "august": "August",
             "september": "September",
             "october": "October",
             "november": "November",
             "december": "December",
+            # "march": "March",
+            # "may": "May",
         }
     ),
     path="misc.capitalization.months",

proselint/checks/misc/institution_name.py

@@ -23,7 +23,7 @@
 check = Check(
     check_type=types.PreferredFormsSimple(
         items={
-            "Virginia Polytechnic and State University": (
+            "virginia polytechnic and state university": (
                 "Virginia Polytechnic Institute and State University"
             ),
         }

proselint/checks/misc/phrasal_adjectives.py

@@ -37,13 +37,15 @@
             "criminal law professor": "criminal-law professor",
             "cut and dried issue": "cut-and-dried issue",
             "downward sloping line": "downward-sloping line",
-            "English language learners": "English-language learners",
-            "English speaking people": "English-speaking people",
+            "english language learners": "English-language learners",
+            "english speaking people": "English-speaking people",
             "even numbered": "even-numbered",
             "fact to face meeting": "face-to-face meeting",
             "fixed rate mortgage": "fixed-rate mortgage",
             "for profit firm": "for-profit firm",
             "foreign sounding name": "foreign-sounding name",
+            "free range chicken": "free-range chicken",
+            "free range poultry": "free-range poultry",
             "government owned business": "government-owned business",
             "hard and fast issue": "hard-and-fast issue",
             "head on collision": "head-on collision",
@@ -52,15 +54,16 @@
             "heath care coverage": "health-care coverage",
             "high school student": "high-school student",
             "hit and run statute": "hit-and-run statute",
-            "HIV negative person": "HIV-negative person",
-            "HIV positive person": "HIV-positive person",
+            "hiv negative person": "HIV-negative person",
+            "hiv positive person": "HIV-positive person",
             "information technology personnel": (
                 "information-technology personnel"
             ),
             "intellectual property rights": "intellectual-property rights",
             "interest group pressures": "interest-group pressures",
             "joint stock company": "joint-stock company",
             "kidney dialysis machine": "kidney-dialysis machine",
+            "larger than life personality": "larger-than-life personality",
             "long run costs": "long-run costs",
             "long term care": "long-term care",
             "low income housing": "low-income housing",
@@ -71,6 +74,9 @@
             "no fault accident": "no-fault accident",
             "no fault divorce": "no-fault divorce",
             "no fault insurance": "no-fault insurance",
+            "non profit making organization": "non-profit-making organization",
+            "non profit-making organization": "non-profit-making organization",
+            "non-profit making organization": "non-profit-making organization",
             "odd numbered": "odd-numbered",
             "office supply store": "office-supply store",
             "one way flight": "one-way flight",
@@ -87,7 +93,6 @@
             "razor sharp intellect": "razor-sharp intellect",
             "razor sharp mind": "razor-sharp mind",
             "razor sharp wit": "razor-sharp wit",
-            "larger than life personality": "larger-than-life personality",
             "real estate prices": "real-estate prices",
             "real estate tycoon": "real-estate tycoon",
             "right wing militia": "right-wing militia",
@@ -96,42 +101,37 @@
             "second largest army": "second-largest army",
             "shell shocked mothers": "shell-shocked mothers",
             "shell shocked soldiers": "shell-shocked soldiers",
+            "small animal veterinarian": "small-animal veterinarian",
             "small business loan": "small-business loan",
             "small business owner": "small-business owner",
             "small state senator": "small-state senator",
-            "small animal veterinarian": "small-animal veterinarian",
+            "stained glass ceiling": "stained-glass ceiling",
+            "stained glass window": "stained-glass window",
             "state sponsored terrorism": "state-sponsored terrorism",
             "state sponsored violence": "state-sponsored violence",
             "thumbs up sign": "thumbs-up sign",
             "time honored tradition": "time-honored tradition",
-            r"U\.S\. led campaign": r"U\.S\.-led campaign",
             "upward sloping line": "upward-sloping line",
             "venture backed company": "venture-backed company",
             "well publicized event": "well-publicized event",
             "wire transfer service": "wire-transfer service",
             "yes or no question": "yes-or-no question",
             "zero sum game": "zero-sum game",
-            "stained glass ceiling": "stained-glass ceiling",
-            "stained glass window": "stained-glass window",
-            "free range chicken": "free-range chicken",
-            "free range poultry": "free-range poultry",
-            "non profit making organization": "non-profit-making organization",
-            "non-profit making organization": "non-profit-making organization",
-            "non profit-making organization": "non-profit-making organization",
+            r"u\.s\. led campaign": r"U\.S\.-led campaign",
             # Harmony
             "three part harmony": "three-part harmony",
             "four part harmony": "four-part harmony",
             "six part harmony": "six-part harmony",
             "eight part harmony": "eight-part harmony",
             # Losses and gains.
-            "first quarter loss": "first-quarter loss",
-            "second quarter loss": "second-quarter loss",
-            "third quarter loss": "third-quarter loss",
-            "fourth quarter loss": "fourth-quarter loss",
             "first quarter gain": "first-quarter gain",
+            "first quarter loss": "first-quarter loss",
             "second quarter gain": "second-quarter gain",
+            "second quarter loss": "second-quarter loss",
             "third quarter gain": "third-quarter gain",
+            "third quarter loss": "third-quarter loss",
             "fourth quarter gain": "fourth-quarter gain",
+            "fourth quarter loss": "fourth-quarter loss",
         }
     ),
     path="misc.phrasal_adjectives.examples",

proselint/checks/misc/preferred_forms.py

@@ -14,48 +14,50 @@
 
 """
 
-from proselint.registry.checks import Check, types
+from proselint.registry.checks import Check, Padding, types
+
+CHECK_PATH = "misc.preferred_forms"
+CHECK_MESSAGE = "'{}' is the preferred form."
 
 check = Check(
     check_type=types.PreferredFormsSimple(
         items={
             # Obsolete words
             "imprimature": "imprimatur",
             # Proper nouns
-            "haloween": "Halloween",
             "hallowe'en": "Halloween",
-            "Khruschev": "Khrushchev",
-            "Kruschev": "Khrushchev",
-            "Klu Klux Klan": "Ku Klux Klan",
-            "Pontius Pilot": "Pontius Pilate",
+            "haloween": "Halloween",
+            "khruschev": "Khrushchev",
+            "klu klux klan": "Ku Klux Klan",
+            "kruschev": "Khrushchev",
+            "pontius pilot": "Pontius Pilate",
             # Plurals
             "hippopotami": "hippopotamuses",
+            "longstanding": "long-standing",
             "manifesti": "manifestos",
             "matrixes": "matrices",
             "mongeese": "mongooses",
             "narcissuses": "narcissi",
+            "non-sequitur": "non sequitur",
             "retinae": "retinas",
-            "soprani": "sopranos",
-            "titmouses": "titmice",
-            # Hyphenated words
-            "longstanding": "long-standing",
             "sans-serif": "sans serif",
             "sanserif": "sans serif",
+            "soprani": "sopranos",
+            "titmouses": "titmice",
             "tort feasor": "tortfeasor",
             "tort-feasor": "tortfeasor",
-            "tranship": "transship",
             "trans-ship": "transship",
-            "transhipped": "transshiped",
             "trans-shipped": "transshipped",
-            "transhipping": "transshipping",
             "trans-shipping": "transshipping",
-            "non-sequitur": "non sequitur",
+            "tranship": "transship",
+            "transhipped": "transshiped",
+            "transhipping": "transshipping",
             # Misc
             "mental attitude": "attitude",
-            "Chief Justice of the United States Supreme Court": (
+            "chief justice of the united states supreme court": (
                 "Chief Justice of the United States"
             ),
-            "Chief Justice of the Supreme Court of the United States": (
+            "chief justice of the supreme court of the united states": (
                 "Chief Justice of the United States"
             ),
             "chitlings": "chitterlings",
@@ -122,11 +124,10 @@
             "in the meanwhile": "in the meantime",
             "lengthy distances": "long distances",
             "maddening crowd": "madding crowd",
-            "Magna Charta": "Magna Carta",
+            "magna charta": "Magna Carta",
             "mariage de convenance": "marriage of convenience",
-            "Meantime,": "Meanwhile,",
-            "Middle West": "Midwest",
-            "Middle Western": "Midwestern",
+            "middle west": "Midwest",
+            "middle western": "Midwestern",
             "modes of operandi": "modi operandi",
             "mode of operandi": "modus operandi",
             "notion seconded": "motion seconded",
@@ -144,8 +145,8 @@
             "both of the last": "the last two",
             "inorganic food": "unorganic food",
             "veil of tears": "vale of tears",
-            "Venus's flytrap": "Venus flytrap",
-            "Venus' flytrap": "Venus flytrap",
+            "venus's flytrap": "Venus flytrap",
+            "venus' flytrap": "Venus flytrap",
             "was accused with": "was accused of",
             # Verbosity
             "make an attempt to": "try to",
@@ -177,4 +178,23 @@
     message="'{}' is the preferred form.",
 )
 
-__register__ = (check,)
+check_meantime_capital = Check(
+    check_type=types.PreferredForms(items={
+        r"\bMeantime,\B": "Meanwhile,",
+    }, padding=Padding.RAW),
+    path=CHECK_PATH,
+    message=CHECK_MESSAGE,
+    ignore_case=False,
+)
+
+check_meantime_clause = Check(
+    check_type=types.PreferredForms(items={
+        r"\b[;,] meantime,\B": "meanwhile,"
+    }, padding=Padding.RAW),
+    path=CHECK_PATH,
+    message=CHECK_MESSAGE,
+    ignore_case=False,
+    offset=(2, 0),
+)
+
+__register__ = (check, check_meantime_capital, check_meantime_clause)

proselint/checks/misc/pretension.py

@@ -14,7 +14,7 @@
 
 """
 
-from proselint.registry.checks import Check, CheckFlags, types
+from proselint.registry.checks import Check, types
 
 check = Check(
     check_type=types.Existence(
@@ -27,7 +27,6 @@
     ),
     path="misc.pretension",
     message="Jargon words like '{}' are the hallmarks of a pretentious ass.",
-    flags=CheckFlags(results_limit=1),
 )
 
 __register__ = (check,)

proselint/checks/misc/suddenly.py

@@ -27,13 +27,12 @@
 
 """
 
-from proselint.registry.checks import Check, CheckFlags, types
+from proselint.registry.checks import Check, types
 
 check = Check(
     check_type=types.ExistenceSimple(pattern="Suddenly,"),
     path="misc.suddenly",
     message="Suddenly is nondescript, slows the action, and warns your reader.",
-    flags=CheckFlags(results_limit=3),
     ignore_case=False,
 )
 

proselint/checks/mixed_metaphors.py

@@ -1,6 +1,6 @@
 """Mixed metaphors."""
 
-from proselint.registry.checks import Check, CheckFlags, types
+from proselint.registry.checks import Check, types
 
 """
 source:     Sir Ernest Gowers
@@ -20,7 +20,6 @@
     ),
     path="mixed_metaphors.bottleneck",
     message="Mixed metaphor — bottles with big necks are easy to pass through.",
-    flags=CheckFlags(results_limit=1),
 )
 
 """

proselint/checks/mondegreens.py

@@ -24,13 +24,13 @@
             "attorney and not a republic": "attorney and notary public",
             "beckon call": "beck and call",
             "for all intensive purposes": "for all intents and purposes",
-            "Lady Mondegreen": "laid him on the green",
-            "Olive, the other reindeer": "all of the other reindeer",
+            "lady mondegreen": "laid him on the green",
+            "olive, the other reindeer": "all of the other reindeer",
             "to the manor born": "to the manner born",
         }
     ),
     path="mondegreens",
     message="'{}' is the preferred form.",
-)
+    )
 
 __register__ = (check,)

proselint/checks/needless-variants

@@ -197,7 +197,7 @@ unrevokable,irrevocable
 judgmatic,judgmental
 gerry-rigged,jury-rigged
 jerry-rigged,jury-rigged
-Coffee klatsch,kaffeeklatsch
+coffee klatsch,kaffeeklatsch
 coffee klatch,kaffeeklatsch
 nicknack,knickknack
 labyrinthian,labyrinthine
@@ -358,4 +358,4 @@ vociferant,vociferous
 volitive,volitional
 wolvish,wolfish
 wolverene,wolverine
-Zoroastrism,Zoroastrianism
+zoroastrism,Zoroastrianism