Compose table was too big to include in the key table - moved it to

a separate table...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1041 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 101 insertions, 97 deletions

diff --git a/documentation/Fl_Input.html b/documentation/Fl_Input.html
index 87b3c9421..56d751184 100644
--- a/documentation/Fl_Input.html
+++ b/documentation/Fl_Input.html
@@ -75,9 +75,37 @@ selection.</TD></TR>
 <TR><TD><B>RightCtrl or
 <BR>Compose</B></TD><TD><a name=compose>
 Start a <A href="events.html#compose">compose-character</A>
-sequence.  The next one or two keys typed define the character to insert:
+sequence.  The next one or two keys typed define the character to
+insert (see table that follows.)
 
-<br><center><table border=1>
+<p>For instance, to type "á" type [compose][a]['] or [compose]['][a].
+
+<P>The character "nbsp" (non-breaking space) is typed by using
+[compose][space].
+
+<P>The single-character sequences may be followed by a space if
+necessary to remove ambiguity.  For instance, if you really want to
+type "ª~" rather than "ã" you must type [compose][a][space][~].
+
+<p>The same key may be used to "quote" control characters into the
+text.  If you need a <tt>^Q</tt> character you can get one by typing
+[compose][Control+Q].
+
+<p>X may have a key on the keyboard
+defined as <tt>XK_Multi_key</tt>.  If so this key may be used as well
+as the right-hand control key.  You can set this up with the program
+<tt>xmodmap</tt>.
+
+<p>If your keyboard is set to support a foreign language you should
+also be able to type "dead key" prefix characters.  On X you will
+actually be able to see what dead key you typed, and if you then move
+the cursor without completing the sequence the accent will remain
+inserted.
+</TABLE></CENTER>
+
+<!-- NEW PAGE -->
+<center><table border=1>
+<caption align="center">Character Composition Table</caption>
 <tr>
 	<th>Keys</th><th>Char</th>
 	<th>Keys</th><th>Char</th>
@@ -87,143 +115,119 @@ sequence.  The next one or two keys typed define the character to insert:
 	<th>Keys</th><th>Char</th>
 
 </tr><tr>
-	<td align=center><small>space</small></td><td align=center><small>nbsp</small></td>
+	<td align=center><TT>sp</TT></td><td align=center><small>nbsp</small></td>
 	<td align=center><TT>*</tt></td><td align=center>°</td>
-	<td align=center><TT>`A</tt></td><td align=center>À</td>
-	<td align=center><TT>D-</tt></td><td align=center>Ð</td>
-	<td align=center><TT>`a</tt></td><td align=center>à</td>
-	<td align=center><TT>d-</tt></td><td align=center>ð
+	<td align=center><TT>` A</tt></td><td align=center>À</td>
+	<td align=center><TT>D -</tt></td><td align=center>Ð</td>
+	<td align=center><TT>` a</tt></td><td align=center>à</td>
+	<td align=center><TT>d -</tt></td><td align=center>ð
 </tr><tr>
 	<td align=center><TT>!</tt></td><td align=center>¡</td>
-	<td align=center><TT>+-</tt></td><td align=center>±</td>
-	<td align=center><TT>'A</tt></td><td align=center>Á</td>
-	<td align=center><TT>~N</tt></td><td align=center>Ñ</td>
-	<td align=center><TT>'a</tt></td><td align=center>á</td>
-	<td align=center><TT>~n</tt></td><td align=center>ñ
+	<td align=center><TT>+ -</tt></td><td align=center>±</td>
+	<td align=center><TT>' A</tt></td><td align=center>Á</td>
+	<td align=center><TT>~ N</tt></td><td align=center>Ñ</td>
+	<td align=center><TT>' a</tt></td><td align=center>á</td>
+	<td align=center><TT>~ n</tt></td><td align=center>ñ
 </tr><tr>
 	<td align=center><TT>%</tt></td><td align=center>¢</td>
 	<td align=center><TT>2</tt></td><td align=center>²</td>
