From 5f320f30ee51dc3ce8e77fea9dcfb4826112c1d7 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:18:27 +0200
Subject: [PATCH 01/15] Add socketOutputAction to list of action types

---
 Data/alphabets/alphabet.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 0403fd7a..b40dc190 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -14,9 +14,9 @@
 <!ATTLIST group label CDATA #IMPLIED>
 
 <!-- Single symbols -->
-<!ELEMENT node (textCharAction*|deleteTextAction*|moveCursorAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|atspiAction*|keyboardAction*)>
 <!ATTLIST node label CDATA #REQUIRED>
 <!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
+<!ELEMENT node (textCharAction*|deleteTextAction*|moveCursorAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|atspiAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
 <!ATTLIST node speedFactor CDATA #IMPLIED>
 

From 19438ca7c91591ab0401287eec1cf1353fe675e1 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:20:41 +0200
Subject: [PATCH 02/15] Remove socketName attribute

From socketOutputAction elements. Connecting to multiple sockets currently is not supported
---
 Data/alphabets/alphabet.dtd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index b40dc190..ca0309bb 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -71,7 +71,6 @@
 <!-- External actions: -->
 <!-- Similar to the socket input option, this action enables connecting Dasher to other accessibility tools, sending messages that the other tool can process. -->
 <!ELEMENT socketOutputAction EMPTY>
-<!ATTLIST socketOutputAction socketName CDATA #IMPLIED>
 <!ATTLIST socketOutputAction doString CDATA #IMPLIED>
 <!ATTLIST socketOutputAction undoString CDATA #IMPLIED>
 <!ATTLIST socketOutputAction suppressNewline CDATA #IMPLIED>

From 8e38b2f562b835e6d21643345fabcb28dbf77628 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:23:40 +0200
Subject: [PATCH 03/15] Make colorInfoName attribute required

For group elements, since it is necessary to assign colors to the group itself and all nodes it contains.
---
 Data/alphabets/alphabet.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index ca0309bb..f659f37a 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -9,7 +9,7 @@
 
 <!-- Logical groups of symbols, eg name="lowercase" -->
 <!ELEMENT group (node*|group*)>
-<!ATTLIST group colorInfoName CDATA #IMPLIED>
+<!ATTLIST group colorInfoName CDATA #REQUIRED>
 <!ATTLIST group name CDATA #IMPLIED>
 <!ATTLIST group label CDATA #IMPLIED>
 

From b668479849ac26c074a5dd27ba8349339a8150f7 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:25:48 +0200
Subject: [PATCH 04/15] Improve comments in alphabet.dtd

---
 Data/alphabets/alphabet.dtd | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index f659f37a..14ae0333 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -1,13 +1,13 @@
-<!-- alphabet defintion for Dasher -->
+<!-- Alphabet definition for Dasher -->
 
 <!ELEMENT alphabet (group*)>
 <!ATTLIST alphabet name CDATA #REQUIRED> <!-- unique name that can be referenced in Dasher to choose this alphabet -->
 <!ATTLIST alphabet orientation (LR|RL|TB|BT) #REQUIRED> <!-- orientation in which this alphabet is typed. Example: LR=Left-to-Right -->
 <!ATTLIST alphabet conversionMode (none|mandarin|routingContextInsensitive|routingContextSensitive) "none"> <!-- conversion mode that is used internally to spawn a decoder that can handle phonetic writing -->
 <!ATTLIST alphabet trainingFilename CDATA #IMPLIED> <!-- filename that is referenced for training the language model -->
-<!ATTLIST alphabet colorsName CDATA "Default"> <!-- unique name of the color schema that should be used by default -->
+<!ATTLIST alphabet colorsName CDATA "Default"> <!-- unique name of the color scheme that should be used by default -->
 
-<!-- Logical groups of symbols, eg name="lowercase" -->
+<!-- Logical groups of symbols, e.g. name="lowercase" -->
 <!ELEMENT group (node*|group*)>
 <!ATTLIST group colorInfoName CDATA #REQUIRED>
 <!ATTLIST group name CDATA #IMPLIED>
@@ -34,7 +34,7 @@
 
 <!-- Text-to-Speech: -->
 <!ELEMENT fixedTTSAction EMPTY>
-<!ATTLIST fixedTTSAction text CDATA #REQUIRED> <!-- speaks out the given text -->
+<!ATTLIST fixedTTSAction text CDATA #REQUIRED> <!-- Reads out the given text -->
 
 <!ELEMENT contextTTSAction EMPTY>
 <!ATTLIST contextTTSAction context (word|sentence|paragraph|all) #REQUIRED> <!-- Reads out the last word/sentence/paragraph/all -->
@@ -44,8 +44,8 @@
 <!ELEMENT stopTTSAction EMPTY> <!-- Stops any currently ongoing TTS -->
 
 <!-- Dasher-internal: -->
-<!ELEMENT pauseDasherAction EMPTY> <!-- Stops any currently ongoing TTS -->
-<!ATTLIST pauseDasherAction time CDATA #IMPLIED> <!-- Pauses Dasher for the given time, or stops forever if time is unspecified -->
+<!ELEMENT pauseDasherAction EMPTY>
+<!ATTLIST pauseDasherAction time CDATA #IMPLIED> <!-- Pauses Dasher for the given time (in milliseconds), or stops forever if time is negative or unspecified -->
 
 <!-- System/application control: -->
 
@@ -69,7 +69,8 @@
 <!ATTLIST keyboardAction undoRelease CDATA #IMPLIED> <!-- As above, but only performing the release -->
 
 <!-- External actions: -->
-<!-- Similar to the socket input option, this action enables connecting Dasher to other accessibility tools, sending messages that the other tool can process. -->
+<!-- Similar to the socket input option, this action enables connecting Dasher to other accessibility tools, sending messages that the other tool can process. 
+     The sent messages are implicitly terminated with a newline character, unless suppressNewline is "true".-->
 <!ELEMENT socketOutputAction EMPTY>
 <!ATTLIST socketOutputAction doString CDATA #IMPLIED>
 <!ATTLIST socketOutputAction undoString CDATA #IMPLIED>

From cd2c8effed2dd3b68fc4c67301dd75a16e07cdc2 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:29:27 +0200
Subject: [PATCH 05/15] Make node label optional

---
 Data/alphabets/alphabet.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 14ae0333..9aff4618 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -14,9 +14,9 @@
 <!ATTLIST group label CDATA #IMPLIED>
 
 <!-- Single symbols -->
-<!ATTLIST node label CDATA #REQUIRED>
 <!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
 <!ELEMENT node (textCharAction*|deleteTextAction*|moveCursorAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|atspiAction*|keyboardAction*|socketOutputAction*)>
+<!ATTLIST node label CDATA #IMPLIED>
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
 <!ATTLIST node speedFactor CDATA #IMPLIED>
 

From 17d428d19e15ad21a94efb8b94688926ee4371f4 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:42:46 +0200
Subject: [PATCH 06/15] Move speedFactor attribute

From node to group elements, since it is intended for features like the "slow control box" in the original Dasher. Specifying a speedFactor for nodes could be added as well, but probably is rarely needed
---
 Data/alphabets/alphabet.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 9aff4618..171b4977 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -12,13 +12,13 @@
 <!ATTLIST group colorInfoName CDATA #REQUIRED>
 <!ATTLIST group name CDATA #IMPLIED>
 <!ATTLIST group label CDATA #IMPLIED>
+<!ATTLIST group speedFactor CDATA #IMPLIED>
 
 <!-- Single symbols -->
 <!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
 <!ELEMENT node (textCharAction*|deleteTextAction*|moveCursorAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|atspiAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node label CDATA #IMPLIED>
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
-<!ATTLIST node speedFactor CDATA #IMPLIED>
 
 <!-- Actions that can happen if the node is selected -->
 

From d19e73c1842b12da79902ad5268ce27b1471dc20 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:45:58 +0200
Subject: [PATCH 07/15] Rename some text editing actions and attributes

---
 Data/alphabets/alphabet.dtd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 171b4977..05bd2d30 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -16,7 +16,7 @@
 
 <!-- Single symbols -->
 <!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
-<!ELEMENT node (textCharAction*|deleteTextAction*|moveCursorAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|atspiAction*|keyboardAction*|socketOutputAction*)>
+<!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|atspiAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node label CDATA #IMPLIED>
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
 
@@ -27,17 +27,17 @@
 <!ATTLIST textCharAction unicode CDATA #IMPLIED> <!-- If the Unicode value is unspecified, the label will be used to determine it. If the label is empty or consists of more than one character, an error will be thrown. -->
 
 <!ELEMENT deleteTextAction EMPTY>
-<!ATTLIST deleteTextAction distance CDATA #REQUIRED> <!-- Can be "(last|next) (char|word|sentence|paragraph)", or "all" -->
+<!ATTLIST deleteTextAction range CDATA #REQUIRED> <!-- Can be "char|word|sentence|line|paragraph|all" -->
 
-<!ELEMENT moveCursorAction EMPTY>
-<!ATTLIST moveCursorAction distance CDATA #REQUIRED> <!-- Can be "(last|next) (char|word|sentence|paragraph)" -->
+<!ELEMENT moveTextCaretAction EMPTY>
+<!ATTLIST moveTextCaretAction target CDATA #REQUIRED> <!-- Can be "(previous|next) (char|word|sentence|line|paragraph)", or "start" or "end" -->
 
 <!-- Text-to-Speech: -->
 <!ELEMENT fixedTTSAction EMPTY>
 <!ATTLIST fixedTTSAction text CDATA #REQUIRED> <!-- Reads out the given text -->
 
 <!ELEMENT contextTTSAction EMPTY>
-<!ATTLIST contextTTSAction context (word|sentence|paragraph|all) #REQUIRED> <!-- Reads out the last word/sentence/paragraph/all -->
+<!ATTLIST contextTTSAction range CDATA #REQUIRED> <!-- Reads out the current char|word|sentence|line|paragraph|all -->
 
 <!ELEMENT repeatTTSAction EMPTY> <!-- Repeats the last TTS output -->
 

From de5f3d284126adf88afa513c68c299668deac7e4 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:50:32 +0200
Subject: [PATCH 08/15] Rename atspiAction to accessibilityAction

Since AT-SPI is just one accessibility interface, and others will be needed on other platforms
---
 Data/alphabets/alphabet.dtd | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 05bd2d30..d46a7f04 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -16,7 +16,7 @@
 
 <!-- Single symbols -->
 <!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
-<!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|atspiAction*|keyboardAction*|socketOutputAction*)>
+<!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|accessibilityAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node label CDATA #IMPLIED>
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
 
@@ -47,18 +47,17 @@
 <!ELEMENT pauseDasherAction EMPTY>
 <!ATTLIST pauseDasherAction time CDATA #IMPLIED> <!-- Pauses Dasher for the given time (in milliseconds), or stops forever if time is negative or unspecified -->
 
-<!-- System/application control: -->
-
 <!ELEMENT changeSettingAction EMPTY>
 <!ATTLIST changeSettingAction settingsName CDATA #REQUIRED> <!-- Stringname of the Setting -->
 <!ATTLIST changeSettingAction doValue CDATA #IMPLIED> <!-- New Value of the Setting in case of selection -->
 <!ATTLIST changeSettingAction undoValue CDATA #IMPLIED> <!-- New Value of the Setting in case of deselection -->
 
+<!-- System/application control: -->
 <!-- These two actions enable triggering any action in an application that can be bound to a keyboard shortcut or is accessible
-     via the Assistive Technology Service Provider Interface (AT-SPI). Anything else probably isn't technically feasible. -->
-<!ELEMENT atspiAction EMPTY>
-<!ATTLIST atspiAction action CDATA #REQUIRED> <!-- Sends the specified AT-SPI action to the currently focused application -->
-<!ATTLIST atspiAction undoAction CDATA #REQUIRED> <!-- Sends the specified AT-SPI action to the currently focused application -->
+     via accessibility services like the Assistive Technology Service Provider Interface (AT-SPI). Anything else probably isn't technically feasible. -->
+<!ELEMENT accessibilityAction EMPTY>
+<!ATTLIST accessibilityAction doAction CDATA #REQUIRED> <!-- Sends the specified AT-SPI action to the currently focused application -->
+<!ATTLIST accessibilityAction undoAction CDATA #REQUIRED> <!-- Sends the specified AT-SPI action to the currently focused application -->
 
 <!ELEMENT keyboardAction EMPTY>
 <!ATTLIST keyboardAction key CDATA #IMPLIED> <!-- Emulates a keyboard shortcut, possibly with several modifiers, given as keyboard scancodes divided by commas (e.g. "1d,38,e053" for Ctrl+Alt+Entf), performing a press and a release -->
@@ -78,5 +77,5 @@
 
 <!-- Especially for the last two, it probably makes sense to add a windowTitle attribute to nodes: -->
 <!-- <node label="New Tab" windowTitle=".*(Firefox|Chrome|Edge).*" fixedProbability="0.02"> Only shows this node if the title of the currently focused window matches the given regex. -->
- <!--  <atspiAction action="NewTab"/> -->
+<!--   <accessibilityAction doAction="NewTab" undoAction="CloseTab"/> -->
 <!-- </node> -->

From 72601c77667012c0d47b956c58781a32ed010d5d Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 11:55:18 +0200
Subject: [PATCH 09/15] Add changeSettingAction to list of action types

---
 Data/alphabets/alphabet.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index d46a7f04..24e54644 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -16,7 +16,7 @@
 
 <!-- Single symbols -->
 <!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
-<!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|accessibilityAction*|keyboardAction*|socketOutputAction*)>
+<!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|changeSettingAction*|accessibilityAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node label CDATA #IMPLIED>
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
 

