Merge pull request ppannuto#25 from Garrett-R/master

ppannuto · web-flow · commit 98891c914eb8 · 2017-05-19T11:26:29.000-04:00
Add various dash types
diff --git a/titlecase/__init__.py b/titlecase/__init__.py
@@ -15,15 +15,15 @@
 __version__ = '0.9.0'
 
 SMALL = 'a|an|and|as|at|but|by|en|for|if|in|of|on|or|the|to|v\.?|via|vs\.?'
-PUNCT = r"""!"#$%&'‘()*+,\-./:;?@[\\\]_`{|}~"""
+PUNCT = r"""!"#$%&'‘()*+,\-–‒—―./:;?@[\\\]_`{|}~"""
 
 SMALL_WORDS = re.compile(r'^(%s)$' % SMALL, re.I)
 INLINE_PERIOD = re.compile(r'[a-z][.][a-z]', re.I)
 UC_ELSEWHERE = re.compile(r'[%s]*?[a-zA-Z]+[A-Z]+?' % PUNCT)
 CAPFIRST = re.compile(r"^[%s]*?([A-Za-z])" % PUNCT)
 SMALL_FIRST = re.compile(r'^([%s]*)(%s)\b' % (PUNCT, SMALL), re.I)
 SMALL_LAST = re.compile(r'\b(%s)[%s]?$' % (SMALL, PUNCT), re.I)
-SUBPHRASE = re.compile(r'([:.;?!\-\—][ ])(%s)' % SMALL)
+SUBPHRASE = re.compile(r'([:.;?!\-–‒—―][ ])(%s)' % SMALL)
 APOS_SECOND = re.compile(r"^[dol]{1}['‘]{1}[a-z]+(?:['s]{2})?$", re.I)
 ALL_CAPS = re.compile(r'^[A-Z\s\d%s]+$' % PUNCT)
 UC_INITIALS = re.compile(r"^(?:[A-Z]{1}\.{1}|[A-Z]{1}\.{1}[A-Z]{1})+$")
diff --git a/titlecase/tests.py b/titlecase/tests.py
@@ -112,6 +112,14 @@
         "Snakes on a Plane — The TV Edit — The Famous Line",
         "Snakes on a Plane — The TV Edit — The Famous Line"
     ),
+    (
+        "EPISODE 7 — THE FORCE AWAKENS",
+        "Episode 7 — The Force Awakens"
+    ),
+    (
+        "episode 7 – The force awakens",
+        "Episode 7 – The Force Awakens"
+    ),
     (
         '"Nothing to Be Afraid of?"',
         '"Nothing to Be Afraid Of?"'
