[dasher: 215/217] Tweaks for speak and edit control boxes.

[Patrick Welche <pwelche src gnome org>]

commit b869643551168a6b56e06c29d36704cf752570f1
Author: Ada Majorek <amajorek google com>
Date:   Tue Feb 23 17:38:50 2016 -0800

    Tweaks for speak and edit control boxes.

 Data/control/control.edit.xml  |   83 +---------------------------------------
 Data/control/control.speak.xml |   24 ++++++-----
 2 files changed, 15 insertions(+), 92 deletions(-)
---
diff --git a/Data/control/control.edit.xml b/Data/control/control.edit.xml
index 3e3ba32..5e653d5 100644
--- a/Data/control/control.edit.xml
+++ b/Data/control/control.edit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE control SYSTEM "control.dtd">
-<control name="Edit Larger Document">
+<control name="Edit Larger Document (symbols)">
   <alph/>
   
   <node label="&#9209;" color="242">
@@ -9,12 +9,6 @@
     <root/>
   </node>
 
-  <node label="&#9208;" color="241">
-    <pause/>
-    <alph/>
-    <root/>
-  </node>
-
   <node name="CTL_MOVE" label="&#10018;" color="-1">
     <node name="CTL_MOVE_BACKWARD" label="&#8678;" color="-1">
       <node label="&#128464;" color="-1">
@@ -23,12 +17,6 @@
         <ref name="CTL_MOVE_BACKWARD"/>
         <ref name="CTL_MOVE_FORWARD"/>
       </node>
-      <node label="&#128463;" color="-1">
-        <move forward="no" dist="page"/>
-        <alph/>
-        <ref name="CTL_MOVE_BACKWARD"/>
-        <ref name="CTL_MOVE_FORWARD"/>
-      </node>
       <node label="&#182;" color="-1">
         <move forward="no" dist="paragraph"/>
         <alph/>
@@ -81,12 +69,6 @@
         <ref name="CTL_MOVE_BACKWARD"/>
         <ref name="CTL_MOVE_FORWARD"/>
       </node>
-      <node label="&#128463;" color="-1">
-        <move forward="yes" dist="page"/>
-        <alph/>
-        <ref name="CTL_MOVE_BACKWARD"/>
-        <ref name="CTL_MOVE_FORWARD"/>
-      </node>
       <node label="&#128464;" color="-1">
         <move forward="yes" dist="all"/>
         <alph/>
@@ -95,7 +77,6 @@
       </node>
     </node>
 
-    
   </node>
   
   <node name="CTL_DELETE" label="&#10683;" color="-1">
@@ -106,12 +87,6 @@
         <ref name="CTL_DELETE_BACKWARD"/>
         <ref name="CTL_DELETE_FORWARD"/>
       </node>
-      <node label="&#128463;" color="-1">
-        <delete forward="no" dist="page"/>
-        <alph/>
-        <ref name="CTL_DELETE_BACKWARD"/>
-        <ref name="CTL_DELETE_FORWARD"/>
-      </node>
       <node label="&#182;" color="-1">
         <delete forward="no" dist="paragraph"/>
         <alph/>
@@ -164,12 +139,6 @@
         <ref name="CTL_DELETE_BACKWARD"/>
         <ref name="CTL_DELETE_FORWARD"/>
       </node>
-      <node label="&#128463;" color="-1">
-        <delete forward="yes" dist="page"/>
-        <alph/>
-        <ref name="CTL_DELETE_BACKWARD"/>
-        <ref name="CTL_DELETE_FORWARD"/>
-      </node>
       <node label="&#128464;" color="-1">
         <delete forward="yes" dist="all"/>
         <alph/>
@@ -177,57 +146,9 @@
         <ref name="CTL_DELETE_FORWARD"/>
       </node>
     </node>
-    <node label="&#8999;" color="-1">
-      <alph/>
-      <node label="&#128464;" color="242">
-        <delete forward="yes" dist="all"/>
-        <delete forward="no" dist="all"/>
-        <alph/>
-        <root/>
-      </node>
-      <alph/>
-    </node>
-  </node>
-
-  <node  name="CTL_COPY" label="&#128203;" color="-1">
-
-    <node label="&#128464;" color="-1">
-      <copy what="all"/>
-      <alph/>
-      <root/>
-    </node>
-    <node label="&#127381;" color="-1">
-      <copy what="new"/>
-      <alph/>
-      <root/>
-    </node>
-    <node label="&#128259;" color="-1">
-      <copy what="repeat"/>
-      <alph/>
-      <root/>
-    </node>
-    <node label="&#128463;" color="-1">
-      <copy what="page"/>
-      <alph/>
-      <root/>
-    </node>
-    <node label="&#182;" color="-1">
-      <copy what="paragraph"/>
-      <alph/>
-      <root/>
-    </node>
-    <node label=".&#8265;" color="-1">
-      <copy what="sentence"/>
-      <alph/>
-      <root/>
-    </node>
-    <node label="&#11052;" color="-1">
-      <copy what="word"/>
-      <alph/>
-      <root/>
-    </node>
   </node>
 
   <alph/>
+  
 </control>
 
diff --git a/Data/control/control.speak.xml b/Data/control/control.speak.xml
index 045141e..c9f4c47 100644
--- a/Data/control/control.speak.xml
+++ b/Data/control/control.speak.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE control SYSTEM "control.dtd">
-<control name="Conversation">
+<control name="Conversation (symbols)">
   
 
   <node name="CTL_MOVE" label="&#10018;" color="-1">
@@ -158,7 +158,7 @@
 
   <node  name="CTL_SPEAK" label="&#128483;" color="241">
 
-    <node label="&#128711;" color="242">
+    <node label="&#9209;" color="242">
       <speak what="cancel"/>
       <alph/>
       <root/>
@@ -168,26 +168,28 @@
       <alph/>
       <root/>
     </node>
-    <node name="CTL_SPEAK_PARAGRAPH" label="&#182;" color="-1">
+    <node label="&#182;" color="-1">
       <speak what="paragraph"/>
+      <move forward="yes" dist="paragraph"/>
       <alph/>
-      <node label="&#8680;&#182;" color="-1">
-        <move forward="yes" dist="paragraph"/>
-        <alph/>
-        <ref name="CTL_SPEAK_PARAGRAPH"/>
-        <ref name="CTL_SPEAK"/>
-      </node>
       <node label="&#9114;&#182;" color="242">
-        <move forward="yes" dist="paragraph"/>
         <delete forward="no" dist="paragraph"/>
-        <move forward="no" dist="char"/>
+        <delete forward="no" dist="char"/>
         <alph/>
         <root/>
       </node>
+      <node  name="CTL_SPEAK_PARAGRAPH2" label="&#128483;&#182;" 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="&#128464;" color="-1">
       <speak what="all"/>
+      <move forward="yes" dist="all"/>
       <alph/>
       <node label="&#9114;&#128464;" color="242">
         <delete forward="yes" dist="all"/>