From 42e544b3f8e5de2db70645aabdf36456fce3acf6 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Sun, 29 Sep 2024 12:06:27 +0200
Subject: [PATCH 10/15] Replace changeSettingAction with changeAlphabetAction

As a simpler, more specialized alternative
---
 Data/alphabets/alphabet.dtd | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 24e54644..98a17336 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -16,7 +16,7 @@
 
 <!-- Single symbols -->
 <!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
-<!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|changeSettingAction*|accessibilityAction*|keyboardAction*|socketOutputAction*)>
+<!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|changeAlphabetAction*|accessibilityAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node label CDATA #IMPLIED>
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
 
@@ -47,10 +47,15 @@
 <!ELEMENT pauseDasherAction EMPTY>
 <!ATTLIST pauseDasherAction time CDATA #IMPLIED> <!-- Pauses Dasher for the given time (in milliseconds), or stops forever if time is negative or unspecified -->
 
+<!ELEMENT changeAlphabetAction EMPTY>
+<!ELEMENT changeAlphabetAction alphabetName CDATA #REQUIRED> <!-- Switches Dasher to the given alphabet -->
+
+<!-- A general action that could be used to change any Dasher setting could look like this, but probably is way too complicated and not that useful:
 <!ELEMENT changeSettingAction EMPTY>
