guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/06: installer: Parse the 'shortDescription' field from xkeyboard-conf


From: guix-commits
Subject: 05/06: installer: Parse the 'shortDescription' field from xkeyboard-config.
Date: Wed, 17 Apr 2019 09:32:54 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 818595a974a3fc9caa7edd8a4f19d5485c91caba
Author: Ludovic Court├Ęs <address@hidden>
Date:   Wed Apr 17 15:13:31 2019 +0200

    installer: Parse the 'shortDescription' field from xkeyboard-config.
    
    * gnu/installer/keymap.scm (<x11-keymap-layout>)[synopsis]: New field.
    (xkb-rules->models+layouts): Fill out the 'synopsis' field.
---
 gnu/installer/keymap.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/installer/keymap.scm b/gnu/installer/keymap.scm
index d66b376..df9fc5e 100644
--- a/gnu/installer/keymap.scm
+++ b/gnu/installer/keymap.scm
@@ -36,6 +36,7 @@
             make-x11-keymap-layout
             x11-keymap-layout?
             x11-keymap-layout-name
+            x11-keymap-layout-synopsis
             x11-keymap-layout-description
             x11-keymap-layout-variants
 
@@ -60,7 +61,8 @@
   x11-keymap-layout make-x11-keymap-layout
   x11-keymap-layout?
   (name            x11-keymap-layout-name) ;string
-  (description     x11-keymap-layout-description) ;string
+  (synopsis        x11-keymap-layout-synopsis)    ;string (e.g., "en")
+  (description     x11-keymap-layout-description) ;string (a whole phrase)
   (variants        x11-keymap-layout-variants)) ;list of <x11-keymap-variant>
 
 (define-record-type* <x11-keymap-variant>
@@ -117,6 +119,8 @@ Configuration Database, describing possible XKB 
configurations."
                   (variantList ,[variant -> v] ...))
                  (x11-keymap-layout
                   (name name)
+                  (synopsis (car
+                             (assoc-ref rest-layout 'shortDescription)))
                   (description (car
                                 (assoc-ref rest-layout 'description)))
                   (variants (list v ...)))]
@@ -126,6 +130,8 @@ Configuration Database, describing possible XKB 
configurations."
                    . ,rest-layout))
                  (x11-keymap-layout
                   (name name)
+                  (synopsis (car
+                             (assoc-ref rest-layout 'shortDescription)))
                   (description (car
                                 (assoc-ref rest-layout 'description)))
                   (variants '()))]))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]