1 files changed, 76 insertions, 28 deletions
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
index befcfc679..998145e65 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,33 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
+default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Latvia";
+    name[Group1]="Latvian (Sun Type 6/7)";
 
+	include "sun_vndr/us(sun_type6)"
 
    key <TLDE> { [          grave,    asciitilde,	acute,    asciitilde ] };
    key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
@@ -108,10 +87,79 @@ xkb_symbols "type6" {
    key <AB10> { [          slash,      question,	slash,      abovedot ] };
 
 	include "level3(ralt_switch)"
+};
 
+alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/lv(sun_type6)"
 };
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/lv(type6)"
+	xkb_symbols "apostrophe" {
+	include "lv(apostrophe)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "tilde" {
+	include "lv(tilde)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fkey" {
+	include "lv(fkey)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "adapted" {
+	include "lv(adapted)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ergonomic" {
+	include "lv(ergonomic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "modern" {
+	include "lv(modern)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "lv(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ykeydvorak" {
+	include "lv(ykeydvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "minuskeydvorak" {
+	include "lv(minuskeydvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorakprogr" {
+	include "lv(dvorakprogr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ykeydvorakprogr" {
+	include "lv(ykeydvorakprogr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "minuskeydvorakprogr" {
+	include "lv(minuskeydvorakprogr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "lv(colemak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "apostrophecolemak" {
+	include "lv(apostrophecolemak)"
 };