-	<td align=center><TT>A^</tt></td><td align=center>Â</td>
-	<td align=center><TT>`O</tt></td><td align=center>Ò</td>
-	<td align=center><TT>^a</tt></td><td align=center>â</td>
-	<td align=center><TT>`o</tt></td><td align=center>ò
+	<td align=center><TT>A ^</tt></td><td align=center>Â</td>
+	<td align=center><TT>` O</tt></td><td align=center>Ò</td>
+	<td align=center><TT>^ a</tt></td><td align=center>â</td>
+	<td align=center><TT>` o</tt></td><td align=center>ò
 </tr><tr>
 	<td align=center><TT>#</tt></td><td align=center>£</td>
 	<td align=center><TT>3</tt></td><td align=center>³</td>
-	<td align=center><TT>~A</tt></td><td align=center>Ã</td>
-	<td align=center><TT>'O</tt></td><td align=center>Ó</td>
-	<td align=center><TT>~a</tt></td><td align=center>ã</td>
-	<td align=center><TT>'o</tt></td><td align=center>ó
+	<td align=center><TT>~ A</tt></td><td align=center>Ã</td>
+	<td align=center><TT>' O</tt></td><td align=center>Ó</td>
+	<td align=center><TT>~ a</tt></td><td align=center>ã</td>
+	<td align=center><TT>' o</tt></td><td align=center>ó
 </tr><tr>
 	<td align=center><TT>$</tt></td><td align=center>¤</td>
 	<td align=center><TT>'</tt></td><td align=center>´</td>
-	<td align=center><TT>:A</tt></td><td align=center>Ä</td>
-	<td align=center><TT>^O</tt></td><td align=center>Ô</td>
-	<td align=center><TT>:a</tt></td><td align=center>ä</td>
-	<td align=center><TT>^o</tt></td><td align=center>ô
+	<td align=center><TT>: A</tt></td><td align=center>Ä</td>
+	<td align=center><TT>^ O</tt></td><td align=center>Ô</td>
+	<td align=center><TT>: a</tt></td><td align=center>ä</td>
+	<td align=center><TT>^ o</tt></td><td align=center>ô
 </tr><tr>
-	<td align=center><TT>y=</tt></td><td align=center>¥</td>
+	<td align=center><TT>y =</tt></td><td align=center>¥</td>
 	<td align=center><TT>u</tt></td><td align=center>µ</td>
-	<td align=center><TT>*A</tt></td><td align=center>Å</td>
-	<td align=center><TT>~O</tt></td><td align=center>Õ</td>
-	<td align=center><TT>*a</tt></td><td align=center>å</td>
-	<td align=center><TT>~o</tt></td><td align=center>õ
+	<td align=center><TT>* A</tt></td><td align=center>Å</td>
+	<td align=center><TT>~ O</tt></td><td align=center>Õ</td>
+	<td align=center><TT>* a</tt></td><td align=center>å</td>
+	<td align=center><TT>~ o</tt></td><td align=center>õ
 </tr><tr>
 	<td align=center><TT>|</tt></td><td align=center>¦</td>
 	<td align=center><TT>p</tt></td><td align=center>¶</td>
-	<td align=center><TT>AE</tt></td><td align=center>Æ</td>
-	<td align=center><TT>:O</tt></td><td align=center>Ö</td>
-	<td align=center><TT>ae</tt></td><td align=center>æ</td>
-	<td align=center><TT>:o</tt></td><td align=center>ö
+	<td align=center><TT>A E</tt></td><td align=center>Æ</td>
+	<td align=center><TT>: O</tt></td><td align=center>Ö</td>
+	<td align=center><TT>a e</tt></td><td align=center>æ</td>
+	<td align=center><TT>: o</tt></td><td align=center>ö
 </tr><tr>
 	<td align=center><TT>&amp;</tt></td><td align=center>§</td>
 	<td align=center><TT>.</tt></td><td align=center>·</td>
-	<td align=center><TT>,C</tt></td><td align=center>Ç</td>
+	<td align=center><TT>, C</tt></td><td align=center>Ç</td>
 	<td align=center><TT>x</tt></td><td align=center>×</td>
