Rearrange some documentation.

diff --git a/README b/README
index 4755de3cd2a77dee861f32e9ae6a8b9c4dff218c..fdcf795c6db3320b297726f9eb57fe1c122244fa 100644 (file)
--- a/README
+++ b/README
@@ -19,60 +19,7 @@ Please send any additions to the authors!!
 
 A modified version of the program "QSO" by Paul J. Drongowski is also included.
 
-                            Morse Code Table
-
-        A  .-          N  -.          1  .----       .  .-.-.-
-        B  -...        O  ---         2  ..---       ,  --..--
-        C  -.-.        P  .--.        3  ...--       ?  ..--..
-        D  -..         Q  --.-        4  ....-       (  -.--.
-        E  .           R  .-.         5  .....       -  -....-
-        F  ..-.        S  ...         6  -....
-        G  --.         T  -           7  --...
-        H  ....        U  ..-         8  ---..
-        I  ..          V  ...-        9  ----.
-        J  .---        W  .--         0  -----
-        K  -.-         X  -..-        /  -..-.
-        L  .-..        Y  -.--        +  .-.-.
-        M  --          Z  --..        =  -...-
-
-The following characters are included if one uses the -B option:
-
-        )  -.--.-      "  .-..-.      _  ..--.-      '  .----.
-        :  ---...      ;  -.-.-.      $  ...-..-     !  -.-.--
-
-            Procedural Signals (Prosigns) for Morse Code
-
-<AR>    "+" over, end of message
-<AS>    "*" please stand by (<AS> 5  Wait 5 Minutes) (".-...")
-<BT>    "=" (double dash) pause, break for text
-CL          going off the air (clear)
-CQ          calling any station
-K           go, invite any station to transmit
-<KN>    "(" go only, invite a specific station to transmit
-R           all received OK
-<SK>    "%" end of contact (sent before call) ("...-.-", known also as <VA>)
-
-The following Procedural Signals (Prosigns) are included if one
-uses the -S option:
-
-<AA>    "^" new line (".-.-", the same as :a, ae)
-<BK>    "#" invite receiving station to transmit ("-...-.-")
-<KA>    "&" attention ("-.-.-")
-<SN>    "@" understood ("...-.")
-
-The following characters are included if one uses the -A option:
-
-        :a  .-.-   (also for ae, the same as <AA>)
-        `a  .--.-  (also oa, danish a with ring over it)
-        ch  ----   (bar-ch ?, bar-h ?, ISO 8859-1 code 199 and 231 ?)
-        -d  ..--.  (eth, overstrike d with -, ISO 8859-1 code 208 and 240)
-        `e  ..-..
-        ~n  --.--
-        :o  ---.   (also for oe)
-        :u  ..--   (also for ue)
-        ]p  .--..  (thorn, overstrike ] with p, ISO 8859-1 code 222 and 254)
-        paragraph  .-.-..  (ISO 8859-1 code 167 ?)
-
+For the character set this trainer generates, see the manual page.
 Special Characters and Groups (never included, placed here for completeness) :
 
 Multiplication sign  -..-  (the same as x, ISO 8859-1 code 215 ?)
@@ -86,19 +33,3 @@ Cut Numbers :
 3   .--     8   -..            3   ...-    8   -..
 4   ...-    9   -.             4   ....-   9   -.
 5   ...     0   -              5   .       0   -
-
-Written by:
-  Joe Dellinger, Hawaii Institute of Geophysics, University of Hawaii at Manoa
-  submitted to comp.sources.misc Dec 15 1993
-  Revised version submitted to comp.sources.misc Nov 22 1994
-
-- joe@sep.stanford.edu
-  jdellinger@trc.amoco.com
-  joe@soest.hawaii.edu
-
-Since January 2005, maintained by:
-  Eric S. Raymond <esr@thyrsus.com>
-  * Turned the old compile-time options for expanding the test set into
-    runtime options -A, -B, -S, -X, -x.
-  * Wrote the manual page.
-  * Updated all code to use ANSI prototypes.

