[dasher: 217/217] Control boxes with text added.
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher: 217/217] Control boxes with text added.
- Date: Sat, 27 Feb 2016 12:18:33 +0000 (UTC)
commit 21b4cdf5efba30292e2fee3c595f6df3d13ac9c0
Author: Ada Majorek <amajorek google com>
Date: Wed Feb 24 21:45:19 2016 -0800
Control boxes with text added.
Script for generating asci control boxes.
Cleanup in control boxes.
Added new boxes to install
Data/control/control.all.txt.xml | 311 ++++++++++++++++++++++++++
Data/control/control.edit.txt.xml | 154 +++++++++++++
Data/control/control.generic.xml | 218 ++++++++++++++++++
Data/control/control.prepared_speech.txt.xml | 71 ++++++
Data/control/control.prepared_speech.xml | 22 +-
Data/control/control.speak.txt.xml | 206 +++++++++++++++++
Data/control/control.xml | 308 ++++++--------------------
Data/control/text-control.sh | 29 +++
Data/settings/settings.direct.xml | 2 +-
Data/settings/settings.edit.xml | 2 +-
Data/settings/settings.prepared_speech.xml | 2 +-
Data/settings/settings.speak.xml | 2 +-
Src/Installer/Dasher.wxs | 13 +-
13 files changed, 1076 insertions(+), 264 deletions(-)
---
diff --git a/Data/control/control.all.txt.xml b/Data/control/control.all.txt.xml
new file mode 100644
index 0000000..d448458
--- /dev/null
+++ b/Data/control/control.all.txt.xml
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE control SYSTEM "control.dtd">
+<control name="All Available Commands (ascii)">
+ <alph/>
+
+ <node label="Stop" color="242">
+ <stop/>
+ <alph/>
+ <root/>
+ </node>
+
+ <node label="Pause" color="241">
+ <pause/>
+ <alph/>
+ <root/>
+ </node>
+
+ <node name="CTL_MOVE" label="Move" color="-1">
+ <node name="CTL_MOVE_BACKWARD" label="<=" color="-1">
+ <node label="All" color="-1">
+ <move forward="no" dist="all"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <move forward="no" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <move forward="no" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Line" color="-1">
+ <move forward="no" dist="line"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <move forward="no" dist="word"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Letter" color="-1">
+ <move forward="no" dist="char"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_MOVE_FORWARD" label="=>" color="-1">
+
+ <node label="Letter" color="-1">
+ <move forward="yes" dist="char"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <move forward="yes" dist="word"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Line" color="-1">
+ <move forward="yes" dist="line"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <move forward="yes" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="All" color="-1">
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+ </node>
+
+ <node name="CTL_DELETE" label="Delete" color="-1">
+ <node name="CTL_DELETE_BACKWARD" label="<x" color="-1">
+ <node label="All" color="-1">
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <delete forward="no" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <delete forward="no" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Line" color="-1">
+ <delete forward="no" dist="line"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <delete forward="no" dist="word"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Letter" color="-1">
+ <delete forward="no" dist="char"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_DELETE_FORWARD" label="x>" color="-1">
+
+ <node label="Letter" color="-1">
+ <delete forward="yes" dist="char"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <delete forward="yes" dist="word"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Line" color="-1">
+ <delete forward="yes" dist="line"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <delete forward="yes" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <delete forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="All" color="-1">
+ <delete forward="yes" dist="all"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ </node>
+ </node>
+
+ <node name="CTL_CLEAR" label="Clear" color="-1">
+ <alph/>
+ <node label="All" color="242">
+ <delete forward="yes" dist="all"/>
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <root/>
+ </node>
+ <alph/>
+ </node>
+
+ <node name="CTL_COPY" label="Copy" color="-1">
+
+ <node label="Repeat" color="-1">
+ <copy what="repeat"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Word" color="-1">
+ <copy what="word"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Line" color="-1">
+ <copy what="line"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Sentence" color="-1">
+ <copy what="sentence"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <copy what="paragraph"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="New" color="-1">
+ <copy what="new"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="All" color="-1">
+ <copy what="all"/>
+ <alph/>
+ <root/>
+ </node>
+ </node>
+
+ <node name="CTL_SPEAK" label="Speak" color="241">
+ <node label="Stop" color="242">
+ <speak what="cancel"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Repeat" color="241">
+ <speak what="repeat"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Word" color="-1">
+ <speak what="word"/>
+ <move forward="yes" dist="word"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Line" color="-1">
+ <speak what="line"/>
+ <move forward="yes" dist="line"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Sentence" color="-1">
+ <speak what="sentence"/>
+ <move forward="yes" dist="sentence"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <speak what="paragraph"/>
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="New" color="-1">
+ <speak what="new"/>
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="All" color="-1">
+ <speak what="all"/>
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <root/>
+ </node>
+ </node>
+
+ <alph/>
+
+ <!--
+ <node label="utf symbols" color="241">
+ <node label="🔇💬🔊🔉🔈↻┅Line╍⭙Sentence"
color="242">
+ <alph/>
+ <root/>
+ </node>
+ <node label="Clear⎘⎗⎌⍾<x ⌧x>🛇‒Delete"
color="242">
+ <alph/>
+ <root/>
+ </node>
+ <node label="Speak🗗🗖🗕🔔Repeat🔁📣PageAll" color="242">
+ <alph/>
+ <root/>
+ </node>
+ <node label="Copy📁💾✘✂⚠☰┅Word●Letter" color="242">
+ <alph/>
+ <root/>
+ </node>
+ <node label="Copy📁💾✘✂⚠☰┅Word●Letter" color="242">
+ <alph/>
+ <root/>
+ </node>
+ <node label="<=🛈🗟⥁⟳=>↔New" color="242">
+ <alph/>
+ <root/>
+ </node>
+ </node>
+ -->
+</control>
+
diff --git a/Data/control/control.edit.txt.xml b/Data/control/control.edit.txt.xml
new file mode 100644
index 0000000..f943c66
--- /dev/null
+++ b/Data/control/control.edit.txt.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE control SYSTEM "control.dtd">
+<control name="Edit Larger Document (ascii)">
+ <alph/>
+
+ <node label="Stop" color="242">
+ <stop/>
+ <alph/>
+ <root/>
+ </node>
+
+ <node name="CTL_MOVE" label="Move" color="-1">
+ <node name="CTL_MOVE_BACKWARD" label="<=" color="-1">
+ <node label="All" color="-1">
+ <move forward="no" dist="all"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <move forward="no" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <move forward="no" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <move forward="no" dist="word"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Letter" color="-1">
+ <move forward="no" dist="char"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_MOVE_FORWARD" label="=>" color="-1">
+
+ <node label="Letter" color="-1">
+ <move forward="yes" dist="char"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <move forward="yes" dist="word"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <move forward="yes" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="All" color="-1">
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+ </node>
+
+ <node name="CTL_DELETE" label="Delete" color="-1">
+ <node name="CTL_DELETE_BACKWARD" label="<x" color="-1">
+ <node label="All" color="-1">
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <delete forward="no" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <delete forward="no" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <delete forward="no" dist="word"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Letter" color="-1">
+ <delete forward="no" dist="char"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_DELETE_FORWARD" label="x>" color="-1">
+
+ <node label="Letter" color="-1">
+ <delete forward="yes" dist="char"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <delete forward="yes" dist="word"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <delete forward="yes" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <delete forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="All" color="-1">
+ <delete forward="yes" dist="all"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ </node>
+ </node>
+
+ <alph/>
+
+</control>
+
diff --git a/Data/control/control.generic.xml b/Data/control/control.generic.xml
new file mode 100644
index 0000000..fe23137
--- /dev/null
+++ b/Data/control/control.generic.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE control SYSTEM "control.dtd">
+<control name="Default (symbols)">
+ <alph/>
+
+ <node label="⏹" color="242">
+ <stop/>
+ <alph/>
+ <root/>
+ </node>
+
+ <node label="⏸" color="241">
+ <pause/>
+ <alph/>
+ <root/>
+ </node>
+
+ <node name="CTL_MOVE" label="✢" color="-1">
+ <alph/>
+ <node name="CTL_MOVE_BACKWARD" label="⇦" color="-1">
+ <node label="🗐" color="-1">
+ <move forward="no" dist="all"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="¶" color="-1">
+ <move forward="no" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label=".⁉" color="-1">
+ <move forward="no" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="⬬" color="-1">
+ <move forward="no" dist="word"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="•" color="-1">
+ <move forward="no" dist="char"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_MOVE_FORWARD" label="⇨" color="-1">
+
+ <node label="•" color="-1">
+ <move forward="yes" dist="char"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="⬬" color="-1">
+ <move forward="yes" dist="word"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label=".⁉" color="-1">
+ <move forward="yes" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="¶" color="-1">
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="🗐" color="-1">
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+
+ </node>
+ <node name="CTL_DELETE" label="⦻" color="-1">
+ <alph/>
+ <node name="CTL_DELETE_BACKWARD" label="⌫" color="-1">
+ <node label="🗐" color="-1">
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="¶" color="-1">
+ <delete forward="no" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label=".⁉" color="-1">
+ <delete forward="no" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="⬬" color="-1">
+ <delete forward="no" dist="word"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="•" color="-1">
+ <delete forward="no" dist="char"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_DELETE_FORWARD" label="⌦" color="-1">
+
+ <node label="•" color="-1">
+ <delete forward="yes" dist="char"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="⬬" color="-1">
+ <delete forward="yes" dist="word"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label=".⁉" color="-1">
+ <delete forward="yes" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="¶" color="-1">
+ <delete forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="🗐" color="-1">
+ <delete forward="yes" dist="all"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ </node>
+
+
+ </node>
+ <node name="CTL_CLEAR" label="⎚" color="-1">
+ <alph/>
+ <node label="🗐" color="242">
+ <delete forward="yes" dist="all"/>
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <root/>
+ </node>
+ <alph/>
+ </node>
+
+ <node name="CTL_SPEAK" label="🗣" color="241">
+
+ <node label="⏹" color="242">
+ <speak what="cancel"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="🔃" color="241">
+ <speak what="repeat"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="¶" color="-1">
+ <speak what="paragraph"/>
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <node label="⎚¶" color="242">
+ <delete forward="no" dist="paragraph"/>
+ <delete forward="no" dist="char"/>
+ <alph/>
+ <root/>
+ </node>
+ <node name="CTL_SPEAK_PARAGRAPH2" label="🗣¶" color="-1">
+ <speak what="paragraph"/>
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_SPEAK_PARAGRAPH2"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="🗐" color="-1">
+ <speak what="all"/>
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <node label="⎚🗐" color="242">
+ <delete forward="yes" dist="all"/>
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <root/>
+ </node>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <alph/>
+ </node>
+
+</control>
+
diff --git a/Data/control/control.prepared_speech.txt.xml b/Data/control/control.prepared_speech.txt.xml
new file mode 100644
index 0000000..8424ead
--- /dev/null
+++ b/Data/control/control.prepared_speech.txt.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE control SYSTEM "control.dtd">
+<control name="Speak From Prepared Document (ascii)">
+
+ <node name="CTL_MOVE" label="Move" color="-1">
+
+ <node name="CTL_MOVE_BACKWARD" label="<=" color="-1">
+ <node label="All" color="-1">
+ <move forward="no" dist="all"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <move forward="no" dist="paragraph"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <move forward="no" dist="sentence"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ </node>
+
+ <node name="CTL_MOVE_FORWARD" label="=>" color="-1">
+
+ <node label="Sentence" color="-1">
+ <move forward="yes" dist="sentence"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <move forward="yes" dist="paragraph"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="All" color="-1">
+ <move forward="yes" dist="all"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ </node>
+ </node>
+
+ <node name="CTL_SPEAK" label="Speak" color="241">
+
+ <node label="Stop" color="242">
+ <speak what="cancel"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="Repeat" color="241">
+ <speak what="repeat"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <speak what="sentence"/>
+ <move forward="yes" dist="sentence"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <speak what="paragraph"/>
+ <move forward="yes" dist="paragraph"/>
+ <ref name="CTL_MOVE"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ </node>
+</control>
+
diff --git a/Data/control/control.prepared_speech.xml b/Data/control/control.prepared_speech.xml
index 2297c07..6e98dbc 100644
--- a/Data/control/control.prepared_speech.xml
+++ b/Data/control/control.prepared_speech.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE control SYSTEM "control.dtd">
-<control name="Speak From Prepared Document">
+<control name="Speak From Prepared Document (symbols)">
<node name="CTL_MOVE" label="✢" color="-1">
@@ -44,25 +44,25 @@
<node name="CTL_SPEAK" label="🗣" color="241">
- <node label="¶" color="-1">
- <speak what="paragraph"/>
- <move forward="yes" dist="paragraph"/>
+ <node label="⏹" color="242">
+ <speak what="cancel"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
- <node label=".⁉" color="-1">
- <speak what="sentence"/>
- <move forward="yes" dist="sentence"/>
+ <node label="🔃" color="241">
+ <speak what="repeat"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
- <node label="🔃" color="241">
- <speak what="repeat"/>
+ <node label=".⁉" color="-1">
+ <speak what="sentence"/>
+ <move forward="yes" dist="sentence"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
- <node label="🛇" color="241">
- <speak what="cancel"/>
+ <node label="¶" color="-1">
+ <speak what="paragraph"/>
+ <move forward="yes" dist="paragraph"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
diff --git a/Data/control/control.speak.txt.xml b/Data/control/control.speak.txt.xml
new file mode 100644
index 0000000..603d2e6
--- /dev/null
+++ b/Data/control/control.speak.txt.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE control SYSTEM "control.dtd">
+<control name="Conversation (ascii)">
+
+
+ <node name="CTL_MOVE" label="Move" color="-1">
+ <alph/>
+ <node name="CTL_MOVE_BACKWARD" label="<=" color="-1">
+ <node label="All" color="-1">
+ <move forward="no" dist="all"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <move forward="no" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <move forward="no" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <move forward="no" dist="word"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Letter" color="-1">
+ <move forward="no" dist="char"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_MOVE_FORWARD" label="=>" color="-1">
+
+ <node label="Letter" color="-1">
+ <move forward="yes" dist="char"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <move forward="yes" dist="word"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <move forward="yes" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="All" color="-1">
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+
+ </node>
+ <node name="CTL_DELETE" label="Delete" color="-1">
+ <alph/>
+ <node name="CTL_DELETE_BACKWARD" label="<x" color="-1">
+ <node label="All" color="-1">
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <delete forward="no" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <delete forward="no" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <delete forward="no" dist="word"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Letter" color="-1">
+ <delete forward="no" dist="char"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_DELETE_FORWARD" label="x>" color="-1">
+
+ <node label="Letter" color="-1">
+ <delete forward="yes" dist="char"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Word" color="-1">
+ <delete forward="yes" dist="word"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Sentence" color="-1">
+ <delete forward="yes" dist="sentence"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <delete forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ <node label="All" color="-1">
+ <delete forward="yes" dist="all"/>
+ <alph/>
+ <ref name="CTL_DELETE_BACKWARD"/>
+ <ref name="CTL_DELETE_FORWARD"/>
+ </node>
+ </node>
+
+
+ </node>
+ <node name="CTL_CLEAR" label="Clear" color="-1">
+ <alph/>
+ <node label="All" color="242">
+ <delete forward="yes" dist="all"/>
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <root/>
+ </node>
+ <alph/>
+ </node>
+
+ <node name="CTL_SPEAK" label="Speak" color="241">
+
+ <node label="Stop" color="242">
+ <speak what="cancel"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Repeat" color="241">
+ <speak what="repeat"/>
+ <alph/>
+ <root/>
+ </node>
+ <node label="Paragraph" color="-1">
+ <speak what="paragraph"/>
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <node label="ClearParagraph" color="242">
+ <delete forward="no" dist="paragraph"/>
+ <delete forward="no" dist="char"/>
+ <alph/>
+ <root/>
+ </node>
+ <node name="CTL_SPEAK_PARAGRAPH2" label="SpeakParagraph" color="-1">
+ <speak what="paragraph"/>
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <ref name="CTL_SPEAK_PARAGRAPH2"/>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <node label="All" color="-1">
+ <speak what="all"/>
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <node label="ClearAll" color="242">
+ <delete forward="yes" dist="all"/>
+ <delete forward="no" dist="all"/>
+ <alph/>
+ <root/>
+ </node>
+ <ref name="CTL_SPEAK"/>
+ </node>
+ <alph/>
+ </node>
+
+</control>
+
diff --git a/Data/control/control.xml b/Data/control/control.xml
index 6f50600..fd199f1 100644
--- a/Data/control/control.xml
+++ b/Data/control/control.xml
@@ -2,58 +2,47 @@
<!DOCTYPE control SYSTEM "control.dtd">
<control name="">
<alph/>
-
- <node label="⏹" color="242">
+
+ <node label="Stop" color="242">
<stop/>
<alph/>
<root/>
</node>
- <node label="⏸" color="241">
+ <node label="Pause" color="241">
<pause/>
<alph/>
<root/>
</node>
- <node name="CTL_MOVE" label="✢" color="-1">
- <node name="CTL_MOVE_BACKWARD" label="⇦" color="-1">
- <node label="🗐" color="-1">
+ <node name="CTL_MOVE" label="Move" color="-1">
+ <alph/>
+ <node name="CTL_MOVE_BACKWARD" label="<=" color="-1">
+ <node label="All" color="-1">
<move forward="no" dist="all"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="🗏" color="-1">
- <move forward="no" dist="page"/>
- <alph/>
- <ref name="CTL_MOVE_BACKWARD"/>
- <ref name="CTL_MOVE_FORWARD"/>
- </node>
- <node label="¶" color="-1">
+ <node label="Paragraph" color="-1">
<move forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label=".⁉" color="-1">
+ <node label="Sentence" color="-1">
<move forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="━" color="-1">
- <move forward="no" dist="line"/>
- <alph/>
- <ref name="CTL_MOVE_BACKWARD"/>
- <ref name="CTL_MOVE_FORWARD"/>
- </node>
- <node label="⬬" color="-1">
+ <node label="Word" color="-1">
<move forward="no" dist="word"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="•" color="-1">
+ <node label="Letter" color="-1">
<move forward="no" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -61,45 +50,33 @@
</node>
</node>
- <node name="CTL_MOVE_FORWARD" label="⇨" color="-1">
+ <node name="CTL_MOVE_FORWARD" label="=>" color="-1">
- <node label="•" color="-1">
+ <node label="Letter" color="-1">
<move forward="yes" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="⬬" color="-1">
+ <node label="Word" color="-1">
<move forward="yes" dist="word"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="━" color="-1">
- <move forward="yes" dist="line"/>
- <alph/>
- <ref name="CTL_MOVE_BACKWARD"/>
- <ref name="CTL_MOVE_FORWARD"/>
- </node>
- <node label=".⁉" color="-1">
+ <node label="Sentence" color="-1">
<move forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="¶" color="-1">
+ <node label="Paragraph" color="-1">
<move forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="🗏" color="-1">
- <move forward="yes" dist="page"/>
- <alph/>
- <ref name="CTL_MOVE_BACKWARD"/>
- <ref name="CTL_MOVE_FORWARD"/>
- </node>
- <node label="🗐" color="-1">
+ <node label="All" color="-1">
<move forward="yes" dist="all"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -109,46 +86,34 @@
</node>
-
- <node name="CTL_DELETE" label="⦻" color="-1">
- <node name="CTL_DELETE_BACKWARD" label="⌫" color="-1">
- <node label="🗐" color="-1">
+ <node name="CTL_DELETE" label="Delete" color="-1">
+ <alph/>
+ <node name="CTL_DELETE_BACKWARD" label="<x" color="-1">
+ <node label="All" color="-1">
<delete forward="no" dist="all"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="🗏" color="-1">
- <delete forward="no" dist="page"/>
- <alph/>
- <ref name="CTL_DELETE_BACKWARD"/>
- <ref name="CTL_DELETE_FORWARD"/>
- </node>
- <node label="¶" color="-1">
+ <node label="Paragraph" color="-1">
<delete forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label=".⁉" color="-1">
+ <node label="Sentence" color="-1">
<delete forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="━" color="-1">
- <delete forward="no" dist="line"/>
- <alph/>
- <ref name="CTL_DELETE_BACKWARD"/>
- <ref name="CTL_DELETE_FORWARD"/>
- </node>
- <node label="⬬" color="-1">
+ <node label="Word" color="-1">
<delete forward="no" dist="word"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="•" color="-1">
+ <node label="Letter" color="-1">
<delete forward="no" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -156,245 +121,98 @@
</node>
</node>
- <node name="CTL_DELETE_FORWARD" label="⌦" color="-1">
+ <node name="CTL_DELETE_FORWARD" label="x>" color="-1">
- <node label="•" color="-1">
+ <node label="Letter" color="-1">
<delete forward="yes" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="⬬" color="-1">
+ <node label="Word" color="-1">
<delete forward="yes" dist="word"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="━" color="-1">
- <delete forward="yes" dist="line"/>
- <alph/>
- <ref name="CTL_DELETE_BACKWARD"/>
- <ref name="CTL_DELETE_FORWARD"/>
- </node>
- <node label=".⁉" color="-1">
+ <node label="Sentence" color="-1">
<delete forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="¶" color="-1">
+ <node label="Paragraph" color="-1">
<delete forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="🗏" color="-1">
- <delete forward="yes" dist="page"/>
- <alph/>
- <ref name="CTL_DELETE_BACKWARD"/>
- <ref name="CTL_DELETE_FORWARD"/>
- </node>
- <node label="🗐" color="-1">
+ <node label="All" color="-1">
<delete forward="yes" dist="all"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
</node>
- <node label="⌧" color="-1">
- <alph/>
- <node label="🗐" color="242">
- <delete forward="yes" dist="all"/>
- <delete forward="no" dist="all"/>
- <alph/>
- <root/>
- </node>
- <alph/>
- </node>
- </node>
- <node name="CTL_COPY" label="📋" color="-1">
- <node label="🗐" color="-1">
- <copy what="all"/>
- <alph/>
- <root/>
- </node>
- <node label="🆕" color="-1">
- <copy what="new"/>
- <alph/>
- <root/>
- </node>
- <node label="🔃" color="-1">
- <copy what="repeat"/>
- <alph/>
- <root/>
- </node>
- <node label="🗏" color="-1">
- <copy what="page"/>
- <alph/>
- <root/>
- </node>
- <node label="¶" color="-1">
- <copy what="paragraph"/>
- <alph/>
- <root/>
- </node>
- <node label=".⁉" color="-1">
- <copy what="sentence"/>
- <alph/>
- <root/>
- </node>
- <node label="━" color="-1">
- <copy what="line"/>
- <alph/>
- <root/>
- </node>
- <node label="⬬" color="-1">
- <copy what="word"/>
+ </node>
+ <node name="CTL_CLEAR" label="Clear" color="-1">
+ <alph/>
+ <node label="All" color="242">
+ <delete forward="yes" dist="all"/>
+ <delete forward="no" dist="all"/>
<alph/>
<root/>
</node>
+ <alph/>
</node>
- <node name="CTL_SPEAK" label="🗣" color="241">
- <node label="🗐" color="-1">
- <speak what="all"/>
- <ref name="CTL_SPEAK"/>
- <node label="⌧🗐" color="242">
- <delete forward="yes" dist="all"/>
- <delete forward="no" dist="all"/>
- <alph/>
- <root/>
- </node>
+ <node name="CTL_SPEAK" label="Speak" color="241">
+
+ <node label="Stop" color="242">
+ <speak what="cancel"/>
+ <alph/>
<root/>
</node>
- <node label="🆕" color="-1">
- <speak what="new"/>
+ <node label="Repeat" color="241">
+ <speak what="repeat"/>
<alph/>
- <ref name="CTL_SPEAK"/>
- </node>
- <node label="🗏" color="-1">
- <speak what="page"/>
- <ref name="CTL_SPEAK"/>
- <node label="⌧🗏" color="242">
- <move forward="yes" dist="page"/>
- <delete forward="no" dist="page"/>
- <move forward="no" dist="char"/>
- <alph/>
- <root/>
- </node>
- <node label="⇨🗏" color="-1">
- <move forward="yes" dist="page"/>
- <ref name="CTL_SPEAK"/>
- <root/>
- </node>
+ <root/>
</node>
- <node label="¶" color="-1">
+ <node label="Paragraph" color="-1">
<speak what="paragraph"/>
- <ref name="CTL_SPEAK"/>
- <node label="⌧¶" color="242">
- <move forward="yes" dist="paragraph"/>
+ <move forward="yes" dist="paragraph"/>
+ <alph/>
+ <node label="ClearParagraph" color="242">
<delete forward="no" dist="paragraph"/>
- <move forward="no" dist="char"/>
+ <delete forward="no" dist="char"/>
<alph/>
<root/>
</node>
- <node label="⇨¶" color="-1">
+ <node name="CTL_SPEAK_PARAGRAPH2" label="SpeakParagraph" color="-1">
+ <speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
- <ref name="CTL_SPEAK"/>
- <root/>
- </node>
- </node>
- <node label=".⁉" color="-1">
- <speak what="sentence"/>
- <ref name="CTL_SPEAK"/>
- <node label="⌧.⁉" color="242">
- <move forward="yes" dist="sentence"/>
- <delete forward="no" dist="sentence"/>
- <move forward="no" dist="char"/>
<alph/>
- <root/>
- </node>
- <node label="⇨.⁉" color="-1">
- <move forward="yes" dist="sentence"/>
+ <ref name="CTL_SPEAK_PARAGRAPH2"/>
<ref name="CTL_SPEAK"/>
- <root/>
</node>
- </node>
- <node label="━" color="-1">
- <speak what="line"/>
<ref name="CTL_SPEAK"/>
- <node label="⌧━" color="242">
- <move forward="yes" dist="line"/>
- <delete forward="no" dist="line"/>
- <move forward="no" dist="char"/>
- <alph/>
- <root/>
- </node>
- <node label="⇨━" color="-1">
- <move forward="yes" dist="line"/>
- <ref name="CTL_SPEAK"/>
- <root/>
- </node>
</node>
- <node label="⬬" color="-1">
- <speak what="word"/>
- <ref name="CTL_SPEAK"/>
- <node label="⌧⬬" color="242">
- <move forward="yes" dist="word"/>
- <delete forward="no" dist="word"/>
- <move forward="no" dist="char"/>
+ <node label="All" color="-1">
+ <speak what="all"/>
+ <move forward="yes" dist="all"/>
+ <alph/>
+ <node label="ClearAll" color="242">
+ <delete forward="yes" dist="all"/>
+ <delete forward="no" dist="all"/>
<alph/>
<root/>
</node>
- <node label="⇨⬬" color="-1">
- <move forward="yes" dist="word"/>
- <ref name="CTL_SPEAK"/>
- <root/>
- </node>
- </node>
- <node label="🔃" color="241">
- <speak what="repeat"/>
- <alph/>
- <root/>
- </node>
- <node label="🛇" color="241">
- <speak what="cancel"/>
- <alph/>
- <root/>
+ <ref name="CTL_SPEAK"/>
</node>
+ <alph/>
</node>
- <alph/>
-
- <!--
- <node label="utf symbols" color="241">
- <node label="🔇💬🔊🔉🔈↻┅━╍⭙⁉"
color="242">
- <alph/>
- <root/>
- </node>
- <node label="⎚⎘⎗⎌⍾⌫ ⌧⌦🛇‒⦻"
color="242">
- <alph/>
- <root/>
- </node>
- <node label="🗣🗗🗖🗕🔔🔃🔁📣🗏🗐"
color="242">
- <alph/>
- <root/>
- </node>
- <node label="📋📁💾✘✂⚠☰┅⬬●•"
color="242">
- <alph/>
- <root/>
- </node>
- <node label="📋📁💾✘✂⚠☰┅⬬●•"
color="242">
- <alph/>
- <root/>
- </node>
- <node label="⇦🛈🗟⥁⟳⇨↔🆕" color="242">
- <alph/>
- <root/>
- </node>
- </node>
- -->
</control>
diff --git a/Data/control/text-control.sh b/Data/control/text-control.sh
new file mode 100644
index 0000000..4b1ed59
--- /dev/null
+++ b/Data/control/text-control.sh
@@ -0,0 +1,29 @@
+ #!/bin/bash
+ for i in $( grep -l " (symbols)" control.*xml); do
+ echo item: $i
+ sed -e '''
+ s/ (symbols)/ (ascii)/g
+ s/⏹/Stop/g
+ s/⏸/Pause/g
+ s/✢/Move/g
+ s/⇦/\<=/g
+ s/⇨/=\>/g
+ s/🗐/All/g
+ s/🗏/Page/g
+ s/¶/Paragraph/g
+ s/.⁉/Sentence/g
+ s/━/Line/g
+ s/⬬/Word/g
+ s/•/Letter/g
+ s/⦻/Delete/g
+ s/⌫/\<x/g
+ s/⌦/x\>/g
+ s/⎚/Clear/g
+ s/📋/Copy/g
+ s/🆕/New/g
+ s/🔃/Repeat/g
+ s/🗣/Speak/g
+ ''' <$i >$(basename $i .xml).txt.xml
+ done
+ sed -e 's_<control name="Default (ascii)">_<control name="">_' <control.generic.txt.xml
control.xml
+ rm control.generic.txt.xml
diff --git a/Data/settings/settings.direct.xml b/Data/settings/settings.direct.xml
index 8076d51..5f19b76 100644
--- a/Data/settings/settings.direct.xml
+++ b/Data/settings/settings.direct.xml
@@ -6,6 +6,6 @@
<bool name="ControlMode" value="False"/>
<bool name="CopyOnStop" value="False"/>
<bool name="TimeStampNewFiles" value="False"/>
- <string name="ControlBoxID" value="Direct Entry"/>
+ <string name="ControlBoxID" value="Direct Entry (ascii)"/>
<string name="ToolbarID" value="Direct Entry"/>
</settings>
diff --git a/Data/settings/settings.edit.xml b/Data/settings/settings.edit.xml
index e03f590..43b04f6 100644
--- a/Data/settings/settings.edit.xml
+++ b/Data/settings/settings.edit.xml
@@ -7,6 +7,6 @@
<bool name="CopyOnStop" value="True"/>
<bool name="FullScreen" value="True"/>
<bool name="TimeStampNewFiles" value="True"/>
-<string name="ControlBoxID" value="Edit Larger Document"/>
+<string name="ControlBoxID" value="Edit Larger Document (ascii)"/>
<string name="ToolbarID" value="Edit Larger Document"/>
</settings>
diff --git a/Data/settings/settings.prepared_speech.xml b/Data/settings/settings.prepared_speech.xml
index fe3779e..8302c55 100644
--- a/Data/settings/settings.prepared_speech.xml
+++ b/Data/settings/settings.prepared_speech.xml
@@ -5,6 +5,6 @@
<bool name="ConfirmUnsavedFiles" value="True"/>
<bool name="ControlMode" value="True"/>
<bool name="FullScreen" value="True"/>
-<string name="ControlBoxID" value="Speak From Prepared Document"/>
+<string name="ControlBoxID" value="Speak From Prepared Document (ascii)"/>
<string name="ToolbarID" value="Speak From Prepared Document"/>
</settings>
diff --git a/Data/settings/settings.speak.xml b/Data/settings/settings.speak.xml
index b01df0e..07e9a7a 100644
--- a/Data/settings/settings.speak.xml
+++ b/Data/settings/settings.speak.xml
@@ -9,6 +9,6 @@
<bool name="CopyOnStop" value="True"/>
<bool name="FullScreen" value="True"/>
<bool name="TimeStampNewFiles" value="False"/>
-<string name="ControlBoxID" value="Conversation"/>
+<string name="ControlBoxID" value="Conversation (ascii)"/>
<string name="ToolbarID" value="Conversation"/>
</settings>
diff --git a/Src/Installer/Dasher.wxs b/Src/Installer/Dasher.wxs
index 7a58f3f..ec360f4 100644
--- a/Src/Installer/Dasher.wxs
+++ b/Src/Installer/Dasher.wxs
@@ -212,11 +212,16 @@
<File Id="colour.xml" Name="colour.xml"
DiskId="1" Source="..\..\Data\colours\colour.xml"/>
</Component>
<Component Id="Control" Guid="609c8273-df28-4b77-a6d6-173f9766dcef">
- <File Id="control.xml" Name="control.xml" DiskId="1"
Source="..\..\Data\control\control.xml"/>
+ <File Id="control.411.xml" Name="control.411.xml" DiskId="1"
Source="..\..\Data\control\control.411.xml"/>
+ <File Id="control.xml" Name="control.xml" DiskId="1"
Source="..\..\Data\control\control.xml"/>
+ <File Id="control.edit.txt.xml" Name="control.edit.txt.xml" DiskId="1"
Source="..\..\Data\control\control.edit.txt.xml"/>
+ <File Id="control.prepared_speech.txt.xml" Name="control.prepared_speech.txt.xml" DiskId="1"
Source="..\..\Data\control\control.prepared_speech.txt.xml"/>
+ <File Id="control.speak.txt.xml" Name="control.speak.txt.xml" DiskId="1"
Source="..\..\Data\control\control.speak.txt.xml"/>
+ <File Id="control.all.txt.xml" Name="control.all.txt.xml" DiskId="1"
Source="..\..\Data\control\control.all.txt.xml"/>
+ <File Id="control.generic.xml" Name="control.generic.xml" DiskId="1"
Source="..\..\Data\control\control.generic.xml"/>
<File Id="control.edit.xml" Name="control.edit.xml" DiskId="1"
Source="..\..\Data\control\control.edit.xml"/>
<File Id="control.prepared_speech.xml" Name="control.prepared_speech.xml" DiskId="1"
Source="..\..\Data\control\control.prepared_speech.xml"/>
<File Id="control.speak.xml" Name="control.speak.xml" DiskId="1"
Source="..\..\Data\control\control.speak.xml"/>
- <File Id="control.411.xml" Name="control.411.xml" DiskId="1"
Source="..\..\Data\control\control.411.xml"/>
<File Id="control.all.xml" Name="control.all.xml" DiskId="1"
Source="..\..\Data\control\control.all.xml"/>
</Component>
<Component Id="Settings" Guid="778c7950-dfe0-4b3e-91e7-a7c386f0daa2">
@@ -234,7 +239,7 @@
<Component Id="ProgramShortcuts"
Guid="D28C2189-5E40-4f93-B42E-0CD76D8B5B37" KeyPath="no">
<Shortcut Id="pmfShortcutDasher" Name="Dasher 5.00 alpha" Target="[#DasherEXE]"
WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
<Shortcut Id="pmfShortcutDasherSpeak" Name="Dasher for conversation" Target="[#DasherEXE]"
Arguments="/config speak" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
- <Shortcut Id="pmfShortcutDasherPreparedSpeech" Name="Dasher for giving speeches"
Target="[#DasherEXE]" Arguments="/config prepared_speech" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe"
IconIndex="0"/>
+ <Shortcut Id="pmfShortcutDasherPreparedSpeech" Name="Dasher for speeches" Target="[#DasherEXE]"
Arguments="/config prepared_speech" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
<Shortcut Id="pmfShortcutDasherDirect" Name="Dasher direct entry" Target="[#DasherEXE]"
Arguments="/config direct" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
<Shortcut Id="pmfShortcutDasherEdit" Name="Dasher for editing" Target="[#DasherEXE]"
Arguments="/config edit" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
<Registry Id="ProgramShortcutsReg" Root="HKCU" Key="Software\Inference Group\Dasher5"
Name="ProgramShortcuts" Action="write" Type="string" Value="Dummy Key" KeyPath="yes"/>
@@ -246,7 +251,7 @@
<Component Id="DesktopShortcuts" Guid="113e7f55-fb83-40a6-8bec-9a143a90434c" KeyPath="no">
<Shortcut Id="desktopShortcutDasher" Name="Dasher 5.00 alpha" Target="[#DasherEXE]"
WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
<Shortcut Id="desktopShortcutDasherSpeak" Name="Dasher for conversation" Target="[#DasherEXE]"
Arguments="/config speak" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
- <Shortcut Id="desktopShortcutDasherPreparedSpeech" Name="Dasher for giving speeches"
Target="[#DasherEXE]" Arguments="/config prepared_speech" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe"
IconIndex="0"/>
+ <Shortcut Id="desktopShortcutDasherPreparedSpeech" Name="Dasher for speeches"
Target="[#DasherEXE]" Arguments="/config prepared_speech" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe"
IconIndex="0"/>
<Shortcut Id="desktopShortcutDasherDirect" Name="Dasher direct entry" Target="[#DasherEXE]"
Arguments="/config direct" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
<Shortcut Id="desktopShortcutDasherEdit" Name="Dasher for editing" Target="[#DasherEXE]"
Arguments="/config edit" WorkingDirectory="INSTALLDIR" Icon="Dasher.exe" IconIndex="0"/>
<Registry Id="DesktopShortcutsReg" Root="HKCU" Key="Software\Inference Group\Dasher5"
Name="DesktopShortcuts" Action="write" Type="string" Value="Dummy Key" KeyPath="yes"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