-<!ATTLIST changeSettingAction settingsName CDATA #REQUIRED> <!-- Stringname of the Setting -->
-<!ATTLIST changeSettingAction doValue CDATA #IMPLIED> <!-- New Value of the Setting in case of selection -->
-<!ATTLIST changeSettingAction undoValue CDATA #IMPLIED> <!-- New Value of the Setting in case of deselection -->
+<!ATTLIST changeSettingAction settingName CDATA #REQUIRED> <!- Stringname of the setting ->
+<!ATTLIST changeSettingAction doValue CDATA #IMPLIED> <!- New value of the setting in case of selection ->
+<!ATTLIST changeSettingAction undoValue CDATA #IMPLIED> <!- New value of the setting in case of deselection ->
+-->
 
 <!-- System/application control: -->
 <!-- These two actions enable triggering any action in an application that can be bound to a keyboard shortcut or is accessible

From 169959ba065631f1fcee437392dab89420ce712d Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:28:16 +0200
Subject: [PATCH 11/15] Add trainingUnicode attribute to nodes

Intended to be able to specify the representation of nodes that do not correspond to text characters in the training data
---
 Data/alphabets/alphabet.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 98a17336..79350574 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -18,6 +18,7 @@
 <!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
 <!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|changeAlphabetAction*|accessibilityAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node label CDATA #IMPLIED>
