From 350d48080b3a5e73b55b6fce417b0611e14162b9 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Sun, 1 Jul 2007 22:56:37 +0200
Subject: [PATCH] support dvorak keyboard layout in iso-mode as well

---
 debian/changelog   |  3 +++
 language-functions | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b008a3a..4e00992 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ grml-autoconfig (0.7.4) unstable; urgency=low
       can be found the user gets a hint to execute 'Start lvm2' to
       set it up
     - bootoption 'nolvm' completely disables the lvm code/checks
+  * support dvorak keyboard layout in iso-mode as well (using
+    bootoption 'dvorak-iso'; bootoptions 'dvorak' and 'dvorak-utf8'
+    are supported as well of course)
 
  -- Michael Prokop <mika@grml.org>  Sun, 01 Jul 2007 20:35:30 +0200
 
diff --git a/language-functions b/language-functions
index 8605b44..def9853 100644
--- a/language-functions
+++ b/language-functions
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Jun 04 22:31:00 CEST 2007 [mika]
+# Latest change: Son Jul 01 22:55:38 CEST 2007 [mika]
 ################################################################################
 
 # The default language/keyboard to use. This CAN NOT be autoprobed.
@@ -330,8 +330,8 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="dk,de,us,fr"
                 TZ="Europe/Copenhagen"
                 ;;
-        dvorak)
-                # Dvorak layout
+        dvorak|dvorak-utf8)
+                # Dvorak layout (UTF8)
                 LANGUAGE="us"
                 COUNTRY="at"
                 LANG="en_US.UTF-8"
@@ -342,6 +342,18 @@ case "$LANGUAGE" in
                 KDEKEYBOARDS="dvorak,us,de,fr"
                 TZ="Europe/Vienna"
                 ;;
+        dvorak-iso)
+                # Dvorak layout (ISO)
+                LANGUAGE="us"
+                COUNTRY="at"
+                LANG="en_US.iso885915"
+                KEYTABLE="dvorak"
+                XKEYBOARD="dvorak"
+                KDEKEYBOARD="dvorak,us,de"
+                CHARSET="iso8859-15"
+                KDEKEYBOARDS="dvorak,us,de,fr"
+                TZ="Europe/Vienna"
+                ;;
         en-iso)
                 # English in Austria [see us + uk for american and english version!]
                 # LANGUAGE="en_US:en_GB:en"
-- 
2.1.4