-	<td align=center><TT>,c</tt></td><td align=center>ç</td>
-	<td align=center><TT>-:</tt></td><td align=center>÷
+	<td align=center><TT>, c</tt></td><td align=center>ç</td>
+	<td align=center><TT>- :</tt></td><td align=center>÷
 </tr><tr>
 	<td align=center><TT>:</tt></td><td align=center>¨</td>
 	<td align=center><TT>,</tt></td><td align=center>¸</td>
-	<td align=center><TT>E`</tt></td><td align=center>È</td>
-	<td align=center><TT>O/</tt></td><td align=center>Ø</td>
-	<td align=center><TT>`e</tt></td><td align=center>è</td>
-	<td align=center><TT>o/</tt></td><td align=center>ø
+	<td align=center><TT>E `</tt></td><td align=center>È</td>
+	<td align=center><TT>O /</tt></td><td align=center>Ø</td>
+	<td align=center><TT>` e</tt></td><td align=center>è</td>
+	<td align=center><TT>o /</tt></td><td align=center>ø
 </tr><tr>
 	<td align=center><TT>c</tt></td><td align=center>©</td>
 	<td align=center><TT>1</tt></td><td align=center>¹</td>
-	<td align=center><TT>'E</tt></td><td align=center>É</td>
-	<td align=center><TT>`U</tt></td><td align=center>Ù</td>
-	<td align=center><TT>'e</tt></td><td align=center>é</td>
-	<td align=center><TT>`u</tt></td><td align=center>ù
+	<td align=center><TT>' E</tt></td><td align=center>É</td>
+	<td align=center><TT>` U</tt></td><td align=center>Ù</td>
+	<td align=center><TT>' e</tt></td><td align=center>é</td>
+	<td align=center><TT>` u</tt></td><td align=center>ù
 </tr><tr>
 	<td align=center><TT>a</tt></td><td align=center>ª</td>
 	<td align=center><TT>o</tt></td><td align=center>º</td>
-	<td align=center><TT>^E</tt></td><td align=center>Ê</td>
-	<td align=center><TT>'U</tt></td><td align=center>Ú</td>
-	<td align=center><TT>^e</tt></td><td align=center>ê</td>
-	<td align=center><TT>'u</tt></td><td align=center>ú
+	<td align=center><TT>^ E</tt></td><td align=center>Ê</td>
+	<td align=center><TT>' U</tt></td><td align=center>Ú</td>
+	<td align=center><TT>^ e</tt></td><td align=center>ê</td>
+	<td align=center><TT>' u</tt></td><td align=center>ú
 </tr><tr>
-	<td align=center><TT>&lt;&lt;</tt></td><td align=center>«</td>
-	<td align=center><TT>>></tt></td><td align=center>»</td>
-	<td align=center><TT>:E</tt></td><td align=center>Ë</td>
-	<td align=center><TT>^U</tt></td><td align=center>Û</td>
-	<td align=center><TT>:e</tt></td><td align=center>ë</td>
-	<td align=center><TT>^u</tt></td><td align=center>û
+	<td align=center><TT>&lt; &lt;</tt></td><td align=center>«</td>
+	<td align=center><TT>&gt; &gt;</tt></td><td align=center>»</td>
+	<td align=center><TT>: E</tt></td><td align=center>Ë</td>
+	<td align=center><TT>^ U</tt></td><td align=center>Û</td>
+	<td align=center><TT>: e</tt></td><td align=center>ë</td>
+	<td align=center><TT>^ u</tt></td><td align=center>û
 </tr><tr>
 	<td align=center><TT>~</tt></td><td align=center>¬</td>