+<!ATTLIST node trainingUnicode CDATA #IMPLIED>
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
 
 <!-- Actions that can happen if the node is selected -->

From c03f2c6141670ee74d973865565513eff4f63234 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Mon, 30 Sep 2024 12:35:54 +0200
Subject: [PATCH 12/15] Remove text attribute from nodes

Since it is not needed. The label of a node can be specified using the label attribute, the representation in the training data can be specified using the trainingUnicode attribute and the text to output is determined by the textCharAction(s) inside the node
---
 Data/alphabets/alphabet.dtd | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 79350574..961e7e84 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -15,7 +15,6 @@
 <!ATTLIST group speedFactor CDATA #IMPLIED>
 
 <!-- Single symbols -->
-<!ATTLIST node text CDATA #IMPLIED> <!-- represents the text that is output and also used for training, defaults to the same value as label -->
 <!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|changeAlphabetAction*|accessibilityAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node label CDATA #IMPLIED>
 <!ATTLIST node trainingUnicode CDATA #IMPLIED>

From 2483c886977c899df37be70dee1f2a7154402be6 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:09:39 +0200
Subject: [PATCH 13/15] Add windowTitle attribute to nodes

Intended to be able to specify that a node should only be shown when interacting with a certain application. However, this feature is not available in any implementation yet
---
 Data/alphabets/alphabet.dtd | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index 961e7e84..de977637 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -18,8 +18,14 @@
 <!ELEMENT node (textCharAction*|deleteTextAction*|moveTextCaretAction*|fixedTTSAction*|contextTTSAction*|repeatTTSAction*|stopTTSAction*|pauseDasherAction*|changeAlphabetAction*|accessibilityAction*|keyboardAction*|socketOutputAction*)>
 <!ATTLIST node label CDATA #IMPLIED>
 <!ATTLIST node trainingUnicode CDATA #IMPLIED>
