From e00f5bcae60486f128f048dbd39694c1ce978fae Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Sun, 21 Dec 2014 01:31:10 +0100
Subject: [PATCH] finished internal layout

---
 src/mess/layout/tispeak.lay | 80 ++++++++++++++++++++++++-------------
 1 file changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/mess/layout/tispeak.lay b/src/mess/layout/tispeak.lay
index abba8746cdd..2fb07738076 100644
--- a/src/mess/layout/tispeak.lay
+++ b/src/mess/layout/tispeak.lay
@@ -3,43 +3,67 @@
 
 <!-- define elements -->
 
+<!-- note: the TI Speak & Spell 14seg digits look different from MAME's default, most notably the right half is wider -->
+
 	<element name="digit" defstate="0">
 		<led14seg><color red="0.3" green="1.0" blue="0.7" /></led14seg>
 	</element>
 
+<!-- add our own for DP(display point) and the custom AP(apostrophe) segments -->
+
+	<element name="lamp_dp" defstate="0">
+		<disk state="0"><color red="0.0353" green="0.1255" blue="0.0863" /></disk>
+		<disk state="1"><color red="0.3" green="1.0" blue="0.7" /></disk>
+	</element>
+	<element name="lamp_ap" defstate="0">
+		<rect state="0"><color red="0.0353" green="0.1255" blue="0.0863" /></rect>
+		<rect state="1"><color red="0.3" green="1.0" blue="0.7" /></rect>
+	</element>
+
+
 
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="0" right="100" top="0" bottom="100" />
+		<bounds left="0" right="100" top="0" bottom="15" />
 
-		<bezel name="digit0" element="digit">
-			<bounds x="0" y="0" width="10" height="15" />
-		</bezel>
-		<bezel name="digit1" element="digit">
-			<bounds x="10" y="0" width="10" height="15" />
-		</bezel>
-		<bezel name="digit2" element="digit">
-			<bounds x="20" y="0" width="10" height="15" />
-		</bezel>
-		<bezel name="digit3" element="digit">
-			<bounds x="30" y="0" width="10" height="15" />
-		</bezel>
-		<bezel name="digit4" element="digit">
-			<bounds x="40" y="0" width="10" height="15" />
-		</bezel>
-		<bezel name="digit5" element="digit">
-			<bounds x="50" y="0" width="10" height="15" />
-		</bezel>
-		<bezel name="digit6" element="digit">
-			<bounds x="60" y="0" width="10" height="15" />
-		</bezel>
-		<bezel name="digit7" element="digit">
-			<bounds x="70" y="0" width="10" height="15" />
-		</bezel>
-		<bezel name="digit8" element="digit">
-			<bounds x="80" y="0" width="10" height="15" />
-		</bezel>
+	<!-- 9 digits (snspell has 8, snmath has 9) -->
+
+		<bezel name="digit0" element="digit"><bounds x="0" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp0" element="lamp_dp"><bounds x="9" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp1" element="lamp_ap"><bounds x="10.5" y="0" width="0.5" height="3.5" /></bezel>
+
+		<bezel name="digit1" element="digit"><bounds x="11" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp10" element="lamp_dp"><bounds x="20" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp11" element="lamp_ap"><bounds x="21.5" y="0" width="0.5" height="3.5" /></bezel>
+
+		<bezel name="digit2" element="digit"><bounds x="22" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp20" element="lamp_dp"><bounds x="31" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp21" element="lamp_ap"><bounds x="32.5" y="0" width="0.5" height="3.5" /></bezel>
+
+		<bezel name="digit3" element="digit"><bounds x="33" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp30" element="lamp_dp"><bounds x="42" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp31" element="lamp_ap"><bounds x="43.5" y="0" width="0.5" height="3.5" /></bezel>
+
+		<bezel name="digit4" element="digit"><bounds x="44" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp40" element="lamp_dp"><bounds x="53" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp41" element="lamp_ap"><bounds x="54.5" y="0" width="0.5" height="3.5" /></bezel>
+
+		<bezel name="digit5" element="digit"><bounds x="55" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp50" element="lamp_dp"><bounds x="64" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp51" element="lamp_ap"><bounds x="65.5" y="0" width="0.5" height="3.5" /></bezel>
+
+		<bezel name="digit6" element="digit"><bounds x="66" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp60" element="lamp_dp"><bounds x="75" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp61" element="lamp_ap"><bounds x="76.5" y="0" width="0.5" height="3.5" /></bezel>
+
+		<bezel name="digit7" element="digit"><bounds x="77" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp70" element="lamp_dp"><bounds x="86" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp71" element="lamp_ap"><bounds x="87.5" y="0" width="0.5" height="3.5" /></bezel>
+
+		<bezel name="digit8" element="digit"><bounds x="88" y="0" width="10" height="15" /></bezel>
+		<bezel name="lamp80" element="lamp_dp"><bounds x="97" y="13.5" width="1.5" height="1.5" /></bezel>
+		<bezel name="lamp81" element="lamp_ap"><bounds x="98.5" y="0" width="0.5" height="3.5" /></bezel>
 
 	</view>
 </mamelayout>