diff --git a/data/keyboards/geometry/compact.xml b/data/keyboards/geometry/compact.xml
index 1fe0d7f5..43e8ffc2 100644
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@@ -14,54 +14,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -75,8 +33,9 @@
+
-
+
diff --git a/data/keyboards/symbols/special/number.xml b/data/keyboards/symbols/special/number.xml
index cf0fd310..5e44402c 100644
--- a/data/keyboards/symbols/special/number.xml
+++ b/data/keyboards/symbols/special/number.xml
@@ -1,117 +1,22 @@
-
- 1
- 1
- 1
- 1
-
-
- 2
- 2
- 2
- 2
-
-
- 3
- 3
- 3
- 3
-
-
- parenleft
- parenleft
- parenleft
- parenleft
-
-
- parenright
- parenright
- parenright
- parenright
-
-
- 4
- 4
- 4
- 4
-
-
- 5
- 5
- 5
- 5
-
-
- 6
- 6
- 6
- 6
-
-
- numbersign
- numbersign
- numbersign
- numbersign
-
-
- asterisk
- asterisk
- asterisk
- asterisk
-
-
- 7
- 7
- 7
- 7
-
-
- 8
- 8
- 8
- 8
-
-
- 9
- 9
- 9
- 9
-
-
- plus
- plus
- plus
- plus
-
-
- minus
- minus
- minus
- minus
-
-
- 0
- 0
- 0
- 0
-
-
- Return
- Return
- Return
- Return
-
-
- space
- space
- space
- space
-
-
- BackSpace
- BackSpace
- BackSpace
- BackSpace
-
+ 1
+ 2
+ 3
+ parenleft
+ parenright
+ 4
+ 5
+ 6
+ numbersign
+ asterisk
+ 7
+ 8
+ 9
+ plus
+ minus
+ 0
+ Return
+ space
+ BackSpace
diff --git a/data/keyboards/symbols/us.xml b/data/keyboards/symbols/us.xml
index 336fa2c9..d62a5076 100644
--- a/data/keyboards/symbols/us.xml
+++ b/data/keyboards/symbols/us.xml
@@ -2,208 +2,117 @@
asterisk
show_symbols
-
- q
- Q
- 1
- asciitilde
-
-
- w
- W
- 2
- quoteleft
-
-
- e
- E
- 3
- bar
-
-
- r
- R
- 4
- U00B7
-
-
- t
- T
- 5
- squareroot
-
-
- y
- Y
- 6
- Greek_pi
-
-
- u
- U
- 7
- division
-
-
- i
- I
- 8
- multiply
-
-
- o
- O
- 9
- paragraph
-
-
- p
- P
- 0
- Greek_tau
-
-
- a
- A
- at
- copyright
-
-
- s
- S
- numbersign
- U00AE
-
-
- d
- D
- dollar
- U00A3
-
-
- f
- F
- percent
- EuroSign
-
-
- g
- G
- ampersand
- U00A5
-
-
- h
- H
- minus
- asciicircum
-
-
- j
- J
- underscore
- degree
-
-
- k
- K
- plus
- equal
-
-
- l
- L
- parenleft
- braceleft
-
-
-
-
-
- parenright
- braceright
-
-
- Return
- Return
- Return
- Return
-
-
- Shift_L
- Shift_L
- Shift_L
- Shift_L
-
-
- z
- Z
- comma
- backslash
-
-
- x
- X
- quotedbl
- slash
-
-
- c
- C
- quoteright
- less
-
-
- v
- V
- colon
- greater
-
-
- b
- B
- semicolon
- equal
-
-
- n
- N
- exclam
- bracketleft
-
-
- m
- M
- question
- bracketright
-
-
- period
- period
- period
- period
-
-
- show_numbers
- show_letters
-
-
- preferences
- preferences
- preferences
- preferences
-
-
- space
- space
- space
- space
-
-
- BackSpace
- BackSpace
- BackSpace
- BackSpace
-
+ q
+ Q
+ 1
+ asciitilde
+ w
+ W
+ 2
+ quoteleft
+ e
+ E
+ 3
+ bar
+ r
+ R
+ 4
+ U00B7
+ t
+ T
+ 5
+ squareroot
+ y
+ Y
+ 6
+ Greek_pi
+ u
+ U
+ 7
+ division
+ i
+ I
+ 8
+ multiply
+ o
+ O
+ 9
+ paragraph
+ p
+ P
+ 0
+ Greek_tau
+ a
+ A
+ at
+ copyright
+ s
+ S
+ numbersign
+ U00AE
+ d
+ D
+ dollar
+ U00A3
+ f
+ F
+ percent
+ EuroSign
+ g
+ G
+ ampersand
+ U00A5
+ h
+ H
+ minus
+ asciicircum
+ j
+ J
+ underscore
+ degree
+ k
+ K
+ plus
+ equal
+ l
+ L
+ parenleft
+ braceleft
+ parenright
+ braceright
+ Return
+ Shift_L
+ z
+ Z
+ comma
+ backslash
+ x
+ X
+ quotedbl
+ slash
+ c
+ C
+ quoteright
+ less
+ v
+ V
+ colon
+ greater
+ b
+ B
+ semicolon
+ n
+ N
+ exclam
+ bracketleft
+ m
+ M
+ question
+ bracketright
+ period
+ show_numbers
+ show_letters
+ preferences
+ space
+ BackSpace
diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c
index f9bad83a..8dc269cc 100644
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@@ -53,8 +53,8 @@ typedef struct _EekXmlLayoutPrivate
} EekXmlLayoutPrivate;
G_DEFINE_TYPE_EXTENDED (EekXmlLayout, eek_xml_layout, EEK_TYPE_LAYOUT,
- 0, /* GTypeFlags */
- G_ADD_PRIVATE(EekXmlLayout)
+ 0, /* GTypeFlags */
+ G_ADD_PRIVATE(EekXmlLayout)
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
initable_iface_init))
@@ -674,11 +674,6 @@ static const gchar *symbols_valid_path_list[] = {
"symbols",
"symbol/symbols",
"include/symbols",
- "key/symbols",
- "text/key/symbols",
- "keysym/key/symbols",
- "symbol/key/symbols",
- "invalid/key/symbols",
};
static void
@@ -699,22 +694,7 @@ symbols_start_element_callback (GMarkupParseContext *pcontext,
error))
return;
- if (g_strcmp0 (element_name, "keysym") == 0) {
- attribute = get_attribute (attribute_names, attribute_values,
- "keyval");
- if (attribute == NULL) {
- g_set_error (error,
- G_MARKUP_ERROR,
- G_MARKUP_ERROR_MISSING_ATTRIBUTE,
- "no \"keyval\" attribute for \"keysym\"");
- return;
- }
- data->keyval = strtoul (attribute, NULL, 0);
- }
-
- if (g_strcmp0 (element_name, "symbol") == 0 ||
- g_strcmp0 (element_name, "keysym") == 0 ||
- g_strcmp0 (element_name, "text") == 0) {
+ if (g_strcmp0 (element_name, "symbol") == 0) {
attribute = get_attribute (attribute_names, attribute_values,
"label");
if (attribute != NULL)
@@ -753,9 +733,7 @@ symbols_end_element_callback (GMarkupParseContext *pcontext,
// TODO: this could all be moved to text handler
text = g_strndup (data->text->str, data->text->len);
- if (g_strcmp0 (element_name, "symbol") == 0 ||
- g_strcmp0 (element_name, "keysym") == 0 ||
- g_strcmp0 (element_name, "text") == 0) {
+ if (g_strcmp0 (element_name, "symbol") == 0) {
gchar *name = text;
EekKey *key = eek_keyboard_find_key_by_name (data->keyboard,
@@ -1013,7 +991,7 @@ static void
eek_xml_layout_finalize (GObject *object)
{
EekXmlLayoutPrivate *priv = eek_xml_layout_get_instance_private (
- EEK_XML_LAYOUT (object));
+ EEK_XML_LAYOUT (object));
g_free (priv->id);
@@ -1036,10 +1014,10 @@ eek_xml_layout_class_init (EekXmlLayoutClass *klass)
gobject_class->finalize = eek_xml_layout_finalize;
pspec = g_param_spec_string ("id",
- "ID",
- "ID",
- NULL,
- G_PARAM_CONSTRUCT_ONLY |
+ "ID",
+ "ID",
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_ID, pspec);
}