+<!ATTLIST node windowTitle CDATA #IMPLIED> <!-- Only show this node if the title of the currently focused window matches the given regex -->
 <!ATTLIST node fixedProbability CDATA #IMPLIED>
 
+<!-- Example usage of the windowTitle attribute: -->
+<!-- <node label="New Tab" windowTitle=".*(Firefox|Chrome|Edge).*" fixedProbability="0.02"> -->
+<!--   <accessibilityAction doAction="NewTab" undoAction="CloseTab"/> -->
+<!-- </node> -->
+
 <!-- Actions that can happen if the node is selected -->
 
 <!-- Text output: -->
@@ -79,8 +85,3 @@
 <!ATTLIST socketOutputAction doString CDATA #IMPLIED>
 <!ATTLIST socketOutputAction undoString CDATA #IMPLIED>
 <!ATTLIST socketOutputAction suppressNewline CDATA #IMPLIED>
-
-<!-- Especially for the last two, it probably makes sense to add a windowTitle attribute to nodes: -->
-<!-- <node label="New Tab" windowTitle=".*(Firefox|Chrome|Edge).*" fixedProbability="0.02"> Only shows this node if the title of the currently focused window matches the given regex. -->
-<!--   <accessibilityAction doAction="NewTab" undoAction="CloseTab"/> -->
-<!-- </node> -->

From 5514291b2ec30c9e7f98a10b15f4b987cc86a44d Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:15:44 +0200
Subject: [PATCH 14/15] Update keyboardAction definition

Simplifying the definition by removing the possibility to specify multiple keys per attribute. This option was redundant since the same behaviour can be achieved by using multiple actions (which also is a lot more flexible). Additionally switched from keyboard scancodes to Java virtual key codes since these are more platform-independent and easier to use
---
 Data/alphabets/alphabet.dtd | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index de977637..b15f5525 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -70,13 +70,20 @@
 <!ATTLIST accessibilityAction doAction CDATA #REQUIRED> <!-- Sends the specified AT-SPI action to the currently focused application -->
 <!ATTLIST accessibilityAction undoAction CDATA #REQUIRED> <!-- Sends the specified AT-SPI action to the currently focused application -->
 