diff --git a/morse.c b/morse.c
index 73e3a78bae744e59480b1cf8481d5ce46584f338..1f2bf9aa7dc100c43ba96e9fe613744f610d37b8 100644 (file)
--- a/morse.c
+++ b/morse.c
@@ -60,7 +60,7 @@
  *     Changed ALLPUNCTUATION to runtime -B option.
  *     Changed ERROR_FREQUENCY to runtime -x option.
  *     Changed ERROR_VOLUME to runtime -X option.
- *     Dropped BSD signal support.
+ *     Dropped BSD signal and tty support, it's all POSIX now.
  *     Wrote the manual page.
  */
 

diff --git a/morse.xml b/morse.xml
index 0c77fd9b9ed63a3d3302fbed5d44a8ffac81769d..d465fc96b3c8f947ff41e6d39858fa3e769dd100 100644 (file)
--- a/morse.xml
+++ b/morse.xml
@@ -279,6 +279,72 @@ QSOs that can be fed to the standard input of <command>morse</command>.</para>
 </varlistentry>
 </variablelist>
 
+<para>Here is the basic International Morse codest that the program
+will train you in:</para>
+
+<screen>
+        A  .-          N  -.          1  .----       .  .-.-.-
+        B  -...        O  ---         2  ..---       ,  --..--
+        C  -.-.        P  .--.        3  ...--       ?  ..--..
+        D  -..         Q  --.-        4  ....-       (  -.--.
+        E  .           R  .-.         5  .....       -  -....-
+        F  ..-.        S  ...         6  -....
+        G  --.         T  -           7  --...
+        H  ....        U  ..-         8  ---..
+        I  ..          V  ...-        9  ----.
+        J  .---        W  .--         0  -----
+        K  -.-         X  -..-        /  -..-.
+        L  .-..        Y  -.--        +  .-.-.
+        M  --          Z  --..        =  -...-
+</screen>
+
+<para>The following characters are included if one uses the -B option:</para>
+
+<screen>
+        )  -.--.-      "  .-..-.      _  ..--.-      '  .----.
+        :  ---...      ;  -.-.-.      $  ...-..-     !  -.-.--
+</screen>
+
+<para>The following procedural signals (prosigns) are also included if
+one uses -B:</para>
+
+<screen>
+&lt;AR&gt;    "+" over, end of message
+&lt;AS&gt;    "*" please stand by (&lt;AS&gt; 5  Wait 5 Minutes) (".-...")
+&lt;BT&gt;    "=" (double dash) pause, break for text
+CL          going off the air (clear)
+CQ          calling any station
+K           go, invite any station to transmit
+&lt;KN&gt;    "(" go only, invite a specific station to transmit
+R           all received OK
+&lt;SK&gt;    "%" end of contact (sent before call) ("...-.-", known also as &lt;VA&gt;)
+</screen>
+
+<para>The following less-used prosigns are included if one
+uses the -S option:</para>
+
+<screen>
+&lt;AA&gt;    "^" new line (".-.-", the same as :a, ae)
+&lt;BK&gt;    "#" invite receiving station to transmit ("-...-.-")
+&lt;KA&gt;    "&amp;" attention ("-.-.-")
+&lt;SN&gt;    "@" understood ("...-.")
+</screen>
+
+<para>The following characters are included if one uses the -A option:</para>
+
+<screen>
+        :a  .-.-   (also for ae, the same as &lt;AA&gt;)
+        `a  .--.-  (also oa, danish a with ring over it)
+        ch  ----   (bar-ch ?, bar-h ?, ISO 8859-1 code 199 and 231 ?)
+        -d  ..--.  (eth, overstrike d with -, ISO 8859-1 code 208 and 240)
+        `e  ..-..
+        ~n  --.--
+        :o  ---.   (also for oe)
+        :u  ..--   (also for ue)
+        ]p  .--..  (thorn, overstrike ] with p, ISO 8859-1 code 222 and 254)
+        paragraph  .-.-..  (ISO 8859-1 code 167 ?)
+</screen>
+
 <para>For the raw beginner trying to learn morse code, we recommend
 the following sequence:</para>