From e461b7dd45f717f3317216c7d3207a1d24bf1c85 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Thu, 4 Mar 2021 16:01:40 -0800
Subject: [PATCH] Relax `--abbreviations` rules so that a period isn't
 required.

Partially addresses #7124.
---
 MANUAL.txt                          | 6 +++---
 src/Text/Pandoc/Readers/Markdown.hs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MANUAL.txt b/MANUAL.txt
index 52b82a3d0..667a784e0 100644
--- a/MANUAL.txt
+++ b/MANUAL.txt
@@ -691,9 +691,9 @@ header when requesting a document from a URL:
     system default, use
     `pandoc --print-default-data-file=abbreviations`.  The only
     use pandoc makes of this list is in the Markdown reader.
-    Strings ending in a period that are found in this list will
-    be followed by a nonbreaking space, so that the period will
-    not produce sentence-ending space in formats like LaTeX.
+    Strings found in this list will be followed by a nonbreaking
+    space, and the period will not produce sentence-ending space
+    in formats like LaTeX.  The strings may not contain spaces.
 
 [`pandocfilters`]: https://github.com/jgm/pandocfilters
 [PHP]: https://github.com/vinai/pandocfilters-php
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index b1b99dfe5..34edbcc17 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -1725,7 +1725,7 @@ str = do
   updateLastStrPos
   (do guardEnabled Ext_smart
       abbrevs <- getOption readerAbbreviations
-      if not (T.null result) && T.last result == '.' && result `Set.member` abbrevs
+      if result `Set.member` abbrevs
          then try (do ils <- whitespace
                       notFollowedBy (() <$ cite <|> () <$ note)
                       -- ?? lookAhead alphaNum