+<!-- Emulates keyboard keys, given as Java virtual key codes (see https://docs.oracle.com/javase/8/docs/api/java/awt/event/KeyEvent.html) -->
+<!-- Key combinations (mostly used with modifiers) can be achieved using the "press" and "release" attributes and/or a sequence
+     of several actions. Can additionally use "undoPress", "undoKey" and "undoRelease" attributes to specify the key combination
+     to undo this action. Example for "Ctrl+Alt+Del" (using the "x" prefix for hexadecimal numbers): -->
+<!-- <keyboardAction press="x1D"/> -->
+<!-- <keyboardAction press="x38" key="xE053" release="x38"/> -->
+<!-- <keyboardAction release="x1D"/> -->
 <!ELEMENT keyboardAction EMPTY>
-<!ATTLIST keyboardAction key CDATA #IMPLIED> <!-- Emulates a keyboard shortcut, possibly with several modifiers, given as keyboard scancodes divided by commas (e.g. "1d,38,e053" for Ctrl+Alt+Entf), performing a press and a release -->
-<!ATTLIST keyboardAction press CDATA #IMPLIED> <!-- As above, but only performing the press -->
-<!ATTLIST keyboardAction release CDATA #IMPLIED> <!-- As above, but only performing the release -->
-<!ATTLIST keyboardAction undoKey CDATA #IMPLIED> <!-- Emulates a keyboard shortcut, possibly with several modifiers, given as keyboard scancodes divided by commas (e.g. "1d,38,e053" for Ctrl+Alt+Entf), performing a press and a release -->
-<!ATTLIST keyboardAction undoPress CDATA #IMPLIED> <!-- As above, but only performing the press -->
-<!ATTLIST keyboardAction undoRelease CDATA #IMPLIED> <!-- As above, but only performing the release -->
+<!ATTLIST keyboardAction press CDATA #IMPLIED>
+<!ATTLIST keyboardAction key CDATA #IMPLIED>
+<!ATTLIST keyboardAction release CDATA #IMPLIED>
+<!ATTLIST keyboardAction undoPress CDATA #IMPLIED>
+<!ATTLIST keyboardAction undoKey CDATA #IMPLIED>
+<!ATTLIST keyboardAction undoRelease CDATA #IMPLIED>
 
 <!-- External actions: -->
 <!-- Similar to the socket input option, this action enables connecting Dasher to other accessibility tools, sending messages that the other tool can process. 

From 26ae5c79d40a8fe960ae6fee4d81732840e3b938 Mon Sep 17 00:00:00 2001
From: janschu99 <105646877+janschu99@users.noreply.github.com>
Date: Mon, 30 Sep 2024 13:25:41 +0200
Subject: [PATCH 15/15] Fix syntax error in alphabet.dtd

---
 Data/alphabets/alphabet.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/alphabets/alphabet.dtd b/Data/alphabets/alphabet.dtd
index b15f5525..d300cdeb 100644
--- a/Data/alphabets/alphabet.dtd
+++ b/Data/alphabets/alphabet.dtd
@@ -54,7 +54,7 @@
 <!ATTLIST pauseDasherAction time CDATA #IMPLIED> <!-- Pauses Dasher for the given time (in milliseconds), or stops forever if time is negative or unspecified -->
 
 <!ELEMENT changeAlphabetAction EMPTY>
-<!ELEMENT changeAlphabetAction alphabetName CDATA #REQUIRED> <!-- Switches Dasher to the given alphabet -->
+<!ATTLIST changeAlphabetAction alphabetName CDATA #REQUIRED> <!-- Switches Dasher to the given alphabet -->
 
 <!-- A general action that could be used to change any Dasher setting could look like this, but probably is way too complicated and not that useful:
 <!ELEMENT changeSettingAction EMPTY>