-	<td align=center><TT>14</tt></td><td align=center>¼</td>
-	<td align=center><TT>`I</tt></td><td align=center>Ì</td>
-	<td align=center><TT>:U</tt></td><td align=center>Ü</td>
-	<td align=center><TT>`i</tt></td><td align=center>ì</td>
-	<td align=center><TT>:u</tt></td><td align=center>ü
+	<td align=center><TT>1 4</tt></td><td align=center>¼</td>
+	<td align=center><TT>` I</tt></td><td align=center>Ì</td>
+	<td align=center><TT>: U</tt></td><td align=center>Ü</td>
+	<td align=center><TT>` i</tt></td><td align=center>ì</td>
+	<td align=center><TT>: u</tt></td><td align=center>ü
 </tr><tr>
 	<td align=center><TT>-</tt></td><td align=center>­</td>
-	<td align=center><TT>12</tt></td><td align=center>½</td>
-	<td align=center><TT>'I</tt></td><td align=center>Í</td>
-	<td align=center><TT>'Y</tt></td><td align=center>Ý</td>
-	<td align=center><TT>'i</tt></td><td align=center>í</td>
-	<td align=center><TT>'y</tt></td><td align=center>ý
+	<td align=center><TT>1 2</tt></td><td align=center>½</td>
+	<td align=center><TT>' I</tt></td><td align=center>Í</td>
+	<td align=center><TT>' Y</tt></td><td align=center>Ý</td>
+	<td align=center><TT>' i</tt></td><td align=center>í</td>
+	<td align=center><TT>' y</tt></td><td align=center>ý
 </tr><tr>
 	<td align=center><TT>r</tt></td><td align=center>®</td>
-	<td align=center><TT>34</tt></td><td align=center>¾</td>
-	<td align=center><TT>^I</tt></td><td align=center>Î</td>
-	<td align=center><TT>TH</tt></td><td align=center>Þ</td>
-	<td align=center><TT>^i</tt></td><td align=center>î</td>
-	<td align=center><TT>th</tt></td><td align=center>þ
+	<td align=center><TT>3 4</tt></td><td align=center>¾</td>
+	<td align=center><TT>^ I</tt></td><td align=center>Î</td>
+	<td align=center><TT>T H</tt></td><td align=center>Þ</td>
+	<td align=center><TT>^ i</tt></td><td align=center>î</td>
+	<td align=center><TT>t h</tt></td><td align=center>þ
 </tr><tr>
 	<td align=center><TT>_</tt></td><td align=center>¯</td>
 	<td align=center><TT>?</tt></td><td align=center>¿</td>
-	<td align=center><TT>:I</tt></td><td align=center>Ï</td>
-	<td align=center><TT>ss</tt></td><td align=center>ß</td>
-	<td align=center><TT>:i</tt></td><td align=center>ï</td>
-	<td align=center><TT>:y</tt></td><td align=center>ÿ
+	<td align=center><TT>: I</tt></td><td align=center>Ï</td>
+	<td align=center><TT>s s</tt></td><td align=center>ß</td>
+	<td align=center><TT>: i</tt></td><td align=center>ï</td>
+	<td align=center><TT>: y</tt></td><td align=center>ÿ
 </table></center>
 
-<p>For instance, to type "á" type [compose][a]['] or [compose]['][a].
-
-<P>The character "nbsp" (non-breaking space) is typed by using
-[compose][space].
-
-<P>The single-character sequences may be followed by a space if
-necessary to remove ambiguity.  For instance, if you really want to
-type "ª~" rather than "ã" you must type [compose][a][space][~].
-
-<p>The same key may be used to "quote" control characters into the
-text.  If you need a <tt>^Q</tt> character you can get one by typing
-[compose][Control+Q].
-
-<p>X may have a key on the keyboard
-defined as <tt>XK_Multi_key</tt>.  If so this key may be used as well
-as the right-hand control key.  You can set this up with the program
-<tt>xmodmap</tt>.
-
-<p>If your keyboard is set to support a foreign language you should
-also be able to type "dead key" prefix characters.  On X you will
-actually be able to see what dead key you typed, and if you then move
-the cursor without completing the sequence the accent will remain
-inserted.
-</TABLE></CENTER>
 <H3>Methods</H3>
 <CENTER>
 <TABLE width=90%>