We'll be adding a lot of Bamboo tablets shortly, so to prevent collisions
and visually group the tablet files, rename the existing Bamboos to use a
common naming scheme.

Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
 data/bamboo-16fg-4x5.tablet          |  27 --------
 data/bamboo-16fg-s-pt.tablet         |  27 ++++++++
 data/bamboo-2fg-4x5.tablet           |  27 --------
 data/bamboo-2fg-6x8.tablet           |  27 --------
 data/bamboo-2fg-fun-m-pt.tablet      |  27 ++++++++
 data/bamboo-2fg-fun-s-pt.tablet      |  27 ++++++++
 data/bamboo-2fg-s-p.tablet           |  23 +++++++
 data/bamboo-2fg-s-pt.tablet          |  27 ++++++++
 data/bamboo-2fg-s-t.tablet           |  26 +++++++
 data/bamboo-2fg.tablet               |  26 -------
 data/bamboo-craft.tablet             |  27 --------
 data/bamboo-pen.tablet               |  23 -------
 data/layouts/bamboo-16fg-4x5.svg     | 128 -----------------------------------
 data/layouts/bamboo-16fg-s-pt.svg    | 128 +++++++++++++++++++++++++++++++++++
 data/layouts/bamboo-2fg-4x5.svg      | 128 -----------------------------------
 data/layouts/bamboo-2fg-6x8.svg      | 118 --------------------------------
 data/layouts/bamboo-2fg-fun-m-pt.svg | 118 ++++++++++++++++++++++++++++++++
 data/layouts/bamboo-2fg-fun-s-pt.svg | 118 ++++++++++++++++++++++++++++++++
 data/layouts/bamboo-2fg-s-pt.svg     | 128 +++++++++++++++++++++++++++++++++++
 data/layouts/bamboo-2fg-s-t.svg      | 128 +++++++++++++++++++++++++++++++++++
 data/layouts/bamboo-2fg.svg          | 128 -----------------------------------
 data/layouts/bamboo-craft.svg        | 118 --------------------------------
 22 files changed, 777 insertions(+), 777 deletions(-)
 delete mode 100644 data/bamboo-16fg-4x5.tablet
 create mode 100644 data/bamboo-16fg-s-pt.tablet
 delete mode 100644 data/bamboo-2fg-4x5.tablet
 delete mode 100644 data/bamboo-2fg-6x8.tablet
 create mode 100644 data/bamboo-2fg-fun-m-pt.tablet
 create mode 100644 data/bamboo-2fg-fun-s-pt.tablet
 create mode 100644 data/bamboo-2fg-s-p.tablet
 create mode 100644 data/bamboo-2fg-s-pt.tablet
 create mode 100644 data/bamboo-2fg-s-t.tablet
 delete mode 100644 data/bamboo-2fg.tablet
 delete mode 100644 data/bamboo-craft.tablet
 delete mode 100644 data/bamboo-pen.tablet
 delete mode 100644 data/layouts/bamboo-16fg-4x5.svg
 create mode 100644 data/layouts/bamboo-16fg-s-pt.svg
 delete mode 100644 data/layouts/bamboo-2fg-4x5.svg
 delete mode 100644 data/layouts/bamboo-2fg-6x8.svg
 create mode 100644 data/layouts/bamboo-2fg-fun-m-pt.svg
 create mode 100644 data/layouts/bamboo-2fg-fun-s-pt.svg
 create mode 100644 data/layouts/bamboo-2fg-s-pt.svg
 create mode 100644 data/layouts/bamboo-2fg-s-t.svg
 delete mode 100644 data/layouts/bamboo-2fg.svg
 delete mode 100644 data/layouts/bamboo-craft.svg

