Use announce() for speech on Windows

This uses announce() for speech on Windows, and removes the trigger and event handler.

src/keys/reader/curline.lua

@@ -1,3 +1,2 @@
-reader.stop()
 local line = getLines(reader.line, reader.line + 1)[1]
-ttsQueue(line)
+reader.say(line, true)

src/keys/reader/lastline.lua

@@ -1,5 +1,4 @@
-reader.stop()
 -- We subtract 1 here because of the always blank line at the end.
 reader.line = getLineCount() - 1
 local line = getLines(reader.line, reader.line + 1)[1]
-ttsQueue(line)
+reader.say(line, true)

src/keys/reader/nextline.lua

@@ -1,9 +1,8 @@
-reader.stop()
 reader.line = reader.line + 1
 -- We subtract 1 here because of the always blank line at the end.
 if reader.line > getLineCount() - 1 then
-	ttsQueue("Bottom")
+	reader.say("Bottom", true)
 	reader.line = getLineCount() - 1
 end
 local line = getLines(reader.line, reader.line + 1)[1]
-ttsQueue(line)
+reader.say(line)

src/keys/reader/prevline.lua

@@ -1,8 +1,7 @@
-reader.stop()
 reader.line = reader.line - 1
 if reader.line < 0 then
-	ttsQueue("Top")
+	reader.say("Top", true)
 	reader.line = 0
 end
 local line = getLines(reader.line, reader.line + 1)[1]
-ttsQueue(line)
+reader.say(line)

src/scripts/reader/code.lua

@@ -12,7 +12,9 @@ function reader:install_trigger()
 	end
 	reader.trigger_id = tempRegexTrigger("^", f)
 end
-tempTimer(0, function() reader:install_trigger() end)
+if getOS() ~= "windows" then
+	tempTimer(0, function() reader:install_trigger() end)
+end
 function reader.remove(event, pkg)
 	if pkg ~= "reader" then
 		return true -- keep our handler around
@@ -29,9 +31,22 @@ function reader.stop()
 	ttsClearQueue()
 	ttsSkip()
 end
-reader.send_event = registerAnonymousEventHandler("sysDataSendRequest", function()
-	if command then
+function reader.say(text, interrupt)
+	if getOS() == "windows" then
+		announce(text)
+		return
+	end
+	if interrupt then
 		reader.stop()
 	end
-end)
-setConfig("announceIncomingText", false)
+	ttsQueue(text)
+end
+
+if getOS() ~= "windows" then
+	reader.send_event = registerAnonymousEventHandler("sysDataSendRequest", function()
+		if command then
+			reader.stop()
+		end
+	end)
+	setConfig("announceIncomingText", false)
+end