From a9188cbc6b3b9d26e675213e3834afdbd06296f6 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 26 Sep 2018 18:55:39 -0400
Subject: Re-created VerbNet 3.2 patch

The previous file was not formatted in a way that was easy for patch to use. Also, the file has now been renamed to indicate that it is for VerbNet 3.2.
---
 generator/vn-3.2.diff | 1609 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1609 insertions(+)
 create mode 100644 generator/vn-3.2.diff

(limited to 'generator/vn-3.2.diff')

diff --git a/generator/vn-3.2.diff b/generator/vn-3.2.diff
new file mode 100644
index 0000000..ccb7707
--- /dev/null
+++ b/generator/vn-3.2.diff
@@ -0,0 +1,1609 @@
+diff -Naur old/admit-65.xml new/admit-65.xml
+--- old/admit-65.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/admit-65.xml	2018-09-26 16:41:09.000000000 -0400
+@@ -101,9 +101,8 @@
+                     </SELRESTRS>
+                 </PREP>
+                 <NP value="Location">
+-                    <SELRESTRS logic="or">
+-                        <SELRESTR Value="+" type="location"/>
+-                        <SELRESTR Value="-" type="region"/>
++                    <SELRESTRS>
++                        <SELRESTR Value="+" type="non_region_location"/>
+                     </SELRESTRS>
+                 </NP>
+             </SYNTAX>
+diff -Naur old/amuse-31.1.xml new/amuse-31.1.xml
+--- old/amuse-31.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/amuse-31.1.xml	2018-09-26 16:41:13.000000000 -0400
+@@ -268,6 +268,9 @@
+          <THEMROLE type="Result">
+                 <SELRESTRS/>
+         </THEMROLE>
++        <THEMROLE type="Cause">
++          <SELRESTRS/>
++        </THEMROLE>
+     </THEMROLES>
+     <FRAMES>
+         <FRAME>
+@@ -365,7 +368,9 @@
+                         <SYNRESTR Value="+" type="genitive"/>
+                     </SYNRESTRS>
+                 </NP>
+-                <LEX value="'s"/>
++                <NP value="Cause">
++                  <SYNRESTRS/>
++                </NP>
+                 <VERB/>
+                 <NP value="Experiencer">
+                     <SYNRESTRS/>
+@@ -401,7 +406,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                  <NP value="Result">
+-                    <SYNRESTRS/>
++                    <SYNRESTRS>
++                      <SYNRESTR Value="+" type="adjp"/>
++                    </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/animal_sounds-38.xml new/animal_sounds-38.xml
+--- old/animal_sounds-38.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/animal_sounds-38.xml	2018-09-26 16:41:16.000000000 -0400
+@@ -184,6 +184,11 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <VERB/>
++                <PREP>
++                  <SELRESTRS>
++                    <SELRESTR Value="+" type="loc" />
++                  </SELRESTRS>
++                </PREP>
+                 <NP value="Location">
+                     <SELRESTRS/>
+                 </NP>
+diff -Naur old/assessment-34.1.xml new/assessment-34.1.xml
+--- old/assessment-34.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/assessment-34.1.xml	2018-09-26 16:41:21.000000000 -0400
+@@ -100,7 +100,6 @@
+                         <SYNRESTR Value="+" type="genitive"/>
+                     </SYNRESTRS>
+                 </NP>
+-                <LEX value="'s"/>
+                 <NP value="Attribute">
+                     <SYNRESTRS/>
+                 </NP>
+diff -Naur old/assuming_position-50.xml new/assuming_position-50.xml
+--- old/assuming_position-50.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/assuming_position-50.xml	2018-09-26 16:41:24.000000000 -0400
+@@ -38,8 +38,7 @@
+         </THEMROLE>
+         <THEMROLE type="Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/banish-10.2.xml new/banish-10.2.xml
+--- old/banish-10.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/banish-10.2.xml	2018-09-26 16:41:27.000000000 -0400
+@@ -32,8 +32,7 @@
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <!--"recall" also allow general concrete things (products like playpens)-->
+diff -Naur old/battle-36.4.xml new/battle-36.4.xml
+--- old/battle-36.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/battle-36.4.xml	2018-09-26 16:41:29.000000000 -0400
+@@ -93,7 +93,7 @@
+                 </PREP>
+                 <NP value="Topic">
+                     <SYNRESTRS>
+-                        <SYNRESTR Value="+" type="what_extract"/>
++                        <SYNRESTR Value="+" type="wh_comp"/>
+                     </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+diff -Naur old/become-109.1.xml new/become-109.1.xml
+--- old/become-109.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/become-109.1.xml	2018-09-26 16:41:32.000000000 -0400
+@@ -31,7 +31,9 @@
+                 </NP>
+                 <VERB/>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/beg-58.2.xml new/beg-58.2.xml
+--- old/beg-58.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/beg-58.2.xml	2018-09-26 16:41:35.000000000 -0400
+@@ -38,7 +38,7 @@
+                 <VERB/>
+                 <NP value="Topic">
+                     <SYNRESTRS>
+-			<SYNRESTR Value="-" type="for_comp"/>
++			<SYNRESTR Value="+" type="for_comp"/>
+ 		    </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+diff -Naur old/bend-45.2.xml new/bend-45.2.xml
+--- old/bend-45.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/bend-45.2.xml	2018-09-26 16:41:38.000000000 -0400
+@@ -44,7 +44,9 @@
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Result">
+-                <SELRESTRS/>
++                <SELRESTRS>
++                  <SELRESTR Value="+" type="state"/>
++                </SELRESTRS>
+         </THEMROLE>
+         </THEMROLES>
+     <FRAMES>
+@@ -227,7 +229,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                  <NP value="Result">
+-                    <SYNRESTRS/>
++                   <SYNRESTRS>
++                     <SYNRESTR Value="+" type="adjp"/>
++                   </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -277,9 +281,7 @@
+                     <SELRESTRS/>
+                 </PREP>
+                 <NP value="Result">
+-                    <SELRESTRS>
+-                        <SELRESTR Value="+" type="state"/>
+-                    </SELRESTRS>
++                    <SELRESTRS/>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -329,9 +331,7 @@
+                     <SELRESTRS/>
+                 </PREP>
+                 <NP value="Result">
+-                    <SELRESTRS>
+-                        <SELRESTR Value="+" type="state"/>
+-                    </SELRESTRS>
++                    <SELRESTRS/>
+                 </NP>
+                 <PREP value="with">
+                     <SELRESTRS/>
+diff -Naur old/break-45.1.xml new/break-45.1.xml
+--- old/break-45.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/break-45.1.xml	2018-09-26 16:41:42.000000000 -0400
+@@ -252,7 +252,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -304,7 +306,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+                 <PREP value="with">
+                     <SELRESTRS/>
+diff -Naur old/bring-11.3.xml new/bring-11.3.xml
+--- old/bring-11.3.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/bring-11.3.xml	2018-09-26 16:41:45.000000000 -0400
+@@ -24,10 +24,7 @@
+         <THEMROLE type="Destination">
+             <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+-                <SELRESTRS>
+-                    <SELRESTR Value="+" type="location"/>
+-                    <SELRESTR Value="-" type="region"/>
+-                </SELRESTRS>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Instrument">
+diff -Naur old/butter-9.9.xml new/butter-9.9.xml
+--- old/butter-9.9.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/butter-9.9.xml	2018-09-26 16:41:48.000000000 -0400
+@@ -152,8 +152,7 @@
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/characterize-29.2.xml new/characterize-29.2.xml
+--- old/characterize-29.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/characterize-29.2.xml	2018-09-26 16:41:53.000000000 -0400
+@@ -104,11 +104,11 @@
+                 <NP value="Theme">
+                     <SYNRESTRS/>
+                 </NP>
+-                <LEX value="as"/>
++                <LEX value="to be"/>
+                 <NP value="Attribute">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="+" type="small_clause"/>
+-                    </SYNRESTRS>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -384,6 +384,11 @@
+                                         <SYNRESTR Value="+" type="np_ppart"/>
+                                     </SYNRESTRS>
+                                 </NP>
++                                <NP value="Attribute">
++                                  <SYNRESTRS>
++                                    <SYNRESTR Value="+" type="adjp"/>
++                                  </SYNRESTRS>
++                                </NP>
+                             </SYNTAX>
+                             <SEMANTICS>
+                                 <PRED value="describe">
+diff -Naur old/cheat-10.6.xml new/cheat-10.6.xml
+--- old/cheat-10.6.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/cheat-10.6.xml	2018-09-26 16:41:55.000000000 -0400
+@@ -53,10 +53,7 @@
+         <THEMROLE type="Source">
+             <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+-                <SELRESTRS>
+-                    <SELRESTR Value="+" type="location"/>
+-                    <SELRESTR Value="-" type="region"/>
+-                </SELRESTRS>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/chew-39.2.xml new/chew-39.2.xml
+--- old/chew-39.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/chew-39.2.xml	2018-09-26 16:41:58.000000000 -0400
+@@ -34,8 +34,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Patient">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="comestible"/>
+-                        <SELRESTR Value="+" type="solid"/>
++                        <SELRESTR Value="+" type="solid_food"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+@@ -152,8 +151,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Patient">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="comestible"/>
+-                        <SELRESTR Value="-" type="solid"/>
++                        <SELRESTR Value="+" type="non_solid_food"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+diff -Naur old/coil-9.6.xml new/coil-9.6.xml
+--- old/coil-9.6.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/coil-9.6.xml	2018-09-26 16:42:01.000000000 -0400
+@@ -19,8 +19,7 @@
+         </THEMROLE>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="nonrigid"/>
+-                <SELRESTR Value="+" type="elongated"/>
++                <SELRESTR Value="+" type="slinky"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Location">
+diff -Naur old/coloring-24.xml new/coloring-24.xml
+--- old/coloring-24.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/coloring-24.xml	2018-09-26 16:42:04.000000000 -0400
+@@ -86,7 +86,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/confess-37.10.xml new/confess-37.10.xml
+--- old/confess-37.10.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/confess-37.10.xml	2018-09-26 16:42:07.000000000 -0400
+@@ -108,6 +108,11 @@
+                         <SYNRESTR Value="+" type="np_ppart"/>
+                     </SYNRESTRS>
+                 </NP>
++                <NP value="Attribute">
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
++                </NP>
+             </SYNTAX>
+             <SEMANTICS>
+                 <PRED value="transfer_info">
+diff -Naur old/confine-92.xml new/confine-92.xml
+--- old/confine-92.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/confine-92.xml	2018-09-26 16:42:10.000000000 -0400
+@@ -15,7 +15,7 @@
+     </MEMBERS>
+     <THEMROLES>
+         <THEMROLE type="Agent">
+-            <SELRESTRS>
++            <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+                 <SELRESTR Value="+" type="organization"/>
+             </SELRESTRS>
+diff -Naur old/consider-29.9.xml new/consider-29.9.xml
+--- old/consider-29.9.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/consider-29.9.xml	2018-09-26 16:42:12.000000000 -0400
+@@ -188,9 +188,9 @@
+                                     </SYNRESTRS>
+                                 </NP>
+                                 <NP value="Attribute">
+-                                            <SYNRESTRS>
+-                                                <SYNRESTR Value="-" type="sentential"/>
+-                                            </SYNRESTRS>
++                                  <SYNRESTRS>
++                                    <SYNRESTR Value="+" type="adjp"/>
++                                  </SYNRESTRS>
+                                         </NP>
+                             </SYNTAX>
+                             <SEMANTICS>
+@@ -331,9 +331,9 @@
+                                             <SYNRESTRS/>
+                                         </NP>
+                                         <NP value="Attribute">
+-                                            <SYNRESTRS>
+-                                                <SYNRESTR Value="-" type="sentential"/>
+-                                            </SYNRESTRS>
++                                          <SYNRESTRS>
++                                            <SYNRESTR Value="+" type="adjp"/>
++                                          </SYNRESTRS>
+                                         </NP>
+                                     </SYNTAX>
+                                     <SEMANTICS>
+@@ -465,9 +465,9 @@
+                             <SYNRESTRS/>
+                         </NP>
+                         <NP value="Attribute">
+-                                            <SYNRESTRS>
+-                                                <SYNRESTR Value="-" type="sentential"/>
+-                                            </SYNRESTRS>
++                          <SYNRESTRS>
++                            <SYNRESTR Value="+" type="adjp"/>
++                          </SYNRESTRS>
+                                         </NP>
+                     </SYNTAX>
+                     <SEMANTICS>
+@@ -551,9 +551,9 @@
+                             </SYNRESTRS>
+                         </NP>
+                         <NP value="Attribute">
+-                                            <SYNRESTRS>
+-                                                <SYNRESTR Value="-" type="sentential"/>
+-                                            </SYNRESTRS>
++                          <SYNRESTRS>
++                            <SYNRESTR Value="+" type="adjp"/>
++                          </SYNRESTRS>
+                                         </NP>
+                     </SYNTAX>
+                     <SEMANTICS>
+diff -Naur old/cut-21.1.xml new/cut-21.1.xml
+--- old/cut-21.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/cut-21.1.xml	2018-09-26 16:42:15.000000000 -0400
+@@ -313,7 +313,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -365,7 +367,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+                 <PREP value="with">
+                     <SELRESTRS/>
+@@ -557,7 +561,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/declare-29.4.xml new/declare-29.4.xml
+--- old/declare-29.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/declare-29.4.xml	2018-09-26 16:42:19.000000000 -0400
+@@ -30,9 +30,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="-" type="sentential"/>
+-                    </SYNRESTRS>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -119,9 +119,9 @@
+                     </SYNRESTRS>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="-" type="sentential"/>
+-                    </SYNRESTRS>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -241,9 +241,9 @@
+                             <SELRESTRS/>
+                         </PREP>
+                         <NP value="Result">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="-" type="sentential"/>
+-                    </SYNRESTRS>
++                          <SYNRESTRS>
++                            <SYNRESTR Value="+" type="adjp"/>
++                          </SYNRESTRS>
+                         </NP>
+                     </SYNTAX>
+                     <SEMANTICS>
+diff -Naur old/devour-39.4.xml new/devour-39.4.xml
+--- old/devour-39.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/devour-39.4.xml	2018-09-26 16:42:22.000000000 -0400
+@@ -23,8 +23,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Patient">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="comestible"/>
+-                        <SELRESTR Value="+" type="solid"/>
++                        <SELRESTR Value="+" type="solid_food"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+@@ -64,8 +63,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Patient">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="comestible"/>
+-                        <SELRESTR Value="-" type="solid"/>
++                        <SELRESTR Value="+" type="non_solid_food"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+diff -Naur old/drive-11.5.xml new/drive-11.5.xml
+--- old/drive-11.5.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/drive-11.5.xml	2018-09-26 16:45:33.000000000 -0400
+@@ -34,10 +34,7 @@
+         <THEMROLE type="Destination">
+             <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+-                <SELRESTRS>
+-                    <SELRESTR Value="+" type="location"/>
+-                    <SELRESTR Value="-" type="region"/>
+-                </SELRESTRS>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/eat-39.1.xml new/eat-39.1.xml
+--- old/eat-39.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/eat-39.1.xml	2018-09-26 16:45:36.000000000 -0400
+@@ -21,8 +21,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Patient">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="comestible"/>
+-                        <SELRESTR Value="+" type="solid"/>
++                        <SELRESTR Value="+" type="solid_food"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+@@ -145,8 +144,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Patient">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="comestible"/>
+-                        <SELRESTR Value="-" type="solid"/>
++                        <SELRESTR Value="+" type="non_solid_food"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+diff -Naur old/enforce-63.xml new/enforce-63.xml
+--- old/enforce-63.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/enforce-63.xml	2018-09-26 16:45:38.000000000 -0400
+@@ -8,7 +8,7 @@
+     </MEMBERS>
+     <THEMROLES>
+         <THEMROLE type="Agent">
+-            <SELRESTRS>
++            <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+                 <SELRESTR Value="+" type="organization"/>
+             </SELRESTRS>
+diff -Naur old/entity_specific_modes_being-47.2.xml new/entity_specific_modes_being-47.2.xml
+--- old/entity_specific_modes_being-47.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/entity_specific_modes_being-47.2.xml	2018-09-26 16:45:41.000000000 -0400
+@@ -32,8 +32,7 @@
+         </THEMROLE>
+         <THEMROLE type="Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/estimate-34.2.xml new/estimate-34.2.xml
+--- old/estimate-34.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/estimate-34.2.xml	2018-09-26 16:45:43.000000000 -0400
+@@ -121,10 +121,11 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <VERB/>
++                <LEX value="to be"/>
+                 <NP value="Theme">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="+" type="to_be"/>
+-                    </SYNRESTRS>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/exchange-13.6.xml new/exchange-13.6.xml
+--- old/exchange-13.6.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/exchange-13.6.xml	2018-09-26 16:45:45.000000000 -0400
+@@ -326,8 +326,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Location">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="location"/>
+-                        <SELRESTR Value="-" type="region"/>
++                        <SELRESTR Value="+" type="non_region_location"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+diff -Naur old/exist-47.1.xml new/exist-47.1.xml
+--- old/exist-47.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/exist-47.1.xml	2018-09-26 16:45:47.000000000 -0400
+@@ -10,8 +10,7 @@
+         </THEMROLE>
+         <THEMROLE type="Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/fill-9.8.xml new/fill-9.8.xml
+--- old/fill-9.8.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/fill-9.8.xml	2018-09-26 16:45:50.000000000 -0400
+@@ -129,8 +129,7 @@
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/funnel-9.3.xml new/funnel-9.3.xml
+--- old/funnel-9.3.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/funnel-9.3.xml	2018-09-26 18:49:11.000000000 -0400
+@@ -27,8 +27,7 @@
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/get-13.5.1.xml new/get-13.5.1.xml
+--- old/get-13.5.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/get-13.5.1.xml	2018-09-26 18:49:15.000000000 -0400
+@@ -52,8 +52,7 @@
+         </THEMROLE>
+         <THEMROLE type="Asset">
+             <SELRESTRS>
+-                <SELRESTR Value="-" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="currency"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/gobble-39.3.xml new/gobble-39.3.xml
+--- old/gobble-39.3.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/gobble-39.3.xml	2018-09-26 18:49:18.000000000 -0400
+@@ -20,8 +20,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Patient">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="comestible"/>
+-                        <SELRESTR Value="+" type="solid"/>
++                        <SELRESTR Value="+" type="solid_food"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+@@ -115,8 +114,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Patient">
+                     <SELRESTRS>
+-                        <SELRESTR Value="+" type="comestible"/>
+-                        <SELRESTR Value="-" type="solid"/>
++                        <SELRESTR Value="+" type="non_solid_food"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+diff -Naur old/herd-47.5.2.xml new/herd-47.5.2.xml
+--- old/herd-47.5.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/herd-47.5.2.xml	2018-09-26 18:49:21.000000000 -0400
+@@ -26,8 +26,7 @@
+         </THEMROLE>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="concrete"/>
+-                <SELRESTR Value="+" type="plural"/>
++                <SELRESTR Value="+" type="group"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/hit-18.1.xml new/hit-18.1.xml
+--- old/hit-18.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/hit-18.1.xml	2018-09-26 18:49:25.000000000 -0400
+@@ -231,7 +231,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -291,7 +293,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                  <NP value="Result">
+-                    <SYNRESTRS/>
++                   <SYNRESTRS>
++                     <SYNRESTR Value="+" type="adjp"/>
++                   </SYNRESTRS>
+                 </NP>
+                 <PREP value="with">
+                     <SELRESTRS/>
+@@ -616,7 +620,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/instr_communication-37.4.xml new/instr_communication-37.4.xml
+--- old/instr_communication-37.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/instr_communication-37.4.xml	2018-09-26 18:49:29.000000000 -0400
+@@ -192,7 +192,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Topic">
+-                    <SYNRESTRS/>
++                    <SYNRESTRS>
++                      <SYNRESTR Value="+" type="quotation"/>
++                    </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -230,7 +232,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Topic">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                      <SYNRESTR Value="+" type="quotation"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/judgment-33.xml new/judgment-33.xml
+--- old/judgment-33.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/judgment-33.xml	2018-09-26 18:49:32.000000000 -0400
+@@ -185,6 +185,9 @@
+                         <SYNRESTR Value="+" type="genitive"/>
+                     </SYNRESTRS>
+                 </NP>
++                <NP value="Attribute">
++                  <SYNRESTRS/>
++                </NP>
+             </SYNTAX>
+             <SEMANTICS>
+                 <PRED value="declare">
+@@ -241,10 +244,9 @@
+                 <NP value="Theme">
+                     <SYNRESTRS/>
+                 </NP>
++                <LEX value="to be"/>
+                 <NP value="Attribute">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="+" type="small_clause"/>
+-                    </SYNRESTRS>
++                    <SYNRESTRS/>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/keep-15.2.xml new/keep-15.2.xml
+--- old/keep-15.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/keep-15.2.xml	2018-09-26 18:49:34.000000000 -0400
+@@ -21,8 +21,7 @@
+         </THEMROLE>
+         <THEMROLE type="Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/leave-51.2.xml new/leave-51.2.xml
+--- old/leave-51.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/leave-51.2.xml	2018-09-26 18:49:37.000000000 -0400
+@@ -13,8 +13,7 @@
+         </THEMROLE>
+         <THEMROLE type="Initial_Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/light_emission-43.1.xml new/light_emission-43.1.xml
+--- old/light_emission-43.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/light_emission-43.1.xml	2018-09-26 18:49:40.000000000 -0400
+@@ -28,7 +28,7 @@
+     <THEMROLES>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="-" type="animate"/>
++                <SELRESTR Value="+" type="inanimate"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Location">
+diff -Naur old/manner_speaking-37.3.xml new/manner_speaking-37.3.xml
+--- old/manner_speaking-37.3.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/manner_speaking-37.3.xml	2018-09-26 18:49:43.000000000 -0400
+@@ -261,7 +261,9 @@
+                 </NP>
+                 <VERB/>
+                 <NP value="Topic">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                      <SYNRESTR Value="+" type="quotation"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -600,7 +602,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Topic">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                      <SYNRESTR Value="+" type="quotation"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/matter-91.xml new/matter-91.xml
+--- old/matter-91.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/matter-91.xml	2018-09-26 18:49:45.000000000 -0400
+@@ -7,7 +7,7 @@
+     </MEMBERS>
+     <THEMROLES>
+         <THEMROLE type="Experiencer">
+-            <SELRESTRS>
++            <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+                 <SELRESTR Value="+" type="organization"/>
+             </SELRESTRS>
+diff -Naur old/modes_of_being_with_motion-47.3.xml new/modes_of_being_with_motion-47.3.xml
+--- old/modes_of_being_with_motion-47.3.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/modes_of_being_with_motion-47.3.xml	2018-09-26 18:49:51.000000000 -0400
+@@ -61,8 +61,7 @@
+         </THEMROLE>
+         <THEMROLE type="Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/other_cos-45.4.xml new/other_cos-45.4.xml
+--- old/other_cos-45.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/other_cos-45.4.xml	2018-09-26 18:49:55.000000000 -0400
+@@ -531,7 +531,9 @@
+ 		    </NP>
+ 		    <VERB/>
+ 		    <NP value="Result">
+-			<SYNRESTRS/>
++          <SYNRESTRS>
++            <SYNRESTR Value="+" type="adjp"/>
++          </SYNRESTRS>
+ 		    </NP>
+ 		</SYNTAX>
+ 		<SEMANTICS>
+diff -Naur old/pay-68.xml new/pay-68.xml
+--- old/pay-68.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/pay-68.xml	2018-09-26 18:49:57.000000000 -0400
+@@ -10,7 +10,7 @@
+     </MEMBERS>
+     <THEMROLES>
+         <THEMROLE type="Agent">
+-            <SELRESTRS>
++            <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+                 <SELRESTR Value="+" type="organization"/>
+             </SELRESTRS>
+diff -Naur old/pocket-9.10.xml new/pocket-9.10.xml
+--- old/pocket-9.10.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/pocket-9.10.xml	2018-09-26 18:50:02.000000000 -0400
+@@ -253,7 +253,9 @@
+                         </NP>
+                         <VERB/>
+                         <NP value="Destination">
+-                            <SYNRESTRS/>
++                            <SYNRESTRS>
++                              <SYNRESTR Value="+" type="adv-loc"/>
++                            </SYNRESTRS>
+                         </NP>
+                     </SYNTAX>
+                     <SEMANTICS>
+diff -Naur old/poison-42.2.xml new/poison-42.2.xml
+--- old/poison-42.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/poison-42.2.xml	2018-09-26 18:50:05.000000000 -0400
+@@ -90,7 +90,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/pour-9.5.xml new/pour-9.5.xml
+--- old/pour-9.5.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/pour-9.5.xml	2018-09-26 18:50:07.000000000 -0400
+@@ -21,23 +21,18 @@
+         <THEMROLE type="Theme">
+             <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="substance"/>
+-                <SELRESTRS>
+-                    <SELRESTR Value="+" type="concrete"/>
+-                    <SELRESTR Value="+" type="plural"/>
+-                </SELRESTRS>
++                <SELRESTR Value="+" type="group"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <!--Exception: If Destination is object of a initial_location-type preposition ("from"), then +region is allowed-->
+         <THEMROLE type="Initial_Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+@@ -56,9 +51,10 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <PREP>
+-                    <SELRESTRS>
+-                        <SELRESTR Value="+" type="path"/>
+-                        <SELRESTR Value="-" type="dest_dir"/>
++                    <SELRESTRS logic="or">
++                        <SELRESTR Value="+" type="dir"/>
++                        <SELRESTR Value="+" type="src"/>
++                        <SELRESTR Value="+" type="dest_conf"/>
+                     </SELRESTRS>
+                 </PREP>
+                 <NP value="Destination">
+@@ -154,10 +150,11 @@
+                 </NP>
+                 <VERB/>
+                 <PREP>
+-                    <SELRESTRS>
+-                        <SELRESTR Value="+" type="path"/>
+-                        <SELRESTR Value="-" type="dest_dir"/>
+-                    </SELRESTRS>
++                  <SELRESTRS logic="or">
++                      <SELRESTR Value="+" type="dir"/>
++                      <SELRESTR Value="+" type="src"/>
++                      <SELRESTR Value="+" type="dest_conf"/>
++                  </SELRESTRS>
+                 </PREP>
+                 <NP value="Destination">
+                     <SYNRESTRS/>
+diff -Naur old/push-12.xml new/push-12.xml
+--- old/push-12.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/push-12.xml	2018-09-26 18:50:11.000000000 -0400
+@@ -87,7 +87,9 @@
+                             <SYNRESTRS/>
+                         </NP>
+                         <NP value="Result">
+-                            <SYNRESTRS/>
++                          <SYNRESTRS>
++                            <SYNRESTR Value="+" type="adjp"/>
++                          </SYNRESTRS>
+                         </NP>
+                     </SYNTAX>
+                     <SEMANTICS>
+diff -Naur old/put-9.1.xml new/put-9.1.xml
+--- old/put-9.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/put-9.1.xml	2018-09-26 18:50:15.000000000 -0400
+@@ -32,8 +32,7 @@
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/put_direction-9.4.xml new/put_direction-9.4.xml
+--- old/put_direction-9.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/put_direction-9.4.xml	2018-09-26 18:50:18.000000000 -0400
+@@ -27,8 +27,7 @@
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <!--Exception: If Destination is object of a source-type preposition ("from"), then +region is allowed-->
+diff -Naur old/put_spatial-9.2.xml new/put_spatial-9.2.xml
+--- old/put_spatial-9.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/put_spatial-9.2.xml	2018-09-26 18:50:20.000000000 -0400
+@@ -22,8 +22,7 @@
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/reach-51.8.xml new/reach-51.8.xml
+--- old/reach-51.8.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/reach-51.8.xml	2018-09-26 18:50:23.000000000 -0400
+@@ -9,8 +9,8 @@
+     </MEMBERS>
+     <THEMROLES>
+         <THEMROLE type="Agent">
+-            <SELRESTRS>
+-                <SELRESTR Value="+" type="concrete"/>
++            <SELRESTRS logic="or">
++                <SELRESTR Value="+" type="animate"/>
+                 <SELRESTR Value="+" type="organization"/>
+             </SELRESTRS>
+         </THEMROLE>
+diff -Naur old/roll-51.3.1.xml new/roll-51.3.1.xml
+--- old/roll-51.3.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/roll-51.3.1.xml	2018-09-26 18:50:30.000000000 -0400
+@@ -187,7 +187,9 @@
+                 </NP>
+                 <VERB/>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -253,7 +255,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/see-30.1.xml new/see-30.1.xml
+--- old/see-30.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/see-30.1.xml	2018-09-26 18:50:33.000000000 -0400
+@@ -14,6 +14,9 @@
+         <THEMROLE type="Stimulus">
+             <SELRESTRS/>
+         </THEMROLE>
++        <THEMROLE type="Patient">
++          <SELRESTRS/>
++        </THEMROLE>
+     </THEMROLES>
+     <FRAMES>
+         <FRAME>
+@@ -91,6 +94,12 @@
+                 <NP value="Stimulus">
+                     <SYNRESTRS/>
+                 </NP>
++                <PREP value="in">
++                  <SELRESTRS/>
++                </PREP>
++                <NP value="Patient">
++                  <SYNRESTRS/>
++                </NP>
+             </SYNTAX>
+             <SEMANTICS>
+                 <PRED value="perceive">
+@@ -229,6 +238,9 @@
+                             <SYNRESTRS/>
+                         </NP>
+                         <VERB/>
++                        <NP value="Patient">
++                          <SYNRESTRS/>
++                        </NP>
+                         <NP value="Stimulus">
+                             <SYNRESTRS>
+                                 <SYNRESTR Value="+" type="oc_ing"/>
+diff -Naur old/seem-109.xml new/seem-109.xml
+--- old/seem-109.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/seem-109.xml	2018-09-26 18:50:37.000000000 -0400
+@@ -27,9 +27,9 @@
+                 </NP>
+                 <VERB/>
+                  <NP value="Attribute">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="-" type="sentential"/>
+-                    </SYNRESTRS>
++                   <SYNRESTRS>
++                     <SYNRESTR Value="+" type="adjp"/>
++                   </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/send-11.1.xml new/send-11.1.xml
+--- old/send-11.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/send-11.1.xml	2018-09-26 18:50:39.000000000 -0400
+@@ -38,10 +38,7 @@
+         <THEMROLE type="Destination">
+             <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+-                <SELRESTRS>
+-                    <SELRESTR Value="+" type="location"/>
+-                    <SELRESTR Value="-" type="region"/>
+-                </SELRESTRS>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/slide-11.2.xml new/slide-11.2.xml
+--- old/slide-11.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/slide-11.2.xml	2018-09-26 18:50:41.000000000 -0400
+@@ -24,10 +24,7 @@
+         <THEMROLE type="Destination">
+             <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+-                <SELRESTRS>
+-                    <SELRESTR Value="+" type="location"/>
+-                    <SELRESTR Value="-" type="region"/>
+-                </SELRESTRS>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+           <THEMROLE type="Trajectory">
+@@ -66,10 +63,11 @@
+                 </NP>
+                 <VERB/>
+                 <PREP>
+-                    <SELRESTRS>
+-                        <SELRESTR Value="+" type="path"/>
+-                        <SELRESTR Value="-" type="dest_dir"/>
+-                    </SELRESTRS>
++                  <SELRESTRS logic="or">
++                      <SELRESTR Value="+" type="dir"/>
++                      <SELRESTR Value="+" type="src"/>
++                      <SELRESTR Value="+" type="dest_conf"/>
++                  </SELRESTRS>
+                 </PREP>
+                 <NP value="Initial_Location">
+                     <SYNRESTRS/>
+@@ -215,10 +213,11 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <PREP>
+-                    <SELRESTRS>
+-                        <SELRESTR Value="+" type="path"/>
+-                        <SELRESTR Value="-" type="dest_dir"/>
+-                    </SELRESTRS>
++                  <SELRESTRS logic="or">
++                      <SELRESTR Value="+" type="dir"/>
++                      <SELRESTR Value="+" type="src"/>
++                      <SELRESTR Value="+" type="dest_conf"/>
++                  </SELRESTRS>
+                 </PREP>
+                  <NP value="Trajectory">
+                                     <SELRESTRS/>
+diff -Naur old/smell_emission-43.3.xml new/smell_emission-43.3.xml
+--- old/smell_emission-43.3.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/smell_emission-43.3.xml	2018-09-26 18:50:44.000000000 -0400
+@@ -9,7 +9,7 @@
+     <THEMROLES>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="-" type="animate"/>
++                <SELRESTR Value="+" type="inanimate"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Location">
+diff -Naur old/sound_emission-43.2.xml new/sound_emission-43.2.xml
+--- old/sound_emission-43.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/sound_emission-43.2.xml	2018-09-26 18:50:47.000000000 -0400
+@@ -135,7 +135,7 @@
+     <THEMROLES>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="-" type="animate"/>
++                <SELRESTR Value="+" type="inanimate"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Location">
+diff -Naur old/sound_existence-47.4.xml new/sound_existence-47.4.xml
+--- old/sound_existence-47.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/sound_existence-47.4.xml	2018-09-26 18:50:49.000000000 -0400
+@@ -18,8 +18,7 @@
+         </THEMROLE>
+         <THEMROLE type="Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/spank-18.3.xml new/spank-18.3.xml
+--- old/spank-18.3.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/spank-18.3.xml	2018-09-26 18:50:53.000000000 -0400
+@@ -67,6 +67,9 @@
+         <THEMROLE type="Result">
+                 <SELRESTRS/>
+         </THEMROLE>
++        <THEMROLE type="Recipient">
++          <SELRESTRS/>
++        </THEMROLE>
+     </THEMROLES>
+     <FRAMES>
+         <FRAME>
+@@ -198,7 +201,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                  <NP value="Result">
+-                    <SYNRESTRS/>
++                   <SYNRESTRS>
++                     <SYNRESTR Value="+" type="adjp"/>
++                   </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -526,10 +531,14 @@
+                 </NP>
+                 <VERB/>
+                 <NP value="Patient">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="+" type="genitive"/>
+-                        <SYNRESTR Value="+" type="body_part"/>
+-                    </SYNRESTRS>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="genitive"/>
++                  </SYNRESTRS>
++                </NP>
++                <NP value="Recipient">
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="body_part"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/spatial_configuration-47.6.xml new/spatial_configuration-47.6.xml
+--- old/spatial_configuration-47.6.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/spatial_configuration-47.6.xml	2018-09-26 18:50:57.000000000 -0400
+@@ -63,8 +63,7 @@
+         </THEMROLE>
+         <THEMROLE type="Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/split-23.2.xml new/split-23.2.xml
+--- old/split-23.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/split-23.2.xml	2018-09-26 18:51:00.000000000 -0400
+@@ -56,7 +56,7 @@
+                 <NP value="Patient">
+                     <SYNRESTRS/>
+                 </NP>
+-                <PREP value="off off of from">
++                <PREP value="off off_of from">
+                     <SELRESTRS/>
+                 </PREP>
+                 <NP value="Co-Patient">
+@@ -140,7 +140,7 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <VERB/>
+-                <PREP value="off off of from">
++                <PREP value="off off_of from">
+                     <SELRESTRS/>
+                 </PREP>
+                 <NP value="Co-Patient">
+@@ -209,7 +209,7 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <VERB/>
+-                <PREP value="off off of from">
++                <PREP value="off off_of from">
+                     <SELRESTRS/>
+                 </PREP>
+                 <NP value="Co-Patient">
+diff -Naur old/spray-9.7.xml new/spray-9.7.xml
+--- old/spray-9.7.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/spray-9.7.xml	2018-09-26 18:51:02.000000000 -0400
+@@ -16,8 +16,7 @@
+         </THEMROLE>
+         <THEMROLE type="Destination">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+@@ -251,8 +250,7 @@
+                     <SELRESTRS logic="or">
+                         <SELRESTR Value="+" type="substance"/>
+                         <SELRESTRS>
+-                            <SELRESTR Value="+" type="concrete"/>
+-                            <SELRESTR Value="+" type="plural"/>
++                            <SELRESTR Value="+" type="group"/>
+                         </SELRESTRS>
+                     </SELRESTRS>
+                 </THEMROLE>
+diff -Naur old/steal-10.5.xml new/steal-10.5.xml
+--- old/steal-10.5.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/steal-10.5.xml	2018-09-26 18:51:05.000000000 -0400
+@@ -52,10 +52,7 @@
+         <THEMROLE type="Source">
+             <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+-                <SELRESTRS>
+-                    <SELRESTR Value="+" type="location"/>
+-                    <SELRESTR Value="-" type="region"/>
+-                </SELRESTRS>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Beneficiary">
+diff -Naur old/substance_emission-43.4.xml new/substance_emission-43.4.xml
+--- old/substance_emission-43.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/substance_emission-43.4.xml	2018-09-26 18:51:08.000000000 -0400
+@@ -37,7 +37,7 @@
+     <THEMROLES>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="-" type="animate"/>
++                <SELRESTR Value="+" type="inanimate"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Location">
+diff -Naur old/swarm-47.5.1.xml new/swarm-47.5.1.xml
+--- old/swarm-47.5.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/swarm-47.5.1.xml	2018-09-26 18:51:11.000000000 -0400
+@@ -5,14 +5,12 @@
+     <THEMROLES>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="concrete"/>
+-                <SELRESTR Value="+" type="plural"/>
++                <SELRESTR Value="+" type="group"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Location">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="location"/>
+-                <SELRESTR Value="-" type="region"/>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+     </THEMROLES>
+diff -Naur old/swat-18.2.xml new/swat-18.2.xml
+--- old/swat-18.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/swat-18.2.xml	2018-09-26 18:51:13.000000000 -0400
+@@ -261,7 +261,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -321,7 +323,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+                 <PREP value="with">
+                     <SELRESTRS/>
+diff -Naur old/tape-22.4.xml new/tape-22.4.xml
+--- old/tape-22.4.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/tape-22.4.xml	2018-09-26 18:51:16.000000000 -0400
+@@ -90,8 +90,7 @@
+         </THEMROLE>
+         <THEMROLE type="Instrument">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="concrete"/>
+-                <SELRESTR Value="-" type="animate"/>
++                <SELRESTR Value="+" type="concrete_inanimate"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <!--Instrument is realized in the verb-->
+@@ -361,7 +360,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/throw-17.1.xml new/throw-17.1.xml
+--- old/throw-17.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/throw-17.1.xml	2018-09-26 18:51:18.000000000 -0400
+@@ -24,10 +24,7 @@
+         <THEMROLE type="Destination">
+             <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+-                <SELRESTRS>
+-                    <SELRESTR Value="+" type="location"/>
+-                    <SELRESTR Value="-" type="region"/>
+-                </SELRESTRS>
++                <SELRESTR Value="+" type="non_region_location"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Result">
+diff -Naur old/vehicle-51.4.1.xml new/vehicle-51.4.1.xml
+--- old/vehicle-51.4.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/vehicle-51.4.1.xml	2018-09-26 18:51:22.000000000 -0400
+@@ -224,7 +224,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/waltz-51.5.xml new/waltz-51.5.xml
+--- old/waltz-51.5.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/waltz-51.5.xml	2018-09-26 18:51:25.000000000 -0400
+@@ -178,7 +178,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP> 
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/want-32.1.xml new/want-32.1.xml
+--- old/want-32.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/want-32.1.xml	2018-09-26 18:51:28.000000000 -0400
+@@ -140,6 +140,7 @@
+                         <NP value="Theme">
+                             <SYNRESTRS/>
+                         </NP>
++                        <ADV/>
+                     </SYNTAX>
+                     <SEMANTICS>
+                         <PRED value="desire">
+@@ -192,6 +193,7 @@
+                                 <SYNRESTR Value="+" type="np_ppart"/>
+                             </SYNRESTRS>
+                         </NP>
++                        <ADJ/>
+                     </SYNTAX>
+                     <SEMANTICS>
+                         <PRED value="desire">
+@@ -303,10 +305,11 @@
+                                     <SYNRESTRS/>
+                                 </NP>
+                                 <VERB/>
++                                <LEX value="to be"/>
+                                 <NP value="Theme">
+-                                    <SYNRESTRS>
+-                                        <SYNRESTR Value="+" type="to_be"/>
+-                                    </SYNRESTRS>
++                                  <SYNRESTRS>
++                                    <SYNRESTR Value="+" type="adjp"/>
++                                  </SYNRESTRS>
+                                 </NP>
+                             </SYNTAX>
+                             <SEMANTICS>
+diff -Naur old/wipe_instr-10.4.2.xml new/wipe_instr-10.4.2.xml
+--- old/wipe_instr-10.4.2.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/wipe_instr-10.4.2.xml	2018-09-26 18:51:32.000000000 -0400
+@@ -23,8 +23,7 @@
+         </THEMROLE>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="concrete"/>
+-                <SELRESTR Value="-" type="animate"/>
++                <SELRESTR Value="+" type="concrete_inanimate"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Initial_Location">
+@@ -34,8 +33,7 @@
+         </THEMROLE>
+         <THEMROLE type="Instrument">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="concrete"/>
+-                <SELRESTR Value="-" type="animate"/>
++                <SELRESTR Value="+" type="concrete_inanimate"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Result">
+@@ -175,7 +173,9 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <NP value="Result">
+-                    <SYNRESTRS/>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+diff -Naur old/wipe_manner-10.4.1.xml new/wipe_manner-10.4.1.xml
+--- old/wipe_manner-10.4.1.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/wipe_manner-10.4.1.xml	2018-09-26 18:51:36.000000000 -0400
+@@ -34,8 +34,7 @@
+         </THEMROLE>
+         <THEMROLE type="Theme">
+             <SELRESTRS>
+-                <SELRESTR Value="+" type="concrete"/>
+-                <SELRESTR Value="-" type="animate"/>
++                <SELRESTR Value="+" type="concrete_inanimate"/>
+             </SELRESTRS>
+         </THEMROLE>
+         <THEMROLE type="Source">
+@@ -195,7 +194,7 @@
+             <THEMROLES>
+                 <THEMROLE type="Source">
+                     <SELRESTRS>
+-                        <SELRESTR Value="-" type="region"/>
++                      <SELRESTR Value="+" type="non_region_location"/>
+                     </SELRESTRS>
+                 </THEMROLE>
+             </THEMROLES>
+diff -Naur old/wish-62.xml new/wish-62.xml
+--- old/wish-62.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/wish-62.xml	2018-09-26 18:51:41.000000000 -0400
+@@ -89,10 +89,11 @@
+                     <SYNRESTRS/>
+                 </NP>
+                 <VERB/>
++                <LEX value="to be"/>
+                 <NP value="Theme">
+-                    <SYNRESTRS>
+-                        <SYNRESTR Value="+" type="to_be"/>
+-                    </SYNRESTRS>
++                  <SYNRESTRS>
++                    <SYNRESTR Value="+" type="adjp"/>
++                  </SYNRESTRS>
+                 </NP>
+             </SYNTAX>
+             <SEMANTICS>
+@@ -120,6 +121,7 @@
+                         <SYNRESTR Value="+" type="np_ppart"/>
+                     </SYNRESTRS>
+                 </NP>
++                <ADJ/>
+             </SYNTAX>
+             <SEMANTICS>
+                 <PRED value="desire">
+diff -Naur old/withdraw-82.xml new/withdraw-82.xml
+--- old/withdraw-82.xml	2013-04-22 16:33:03.000000000 -0400
++++ new/withdraw-82.xml	2018-09-26 18:51:45.000000000 -0400
+@@ -4,7 +4,7 @@
+     <MEMBERS/>
+     <THEMROLES>
+         <THEMROLE type="Agent">
+-            <SELRESTRS>
++            <SELRESTRS logic="or">
+                 <SELRESTR Value="+" type="animate"/>
+                 <SELRESTR Value="+" type="organization"/>
+             </SELRESTRS>
-- 
cgit 1.4.1