Improve `parsebib--expand-strings'.

- replace sequences of white space (incl. newlines and tabs) with a single
  space.
- return the abbrev itself if no expansion is found.

1 files changed, 7 insertions, 5 deletions

diff --git a/parsebib.el b/parsebib.el
index 552c4d1..f1d6526 100644
--- a/parsebib.el
+++ b/parsebib.el
@@ -168,11 +168,13 @@ if non-nil."
   "Replace STRINGS with expansions in ABBREVS."
   (mapcar (lambda (str)
             (or (gethash str abbrevs)
-                (cond
-                 ((string-match "\\`[\"{]\\(.*?\\)[\"}]\\'" str)
-                  (match-string 1 str))
-                 ((string-match "[0-9]+" str)
-                  str))))
+                (progn (setq str (replace-regexp-in-string "[ \t\n\f]+" " " str))
+                       (cond
+                        ((string-match "\\`[\"{]\\(.*?\\)[\"}]\\'" str)
+                         (match-string 1 str))
+                        ((string-match "[0-9]+" str)
+                         str)
+                        (t str)))))
           strings))
 
 ;;;;;;;;;;;;;;;;;;;