From 35ed5c4e483ce765696824cbf02c6a67c4e72d07 Mon Sep 17 00:00:00 2001 From: Sean Farley Date: Sun, 8 Jun 2008 19:35:47 +0000 Subject: [PATCH] Fixed the output grammar to properly speak non-terminal dits. Updated Lyndon Nerenberg's radio callsign and E-mail address. PR: bin/7868 Submitted by: Lyndon Nerenberg MFC after: 1 week --- games/morse/morse.6 | 5 +++-- games/morse/morse.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/games/morse/morse.6 b/games/morse/morse.6 index f9ac378dc2d9..f26d9dba4218 100644 --- a/games/morse/morse.6 +++ b/games/morse/morse.6 @@ -172,7 +172,8 @@ Interpret characters with the high-order bit set as Greek characters. .Sh FILES .Bl -tag -width ".Pa /dev/speaker" -compact .It Pa /dev/speaker -speaker device file +.Xr speaker 4 +device file .El .Sh SEE ALSO .Xr speaker 4 @@ -180,7 +181,7 @@ speaker device file Sound support for .Nm added by -.An Lyndon Nerenberg (VE7TCP/VE6BBM) Aq lyndon@orthanc.com . +.An Lyndon Nerenberg (VE6BBM) Aq lyndon@orthanc.ca . .Pp Ability to key an external device added by .An J\(:org Wunsch diff --git a/games/morse/morse.c b/games/morse/morse.c index 87f97dccd5de..7663402c5c99 100644 --- a/games/morse/morse.c +++ b/games/morse/morse.c @@ -32,8 +32,8 @@ */ /* - * Taught to send *real* morse by Lyndon Nerenberg (VE7TCP/VE6BBM) - * + * Taught to send *real* morse by Lyndon Nerenberg (VE6BBM) + * */ #ifndef lint @@ -483,7 +483,8 @@ show(const char *s) printf(" %s\n", s); } else { for (; *s; ++s) - printf(" %s", *s == '.' ? "dit" : "dah"); + printf(" %s", *s == '.' ? *(s + 1) == '\0' ? "dit" : + "di" : "dah"); printf("\n"); } }