Bring jh branch up to speed with trunkjh

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8753 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 30 insertions, 25 deletions

diff --git a/chapter07/console.xml b/chapter07/console.xml
index 54056a2aa..9296952e6 100644
--- a/chapter07/console.xml
+++ b/chapter07/console.xml
@@ -59,8 +59,8 @@
         <para>This variable specifies the arguments for the
         <command>loadkeys</command> program, typically, the name of keymap
         to load, e.g., <quote>es</quote>. If this variable is not set, the
-	bootscript will not run the <command>loadkeys</command> program,
-	and the default kernel keymap will be used.</para>
+        bootscript will not run the <command>loadkeys</command> program,
+        and the default kernel keymap will be used.</para>
       </listitem>
     </varlistentry>
 
@@ -82,13 +82,16 @@
         <para>This variable specifies the arguments for the
         <command>setfont</command> program. Typically, this includes the font
         name, <quote>-m</quote>, and the name of the application character
-	map to load. E.g., in order to load the <quote>lat1-16</quote> font
-	together with the <quote>8859-1</quote> application character map
-	(as it is appropriate in the USA), <!-- because of the copyright sign -->
-	set this variable to <quote>lat1-16 -m 8859-1</quote>.
-        If this variable is not set, the bootscript will not run the
-        <command>setfont</command> program, and the default VGA font will be
-        used together with the default application character map.</para>
+        map to load. E.g., in order to load the <quote>lat1-16</quote> font
+        together with the <quote>8859-1</quote> application character map
+        (as it is appropriate in the USA), 
+        <!-- because of the copyright sign -->
+        set this variable to <quote>lat1-16 -m 8859-1</quote>.
+        In UTF-8 mode, the kernel uses the application character map for
+        conversion of composed 8-bit key codes in the keymap to UTF-8, and thus
+        the argument of the "-m" parameter should be set to the encoding of the
+        composed key codes in the keymap.</para>
+
       </listitem>
     </varlistentry>
 
@@ -96,7 +99,7 @@
       <term>UNICODE</term>
       <listitem>
         <para>Set this variable to <quote>1</quote>, <quote>yes</quote> or
-	<quote>true</quote> in order to put the
+        <quote>true</quote> in order to put the
         console into UTF-8 mode. This is useful in UTF-8 based locales and
         harmful otherwise.</para>
       </listitem>
@@ -108,7 +111,7 @@
         <para>For many keyboard layouts, there is no stock Unicode keymap in
         the Kbd package. The <command>console</command> bootscript will
         convert an available keymap to UTF-8 on the fly if this variable is
-	set to the encoding of the available non-UTF-8 keymap.</para>
+        set to the encoding of the available non-UTF-8 keymap.</para>
       </listitem>
     </varlistentry>
 
@@ -183,17 +186,17 @@ EOF</userinput></screen>
     </listitem>
 
     <listitem>
-      <para>There is no pre-made UTF-8 Russian keymap, therefore it has to be
-      produced by converting the existing KOI8-R keymap as illustrated
-      below:</para>
+      <para>The following example illustrates keymap autoconversion from
+      ISO-8859-15 to UTF-8 and enabling dead keys in Unicode mode:</para>
 
 <screen role="nodump"><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
 <literal># Begin /etc/sysconfig/console
 
 UNICODE="1"
-KEYMAP="ru-ms"
-LEGACY_CHARSET="koi8-r"
-FONT="LatArCyrHeb-16"
+KEYMAP="de-latin1"
+KEYMAP_CORRECTIONS="euro2"
+LEGACY_CHARSET="iso-8859-15"
+FONT="LatArCyrHeb-16 -m 8859-15"
 
 # End /etc/sysconfig/console</literal>
 EOF</userinput></screen>
@@ -204,14 +207,16 @@ EOF</userinput></screen>
       character by themselves, but put an accent on the character produced
       by the next key) or define composition rules (such as: <quote>press
       Ctrl+. A E to get &AElig;</quote> in the default keymap).
-      Linux-&linux-version; in UTF-8 keyboard mode assumes that accented
-      characters produced via dead keys or composing are in the Latin-1 range
-      of Unicode, and it is impossible to change this assumption. Thus,
-      accented characters needed for, e.g., the Czech language, can't be typed
-      on Linux console in UTF-8 mode (but files containing these characters can
-      be displayed correctly). The solution is either to avoid the use of
-      UTF-8, or to install the X window system that doesn't have this
-      limitation in its input handling.</para>
+      Linux-&linux-version; interprets dead keys and composition rules in the
+      keymap correctly only when the source characters to be composed together
+      are not multibyte. This deficiency doesn't affect keymaps for European
+      languages, because there accents are added to unaccented ASCII
+      characters, or two ASCII characters are composed together. However, in
+      UTF-8 mode it is a problem, e.g., for the Greek language, where one
+      sometimes needs to put an accent on the letter <quote>alpha</quote>.
+      The solution is either to avoid the use of UTF-8, or to install the
+      X window system that doesn't have this limitation in its input
+      handling.</para>
     </listitem>
 
     <listitem>