Merge from gnus--rel--5.10

[gnu-emacs] / lisp / play / morse.el

diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index 51d493d013f911f32a6c00ed3fe6e44857697862..7e53f90775ce7d41815950323a4685243359265a 100644 (file)
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -1,8 +1,10 @@
-;;; morse.el --- Convert text to morse code and back.
+;;; morse.el --- convert text to morse code and back             -*- coding: utf-8 -*-
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM>
+;; Keywords: games
 
 ;; This file is part of GNU Emacs.
 
@@ -17,8 +19,14 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; Converts text to Morse code and back with M-x morse-region and
+;; M-x unmorse-region (though Morse code is no longer official :-().
 
 ;;; Code:
 
@@ -69,9 +77,24 @@
                     ("6" . "-....")
                     ("7" . "--...")
                     ("8" . "---..")
-                    ("9" . "----."))
+                    ("9" . "----.")
+                    ;; Non-ASCII
+                    ("Ä" . ".-.-")
+                    ("Æ" . ".-.-")
+                    ("Á" . ".--.-")
+                    ("Å" . ".--.-")
+                    ;; ligature character?? ("Ch" . "----")
+                    ("ß" . ".../...")
+                    ("É" . "..-..")
+                    ("Ñ" . "--.--")
+                    ("Ö" . "---.")
+                    ("Ø" . "---.")
+                    ("Ü" . "..--")
+                    ;; Recently standardized
+                    ("@" . ".--.-."))
   "Morse code character set.")
 
+;;;###autoload
 (defun morse-region (beg end)
   "Convert all text in a given region to morse code."
   (interactive "r")
@@ -94,6 +117,7 @@
               (forward-char 1)
               (setq sep "")))))))
 
+;;;###autoload
 (defun unmorse-region (beg end)
   "Convert morse coded text in region to ordinary ASCII text."
   (interactive "r")
@@ -117,4 +141,5 @@
 
 (provide 'morse)
 
+;;; arch-tag: 3331e6c1-9a9e-453f-abfd-163a9c3f93a6
 ;;; morse.el ends here