From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Subject: bug#40493: installer: Provide a way to select multiple keyboard
 layouts
Date: Wed, 08 Apr 2020 15:22:34 +0200
Message-ID: <87k12q5cyt.fsf@gnu.org>
References: <87369fmd8d.fsf@gmail.com>
 <20200407175002.uzjqzm7fdgxftrrn@pelzflorian.localdomain>
 <87wo6r6ngn.fsf@gnu.org>
 <20200408095812.v3kuwakueh44g6mp@pelzflorian.localdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:42641)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jMAfX-0006aR-9V
 for bug-guix@gnu.org; Wed, 08 Apr 2020 09:23:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jMAfW-0006Rg-9G
 for bug-guix@gnu.org; Wed, 08 Apr 2020 09:23:03 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:39969)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1jMAfW-0006Ra-6O
 for bug-guix@gnu.org; Wed, 08 Apr 2020 09:23:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1jMAfW-0001lB-28
 for bug-guix@gnu.org; Wed, 08 Apr 2020 09:23:02 -0400
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.40493.B40493.15863521656733@debbugs.gnu.org>
In-Reply-To: <20200408095812.v3kuwakueh44g6mp@pelzflorian.localdomain>
 (pelzflorian@pelzflorian.de's message of "Wed, 8 Apr 2020 11:58:12
 +0200")
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
 <mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/bug-guix>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
 <mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+gcggb-bug-guix=m.gmane-mx.org@gnu.org>
To: "pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de>
Cc: 40493@debbugs.gnu.org

Hi,

"pelzflorian (Florian Pelz)" <pelzflorian@pelzflorian.de> skribis:

> The comma is needed, for example the Japanese Kana ("jp" "kana")
> layout breaks otherwise.  I believe the reason is that the "kana"
> variant gets applied to "us" layout.

I see.

> From 68fc18d2816e3997f38d0a3c69566d85b26c8719 Mon Sep 17 00:00:00 2001
> From: Florian Pelz <pelzflorian@pelzflorian.de>
> Date: Wed, 8 Apr 2020 11:46:16 +0200
> Content-Type: text/plain; charset=3DUTF-8
> Content-Transfer-Encoding: 8bit
> Subject: [PATCH] installer: Allow Alt+Shift toggle from non-Latin keyboard
>  layouts.
>
> Fixes <https://bugs.gnu.org/40493>.
>
> * gnu/installer/newt/keymap.scm (%non-latin-layouts): New variable.
> (toggleable-latin-layout): New procedure to compute combined layouts.
> (run-keymap-page): Use it.
> (keyboard-layout->configuration): Apply it in config.scm.
> * gnu/installer/newt/help.scm (run-help-page): Mention Alt+Shift.
> * gnu/installer/keymap.scm (kmscon-update-keymap): Pass on XKB options.
> * gnu/installer/record.scm (<installer>): Adjust code comments.
> * gnu/installer.scm (apply-keymap): Pass on XKB options.
> (installer-steps): Adjust code comments.
> * gnu/packages/patches/kmscon-runtime-keymap-switch.patch: Apply XKB opti=
ons.

[...]

> +(define %non-latin-layouts
> +  ;; List of keyboard layouts marked as $nonlatin in xkeyboard-config.

Out of curiosity, where did you find that info?  Perhaps add the name of
the relevant file or XML tag here.

> +      (apply toggleable-latin-layout
> +             (list layout (or variant "")))))

Simply:

  (toggleable-latin-layout layout (or variant ""))

This allows the compiler to detect a wrong number of arguments.

Go for it, thank you!

Ludo=E2=80=99.