diff --git a/data/bamboo-16fg-4x5.tablet b/data/bamboo-16fg-4x5.tablet
deleted file mode 100644
index d23c264..0000000
--- a/data/bamboo-16fg-4x5.tablet
+++ /dev/null
@@ -1,27 +0,0 @@
-# Wacom
-# Bamboo Capture
-# CTH-470
-#
-# third generation BambooPT
-#
-# stylus with one button no eraser (LP170G); 16FG touch
-# Pen active area: 5.8 x 3.62in
-# Touch active area: 4.92 x 3.35in
-
-[Device]
-Name=Wacom Bamboo Capture
-DeviceMatch=usb:056a:00de
-Class=Bamboo
-Width=6
-Height=4
-Layout=bamboo-16fg-4x5.svg
-IntegratedIn=
-
-[Features]
-Stylus=true
-Reversible=true
-Touch=true
-Buttons=4
-
-[Buttons]
-Left=A;B;C;D
diff --git a/data/bamboo-16fg-s-pt.tablet b/data/bamboo-16fg-s-pt.tablet
new file mode 100644
index 0000000..47f50e4
--- /dev/null
+++ b/data/bamboo-16fg-s-pt.tablet
@@ -0,0 +1,27 @@
+# Wacom
+# Bamboo Capture
+# CTH-470
+#
+# third generation BambooPT
+#
+# stylus with one button no eraser (LP170G); 16FG touch
+# Pen active area: 5.8 x 3.62in
+# Touch active area: 4.92 x 3.35in
+
+[Device]
+Name=Wacom Bamboo Capture
+DeviceMatch=usb:056a:00de
+Class=Bamboo
+Width=6
+Height=4
+Layout=bamboo-16fg-s-pt.svg
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=true
+Buttons=4
+
+[Buttons]
+Left=A;B;C;D
diff --git a/data/bamboo-2fg-4x5.tablet b/data/bamboo-2fg-4x5.tablet
deleted file mode 100644
index 25dbfe4..0000000
--- a/data/bamboo-2fg-4x5.tablet
+++ /dev/null
@@ -1,27 +0,0 @@
-# Wacom
-# Bamboo
-# CTH-460
-#
-# first generation BambooPT
-#
-# stylus with two buttons and eraser (LP160E); 2FG touch
-# Pen active area: 5.8 x 3.62in
-# Touch active area: 4.92 x 3.35in
-
-[Device]
-Name=Wacom Bamboo (2FG)
-DeviceMatch=usb:056a:00d1
-Class=Bamboo
-Width=6
-Height=4
-Layout=bamboo-2fg-4x5.svg
-IntegratedIn=
-
-[Features]
-Stylus=true
-Reversible=true
-Touch=true
-Buttons=4
-
-[Buttons]
-Left=A;B;C;D
diff --git a/data/bamboo-2fg-6x8.tablet b/data/bamboo-2fg-6x8.tablet
deleted file mode 100644
index 35763b3..0000000
--- a/data/bamboo-2fg-6x8.tablet
+++ /dev/null
@@ -1,27 +0,0 @@
-# Wacom
-# Bamboo Fun medium / Bamboo Comic
-# CTH-661
-#
-# first generation BambooPT
-#
-# stylus with two buttons and eraser (LP161E); 2FG touch
-# Pen active area: 8.52 x 5.39 in
-# Touch active area: 7.48 x 5.12 in
-
-[Device]
-Name=Wacom Bamboo Fun medium (2FG)
-DeviceMatch=usb:056a:00d3
-Class=Bamboo
-Width=9
-Height=5
-Layout=bamboo-2fg-6x8.svg
-IntegratedIn=
-
-[Features]
-Stylus=true
-Reversible=true
-Touch=true
-Buttons=4
-
-[Buttons]
-Left=A;B;C;D
diff --git a/data/bamboo-2fg-fun-m-pt.tablet b/data/bamboo-2fg-fun-m-pt.tablet
new file mode 100644
index 0000000..fae4738
--- /dev/null
+++ b/data/bamboo-2fg-fun-m-pt.tablet
@@ -0,0 +1,27 @@
+# Wacom
+# Bamboo Fun medium / Bamboo Comic
+# CTH-661
+#
+# first generation BambooPT
+#
+# stylus with two buttons and eraser (LP161E); 2FG touch
+# Pen active area: 8.52 x 5.39 in
+# Touch active area: 7.48 x 5.12 in
+
+[Device]
+Name=Wacom Bamboo Fun medium (2FG)
+DeviceMatch=usb:056a:00d3
+Class=Bamboo
+Width=9
+Height=5
+Layout=bamboo-2fg-fun-m-pt.svg
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=true
+Buttons=4
+
+[Buttons]
+Left=A;B;C;D
diff --git a/data/bamboo-2fg-fun-s-pt.tablet b/data/bamboo-2fg-fun-s-pt.tablet
new file mode 100644
index 0000000..47aec96
--- /dev/null
+++ b/data/bamboo-2fg-fun-s-pt.tablet
@@ -0,0 +1,27 @@
+# Wacom
+# Bamboo Fun small / Bamboo Craft
+# CTH-461
+#
+# first generation BambooPT
+#
+# stylus with two buttons and eraser (LP161E); 2FG touch
+# Pen active area: 5.8 x 3.62in
+# Touch active area: 4.92 x 3.35in
+
+[Device]
+Name=Wacom Bamboo Fun small (2FG)
+DeviceMatch=usb:056a:00d2
+Class=Bamboo
+Width=6
+Height=4
+Layout=bamboo-2fg-fun-s-pt.svg
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=true
+Buttons=4
+
+[Buttons]
+Left=A;B;C;D
diff --git a/data/bamboo-2fg-s-p.tablet b/data/bamboo-2fg-s-p.tablet
new file mode 100644
index 0000000..e670aa9
--- /dev/null
+++ b/data/bamboo-2fg-s-p.tablet
@@ -0,0 +1,23 @@
+# Wacom
+# Bamboo Pen
+# CTL-460
+#
+# first generation BambooPT
+#
+# stylus with two buttons and no eraser (LP160)
+# Pen active area: 5.8 x 3.62in
+
+[Device]
+Name=Wacom Bamboo Pen small
+DeviceMatch=usb:056a:00d4
+Class=Bamboo
+Width=6
+Height=4
+# No pad buttons, so no layout
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=false
+Buttons=0
diff --git a/data/bamboo-2fg-s-pt.tablet b/data/bamboo-2fg-s-pt.tablet
new file mode 100644
index 0000000..1bd6a57
--- /dev/null
+++ b/data/bamboo-2fg-s-pt.tablet
@@ -0,0 +1,27 @@
+# Wacom
+# Bamboo
+# CTH-460
+#
+# first generation BambooPT
+#
+# stylus with two buttons and eraser (LP160E); 2FG touch
+# Pen active area: 5.8 x 3.62in
+# Touch active area: 4.92 x 3.35in
+
+[Device]
+Name=Wacom Bamboo (2FG)
+DeviceMatch=usb:056a:00d1
+Class=Bamboo
+Width=6
+Height=4
+Layout=bamboo-2fg-s-pt.svg
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=true
+Touch=true
+Buttons=4
+
+[Buttons]
+Left=A;B;C;D
diff --git a/data/bamboo-2fg-s-t.tablet b/data/bamboo-2fg-s-t.tablet
new file mode 100644
index 0000000..8748ecb
--- /dev/null
+++ b/data/bamboo-2fg-s-t.tablet
@@ -0,0 +1,26 @@
+# Wacom
+# Bamboo Touch
+# CTT-460
+#
+# first generation BambooPT
+#
+# no stylus; 2FG touch
+# Touch active area: 4.92 x 3.35in
+
+[Device]
+Name=Wacom Bamboo Touch (2FG)
+DeviceMatch=usb:056a:00d0
+Class=Bamboo
+Width=5
+Height=3
+Layout=bamboo-2fg-s-t.svg
+IntegratedIn=
+
+[Features]
+Stylus=false
+Reversible=true
+Touch=true
+Buttons=4
+
+[Buttons]
+Left=A;B;C;D
diff --git a/data/bamboo-2fg.tablet b/data/bamboo-2fg.tablet
deleted file mode 100644
index f6504d8..0000000
--- a/data/bamboo-2fg.tablet
+++ /dev/null
@@ -1,26 +0,0 @@
-# Wacom
-# Bamboo Touch
-# CTT-460
-#
-# first generation BambooPT
-#
-# no stylus; 2FG touch
-# Touch active area: 4.92 x 3.35in
-
-[Device]
-Name=Wacom Bamboo Touch (2FG)
-DeviceMatch=usb:056a:00d0
-Class=Bamboo
-Width=5
-Height=3
-Layout=bamboo-2fg.svg
-IntegratedIn=
-
-[Features]
-Stylus=false
-Reversible=true
-Touch=true
-Buttons=4
-
-[Buttons]
-Left=A;B;C;D
diff --git a/data/bamboo-craft.tablet b/data/bamboo-craft.tablet
deleted file mode 100644
index 053cdd5..0000000
--- a/data/bamboo-craft.tablet
+++ /dev/null
@@ -1,27 +0,0 @@
-# Wacom
-# Bamboo Fun small / Bamboo Craft
-# CTH-461
-#
-# first generation BambooPT
-#
-# stylus with two buttons and eraser (LP161E); 2FG touch
-# Pen active area: 5.8 x 3.62in
-# Touch active area: 4.92 x 3.35in
-
-[Device]
-Name=Wacom Bamboo Fun small (2FG)
-DeviceMatch=usb:056a:00d2
-Class=Bamboo
-Width=6
-Height=4
-Layout=bamboo-craft.svg
-IntegratedIn=
-
-[Features]
-Stylus=true
-Reversible=true
-Touch=true
-Buttons=4
-
-[Buttons]
-Left=A;B;C;D
diff --git a/data/bamboo-pen.tablet b/data/bamboo-pen.tablet
deleted file mode 100644
index e670aa9..0000000
--- a/data/bamboo-pen.tablet
+++ /dev/null
@@ -1,23 +0,0 @@
-# Wacom
-# Bamboo Pen
-# CTL-460
-#
-# first generation BambooPT
-#
-# stylus with two buttons and no eraser (LP160)
-# Pen active area: 5.8 x 3.62in
-
-[Device]
-Name=Wacom Bamboo Pen small
-DeviceMatch=usb:056a:00d4
-Class=Bamboo
-Width=6
-Height=4
-# No pad buttons, so no layout
-IntegratedIn=
-
-[Features]
-Stylus=true
-Reversible=true
-Touch=false
-Buttons=0
diff --git a/data/layouts/bamboo-16fg-4x5.svg b/data/layouts/bamboo-16fg-4x5.svg
deleted file mode 100644
index ac15aa0..0000000
--- a/data/layouts/bamboo-16fg-4x5.svg
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<!--
-    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
-    Size and positions of controls may not be accurate
- -->
-<svg
-   xmlns="http://www.w3.org/2000/svg";
-   version="1.1"
-   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
-   id="bamboo-2fg-4x5"
-   width="248"
-   height="176">
-  <title
-     id="title">Wacom Bamboo Capture (CTH-470)</title>
-  <g>
-    <rect
-       id="ButtonA"
-       class="A Button"
-       rx=".5"
-       ry=".5"
-       x="28"
-       y="31"
-       width="28"
-       height="36" />
-    <circle
-       id="DotA"
-       cx="41.5"
-       cy="48.5"
-       r=".5" />
-    <path
-       id="LeaderA"
-       class="A Leader"
-       d="M 58 49 l 20 0" />
-    <text
-       id="LabelA"
-       class="A Label"
-       x="80"
-       y="49"
-       style="text-anchor:start;">A</text>
-  </g>
-  <g>
-    <rect
-       id="ButtonB"
-       class="B Button"
-       rx=".5"
-       ry=".5"
-       x="28"
-       y="68"
-       width="28"
-       height="18" />
-    <circle
-       id="DotB"
-       cx="41.5"
-       cy="77.5"
-       r=".5" />
-    <path
-       id="LeaderB"
-       class="B Leader"
-       d="M 58 78 l 20 0" />
-    <text
-       id="LabelB"
-       class="B Label"
-       x="80"
-       y="78"
-       style="text-anchor:start;">B</text>
-  </g>
-  <rect
-      rx="1"
-      ry="1"
-      x="28"
-      y="87"
-      width="28"
-      height="2" />
-  <g>
-    <rect
-       id="ButtonC"
-       class="C Button"
-       x="28"
-       y="90"
-       rx=".5"
-       ry=".5"
-       width="28"
-       height="18" />
-    <circle
-       id="DotC"
-       cx="41.5"
-       cy="99.5"
-       r=".5" />
-    <path
-       id="LeaderC"
-       class="C Leader"
-       d="M 58 100 l 20 0" />
-    <text
-       id="LabelC"
-       class="C Label"
-       x="80"
-       y="100"
-       style="text-anchor:start;">C</text>
-  </g>
-  <g>
-    <rect
-       id="ButtonD"
-       class="D Button"
-       x="28"
-       y="109"
-       rx=".5"
-       ry=".5"
-       width="28"
-       height="36" />
-    <circle
-       id="DotD"
-       cx="41.5"
-       cy="126.5"
-       r=".5" />
-    <path
-       id="LeaderD"
-       class="D Leader"
-       d="M 58 127 l 20 0" />
-    <text
-       id="LabelD"
-       class="D Label"
-       x="80"
-       y="127"
-       style="text-anchor:start;">D</text>
-  </g>
-</svg>
diff --git a/data/layouts/bamboo-16fg-s-pt.svg 
b/data/layouts/bamboo-16fg-s-pt.svg
new file mode 100644
index 0000000..de0237c
--- /dev/null
+++ b/data/layouts/bamboo-16fg-s-pt.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<!--
+    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
+    Size and positions of controls may not be accurate
+ -->
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="bamboo-16fg-s-pt"
+   width="248"
+   height="176">
+  <title
+     id="title">Wacom Bamboo Capture (CTH-470)</title>
+  <g>
+    <rect
+       id="ButtonA"
+       class="A Button"
+       rx=".5"
+       ry=".5"
+       x="28"
+       y="31"
+       width="28"
+       height="36" />
+    <circle
+       id="DotA"
+       cx="41.5"
+       cy="48.5"
+       r=".5" />
+    <path
+       id="LeaderA"
+       class="A Leader"
+       d="M 58 49 l 20 0" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="80"
+       y="49"
+       style="text-anchor:start;">A</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonB"
+       class="B Button"
+       rx=".5"
+       ry=".5"
+       x="28"
+       y="68"
+       width="28"
+       height="18" />
+    <circle
+       id="DotB"
+       cx="41.5"
+       cy="77.5"
+       r=".5" />
+    <path
+       id="LeaderB"
+       class="B Leader"
+       d="M 58 78 l 20 0" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="80"
+       y="78"
+       style="text-anchor:start;">B</text>
+  </g>
+  <rect
+      rx="1"
+      ry="1"
+      x="28"
+      y="87"
+      width="28"
+      height="2" />
+  <g>
+    <rect
+       id="ButtonC"
+       class="C Button"
+       x="28"
+       y="90"
+       rx=".5"
+       ry=".5"
+       width="28"
+       height="18" />
+    <circle
+       id="DotC"
+       cx="41.5"
+       cy="99.5"
+       r=".5" />
+    <path
+       id="LeaderC"
+       class="C Leader"
+       d="M 58 100 l 20 0" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="80"
+       y="100"
+       style="text-anchor:start;">C</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonD"
+       class="D Button"
+       x="28"
+       y="109"
+       rx=".5"
+       ry=".5"
+       width="28"
+       height="36" />
+    <circle
+       id="DotD"
+       cx="41.5"
+       cy="126.5"
+       r=".5" />
+    <path
+       id="LeaderD"
+       class="D Leader"
+       d="M 58 127 l 20 0" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="80"
+       y="127"
+       style="text-anchor:start;">D</text>
+  </g>
+</svg>
diff --git a/data/layouts/bamboo-2fg-4x5.svg b/data/layouts/bamboo-2fg-4x5.svg
deleted file mode 100644
index 0c77451..0000000
--- a/data/layouts/bamboo-2fg-4x5.svg
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<!--
-    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
-    Size and positions of controls may not be accurate
- -->
-<svg
-   xmlns="http://www.w3.org/2000/svg";
-   version="1.1"
-   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
-   id="bamboo-2fg-4x5"
-   width="248"
-   height="176">
-  <title
-     id="title">Wacom Bamboo (2FG) (CTH-460)</title>
-  <g>
-    <rect
-       id="ButtonA"
-       class="A Button"
-       rx=".5"
-       ry=".5"
-       x="28"
-       y="31"
-       width="28"
-       height="36" />
-    <circle
-       id="DotA"
-       cx="41.5"
-       cy="48.5"
-       r=".5" />
-    <path
-       id="LeaderA"
-       class="A Leader"
-       d="M 58 49 l 20 0" />
-    <text
-       id="LabelA"
-       class="A Label"
-       x="80"
-       y="49"
-       style="text-anchor:start;">A</text>
-  </g>
-  <g>
-    <rect
-       id="ButtonB"
-       class="B Button"
-       rx=".5"
-       ry=".5"
-       x="28"
-       y="68"
-       width="28"
-       height="18" />
-    <circle
-       id="DotB"
-       cx="41.5"
-       cy="77.5"
-       r=".5" />
-    <path
-       id="LeaderB"
-       class="B Leader"
-       d="M 58 78 l 20 0" />
-    <text
-       id="LabelB"
-       class="B Label"
-       x="80"
-       y="78"
-       style="text-anchor:start;">B</text>
-  </g>
-  <rect
-      rx="1"
-      ry="1"
-      x="28"
-      y="87"
-      width="28"
-      height="2" />
-  <g>
-    <rect
-       id="ButtonC"
-       class="C Button"
-       x="28"
-       y="90"
-       rx=".5"
-       ry=".5"
-       width="28"
-       height="18" />
-    <circle
-       id="DotC"
-       cx="41.5"
-       cy="99.5"
-       r=".5" />
-    <path
-       id="LeaderC"
-       class="C Leader"
-       d="M 58 100 l 20 0" />
-    <text
-       id="LabelC"
-       class="C Label"
-       x="80"
-       y="100"
-       style="text-anchor:start;">C</text>
-  </g>
-  <g>
-    <rect
-       id="ButtonD"
-       class="D Button"
-       x="28"
-       y="109"
-       rx=".5"
-       ry=".5"
-       width="28"
-       height="36" />
-    <circle
-       id="DotD"
-       cx="41.5"
-       cy="126.5"
-       r=".5" />
-    <path
-       id="LeaderD"
-       class="D Leader"
-       d="M 58 127 l 20 0" />
-    <text
-       id="LabelD"
-       class="D Label"
-       x="80"
-       y="127"
-       style="text-anchor:start;">D</text>
-  </g>
-</svg>
diff --git a/data/layouts/bamboo-2fg-6x8.svg b/data/layouts/bamboo-2fg-6x8.svg
deleted file mode 100644
index c8da175..0000000
--- a/data/layouts/bamboo-2fg-6x8.svg
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<!--
-    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
-    Size and positions of controls may not be accurate
- -->
-<svg
-   xmlns="http://www.w3.org/2000/svg";
-   version="1.1"
-   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
-   id="bamboo-2fg-6x8"
-   width="337"
-   height="222">
-  <title
-     id="title">Wacom Bamboo Fun medium (CTH-661)</title>
-  <g>
-    <path
-       id="ButtonA"
-       class="A Button"
-       d="M 35 35 a 9 9 0 0 1 9 -9 l 19 0 l 0 50 l -28 0 z" />
-    <circle
-       id="DotA"
-       cx="49.5"
-       cy="52.5"
-       r=".5" />
-    <path
-       id="LeaderA"
-       class="A Leader"
-       d="M 65 53 l 20 0" />
-    <text
-       id="LabelA"
-       class="A Label"
-       x="87"
-       y="53"
-       style="text-anchor:start;">A</text>
-  </g>
-  <g>
-    <rect
-       id="ButtonB"
-       class="B Button"
-       rx=".5"
-       ry=".5"
-       x="35"
-       y="77"
-       width="28"
-       height="32" />
-    <circle
-       id="DotB"
-       cx="49.5"
-       cy="93.5"
-       r=".5" />
-    <path
-       id="LeaderB"
-       class="B Leader"
-       d="M 65 94 l 20 0" />
-    <text
-       id="LabelB"
-       class="B Label"
-       x="87"
-       y="94"
-       style="text-anchor:start;">B</text>
-  </g>
-  <rect
-      rx="1"
-      ry="1"
-      x="35"
-      y="110"
-      width="28"
-      height="2" />
-  <g>
-    <rect
-       id="ButtonC"
-       class="C Button"
-       x="35"
-       y="113"
-       rx=".5"
-       ry=".5"
-       width="28"
-       height="32" />
-    <circle
-       id="DotC"
-       cx="49.5"
-       cy="127.5"
-       r=".5" />
-    <path
-       id="LeaderC"
-       class="C Leader"
-       d="M 65 128 l 20 0" />
-    <text
-       id="LabelC"
-       class="C Label"
-       x="87"
-       y="128"
-       style="text-anchor:start;">C</text>
-  </g>
-  <g>
-    <path
-       id="ButtonD"
-       class="D Button"
-       d="M 35 187 a 9 9 0 0 0 9 9 l 19 0 l 0 -50 l -28 0 z" />
-    <circle
-       id="DotD"
-       cx="49.5"
-       cy="169.5"
-       r=".5" />
-    <path
-       id="LeaderD"
-       class="D Leader"
-       d="M 65 170 l 20 0" />
-    <text
-       id="LabelD"
-       class="D Label"
-       x="87"
-       y="170"
-       style="text-anchor:start;">D</text>
-  </g>
-</svg>
diff --git a/data/layouts/bamboo-2fg-fun-m-pt.svg 
b/data/layouts/bamboo-2fg-fun-m-pt.svg
new file mode 100644
index 0000000..8dbd586
--- /dev/null
+++ b/data/layouts/bamboo-2fg-fun-m-pt.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<!--
+    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
+    Size and positions of controls may not be accurate
+ -->
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="bamboo-2fg-fun-m-pt"
+   width="337"
+   height="222">
+  <title
+     id="title">Wacom Bamboo Fun medium (CTH-661)</title>
+  <g>
+    <path
+       id="ButtonA"
+       class="A Button"
+       d="M 35 35 a 9 9 0 0 1 9 -9 l 19 0 l 0 50 l -28 0 z" />
+    <circle
+       id="DotA"
+       cx="49.5"
+       cy="52.5"
+       r=".5" />
+    <path
+       id="LeaderA"
+       class="A Leader"
+       d="M 65 53 l 20 0" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="87"
+       y="53"
+       style="text-anchor:start;">A</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonB"
+       class="B Button"
+       rx=".5"
+       ry=".5"
+       x="35"
+       y="77"
+       width="28"
+       height="32" />
+    <circle
+       id="DotB"
+       cx="49.5"
+       cy="93.5"
+       r=".5" />
+    <path
+       id="LeaderB"
+       class="B Leader"
+       d="M 65 94 l 20 0" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="87"
+       y="94"
+       style="text-anchor:start;">B</text>
+  </g>
+  <rect
+      rx="1"
+      ry="1"
+      x="35"
+      y="110"
+      width="28"
+      height="2" />
+  <g>
+    <rect
+       id="ButtonC"
+       class="C Button"
+       x="35"
+       y="113"
+       rx=".5"
+       ry=".5"
+       width="28"
+       height="32" />
+    <circle
+       id="DotC"
+       cx="49.5"
+       cy="127.5"
+       r=".5" />
+    <path
+       id="LeaderC"
+       class="C Leader"
+       d="M 65 128 l 20 0" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="87"
+       y="128"
+       style="text-anchor:start;">C</text>
+  </g>
+  <g>
+    <path
+       id="ButtonD"
+       class="D Button"
+       d="M 35 187 a 9 9 0 0 0 9 9 l 19 0 l 0 -50 l -28 0 z" />
+    <circle
+       id="DotD"
+       cx="49.5"
+       cy="169.5"
+       r=".5" />
+    <path
+       id="LeaderD"
+       class="D Leader"
+       d="M 65 170 l 20 0" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="87"
+       y="170"
+       style="text-anchor:start;">D</text>
+  </g>
+</svg>
diff --git a/data/layouts/bamboo-2fg-fun-s-pt.svg 
b/data/layouts/bamboo-2fg-fun-s-pt.svg
new file mode 100644
index 0000000..cca01b6
--- /dev/null
+++ b/data/layouts/bamboo-2fg-fun-s-pt.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<!--
+    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
+    Size and positions of controls may not be accurate
+ -->
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="bamboo-2fg-fun-s-pt"
+   width="248"
+   height="176">
+  <title
+     id="title">Wacom Bamboo Fun small (2FG) (CTH-461)</title>
+  <g>
+    <path
+       id="ButtonA"
+       class="A Button"
+       d="M 26 29 a 7 7 0 0 1 7 -7 l 14 0 l 0 39 l -21 0 z" />
+    <circle
+       id="DotA"
+       cx="36.5"
+       cy="41.5"
+       r=".5" />
+    <path
+       id="LeaderA"
+       class="A Leader"
+       d="M 48 42 l 20 0" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="70"
+       y="42"
+       style="text-anchor:start;">A</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonB"
+       class="B Button"
+       rx=".5"
+       ry=".5"
+       x="26"
+       y="62"
+       width="21"
+       height="24" />
+    <circle
+       id="DotB"
+       cx="36.5"
+       cy="73.5"
+       r=".5" />
+    <path
+       id="LeaderB"
+       class="B Leader"
+       d="M 48 74 l 20 0" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="70"
+       y="74"
+       style="text-anchor:start;">B</text>
+  </g>
+  <rect
+      rx="1"
+      ry="1"
+      x="26"
+      y="87"
+      width="21"
+      height="2" />
+  <g>
+    <rect
+       id="ButtonC"
+       class="C Button"
+       x="26"
+       y="90"
+       rx=".5"
+       ry=".5"
+       width="21"
+       height="24" />
+    <circle
+       id="DotC"
+       cx="36.5"
+       cy="101.5"
+       r=".5" />
+    <path
+       id="LeaderC"
+       class="C Leader"
+       d="M 48 102 l 20 0" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="70"
+       y="102"
+       style="text-anchor:start;">C</text>
+  </g>
+  <g>
+    <path
+       id="ButtonD"
+       class="D Button"
+       d="M 26 147 a 7 7 0 0 0 7 7 l 14 0 l 0 -39 l -21 0 z" />
+    <circle
+       id="DotD"
+       cx="36.5"
+       cy="133.5"
+       r=".5" />
+    <path
+       id="LeaderD"
+       class="D Leader"
+       d="M 48 134 l 20 0" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="70"
+       y="134"
+       style="text-anchor:start;">D</text>
+  </g>
+</svg>
diff --git a/data/layouts/bamboo-2fg-s-pt.svg b/data/layouts/bamboo-2fg-s-pt.svg
new file mode 100644
index 0000000..1b4d406
--- /dev/null
+++ b/data/layouts/bamboo-2fg-s-pt.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<!--
+    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
+    Size and positions of controls may not be accurate
+ -->
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="bamboo-2fg-s-pt"
+   width="248"
+   height="176">
+  <title
+     id="title">Wacom Bamboo (2FG) (CTH-460)</title>
+  <g>
+    <rect
+       id="ButtonA"
+       class="A Button"
+       rx=".5"
+       ry=".5"
+       x="28"
+       y="31"
+       width="28"
+       height="36" />
+    <circle
+       id="DotA"
+       cx="41.5"
+       cy="48.5"
+       r=".5" />
+    <path
+       id="LeaderA"
+       class="A Leader"
+       d="M 58 49 l 20 0" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="80"
+       y="49"
+       style="text-anchor:start;">A</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonB"
+       class="B Button"
+       rx=".5"
+       ry=".5"
+       x="28"
+       y="68"
+       width="28"
+       height="18" />
+    <circle
+       id="DotB"
+       cx="41.5"
+       cy="77.5"
+       r=".5" />
+    <path
+       id="LeaderB"
+       class="B Leader"
+       d="M 58 78 l 20 0" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="80"
+       y="78"
+       style="text-anchor:start;">B</text>
+  </g>
+  <rect
+      rx="1"
+      ry="1"
+      x="28"
+      y="87"
+      width="28"
+      height="2" />
+  <g>
+    <rect
+       id="ButtonC"
+       class="C Button"
+       x="28"
+       y="90"
+       rx=".5"
+       ry=".5"
+       width="28"
+       height="18" />
+    <circle
+       id="DotC"
+       cx="41.5"
+       cy="99.5"
+       r=".5" />
+    <path
+       id="LeaderC"
+       class="C Leader"
+       d="M 58 100 l 20 0" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="80"
+       y="100"
+       style="text-anchor:start;">C</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonD"
+       class="D Button"
+       x="28"
+       y="109"
+       rx=".5"
+       ry=".5"
+       width="28"
+       height="36" />
+    <circle
+       id="DotD"
+       cx="41.5"
+       cy="126.5"
+       r=".5" />
+    <path
+       id="LeaderD"
+       class="D Leader"
+       d="M 58 127 l 20 0" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="80"
+       y="127"
+       style="text-anchor:start;">D</text>
+  </g>
+</svg>
diff --git a/data/layouts/bamboo-2fg-s-t.svg b/data/layouts/bamboo-2fg-s-t.svg
new file mode 100644
index 0000000..fa9541b
--- /dev/null
+++ b/data/layouts/bamboo-2fg-s-t.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<!--
+    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
+    Size and positions of controls may not be accurate
+ -->
+<svg
+   xmlns="http://www.w3.org/2000/svg";
+   version="1.1"
+   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+   id="bamboo-2fg-s-t"
+   width="208"
+   height="136">
+  <title
+     id="title">Wacom Bamboo Touch (2FG) (CTT-460)</title>
+  <g>
+    <rect
+       id="ButtonA"
+       class="A Button"
+       rx=".5"
+       ry=".5"
+       x="17"
+       y="11"
+       width="28"
+       height="36" />
+    <circle
+       id="DotA"
+       cx="30.5"
+       cy="28.5"
+       r=".5" />
+    <path
+       id="LeaderA"
+       class="A Leader"
+       d="M 47 29 l 20 0" />
+    <text
+       id="LabelA"
+       class="A Label"
+       x="69"
+       y="29"
+       style="text-anchor:start;">A</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonB"
+       class="B Button"
+       rx=".5"
+       ry=".5"
+       x="17"
+       y="48"
+       width="28"
+       height="18" />
+    <circle
+       id="DotB"
+       cx="30.5"
+       cy="57.5"
+       r=".5" />
+    <path
+       id="LeaderB"
+       class="B Leader"
+       d="M 47 58 l 20 0" />
+    <text
+       id="LabelB"
+       class="B Label"
+       x="69"
+       y="58"
+       style="text-anchor:start;">B</text>
+  </g>
+  <rect
+      rx="1"
+      ry="1"
+      x="17"
+      y="67"
+      width="28"
+      height="2" />
+  <g>
+    <rect
+       id="ButtonC"
+       class="C Button"
+       x="17"
+       y="70"
+       rx=".5"
+       ry=".5"
+       width="28"
+       height="18" />
+    <circle
+       id="DotC"
+       cx="30.5"
+       cy="79.5"
+       r=".5" />
+    <path
+       id="LeaderC"
+       class="C Leader"
+       d="M 47 80 l 20 0" />
+    <text
+       id="LabelC"
+       class="C Label"
+       x="69"
+       y="80"
+       style="text-anchor:start;">C</text>
+  </g>
+  <g>
+    <rect
+       id="ButtonD"
+       class="D Button"
+       x="17"
+       y="89"
+       rx=".5"
+       ry=".5"
+       width="28"
+       height="36" />
+    <circle
+       id="DotD"
+       cx="30.5"
+       cy="106.5"
+       r=".5" />
+    <path
+       id="LeaderD"
+       class="D Leader"
+       d="M 47 107 l 20 0" />
+    <text
+       id="LabelD"
+       class="D Label"
+       x="69"
+       y="107"
+       style="text-anchor:start;">D</text>
+  </g>
+</svg>
diff --git a/data/layouts/bamboo-2fg.svg b/data/layouts/bamboo-2fg.svg
deleted file mode 100644
index 9c70bf0..0000000
--- a/data/layouts/bamboo-2fg.svg
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<!--
-    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
-    Size and positions of controls may not be accurate
- -->
-<svg
-   xmlns="http://www.w3.org/2000/svg";
-   version="1.1"
-   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
-   id="bamboo-2fg"
-   width="208"
-   height="136">
-  <title
-     id="title">Wacom Bamboo Touch (2FG) (CTT-460)</title>
-  <g>
-    <rect
-       id="ButtonA"
-       class="A Button"
-       rx=".5"
-       ry=".5"
-       x="17"
-       y="11"
-       width="28"
-       height="36" />
-    <circle
-       id="DotA"
-       cx="30.5"
-       cy="28.5"
-       r=".5" />
-    <path
-       id="LeaderA"
-       class="A Leader"
-       d="M 47 29 l 20 0" />
-    <text
-       id="LabelA"
-       class="A Label"
-       x="69"
-       y="29"
-       style="text-anchor:start;">A</text>
-  </g>
-  <g>
-    <rect
-       id="ButtonB"
-       class="B Button"
-       rx=".5"
-       ry=".5"
-       x="17"
-       y="48"
-       width="28"
-       height="18" />
-    <circle
-       id="DotB"
-       cx="30.5"
-       cy="57.5"
-       r=".5" />
-    <path
-       id="LeaderB"
-       class="B Leader"
-       d="M 47 58 l 20 0" />
-    <text
-       id="LabelB"
-       class="B Label"
-       x="69"
-       y="58"
-       style="text-anchor:start;">B</text>
-  </g>
-  <rect
-      rx="1"
-      ry="1"
-      x="17"
-      y="67"
-      width="28"
-      height="2" />
-  <g>
-    <rect
-       id="ButtonC"
-       class="C Button"
-       x="17"
-       y="70"
-       rx=".5"
-       ry=".5"
-       width="28"
-       height="18" />
-    <circle
-       id="DotC"
-       cx="30.5"
-       cy="79.5"
-       r=".5" />
-    <path
-       id="LeaderC"
-       class="C Leader"
-       d="M 47 80 l 20 0" />
-    <text
-       id="LabelC"
-       class="C Label"
-       x="69"
-       y="80"
-       style="text-anchor:start;">C</text>
-  </g>
-  <g>
-    <rect
-       id="ButtonD"
-       class="D Button"
-       x="17"
-       y="89"
-       rx=".5"
-       ry=".5"
-       width="28"
-       height="36" />
-    <circle
-       id="DotD"
-       cx="30.5"
-       cy="106.5"
-       r=".5" />
-    <path
-       id="LeaderD"
-       class="D Leader"
-       d="M 47 107 l 20 0" />
-    <text
-       id="LabelD"
-       class="D Label"
-       x="69"
-       y="107"
-       style="text-anchor:start;">D</text>
-  </g>
-</svg>
diff --git a/data/layouts/bamboo-craft.svg b/data/layouts/bamboo-craft.svg
deleted file mode 100644
index aad13b8..0000000
--- a/data/layouts/bamboo-craft.svg
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
-   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<!--
-    Designed after data from 
http://www.wacom-asia.com/download/manuals/BambooUsersManual.pdf
-    Size and positions of controls may not be accurate
- -->
-<svg
-   xmlns="http://www.w3.org/2000/svg";
-   version="1.1"
-   style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
-   id="bamboo-craft"
-   width="248"
-   height="176">
-  <title
-     id="title">Wacom Bamboo Fun small (2FG) (CTH-461)</title>
-  <g>
-    <path
-       id="ButtonA"
-       class="A Button"
-       d="M 26 29 a 7 7 0 0 1 7 -7 l 14 0 l 0 39 l -21 0 z" />
-    <circle
-       id="DotA"
-       cx="36.5"
-       cy="41.5"
-       r=".5" />
-    <path
-       id="LeaderA"
-       class="A Leader"
-       d="M 48 42 l 20 0" />
-    <text
-       id="LabelA"
-       class="A Label"
-       x="70"
-       y="42"
-       style="text-anchor:start;">A</text>
-  </g>
-  <g>
-    <rect
-       id="ButtonB"
-       class="B Button"
-       rx=".5"
-       ry=".5"
-       x="26"
-       y="62"
-       width="21"
-       height="24" />
-    <circle
-       id="DotB"
-       cx="36.5"
-       cy="73.5"
-       r=".5" />
-    <path
-       id="LeaderB"
-       class="B Leader"
-       d="M 48 74 l 20 0" />
-    <text
-       id="LabelB"
-       class="B Label"
-       x="70"
-       y="74"
-       style="text-anchor:start;">B</text>
-  </g>
-  <rect
-      rx="1"
-      ry="1"
-      x="26"
-      y="87"
-      width="21"
-      height="2" />
-  <g>
-    <rect
-       id="ButtonC"
-       class="C Button"
-       x="26"
-       y="90"
-       rx=".5"
-       ry=".5"
-       width="21"
-       height="24" />
-    <circle
-       id="DotC"
-       cx="36.5"
-       cy="101.5"
-       r=".5" />
-    <path
-       id="LeaderC"
-       class="C Leader"
-       d="M 48 102 l 20 0" />
-    <text
-       id="LabelC"
-       class="C Label"
-       x="70"
-       y="102"
-       style="text-anchor:start;">C</text>
-  </g>
-  <g>
-    <path
-       id="ButtonD"
-       class="D Button"
-       d="M 26 147 a 7 7 0 0 0 7 7 l 14 0 l 0 -39 l -21 0 z" />
-    <circle
-       id="DotD"
-       cx="36.5"
-       cy="133.5"
-       r=".5" />
-    <path
-       id="LeaderD"
-       class="D Leader"
-       d="M 48 134 l 20 0" />
-    <text
-       id="LabelD"
-       class="D Label"
-       x="70"
-       y="134"
-       style="text-anchor:start;">D</text>
-  </g>
-</svg>
-- 
2.6.3


------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to