summary refs log tree commit diff stats
path: root/generator/vn-3.2.diff
diff options
context:
space:
mode:
Diffstat (limited to 'generator/vn-3.2.diff')
-rw-r--r--generator/vn-3.2.diff1609
1 files changed, 1609 insertions, 0 deletions
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 @@
1diff -Naur old/admit-65.xml new/admit-65.xml
2--- old/admit-65.xml 2013-04-22 16:33:03.000000000 -0400
3+++ new/admit-65.xml 2018-09-26 16:41:09.000000000 -0400
4@@ -101,9 +101,8 @@
5 </SELRESTRS>
6 </PREP>
7 <NP value="Location">
8- <SELRESTRS logic="or">
9- <SELRESTR Value="+" type="location"/>
10- <SELRESTR Value="-" type="region"/>
11+ <SELRESTRS>
12+ <SELRESTR Value="+" type="non_region_location"/>
13 </SELRESTRS>
14 </NP>
15 </SYNTAX>
16diff -Naur old/amuse-31.1.xml new/amuse-31.1.xml
17--- old/amuse-31.1.xml 2013-04-22 16:33:03.000000000 -0400
18+++ new/amuse-31.1.xml 2018-09-26 16:41:13.000000000 -0400
19@@ -268,6 +268,9 @@
20 <THEMROLE type="Result">
21 <SELRESTRS/>
22 </THEMROLE>
23+ <THEMROLE type="Cause">
24+ <SELRESTRS/>
25+ </THEMROLE>
26 </THEMROLES>
27 <FRAMES>
28 <FRAME>
29@@ -365,7 +368,9 @@
30 <SYNRESTR Value="+" type="genitive"/>
31 </SYNRESTRS>
32 </NP>
33- <LEX value="'s"/>
34+ <NP value="Cause">
35+ <SYNRESTRS/>
36+ </NP>
37 <VERB/>
38 <NP value="Experiencer">
39 <SYNRESTRS/>
40@@ -401,7 +406,9 @@
41 <SYNRESTRS/>
42 </NP>
43 <NP value="Result">
44- <SYNRESTRS/>
45+ <SYNRESTRS>
46+ <SYNRESTR Value="+" type="adjp"/>
47+ </SYNRESTRS>
48 </NP>
49 </SYNTAX>
50 <SEMANTICS>
51diff -Naur old/animal_sounds-38.xml new/animal_sounds-38.xml
52--- old/animal_sounds-38.xml 2013-04-22 16:33:03.000000000 -0400
53+++ new/animal_sounds-38.xml 2018-09-26 16:41:16.000000000 -0400
54@@ -184,6 +184,11 @@
55 <SYNRESTRS/>
56 </NP>
57 <VERB/>
58+ <PREP>
59+ <SELRESTRS>
60+ <SELRESTR Value="+" type="loc" />
61+ </SELRESTRS>
62+ </PREP>
63 <NP value="Location">
64 <SELRESTRS/>
65 </NP>
66diff -Naur old/assessment-34.1.xml new/assessment-34.1.xml
67--- old/assessment-34.1.xml 2013-04-22 16:33:03.000000000 -0400
68+++ new/assessment-34.1.xml 2018-09-26 16:41:21.000000000 -0400
69@@ -100,7 +100,6 @@
70 <SYNRESTR Value="+" type="genitive"/>
71 </SYNRESTRS>
72 </NP>
73- <LEX value="'s"/>
74 <NP value="Attribute">
75 <SYNRESTRS/>
76 </NP>
77diff -Naur old/assuming_position-50.xml new/assuming_position-50.xml
78--- old/assuming_position-50.xml 2013-04-22 16:33:03.000000000 -0400
79+++ new/assuming_position-50.xml 2018-09-26 16:41:24.000000000 -0400
80@@ -38,8 +38,7 @@
81 </THEMROLE>
82 <THEMROLE type="Location">
83 <SELRESTRS>
84- <SELRESTR Value="+" type="location"/>
85- <SELRESTR Value="-" type="region"/>
86+ <SELRESTR Value="+" type="non_region_location"/>
87 </SELRESTRS>
88 </THEMROLE>
89 </THEMROLES>
90diff -Naur old/banish-10.2.xml new/banish-10.2.xml
91--- old/banish-10.2.xml 2013-04-22 16:33:03.000000000 -0400
92+++ new/banish-10.2.xml 2018-09-26 16:41:27.000000000 -0400
93@@ -32,8 +32,7 @@
94 </THEMROLE>
95 <THEMROLE type="Destination">
96 <SELRESTRS>
97- <SELRESTR Value="+" type="location"/>
98- <SELRESTR Value="-" type="region"/>
99+ <SELRESTR Value="+" type="non_region_location"/>
100 </SELRESTRS>
101 </THEMROLE>
102 <!--"recall" also allow general concrete things (products like playpens)-->
103diff -Naur old/battle-36.4.xml new/battle-36.4.xml
104--- old/battle-36.4.xml 2013-04-22 16:33:03.000000000 -0400
105+++ new/battle-36.4.xml 2018-09-26 16:41:29.000000000 -0400
106@@ -93,7 +93,7 @@
107 </PREP>
108 <NP value="Topic">
109 <SYNRESTRS>
110- <SYNRESTR Value="+" type="what_extract"/>
111+ <SYNRESTR Value="+" type="wh_comp"/>
112 </SYNRESTRS>
113 </NP>
114 </SYNTAX>
115diff -Naur old/become-109.1.xml new/become-109.1.xml
116--- old/become-109.1.xml 2013-04-22 16:33:03.000000000 -0400
117+++ new/become-109.1.xml 2018-09-26 16:41:32.000000000 -0400
118@@ -31,7 +31,9 @@
119 </NP>
120 <VERB/>
121 <NP value="Result">
122- <SYNRESTRS/>
123+ <SYNRESTRS>
124+ <SYNRESTR Value="+" type="adjp"/>
125+ </SYNRESTRS>
126 </NP>
127 </SYNTAX>
128 <SEMANTICS>
129diff -Naur old/beg-58.2.xml new/beg-58.2.xml
130--- old/beg-58.2.xml 2013-04-22 16:33:03.000000000 -0400
131+++ new/beg-58.2.xml 2018-09-26 16:41:35.000000000 -0400
132@@ -38,7 +38,7 @@
133 <VERB/>
134 <NP value="Topic">
135 <SYNRESTRS>
136- <SYNRESTR Value="-" type="for_comp"/>
137+ <SYNRESTR Value="+" type="for_comp"/>
138 </SYNRESTRS>
139 </NP>
140 </SYNTAX>
141diff -Naur old/bend-45.2.xml new/bend-45.2.xml
142--- old/bend-45.2.xml 2013-04-22 16:33:03.000000000 -0400
143+++ new/bend-45.2.xml 2018-09-26 16:41:38.000000000 -0400
144@@ -44,7 +44,9 @@
145 </SELRESTRS>
146 </THEMROLE>
147 <THEMROLE type="Result">
148- <SELRESTRS/>
149+ <SELRESTRS>
150+ <SELRESTR Value="+" type="state"/>
151+ </SELRESTRS>
152 </THEMROLE>
153 </THEMROLES>
154 <FRAMES>
155@@ -227,7 +229,9 @@
156 <SYNRESTRS/>
157 </NP>
158 <NP value="Result">
159- <SYNRESTRS/>
160+ <SYNRESTRS>
161+ <SYNRESTR Value="+" type="adjp"/>
162+ </SYNRESTRS>
163 </NP>
164 </SYNTAX>
165 <SEMANTICS>
166@@ -277,9 +281,7 @@
167 <SELRESTRS/>
168 </PREP>
169 <NP value="Result">
170- <SELRESTRS>
171- <SELRESTR Value="+" type="state"/>
172- </SELRESTRS>
173+ <SELRESTRS/>
174 </NP>
175 </SYNTAX>
176 <SEMANTICS>
177@@ -329,9 +331,7 @@
178 <SELRESTRS/>
179 </PREP>
180 <NP value="Result">
181- <SELRESTRS>
182- <SELRESTR Value="+" type="state"/>
183- </SELRESTRS>
184+ <SELRESTRS/>
185 </NP>
186 <PREP value="with">
187 <SELRESTRS/>
188diff -Naur old/break-45.1.xml new/break-45.1.xml
189--- old/break-45.1.xml 2013-04-22 16:33:03.000000000 -0400
190+++ new/break-45.1.xml 2018-09-26 16:41:42.000000000 -0400
191@@ -252,7 +252,9 @@
192 <SYNRESTRS/>
193 </NP>
194 <NP value="Result">
195- <SYNRESTRS/>
196+ <SYNRESTRS>
197+ <SYNRESTR Value="+" type="adjp"/>
198+ </SYNRESTRS>
199 </NP>
200 </SYNTAX>
201 <SEMANTICS>
202@@ -304,7 +306,9 @@
203 <SYNRESTRS/>
204 </NP>
205 <NP value="Result">
206- <SYNRESTRS/>
207+ <SYNRESTRS>
208+ <SYNRESTR Value="+" type="adjp"/>
209+ </SYNRESTRS>
210 </NP>
211 <PREP value="with">
212 <SELRESTRS/>
213diff -Naur old/bring-11.3.xml new/bring-11.3.xml
214--- old/bring-11.3.xml 2013-04-22 16:33:03.000000000 -0400
215+++ new/bring-11.3.xml 2018-09-26 16:41:45.000000000 -0400
216@@ -24,10 +24,7 @@
217 <THEMROLE type="Destination">
218 <SELRESTRS logic="or">
219 <SELRESTR Value="+" type="animate"/>
220- <SELRESTRS>
221- <SELRESTR Value="+" type="location"/>
222- <SELRESTR Value="-" type="region"/>
223- </SELRESTRS>
224+ <SELRESTR Value="+" type="non_region_location"/>
225 </SELRESTRS>
226 </THEMROLE>
227 <THEMROLE type="Instrument">
228diff -Naur old/butter-9.9.xml new/butter-9.9.xml
229--- old/butter-9.9.xml 2013-04-22 16:33:03.000000000 -0400
230+++ new/butter-9.9.xml 2018-09-26 16:41:48.000000000 -0400
231@@ -152,8 +152,7 @@
232 </THEMROLE>
233 <THEMROLE type="Destination">
234 <SELRESTRS>
235- <SELRESTR Value="+" type="location"/>
236- <SELRESTR Value="-" type="region"/>
237+ <SELRESTR Value="+" type="non_region_location"/>
238 </SELRESTRS>
239 </THEMROLE>
240 </THEMROLES>
241diff -Naur old/characterize-29.2.xml new/characterize-29.2.xml
242--- old/characterize-29.2.xml 2013-04-22 16:33:03.000000000 -0400
243+++ new/characterize-29.2.xml 2018-09-26 16:41:53.000000000 -0400
244@@ -104,11 +104,11 @@
245 <NP value="Theme">
246 <SYNRESTRS/>
247 </NP>
248- <LEX value="as"/>
249+ <LEX value="to be"/>
250 <NP value="Attribute">
251- <SYNRESTRS>
252- <SYNRESTR Value="+" type="small_clause"/>
253- </SYNRESTRS>
254+ <SYNRESTRS>
255+ <SYNRESTR Value="+" type="adjp"/>
256+ </SYNRESTRS>
257 </NP>
258 </SYNTAX>
259 <SEMANTICS>
260@@ -384,6 +384,11 @@
261 <SYNRESTR Value="+" type="np_ppart"/>
262 </SYNRESTRS>
263 </NP>
264+ <NP value="Attribute">
265+ <SYNRESTRS>
266+ <SYNRESTR Value="+" type="adjp"/>
267+ </SYNRESTRS>
268+ </NP>
269 </SYNTAX>
270 <SEMANTICS>
271 <PRED value="describe">
272diff -Naur old/cheat-10.6.xml new/cheat-10.6.xml
273--- old/cheat-10.6.xml 2013-04-22 16:33:03.000000000 -0400
274+++ new/cheat-10.6.xml 2018-09-26 16:41:55.000000000 -0400
275@@ -53,10 +53,7 @@
276 <THEMROLE type="Source">
277 <SELRESTRS logic="or">
278 <SELRESTR Value="+" type="animate"/>
279- <SELRESTRS>
280- <SELRESTR Value="+" type="location"/>
281- <SELRESTR Value="-" type="region"/>
282- </SELRESTRS>
283+ <SELRESTR Value="+" type="non_region_location"/>
284 </SELRESTRS>
285 </THEMROLE>
286 </THEMROLES>
287diff -Naur old/chew-39.2.xml new/chew-39.2.xml
288--- old/chew-39.2.xml 2013-04-22 16:33:03.000000000 -0400
289+++ new/chew-39.2.xml 2018-09-26 16:41:58.000000000 -0400
290@@ -34,8 +34,7 @@
291 <THEMROLES>
292 <THEMROLE type="Patient">
293 <SELRESTRS>
294- <SELRESTR Value="+" type="comestible"/>
295- <SELRESTR Value="+" type="solid"/>
296+ <SELRESTR Value="+" type="solid_food"/>
297 </SELRESTRS>
298 </THEMROLE>
299 </THEMROLES>
300@@ -152,8 +151,7 @@
301 <THEMROLES>
302 <THEMROLE type="Patient">
303 <SELRESTRS>
304- <SELRESTR Value="+" type="comestible"/>
305- <SELRESTR Value="-" type="solid"/>
306+ <SELRESTR Value="+" type="non_solid_food"/>
307 </SELRESTRS>
308 </THEMROLE>
309 </THEMROLES>
310diff -Naur old/coil-9.6.xml new/coil-9.6.xml
311--- old/coil-9.6.xml 2013-04-22 16:33:03.000000000 -0400
312+++ new/coil-9.6.xml 2018-09-26 16:42:01.000000000 -0400
313@@ -19,8 +19,7 @@
314 </THEMROLE>
315 <THEMROLE type="Theme">
316 <SELRESTRS>
317- <SELRESTR Value="+" type="nonrigid"/>
318- <SELRESTR Value="+" type="elongated"/>
319+ <SELRESTR Value="+" type="slinky"/>
320 </SELRESTRS>
321 </THEMROLE>
322 <THEMROLE type="Location">
323diff -Naur old/coloring-24.xml new/coloring-24.xml
324--- old/coloring-24.xml 2013-04-22 16:33:03.000000000 -0400
325+++ new/coloring-24.xml 2018-09-26 16:42:04.000000000 -0400
326@@ -86,7 +86,9 @@
327 <SYNRESTRS/>
328 </NP>
329 <NP value="Result">
330- <SYNRESTRS/>
331+ <SYNRESTRS>
332+ <SYNRESTR Value="+" type="adjp"/>
333+ </SYNRESTRS>
334 </NP>
335 </SYNTAX>
336 <SEMANTICS>
337diff -Naur old/confess-37.10.xml new/confess-37.10.xml
338--- old/confess-37.10.xml 2013-04-22 16:33:03.000000000 -0400
339+++ new/confess-37.10.xml 2018-09-26 16:42:07.000000000 -0400
340@@ -108,6 +108,11 @@
341 <SYNRESTR Value="+" type="np_ppart"/>
342 </SYNRESTRS>
343 </NP>
344+ <NP value="Attribute">
345+ <SYNRESTRS>
346+ <SYNRESTR Value="+" type="adjp"/>
347+ </SYNRESTRS>
348+ </NP>
349 </SYNTAX>
350 <SEMANTICS>
351 <PRED value="transfer_info">
352diff -Naur old/confine-92.xml new/confine-92.xml
353--- old/confine-92.xml 2013-04-22 16:33:03.000000000 -0400
354+++ new/confine-92.xml 2018-09-26 16:42:10.000000000 -0400
355@@ -15,7 +15,7 @@
356 </MEMBERS>
357 <THEMROLES>
358 <THEMROLE type="Agent">
359- <SELRESTRS>
360+ <SELRESTRS logic="or">
361 <SELRESTR Value="+" type="animate"/>
362 <SELRESTR Value="+" type="organization"/>
363 </SELRESTRS>
364diff -Naur old/consider-29.9.xml new/consider-29.9.xml
365--- old/consider-29.9.xml 2013-04-22 16:33:03.000000000 -0400
366+++ new/consider-29.9.xml 2018-09-26 16:42:12.000000000 -0400
367@@ -188,9 +188,9 @@
368 </SYNRESTRS>
369 </NP>
370 <NP value="Attribute">
371- <SYNRESTRS>
372- <SYNRESTR Value="-" type="sentential"/>
373- </SYNRESTRS>
374+ <SYNRESTRS>
375+ <SYNRESTR Value="+" type="adjp"/>
376+ </SYNRESTRS>
377 </NP>
378 </SYNTAX>
379 <SEMANTICS>
380@@ -331,9 +331,9 @@
381 <SYNRESTRS/>
382 </NP>
383 <NP value="Attribute">
384- <SYNRESTRS>
385- <SYNRESTR Value="-" type="sentential"/>
386- </SYNRESTRS>
387+ <SYNRESTRS>
388+ <SYNRESTR Value="+" type="adjp"/>
389+ </SYNRESTRS>
390 </NP>
391 </SYNTAX>
392 <SEMANTICS>
393@@ -465,9 +465,9 @@
394 <SYNRESTRS/>
395 </NP>
396 <NP value="Attribute">
397- <SYNRESTRS>
398- <SYNRESTR Value="-" type="sentential"/>
399- </SYNRESTRS>
400+ <SYNRESTRS>
401+ <SYNRESTR Value="+" type="adjp"/>
402+ </SYNRESTRS>
403 </NP>
404 </SYNTAX>
405 <SEMANTICS>
406@@ -551,9 +551,9 @@
407 </SYNRESTRS>
408 </NP>
409 <NP value="Attribute">
410- <SYNRESTRS>
411- <SYNRESTR Value="-" type="sentential"/>
412- </SYNRESTRS>
413+ <SYNRESTRS>
414+ <SYNRESTR Value="+" type="adjp"/>
415+ </SYNRESTRS>
416 </NP>
417 </SYNTAX>
418 <SEMANTICS>
419diff -Naur old/cut-21.1.xml new/cut-21.1.xml
420--- old/cut-21.1.xml 2013-04-22 16:33:03.000000000 -0400
421+++ new/cut-21.1.xml 2018-09-26 16:42:15.000000000 -0400
422@@ -313,7 +313,9 @@
423 <SYNRESTRS/>
424 </NP>
425 <NP value="Result">
426- <SYNRESTRS/>
427+ <SYNRESTRS>
428+ <SYNRESTR Value="+" type="adjp"/>
429+ </SYNRESTRS>
430 </NP>
431 </SYNTAX>
432 <SEMANTICS>
433@@ -365,7 +367,9 @@
434 <SYNRESTRS/>
435 </NP>
436 <NP value="Result">
437- <SYNRESTRS/>
438+ <SYNRESTRS>
439+ <SYNRESTR Value="+" type="adjp"/>
440+ </SYNRESTRS>
441 </NP>
442 <PREP value="with">
443 <SELRESTRS/>
444@@ -557,7 +561,9 @@
445 <SYNRESTRS/>
446 </NP>
447 <NP value="Result">
448- <SYNRESTRS/>
449+ <SYNRESTRS>
450+ <SYNRESTR Value="+" type="adjp"/>
451+ </SYNRESTRS>
452 </NP>
453 </SYNTAX>
454 <SEMANTICS>
455diff -Naur old/declare-29.4.xml new/declare-29.4.xml
456--- old/declare-29.4.xml 2013-04-22 16:33:03.000000000 -0400
457+++ new/declare-29.4.xml 2018-09-26 16:42:19.000000000 -0400
458@@ -30,9 +30,9 @@
459 <SYNRESTRS/>
460 </NP>
461 <NP value="Result">
462- <SYNRESTRS>
463- <SYNRESTR Value="-" type="sentential"/>
464- </SYNRESTRS>
465+ <SYNRESTRS>
466+ <SYNRESTR Value="+" type="adjp"/>
467+ </SYNRESTRS>
468 </NP>
469 </SYNTAX>
470 <SEMANTICS>
471@@ -119,9 +119,9 @@
472 </SYNRESTRS>
473 </NP>
474 <NP value="Result">
475- <SYNRESTRS>
476- <SYNRESTR Value="-" type="sentential"/>
477- </SYNRESTRS>
478+ <SYNRESTRS>
479+ <SYNRESTR Value="+" type="adjp"/>
480+ </SYNRESTRS>
481 </NP>
482 </SYNTAX>
483 <SEMANTICS>
484@@ -241,9 +241,9 @@
485 <SELRESTRS/>
486 </PREP>
487 <NP value="Result">
488- <SYNRESTRS>
489- <SYNRESTR Value="-" type="sentential"/>
490- </SYNRESTRS>
491+ <SYNRESTRS>
492+ <SYNRESTR Value="+" type="adjp"/>
493+ </SYNRESTRS>
494 </NP>
495 </SYNTAX>
496 <SEMANTICS>
497diff -Naur old/devour-39.4.xml new/devour-39.4.xml
498--- old/devour-39.4.xml 2013-04-22 16:33:03.000000000 -0400
499+++ new/devour-39.4.xml 2018-09-26 16:42:22.000000000 -0400
500@@ -23,8 +23,7 @@
501 <THEMROLES>
502 <THEMROLE type="Patient">
503 <SELRESTRS>
504- <SELRESTR Value="+" type="comestible"/>
505- <SELRESTR Value="+" type="solid"/>
506+ <SELRESTR Value="+" type="solid_food"/>
507 </SELRESTRS>
508 </THEMROLE>
509 </THEMROLES>
510@@ -64,8 +63,7 @@
511 <THEMROLES>
512 <THEMROLE type="Patient">
513 <SELRESTRS>
514- <SELRESTR Value="+" type="comestible"/>
515- <SELRESTR Value="-" type="solid"/>
516+ <SELRESTR Value="+" type="non_solid_food"/>
517 </SELRESTRS>
518 </THEMROLE>
519 </THEMROLES>
520diff -Naur old/drive-11.5.xml new/drive-11.5.xml
521--- old/drive-11.5.xml 2013-04-22 16:33:03.000000000 -0400
522+++ new/drive-11.5.xml 2018-09-26 16:45:33.000000000 -0400
523@@ -34,10 +34,7 @@
524 <THEMROLE type="Destination">
525 <SELRESTRS logic="or">
526 <SELRESTR Value="+" type="animate"/>
527- <SELRESTRS>
528- <SELRESTR Value="+" type="location"/>
529- <SELRESTR Value="-" type="region"/>
530- </SELRESTRS>
531+ <SELRESTR Value="+" type="non_region_location"/>
532 </SELRESTRS>
533 </THEMROLE>
534 </THEMROLES>
535diff -Naur old/eat-39.1.xml new/eat-39.1.xml
536--- old/eat-39.1.xml 2013-04-22 16:33:03.000000000 -0400
537+++ new/eat-39.1.xml 2018-09-26 16:45:36.000000000 -0400
538@@ -21,8 +21,7 @@
539 <THEMROLES>
540 <THEMROLE type="Patient">
541 <SELRESTRS>
542- <SELRESTR Value="+" type="comestible"/>
543- <SELRESTR Value="+" type="solid"/>
544+ <SELRESTR Value="+" type="solid_food"/>
545 </SELRESTRS>
546 </THEMROLE>
547 </THEMROLES>
548@@ -145,8 +144,7 @@
549 <THEMROLES>
550 <THEMROLE type="Patient">
551 <SELRESTRS>
552- <SELRESTR Value="+" type="comestible"/>
553- <SELRESTR Value="-" type="solid"/>
554+ <SELRESTR Value="+" type="non_solid_food"/>
555 </SELRESTRS>
556 </THEMROLE>
557 </THEMROLES>
558diff -Naur old/enforce-63.xml new/enforce-63.xml
559--- old/enforce-63.xml 2013-04-22 16:33:03.000000000 -0400
560+++ new/enforce-63.xml 2018-09-26 16:45:38.000000000 -0400
561@@ -8,7 +8,7 @@
562 </MEMBERS>
563 <THEMROLES>
564 <THEMROLE type="Agent">
565- <SELRESTRS>
566+ <SELRESTRS logic="or">
567 <SELRESTR Value="+" type="animate"/>
568 <SELRESTR Value="+" type="organization"/>
569 </SELRESTRS>
570diff -Naur old/entity_specific_modes_being-47.2.xml new/entity_specific_modes_being-47.2.xml
571--- old/entity_specific_modes_being-47.2.xml 2013-04-22 16:33:03.000000000 -0400
572+++ new/entity_specific_modes_being-47.2.xml 2018-09-26 16:45:41.000000000 -0400
573@@ -32,8 +32,7 @@
574 </THEMROLE>
575 <THEMROLE type="Location">
576 <SELRESTRS>
577- <SELRESTR Value="+" type="location"/>
578- <SELRESTR Value="-" type="region"/>
579+ <SELRESTR Value="+" type="non_region_location"/>
580 </SELRESTRS>
581 </THEMROLE>
582 </THEMROLES>
583diff -Naur old/estimate-34.2.xml new/estimate-34.2.xml
584--- old/estimate-34.2.xml 2013-04-22 16:33:03.000000000 -0400
585+++ new/estimate-34.2.xml 2018-09-26 16:45:43.000000000 -0400
586@@ -121,10 +121,11 @@
587 <SYNRESTRS/>
588 </NP>
589 <VERB/>
590+ <LEX value="to be"/>
591 <NP value="Theme">
592- <SYNRESTRS>
593- <SYNRESTR Value="+" type="to_be"/>
594- </SYNRESTRS>
595+ <SYNRESTRS>
596+ <SYNRESTR Value="+" type="adjp"/>
597+ </SYNRESTRS>
598 </NP>
599 </SYNTAX>
600 <SEMANTICS>
601diff -Naur old/exchange-13.6.xml new/exchange-13.6.xml
602--- old/exchange-13.6.xml 2013-04-22 16:33:03.000000000 -0400
603+++ new/exchange-13.6.xml 2018-09-26 16:45:45.000000000 -0400
604@@ -326,8 +326,7 @@
605 <THEMROLES>
606 <THEMROLE type="Location">
607 <SELRESTRS>
608- <SELRESTR Value="+" type="location"/>
609- <SELRESTR Value="-" type="region"/>
610+ <SELRESTR Value="+" type="non_region_location"/>
611 </SELRESTRS>
612 </THEMROLE>
613 </THEMROLES>
614diff -Naur old/exist-47.1.xml new/exist-47.1.xml
615--- old/exist-47.1.xml 2013-04-22 16:33:03.000000000 -0400
616+++ new/exist-47.1.xml 2018-09-26 16:45:47.000000000 -0400
617@@ -10,8 +10,7 @@
618 </THEMROLE>
619 <THEMROLE type="Location">
620 <SELRESTRS>
621- <SELRESTR Value="+" type="location"/>
622- <SELRESTR Value="-" type="region"/>
623+ <SELRESTR Value="+" type="non_region_location"/>
624 </SELRESTRS>
625 </THEMROLE>
626 </THEMROLES>
627diff -Naur old/fill-9.8.xml new/fill-9.8.xml
628--- old/fill-9.8.xml 2013-04-22 16:33:03.000000000 -0400
629+++ new/fill-9.8.xml 2018-09-26 16:45:50.000000000 -0400
630@@ -129,8 +129,7 @@
631 </THEMROLE>
632 <THEMROLE type="Destination">
633 <SELRESTRS>
634- <SELRESTR Value="+" type="location"/>
635- <SELRESTR Value="-" type="region"/>
636+ <SELRESTR Value="+" type="non_region_location"/>
637 </SELRESTRS>
638 </THEMROLE>
639 </THEMROLES>
640diff -Naur old/funnel-9.3.xml new/funnel-9.3.xml
641--- old/funnel-9.3.xml 2013-04-22 16:33:03.000000000 -0400
642+++ new/funnel-9.3.xml 2018-09-26 18:49:11.000000000 -0400
643@@ -27,8 +27,7 @@
644 </THEMROLE>
645 <THEMROLE type="Destination">
646 <SELRESTRS>
647- <SELRESTR Value="+" type="location"/>
648- <SELRESTR Value="-" type="region"/>
649+ <SELRESTR Value="+" type="non_region_location"/>
650 </SELRESTRS>
651 </THEMROLE>
652 </THEMROLES>
653diff -Naur old/get-13.5.1.xml new/get-13.5.1.xml
654--- old/get-13.5.1.xml 2013-04-22 16:33:03.000000000 -0400
655+++ new/get-13.5.1.xml 2018-09-26 18:49:15.000000000 -0400
656@@ -52,8 +52,7 @@
657 </THEMROLE>
658 <THEMROLE type="Asset">
659 <SELRESTRS>
660- <SELRESTR Value="-" type="location"/>
661- <SELRESTR Value="-" type="region"/>
662+ <SELRESTR Value="+" type="currency"/>
663 </SELRESTRS>
664 </THEMROLE>
665 </THEMROLES>
666diff -Naur old/gobble-39.3.xml new/gobble-39.3.xml
667--- old/gobble-39.3.xml 2013-04-22 16:33:03.000000000 -0400
668+++ new/gobble-39.3.xml 2018-09-26 18:49:18.000000000 -0400
669@@ -20,8 +20,7 @@
670 <THEMROLES>
671 <THEMROLE type="Patient">
672 <SELRESTRS>
673- <SELRESTR Value="+" type="comestible"/>
674- <SELRESTR Value="+" type="solid"/>
675+ <SELRESTR Value="+" type="solid_food"/>
676 </SELRESTRS>
677 </THEMROLE>
678 </THEMROLES>
679@@ -115,8 +114,7 @@
680 <THEMROLES>
681 <THEMROLE type="Patient">
682 <SELRESTRS>
683- <SELRESTR Value="+" type="comestible"/>
684- <SELRESTR Value="-" type="solid"/>
685+ <SELRESTR Value="+" type="non_solid_food"/>
686 </SELRESTRS>
687 </THEMROLE>
688 </THEMROLES>
689diff -Naur old/herd-47.5.2.xml new/herd-47.5.2.xml
690--- old/herd-47.5.2.xml 2013-04-22 16:33:03.000000000 -0400
691+++ new/herd-47.5.2.xml 2018-09-26 18:49:21.000000000 -0400
692@@ -26,8 +26,7 @@
693 </THEMROLE>
694 <THEMROLE type="Theme">
695 <SELRESTRS>
696- <SELRESTR Value="+" type="concrete"/>
697- <SELRESTR Value="+" type="plural"/>
698+ <SELRESTR Value="+" type="group"/>
699 </SELRESTRS>
700 </THEMROLE>
701 </THEMROLES>
702diff -Naur old/hit-18.1.xml new/hit-18.1.xml
703--- old/hit-18.1.xml 2013-04-22 16:33:03.000000000 -0400
704+++ new/hit-18.1.xml 2018-09-26 18:49:25.000000000 -0400
705@@ -231,7 +231,9 @@
706 <SYNRESTRS/>
707 </NP>
708 <NP value="Result">
709- <SYNRESTRS/>
710+ <SYNRESTRS>
711+ <SYNRESTR Value="+" type="adjp"/>
712+ </SYNRESTRS>
713 </NP>
714 </SYNTAX>
715 <SEMANTICS>
716@@ -291,7 +293,9 @@
717 <SYNRESTRS/>
718 </NP>
719 <NP value="Result">
720- <SYNRESTRS/>
721+ <SYNRESTRS>
722+ <SYNRESTR Value="+" type="adjp"/>
723+ </SYNRESTRS>
724 </NP>
725 <PREP value="with">
726 <SELRESTRS/>
727@@ -616,7 +620,9 @@
728 <SYNRESTRS/>
729 </NP>
730 <NP value="Result">
731- <SYNRESTRS/>
732+ <SYNRESTRS>
733+ <SYNRESTR Value="+" type="adjp"/>
734+ </SYNRESTRS>
735 </NP>
736 </SYNTAX>
737 <SEMANTICS>
738diff -Naur old/instr_communication-37.4.xml new/instr_communication-37.4.xml
739--- old/instr_communication-37.4.xml 2013-04-22 16:33:03.000000000 -0400
740+++ new/instr_communication-37.4.xml 2018-09-26 18:49:29.000000000 -0400
741@@ -192,7 +192,9 @@
742 <SYNRESTRS/>
743 </NP>
744 <NP value="Topic">
745- <SYNRESTRS/>
746+ <SYNRESTRS>
747+ <SYNRESTR Value="+" type="quotation"/>
748+ </SYNRESTRS>
749 </NP>
750 </SYNTAX>
751 <SEMANTICS>
752@@ -230,7 +232,9 @@
753 <SYNRESTRS/>
754 </NP>
755 <NP value="Topic">
756- <SYNRESTRS/>
757+ <SYNRESTRS>
758+ <SYNRESTR Value="+" type="quotation"/>
759+ </SYNRESTRS>
760 </NP>
761 </SYNTAX>
762 <SEMANTICS>
763diff -Naur old/judgment-33.xml new/judgment-33.xml
764--- old/judgment-33.xml 2013-04-22 16:33:03.000000000 -0400
765+++ new/judgment-33.xml 2018-09-26 18:49:32.000000000 -0400
766@@ -185,6 +185,9 @@
767 <SYNRESTR Value="+" type="genitive"/>
768 </SYNRESTRS>
769 </NP>
770+ <NP value="Attribute">
771+ <SYNRESTRS/>
772+ </NP>
773 </SYNTAX>
774 <SEMANTICS>
775 <PRED value="declare">
776@@ -241,10 +244,9 @@
777 <NP value="Theme">
778 <SYNRESTRS/>
779 </NP>
780+ <LEX value="to be"/>
781 <NP value="Attribute">
782- <SYNRESTRS>
783- <SYNRESTR Value="+" type="small_clause"/>
784- </SYNRESTRS>
785+ <SYNRESTRS/>
786 </NP>
787 </SYNTAX>
788 <SEMANTICS>
789diff -Naur old/keep-15.2.xml new/keep-15.2.xml
790--- old/keep-15.2.xml 2013-04-22 16:33:03.000000000 -0400
791+++ new/keep-15.2.xml 2018-09-26 18:49:34.000000000 -0400
792@@ -21,8 +21,7 @@
793 </THEMROLE>
794 <THEMROLE type="Location">
795 <SELRESTRS>
796- <SELRESTR Value="+" type="location"/>
797- <SELRESTR Value="-" type="region"/>
798+ <SELRESTR Value="+" type="non_region_location"/>
799 </SELRESTRS>
800 </THEMROLE>
801 </THEMROLES>
802diff -Naur old/leave-51.2.xml new/leave-51.2.xml
803--- old/leave-51.2.xml 2013-04-22 16:33:03.000000000 -0400
804+++ new/leave-51.2.xml 2018-09-26 18:49:37.000000000 -0400
805@@ -13,8 +13,7 @@
806 </THEMROLE>
807 <THEMROLE type="Initial_Location">
808 <SELRESTRS>
809- <SELRESTR Value="+" type="location"/>
810- <SELRESTR Value="-" type="region"/>
811+ <SELRESTR Value="+" type="non_region_location"/>
812 </SELRESTRS>
813 </THEMROLE>
814 </THEMROLES>
815diff -Naur old/light_emission-43.1.xml new/light_emission-43.1.xml
816--- old/light_emission-43.1.xml 2013-04-22 16:33:03.000000000 -0400
817+++ new/light_emission-43.1.xml 2018-09-26 18:49:40.000000000 -0400
818@@ -28,7 +28,7 @@
819 <THEMROLES>
820 <THEMROLE type="Theme">
821 <SELRESTRS>
822- <SELRESTR Value="-" type="animate"/>
823+ <SELRESTR Value="+" type="inanimate"/>
824 </SELRESTRS>
825 </THEMROLE>
826 <THEMROLE type="Location">
827diff -Naur old/manner_speaking-37.3.xml new/manner_speaking-37.3.xml
828--- old/manner_speaking-37.3.xml 2013-04-22 16:33:03.000000000 -0400
829+++ new/manner_speaking-37.3.xml 2018-09-26 18:49:43.000000000 -0400
830@@ -261,7 +261,9 @@
831 </NP>
832 <VERB/>
833 <NP value="Topic">
834- <SYNRESTRS/>
835+ <SYNRESTRS>
836+ <SYNRESTR Value="+" type="quotation"/>
837+ </SYNRESTRS>
838 </NP>
839 </SYNTAX>
840 <SEMANTICS>
841@@ -600,7 +602,9 @@
842 <SYNRESTRS/>
843 </NP>
844 <NP value="Topic">
845- <SYNRESTRS/>
846+ <SYNRESTRS>
847+ <SYNRESTR Value="+" type="quotation"/>
848+ </SYNRESTRS>
849 </NP>
850 </SYNTAX>
851 <SEMANTICS>
852diff -Naur old/matter-91.xml new/matter-91.xml
853--- old/matter-91.xml 2013-04-22 16:33:03.000000000 -0400
854+++ new/matter-91.xml 2018-09-26 18:49:45.000000000 -0400
855@@ -7,7 +7,7 @@
856 </MEMBERS>
857 <THEMROLES>
858 <THEMROLE type="Experiencer">
859- <SELRESTRS>
860+ <SELRESTRS logic="or">
861 <SELRESTR Value="+" type="animate"/>
862 <SELRESTR Value="+" type="organization"/>
863 </SELRESTRS>
864diff -Naur old/modes_of_being_with_motion-47.3.xml new/modes_of_being_with_motion-47.3.xml
865--- old/modes_of_being_with_motion-47.3.xml 2013-04-22 16:33:03.000000000 -0400
866+++ new/modes_of_being_with_motion-47.3.xml 2018-09-26 18:49:51.000000000 -0400
867@@ -61,8 +61,7 @@
868 </THEMROLE>
869 <THEMROLE type="Location">
870 <SELRESTRS>
871- <SELRESTR Value="+" type="location"/>
872- <SELRESTR Value="-" type="region"/>
873+ <SELRESTR Value="+" type="non_region_location"/>
874 </SELRESTRS>
875 </THEMROLE>
876 </THEMROLES>
877diff -Naur old/other_cos-45.4.xml new/other_cos-45.4.xml
878--- old/other_cos-45.4.xml 2013-04-22 16:33:03.000000000 -0400
879+++ new/other_cos-45.4.xml 2018-09-26 18:49:55.000000000 -0400
880@@ -531,7 +531,9 @@
881 </NP>
882 <VERB/>
883 <NP value="Result">
884- <SYNRESTRS/>
885+ <SYNRESTRS>
886+ <SYNRESTR Value="+" type="adjp"/>
887+ </SYNRESTRS>
888 </NP>
889 </SYNTAX>
890 <SEMANTICS>
891diff -Naur old/pay-68.xml new/pay-68.xml
892--- old/pay-68.xml 2013-04-22 16:33:03.000000000 -0400
893+++ new/pay-68.xml 2018-09-26 18:49:57.000000000 -0400
894@@ -10,7 +10,7 @@
895 </MEMBERS>
896 <THEMROLES>
897 <THEMROLE type="Agent">
898- <SELRESTRS>
899+ <SELRESTRS logic="or">
900 <SELRESTR Value="+" type="animate"/>
901 <SELRESTR Value="+" type="organization"/>
902 </SELRESTRS>
903diff -Naur old/pocket-9.10.xml new/pocket-9.10.xml
904--- old/pocket-9.10.xml 2013-04-22 16:33:03.000000000 -0400
905+++ new/pocket-9.10.xml 2018-09-26 18:50:02.000000000 -0400
906@@ -253,7 +253,9 @@
907 </NP>
908 <VERB/>
909 <NP value="Destination">
910- <SYNRESTRS/>
911+ <SYNRESTRS>
912+ <SYNRESTR Value="+" type="adv-loc"/>
913+ </SYNRESTRS>
914 </NP>
915 </SYNTAX>
916 <SEMANTICS>
917diff -Naur old/poison-42.2.xml new/poison-42.2.xml
918--- old/poison-42.2.xml 2013-04-22 16:33:03.000000000 -0400
919+++ new/poison-42.2.xml 2018-09-26 18:50:05.000000000 -0400
920@@ -90,7 +90,9 @@
921 <SYNRESTRS/>
922 </NP>
923 <NP value="Result">
924- <SYNRESTRS/>
925+ <SYNRESTRS>
926+ <SYNRESTR Value="+" type="adjp"/>
927+ </SYNRESTRS>
928 </NP>
929 </SYNTAX>
930 <SEMANTICS>
931diff -Naur old/pour-9.5.xml new/pour-9.5.xml
932--- old/pour-9.5.xml 2013-04-22 16:33:03.000000000 -0400
933+++ new/pour-9.5.xml 2018-09-26 18:50:07.000000000 -0400
934@@ -21,23 +21,18 @@
935 <THEMROLE type="Theme">
936 <SELRESTRS logic="or">
937 <SELRESTR Value="+" type="substance"/>
938- <SELRESTRS>
939- <SELRESTR Value="+" type="concrete"/>
940- <SELRESTR Value="+" type="plural"/>
941- </SELRESTRS>
942+ <SELRESTR Value="+" type="group"/>
943 </SELRESTRS>
944 </THEMROLE>
945 <THEMROLE type="Destination">
946 <SELRESTRS>
947- <SELRESTR Value="+" type="location"/>
948- <SELRESTR Value="-" type="region"/>
949+ <SELRESTR Value="+" type="non_region_location"/>
950 </SELRESTRS>
951 </THEMROLE>
952 <!--Exception: If Destination is object of a initial_location-type preposition ("from"), then +region is allowed-->
953 <THEMROLE type="Initial_Location">
954 <SELRESTRS>
955- <SELRESTR Value="+" type="location"/>
956- <SELRESTR Value="-" type="region"/>
957+ <SELRESTR Value="+" type="non_region_location"/>
958 </SELRESTRS>
959 </THEMROLE>
960 </THEMROLES>
961@@ -56,9 +51,10 @@
962 <SYNRESTRS/>
963 </NP>
964 <PREP>
965- <SELRESTRS>
966- <SELRESTR Value="+" type="path"/>
967- <SELRESTR Value="-" type="dest_dir"/>
968+ <SELRESTRS logic="or">
969+ <SELRESTR Value="+" type="dir"/>
970+ <SELRESTR Value="+" type="src"/>
971+ <SELRESTR Value="+" type="dest_conf"/>
972 </SELRESTRS>
973 </PREP>
974 <NP value="Destination">
975@@ -154,10 +150,11 @@
976 </NP>
977 <VERB/>
978 <PREP>
979- <SELRESTRS>
980- <SELRESTR Value="+" type="path"/>
981- <SELRESTR Value="-" type="dest_dir"/>
982- </SELRESTRS>
983+ <SELRESTRS logic="or">
984+ <SELRESTR Value="+" type="dir"/>
985+ <SELRESTR Value="+" type="src"/>
986+ <SELRESTR Value="+" type="dest_conf"/>
987+ </SELRESTRS>
988 </PREP>
989 <NP value="Destination">
990 <SYNRESTRS/>
991diff -Naur old/push-12.xml new/push-12.xml
992--- old/push-12.xml 2013-04-22 16:33:03.000000000 -0400
993+++ new/push-12.xml 2018-09-26 18:50:11.000000000 -0400
994@@ -87,7 +87,9 @@
995 <SYNRESTRS/>
996 </NP>
997 <NP value="Result">
998- <SYNRESTRS/>
999+ <SYNRESTRS>
1000+ <SYNRESTR Value="+" type="adjp"/>
1001+ </SYNRESTRS>
1002 </NP>
1003 </SYNTAX>
1004 <SEMANTICS>
1005diff -Naur old/put-9.1.xml new/put-9.1.xml
1006--- old/put-9.1.xml 2013-04-22 16:33:03.000000000 -0400
1007+++ new/put-9.1.xml 2018-09-26 18:50:15.000000000 -0400
1008@@ -32,8 +32,7 @@
1009 </THEMROLE>
1010 <THEMROLE type="Destination">
1011 <SELRESTRS>
1012- <SELRESTR Value="+" type="location"/>
1013- <SELRESTR Value="-" type="region"/>
1014+ <SELRESTR Value="+" type="non_region_location"/>
1015 </SELRESTRS>
1016 </THEMROLE>
1017 </THEMROLES>
1018diff -Naur old/put_direction-9.4.xml new/put_direction-9.4.xml
1019--- old/put_direction-9.4.xml 2013-04-22 16:33:03.000000000 -0400
1020+++ new/put_direction-9.4.xml 2018-09-26 18:50:18.000000000 -0400
1021@@ -27,8 +27,7 @@
1022 </THEMROLE>
1023 <THEMROLE type="Destination">
1024 <SELRESTRS>
1025- <SELRESTR Value="+" type="location"/>
1026- <SELRESTR Value="-" type="region"/>
1027+ <SELRESTR Value="+" type="non_region_location"/>
1028 </SELRESTRS>
1029 </THEMROLE>
1030 <!--Exception: If Destination is object of a source-type preposition ("from"), then +region is allowed-->
1031diff -Naur old/put_spatial-9.2.xml new/put_spatial-9.2.xml
1032--- old/put_spatial-9.2.xml 2013-04-22 16:33:03.000000000 -0400
1033+++ new/put_spatial-9.2.xml 2018-09-26 18:50:20.000000000 -0400
1034@@ -22,8 +22,7 @@
1035 </THEMROLE>
1036 <THEMROLE type="Destination">
1037 <SELRESTRS>
1038- <SELRESTR Value="+" type="location"/>
1039- <SELRESTR Value="-" type="region"/>
1040+ <SELRESTR Value="+" type="non_region_location"/>
1041 </SELRESTRS>
1042 </THEMROLE>
1043 </THEMROLES>
1044diff -Naur old/reach-51.8.xml new/reach-51.8.xml
1045--- old/reach-51.8.xml 2013-04-22 16:33:03.000000000 -0400
1046+++ new/reach-51.8.xml 2018-09-26 18:50:23.000000000 -0400
1047@@ -9,8 +9,8 @@
1048 </MEMBERS>
1049 <THEMROLES>
1050 <THEMROLE type="Agent">
1051- <SELRESTRS>
1052- <SELRESTR Value="+" type="concrete"/>
1053+ <SELRESTRS logic="or">
1054+ <SELRESTR Value="+" type="animate"/>
1055 <SELRESTR Value="+" type="organization"/>
1056 </SELRESTRS>
1057 </THEMROLE>
1058diff -Naur old/roll-51.3.1.xml new/roll-51.3.1.xml
1059--- old/roll-51.3.1.xml 2013-04-22 16:33:03.000000000 -0400
1060+++ new/roll-51.3.1.xml 2018-09-26 18:50:30.000000000 -0400
1061@@ -187,7 +187,9 @@
1062 </NP>
1063 <VERB/>
1064 <NP value="Result">
1065- <SYNRESTRS/>
1066+ <SYNRESTRS>
1067+ <SYNRESTR Value="+" type="adjp"/>
1068+ </SYNRESTRS>
1069 </NP>
1070 </SYNTAX>
1071 <SEMANTICS>
1072@@ -253,7 +255,9 @@
1073 <SYNRESTRS/>
1074 </NP>
1075 <NP value="Result">
1076- <SYNRESTRS/>
1077+ <SYNRESTRS>
1078+ <SYNRESTR Value="+" type="adjp"/>
1079+ </SYNRESTRS>
1080 </NP>
1081 </SYNTAX>
1082 <SEMANTICS>
1083diff -Naur old/see-30.1.xml new/see-30.1.xml
1084--- old/see-30.1.xml 2013-04-22 16:33:03.000000000 -0400
1085+++ new/see-30.1.xml 2018-09-26 18:50:33.000000000 -0400
1086@@ -14,6 +14,9 @@
1087 <THEMROLE type="Stimulus">
1088 <SELRESTRS/>
1089 </THEMROLE>
1090+ <THEMROLE type="Patient">
1091+ <SELRESTRS/>
1092+ </THEMROLE>
1093 </THEMROLES>
1094 <FRAMES>
1095 <FRAME>
1096@@ -91,6 +94,12 @@
1097 <NP value="Stimulus">
1098 <SYNRESTRS/>
1099 </NP>
1100+ <PREP value="in">
1101+ <SELRESTRS/>
1102+ </PREP>
1103+ <NP value="Patient">
1104+ <SYNRESTRS/>
1105+ </NP>
1106 </SYNTAX>
1107 <SEMANTICS>
1108 <PRED value="perceive">
1109@@ -229,6 +238,9 @@
1110 <SYNRESTRS/>
1111 </NP>
1112 <VERB/>
1113+ <NP value="Patient">
1114+ <SYNRESTRS/>
1115+ </NP>
1116 <NP value="Stimulus">
1117 <SYNRESTRS>
1118 <SYNRESTR Value="+" type="oc_ing"/>
1119diff -Naur old/seem-109.xml new/seem-109.xml
1120--- old/seem-109.xml 2013-04-22 16:33:03.000000000 -0400
1121+++ new/seem-109.xml 2018-09-26 18:50:37.000000000 -0400
1122@@ -27,9 +27,9 @@
1123 </NP>
1124 <VERB/>
1125 <NP value="Attribute">
1126- <SYNRESTRS>
1127- <SYNRESTR Value="-" type="sentential"/>
1128- </SYNRESTRS>
1129+ <SYNRESTRS>
1130+ <SYNRESTR Value="+" type="adjp"/>
1131+ </SYNRESTRS>
1132 </NP>
1133 </SYNTAX>
1134 <SEMANTICS>
1135diff -Naur old/send-11.1.xml new/send-11.1.xml
1136--- old/send-11.1.xml 2013-04-22 16:33:03.000000000 -0400
1137+++ new/send-11.1.xml 2018-09-26 18:50:39.000000000 -0400
1138@@ -38,10 +38,7 @@
1139 <THEMROLE type="Destination">
1140 <SELRESTRS logic="or">
1141 <SELRESTR Value="+" type="animate"/>
1142- <SELRESTRS>
1143- <SELRESTR Value="+" type="location"/>
1144- <SELRESTR Value="-" type="region"/>
1145- </SELRESTRS>
1146+ <SELRESTR Value="+" type="non_region_location"/>
1147 </SELRESTRS>
1148 </THEMROLE>
1149 </THEMROLES>
1150diff -Naur old/slide-11.2.xml new/slide-11.2.xml
1151--- old/slide-11.2.xml 2013-04-22 16:33:03.000000000 -0400
1152+++ new/slide-11.2.xml 2018-09-26 18:50:41.000000000 -0400
1153@@ -24,10 +24,7 @@
1154 <THEMROLE type="Destination">
1155 <SELRESTRS logic="or">
1156 <SELRESTR Value="+" type="animate"/>
1157- <SELRESTRS>
1158- <SELRESTR Value="+" type="location"/>
1159- <SELRESTR Value="-" type="region"/>
1160- </SELRESTRS>
1161+ <SELRESTR Value="+" type="non_region_location"/>
1162 </SELRESTRS>
1163 </THEMROLE>
1164 <THEMROLE type="Trajectory">
1165@@ -66,10 +63,11 @@
1166 </NP>
1167 <VERB/>
1168 <PREP>
1169- <SELRESTRS>
1170- <SELRESTR Value="+" type="path"/>
1171- <SELRESTR Value="-" type="dest_dir"/>
1172- </SELRESTRS>
1173+ <SELRESTRS logic="or">
1174+ <SELRESTR Value="+" type="dir"/>
1175+ <SELRESTR Value="+" type="src"/>
1176+ <SELRESTR Value="+" type="dest_conf"/>
1177+ </SELRESTRS>
1178 </PREP>
1179 <NP value="Initial_Location">
1180 <SYNRESTRS/>
1181@@ -215,10 +213,11 @@
1182 <SYNRESTRS/>
1183 </NP>
1184 <PREP>
1185- <SELRESTRS>
1186- <SELRESTR Value="+" type="path"/>
1187- <SELRESTR Value="-" type="dest_dir"/>
1188- </SELRESTRS>
1189+ <SELRESTRS logic="or">
1190+ <SELRESTR Value="+" type="dir"/>
1191+ <SELRESTR Value="+" type="src"/>
1192+ <SELRESTR Value="+" type="dest_conf"/>
1193+ </SELRESTRS>
1194 </PREP>
1195 <NP value="Trajectory">
1196 <SELRESTRS/>
1197diff -Naur old/smell_emission-43.3.xml new/smell_emission-43.3.xml
1198--- old/smell_emission-43.3.xml 2013-04-22 16:33:03.000000000 -0400
1199+++ new/smell_emission-43.3.xml 2018-09-26 18:50:44.000000000 -0400
1200@@ -9,7 +9,7 @@
1201 <THEMROLES>
1202 <THEMROLE type="Theme">
1203 <SELRESTRS>
1204- <SELRESTR Value="-" type="animate"/>
1205+ <SELRESTR Value="+" type="inanimate"/>
1206 </SELRESTRS>
1207 </THEMROLE>
1208 <THEMROLE type="Location">
1209diff -Naur old/sound_emission-43.2.xml new/sound_emission-43.2.xml
1210--- old/sound_emission-43.2.xml 2013-04-22 16:33:03.000000000 -0400
1211+++ new/sound_emission-43.2.xml 2018-09-26 18:50:47.000000000 -0400
1212@@ -135,7 +135,7 @@
1213 <THEMROLES>
1214 <THEMROLE type="Theme">
1215 <SELRESTRS>
1216- <SELRESTR Value="-" type="animate"/>
1217+ <SELRESTR Value="+" type="inanimate"/>
1218 </SELRESTRS>
1219 </THEMROLE>
1220 <THEMROLE type="Location">
1221diff -Naur old/sound_existence-47.4.xml new/sound_existence-47.4.xml
1222--- old/sound_existence-47.4.xml 2013-04-22 16:33:03.000000000 -0400
1223+++ new/sound_existence-47.4.xml 2018-09-26 18:50:49.000000000 -0400
1224@@ -18,8 +18,7 @@
1225 </THEMROLE>
1226 <THEMROLE type="Location">
1227 <SELRESTRS>
1228- <SELRESTR Value="+" type="location"/>
1229- <SELRESTR Value="-" type="region"/>
1230+ <SELRESTR Value="+" type="non_region_location"/>
1231 </SELRESTRS>
1232 </THEMROLE>
1233 </THEMROLES>
1234diff -Naur old/spank-18.3.xml new/spank-18.3.xml
1235--- old/spank-18.3.xml 2013-04-22 16:33:03.000000000 -0400
1236+++ new/spank-18.3.xml 2018-09-26 18:50:53.000000000 -0400
1237@@ -67,6 +67,9 @@
1238 <THEMROLE type="Result">
1239 <SELRESTRS/>
1240 </THEMROLE>
1241+ <THEMROLE type="Recipient">
1242+ <SELRESTRS/>
1243+ </THEMROLE>
1244 </THEMROLES>
1245 <FRAMES>
1246 <FRAME>
1247@@ -198,7 +201,9 @@
1248 <SYNRESTRS/>
1249 </NP>
1250 <NP value="Result">
1251- <SYNRESTRS/>
1252+ <SYNRESTRS>
1253+ <SYNRESTR Value="+" type="adjp"/>
1254+ </SYNRESTRS>
1255 </NP>
1256 </SYNTAX>
1257 <SEMANTICS>
1258@@ -526,10 +531,14 @@
1259 </NP>
1260 <VERB/>
1261 <NP value="Patient">
1262- <SYNRESTRS>
1263- <SYNRESTR Value="+" type="genitive"/>
1264- <SYNRESTR Value="+" type="body_part"/>
1265- </SYNRESTRS>
1266+ <SYNRESTRS>
1267+ <SYNRESTR Value="+" type="genitive"/>
1268+ </SYNRESTRS>
1269+ </NP>
1270+ <NP value="Recipient">
1271+ <SYNRESTRS>
1272+ <SYNRESTR Value="+" type="body_part"/>
1273+ </SYNRESTRS>
1274 </NP>
1275 </SYNTAX>
1276 <SEMANTICS>
1277diff -Naur old/spatial_configuration-47.6.xml new/spatial_configuration-47.6.xml
1278--- old/spatial_configuration-47.6.xml 2013-04-22 16:33:03.000000000 -0400
1279+++ new/spatial_configuration-47.6.xml 2018-09-26 18:50:57.000000000 -0400
1280@@ -63,8 +63,7 @@
1281 </THEMROLE>
1282 <THEMROLE type="Location">
1283 <SELRESTRS>
1284- <SELRESTR Value="+" type="location"/>
1285- <SELRESTR Value="-" type="region"/>
1286+ <SELRESTR Value="+" type="non_region_location"/>
1287 </SELRESTRS>
1288 </THEMROLE>
1289 </THEMROLES>
1290diff -Naur old/split-23.2.xml new/split-23.2.xml
1291--- old/split-23.2.xml 2013-04-22 16:33:03.000000000 -0400
1292+++ new/split-23.2.xml 2018-09-26 18:51:00.000000000 -0400
1293@@ -56,7 +56,7 @@
1294 <NP value="Patient">
1295 <SYNRESTRS/>
1296 </NP>
1297- <PREP value="off off of from">
1298+ <PREP value="off off_of from">
1299 <SELRESTRS/>
1300 </PREP>
1301 <NP value="Co-Patient">
1302@@ -140,7 +140,7 @@
1303 <SYNRESTRS/>
1304 </NP>
1305 <VERB/>
1306- <PREP value="off off of from">
1307+ <PREP value="off off_of from">
1308 <SELRESTRS/>
1309 </PREP>
1310 <NP value="Co-Patient">
1311@@ -209,7 +209,7 @@
1312 <SYNRESTRS/>
1313 </NP>
1314 <VERB/>
1315- <PREP value="off off of from">
1316+ <PREP value="off off_of from">
1317 <SELRESTRS/>
1318 </PREP>
1319 <NP value="Co-Patient">
1320diff -Naur old/spray-9.7.xml new/spray-9.7.xml
1321--- old/spray-9.7.xml 2013-04-22 16:33:03.000000000 -0400
1322+++ new/spray-9.7.xml 2018-09-26 18:51:02.000000000 -0400
1323@@ -16,8 +16,7 @@
1324 </THEMROLE>
1325 <THEMROLE type="Destination">
1326 <SELRESTRS>
1327- <SELRESTR Value="+" type="location"/>
1328- <SELRESTR Value="-" type="region"/>
1329+ <SELRESTR Value="+" type="non_region_location"/>
1330 </SELRESTRS>
1331 </THEMROLE>
1332 </THEMROLES>
1333@@ -251,8 +250,7 @@
1334 <SELRESTRS logic="or">
1335 <SELRESTR Value="+" type="substance"/>
1336 <SELRESTRS>
1337- <SELRESTR Value="+" type="concrete"/>
1338- <SELRESTR Value="+" type="plural"/>
1339+ <SELRESTR Value="+" type="group"/>
1340 </SELRESTRS>
1341 </SELRESTRS>
1342 </THEMROLE>
1343diff -Naur old/steal-10.5.xml new/steal-10.5.xml
1344--- old/steal-10.5.xml 2013-04-22 16:33:03.000000000 -0400
1345+++ new/steal-10.5.xml 2018-09-26 18:51:05.000000000 -0400
1346@@ -52,10 +52,7 @@
1347 <THEMROLE type="Source">
1348 <SELRESTRS logic="or">
1349 <SELRESTR Value="+" type="animate"/>
1350- <SELRESTRS>
1351- <SELRESTR Value="+" type="location"/>
1352- <SELRESTR Value="-" type="region"/>
1353- </SELRESTRS>
1354+ <SELRESTR Value="+" type="non_region_location"/>
1355 </SELRESTRS>
1356 </THEMROLE>
1357 <THEMROLE type="Beneficiary">
1358diff -Naur old/substance_emission-43.4.xml new/substance_emission-43.4.xml
1359--- old/substance_emission-43.4.xml 2013-04-22 16:33:03.000000000 -0400
1360+++ new/substance_emission-43.4.xml 2018-09-26 18:51:08.000000000 -0400
1361@@ -37,7 +37,7 @@
1362 <THEMROLES>
1363 <THEMROLE type="Theme">
1364 <SELRESTRS>
1365- <SELRESTR Value="-" type="animate"/>
1366+ <SELRESTR Value="+" type="inanimate"/>
1367 </SELRESTRS>
1368 </THEMROLE>
1369 <THEMROLE type="Location">
1370diff -Naur old/swarm-47.5.1.xml new/swarm-47.5.1.xml
1371--- old/swarm-47.5.1.xml 2013-04-22 16:33:03.000000000 -0400
1372+++ new/swarm-47.5.1.xml 2018-09-26 18:51:11.000000000 -0400
1373@@ -5,14 +5,12 @@
1374 <THEMROLES>
1375 <THEMROLE type="Theme">
1376 <SELRESTRS>
1377- <SELRESTR Value="+" type="concrete"/>
1378- <SELRESTR Value="+" type="plural"/>
1379+ <SELRESTR Value="+" type="group"/>
1380 </SELRESTRS>
1381 </THEMROLE>
1382 <THEMROLE type="Location">
1383 <SELRESTRS>
1384- <SELRESTR Value="+" type="location"/>
1385- <SELRESTR Value="-" type="region"/>
1386+ <SELRESTR Value="+" type="non_region_location"/>
1387 </SELRESTRS>
1388 </THEMROLE>
1389 </THEMROLES>
1390diff -Naur old/swat-18.2.xml new/swat-18.2.xml
1391--- old/swat-18.2.xml 2013-04-22 16:33:03.000000000 -0400
1392+++ new/swat-18.2.xml 2018-09-26 18:51:13.000000000 -0400
1393@@ -261,7 +261,9 @@
1394 <SYNRESTRS/>
1395 </NP>
1396 <NP value="Result">
1397- <SYNRESTRS/>
1398+ <SYNRESTRS>
1399+ <SYNRESTR Value="+" type="adjp"/>
1400+ </SYNRESTRS>
1401 </NP>
1402 </SYNTAX>
1403 <SEMANTICS>
1404@@ -321,7 +323,9 @@
1405 <SYNRESTRS/>
1406 </NP>
1407 <NP value="Result">
1408- <SYNRESTRS/>
1409+ <SYNRESTRS>
1410+ <SYNRESTR Value="+" type="adjp"/>
1411+ </SYNRESTRS>
1412 </NP>
1413 <PREP value="with">
1414 <SELRESTRS/>
1415diff -Naur old/tape-22.4.xml new/tape-22.4.xml
1416--- old/tape-22.4.xml 2013-04-22 16:33:03.000000000 -0400
1417+++ new/tape-22.4.xml 2018-09-26 18:51:16.000000000 -0400
1418@@ -90,8 +90,7 @@
1419 </THEMROLE>
1420 <THEMROLE type="Instrument">
1421 <SELRESTRS>
1422- <SELRESTR Value="+" type="concrete"/>
1423- <SELRESTR Value="-" type="animate"/>
1424+ <SELRESTR Value="+" type="concrete_inanimate"/>
1425 </SELRESTRS>
1426 </THEMROLE>
1427 <!--Instrument is realized in the verb-->
1428@@ -361,7 +360,9 @@
1429 <SYNRESTRS/>
1430 </NP>
1431 <NP value="Result">
1432- <SYNRESTRS/>
1433+ <SYNRESTRS>
1434+ <SYNRESTR Value="+" type="adjp"/>
1435+ </SYNRESTRS>
1436 </NP>
1437 </SYNTAX>
1438 <SEMANTICS>
1439diff -Naur old/throw-17.1.xml new/throw-17.1.xml
1440--- old/throw-17.1.xml 2013-04-22 16:33:03.000000000 -0400
1441+++ new/throw-17.1.xml 2018-09-26 18:51:18.000000000 -0400
1442@@ -24,10 +24,7 @@
1443 <THEMROLE type="Destination">
1444 <SELRESTRS logic="or">
1445 <SELRESTR Value="+" type="animate"/>
1446- <SELRESTRS>
1447- <SELRESTR Value="+" type="location"/>
1448- <SELRESTR Value="-" type="region"/>
1449- </SELRESTRS>
1450+ <SELRESTR Value="+" type="non_region_location"/>
1451 </SELRESTRS>
1452 </THEMROLE>
1453 <THEMROLE type="Result">
1454diff -Naur old/vehicle-51.4.1.xml new/vehicle-51.4.1.xml
1455--- old/vehicle-51.4.1.xml 2013-04-22 16:33:03.000000000 -0400
1456+++ new/vehicle-51.4.1.xml 2018-09-26 18:51:22.000000000 -0400
1457@@ -224,7 +224,9 @@
1458 <SYNRESTRS/>
1459 </NP>
1460 <NP value="Result">
1461- <SYNRESTRS/>
1462+ <SYNRESTRS>
1463+ <SYNRESTR Value="+" type="adjp"/>
1464+ </SYNRESTRS>
1465 </NP>
1466 </SYNTAX>
1467 <SEMANTICS>
1468diff -Naur old/waltz-51.5.xml new/waltz-51.5.xml
1469--- old/waltz-51.5.xml 2013-04-22 16:33:03.000000000 -0400
1470+++ new/waltz-51.5.xml 2018-09-26 18:51:25.000000000 -0400
1471@@ -178,7 +178,9 @@
1472 <SYNRESTRS/>
1473 </NP>
1474 <NP value="Result">
1475- <SYNRESTRS/>
1476+ <SYNRESTRS>
1477+ <SYNRESTR Value="+" type="adjp"/>
1478+ </SYNRESTRS>
1479 </NP>
1480 </SYNTAX>
1481 <SEMANTICS>
1482diff -Naur old/want-32.1.xml new/want-32.1.xml
1483--- old/want-32.1.xml 2013-04-22 16:33:03.000000000 -0400
1484+++ new/want-32.1.xml 2018-09-26 18:51:28.000000000 -0400
1485@@ -140,6 +140,7 @@
1486 <NP value="Theme">
1487 <SYNRESTRS/>
1488 </NP>
1489+ <ADV/>
1490 </SYNTAX>
1491 <SEMANTICS>
1492 <PRED value="desire">
1493@@ -192,6 +193,7 @@
1494 <SYNRESTR Value="+" type="np_ppart"/>
1495 </SYNRESTRS>
1496 </NP>
1497+ <ADJ/>
1498 </SYNTAX>
1499 <SEMANTICS>
1500 <PRED value="desire">
1501@@ -303,10 +305,11 @@
1502 <SYNRESTRS/>
1503 </NP>
1504 <VERB/>
1505+ <LEX value="to be"/>
1506 <NP value="Theme">
1507- <SYNRESTRS>
1508- <SYNRESTR Value="+" type="to_be"/>
1509- </SYNRESTRS>
1510+ <SYNRESTRS>
1511+ <SYNRESTR Value="+" type="adjp"/>
1512+ </SYNRESTRS>
1513 </NP>
1514 </SYNTAX>
1515 <SEMANTICS>
1516diff -Naur old/wipe_instr-10.4.2.xml new/wipe_instr-10.4.2.xml
1517--- old/wipe_instr-10.4.2.xml 2013-04-22 16:33:03.000000000 -0400
1518+++ new/wipe_instr-10.4.2.xml 2018-09-26 18:51:32.000000000 -0400
1519@@ -23,8 +23,7 @@
1520 </THEMROLE>
1521 <THEMROLE type="Theme">
1522 <SELRESTRS>
1523- <SELRESTR Value="+" type="concrete"/>
1524- <SELRESTR Value="-" type="animate"/>
1525+ <SELRESTR Value="+" type="concrete_inanimate"/>
1526 </SELRESTRS>
1527 </THEMROLE>
1528 <THEMROLE type="Initial_Location">
1529@@ -34,8 +33,7 @@
1530 </THEMROLE>
1531 <THEMROLE type="Instrument">
1532 <SELRESTRS>
1533- <SELRESTR Value="+" type="concrete"/>
1534- <SELRESTR Value="-" type="animate"/>
1535+ <SELRESTR Value="+" type="concrete_inanimate"/>
1536 </SELRESTRS>
1537 </THEMROLE>
1538 <THEMROLE type="Result">
1539@@ -175,7 +173,9 @@
1540 <SYNRESTRS/>
1541 </NP>
1542 <NP value="Result">
1543- <SYNRESTRS/>
1544+ <SYNRESTRS>
1545+ <SYNRESTR Value="+" type="adjp"/>
1546+ </SYNRESTRS>
1547 </NP>
1548 </SYNTAX>
1549 <SEMANTICS>
1550diff -Naur old/wipe_manner-10.4.1.xml new/wipe_manner-10.4.1.xml
1551--- old/wipe_manner-10.4.1.xml 2013-04-22 16:33:03.000000000 -0400
1552+++ new/wipe_manner-10.4.1.xml 2018-09-26 18:51:36.000000000 -0400
1553@@ -34,8 +34,7 @@
1554 </THEMROLE>
1555 <THEMROLE type="Theme">
1556 <SELRESTRS>
1557- <SELRESTR Value="+" type="concrete"/>
1558- <SELRESTR Value="-" type="animate"/>
1559+ <SELRESTR Value="+" type="concrete_inanimate"/>
1560 </SELRESTRS>
1561 </THEMROLE>
1562 <THEMROLE type="Source">
1563@@ -195,7 +194,7 @@
1564 <THEMROLES>
1565 <THEMROLE type="Source">
1566 <SELRESTRS>
1567- <SELRESTR Value="-" type="region"/>
1568+ <SELRESTR Value="+" type="non_region_location"/>
1569 </SELRESTRS>
1570 </THEMROLE>
1571 </THEMROLES>
1572diff -Naur old/wish-62.xml new/wish-62.xml
1573--- old/wish-62.xml 2013-04-22 16:33:03.000000000 -0400
1574+++ new/wish-62.xml 2018-09-26 18:51:41.000000000 -0400
1575@@ -89,10 +89,11 @@
1576 <SYNRESTRS/>
1577 </NP>
1578 <VERB/>
1579+ <LEX value="to be"/>
1580 <NP value="Theme">
1581- <SYNRESTRS>
1582- <SYNRESTR Value="+" type="to_be"/>
1583- </SYNRESTRS>
1584+ <SYNRESTRS>
1585+ <SYNRESTR Value="+" type="adjp"/>
1586+ </SYNRESTRS>
1587 </NP>
1588 </SYNTAX>
1589 <SEMANTICS>
1590@@ -120,6 +121,7 @@
1591 <SYNRESTR Value="+" type="np_ppart"/>
1592 </SYNRESTRS>
1593 </NP>
1594+ <ADJ/>
1595 </SYNTAX>
1596 <SEMANTICS>
1597 <PRED value="desire">
1598diff -Naur old/withdraw-82.xml new/withdraw-82.xml
1599--- old/withdraw-82.xml 2013-04-22 16:33:03.000000000 -0400
1600+++ new/withdraw-82.xml 2018-09-26 18:51:45.000000000 -0400
1601@@ -4,7 +4,7 @@
1602 <MEMBERS/>
1603 <THEMROLES>
1604 <THEMROLE type="Agent">
1605- <SELRESTRS>
1606+ <SELRESTRS logic="or">
1607 <SELRESTR Value="+" type="animate"/>
1608 <SELRESTR Value="+" type="organization"/>
1609 </SELRESTRS>