From 4ecfc55ddba0e6ffae4c2f74ad773eea8d290364 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 29 Jan 2024 01:47:41 +0800
Subject: [PATCH] Use C.UTF-8 instead of C in console, and set the consolefont
 for it

---
 chapter09/consoled.xml | 14 ++++++++++++++
 chapter09/locale.xml   |  6 +++---
 chapter09/usage.xml    | 29 +++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/chapter09/consoled.xml b/chapter09/consoled.xml
index f35a586fe..fe1744ddc 100644
--- a/chapter09/consoled.xml
+++ b/chapter09/consoled.xml
@@ -74,6 +74,20 @@
 
   </variablelist>
 
+  <para>We'll use <literal>C.UTF-8</literal> as the locale for interactive
+  sessions in the Linux console in <xref role='.'
+  linkend='ch-config-locale'/>  The only console font shipped by
+  the <application>Kbd</application> package containing the glyphs for
+  all characters from the program messages in the <literal>C.UTF-8</literal>
+  locale is <filename>Lat2-Terminus16</filename> (the other shipped console
+  fonts lack glyphs of some characters like the Unicode left/right
+  quotation marks and the Unicode English dash). So set
+  <filename>Lat2-Terminus16</filename> as the default console font:</para>
+
+  <!-- We are using "nodump" for general settings, but not examples.  This
+       is ironic, but needed for the compatibility with jhalfs!  -->
+<screen role='nodump'><userinput>echo <literal>FONT=Lat2-Terminus16</literal> &gt; /etc/vconsole.conf</userinput></screen>
+
   <para>An example for a German keyboard and console is given below:</para>
 <!-- This is what is used by jhalfs for creating the vconsole.conf file.
      Whenever you want to change the following, please inform the jhalfs
diff --git a/chapter09/locale.xml b/chapter09/locale.xml
index 92a71ee6e..f738e1994 100644
--- a/chapter09/locale.xml
+++ b/chapter09/locale.xml
@@ -131,7 +131,7 @@ EOF</userinput></screen>
   determined to set the desired locale</phrase><phrase
   revision='systemd'>to read the locale settings from
   <filename>/etc/locale.conf</filename> and export them</phrase>,
-  but set the <literal>C</literal> locale instead if running in the Linux
+  but set the <literal>C.UTF-8</literal> locale instead if running in the Linux
   console (to prevent programs from outputting characters that the Linux
   console is unable to render):</para>
 
@@ -143,7 +143,7 @@ for i in $(locale); do
 done
 
 if [[ "$TERM" = linux ]]; then
-  export LANG=C
+  export LANG=C.UTF-8
 else
   source /etc/locale.conf
 
@@ -166,7 +166,7 @@ for i in $(locale); do
 done
 
 if [[ "$TERM" = linux ]]; then
-  export LANG=C
+  export LANG=C.UTF-8
 else
   export LANG=<replaceable>&lt;ll&gt;_&lt;CC&gt;.&lt;charmap&gt;&lt;@modifiers&gt;</replaceable>
 fi
diff --git a/chapter09/usage.xml b/chapter09/usage.xml
index 7c4f18600..73f92ebef 100644
--- a/chapter09/usage.xml
+++ b/chapter09/usage.xml
@@ -432,6 +432,35 @@ EOF</userinput></screen>
   <para>Some examples:</para>
 
   <itemizedlist>
+    <listitem>
+      <para>
+        We'll use <literal>C.UTF-8</literal> as the locale for interactive
+        sessions in the Linux console in <xref role=','
+        linkend='ch-config-locale'/> so we should set
+        <literal>UNICODE</literal> to <literal>1</literal>.  And the only
+        console font shipped by the <application>Kbd</application> package
+        containing the glyphs for all characters from the program messages
+        in the <literal>C.UTF-8</literal> locale is
+        <filename>Lat2-Terminus16</filename> (the other shipped console
+        fonts lack glyphs of some characters like the Unicode left/right
+        quotation marks and the Unicode English dash). So set
+        <filename>Lat2-Terminus16</filename> as the default console
+        font:
+      </para>
+
+      <!-- We are using 'nodump' for the generic setting, but not for an
+           example (see below).  This is deliberate to keep the
+           compatibility with jhalfs.  -->
+<screen role='nodump'><userinput>cat &gt; /etc/sysconfig/console &lt;&lt; "EOF"
+<literal># Begin /etc/sysconfig/console
+
+UNICODE="1"
+FONT="Lat2-Terminus16"
+
+# End /etc/sysconfig/console</literal>
+EOF</userinput></screen>
+
+    </listitem>
 
     <listitem>
       <para>For a non-Unicode setup, only the KEYMAP and FONT variables are