diff options
Diffstat (limited to 'generator/vn.diff')
-rw-r--r-- | generator/vn.diff | 340 |
1 files changed, 330 insertions, 10 deletions
diff --git a/generator/vn.diff b/generator/vn.diff index 5d5e2f3..bbfd6cf 100644 --- a/generator/vn.diff +++ b/generator/vn.diff | |||
@@ -1,8 +1,11 @@ | |||
1 | diff /Users/hatkirby/Downloads/new_vn 2/admit-65.xml datadir/vn/admit-65.xml | 1 | diff /Users/hatkirby/Downloads/new_vn 2/admit-65.xml datadir/vn/admit-65.xml |
2 | 104c104 | 2 | 104,106c104,105 |
3 | < <SELRESTRS logic="or"> | 3 | < <SELRESTRS logic="or"> |
4 | < <SELRESTR Value="+" type="location"/> | ||
5 | < <SELRESTR Value="-" type="region"/> | ||
4 | --- | 6 | --- |
5 | > <SELRESTRS> | 7 | > <SELRESTRS> |
8 | > <SELRESTR Value="+" type="non_region_location"/> | ||
6 | diff /Users/hatkirby/Downloads/new_vn 2/amuse-31.1.xml datadir/vn/amuse-31.1.xml | 9 | diff /Users/hatkirby/Downloads/new_vn 2/amuse-31.1.xml datadir/vn/amuse-31.1.xml |
7 | 270a271,273 | 10 | 270a271,273 |
8 | > <THEMROLE type="Cause"> | 11 | > <THEMROLE type="Cause"> |
@@ -30,6 +33,18 @@ diff /Users/hatkirby/Downloads/new_vn 2/animal_sounds-38.xml datadir/vn/animal_s | |||
30 | diff /Users/hatkirby/Downloads/new_vn 2/assessment-34.1.xml datadir/vn/assessment-34.1.xml | 33 | diff /Users/hatkirby/Downloads/new_vn 2/assessment-34.1.xml datadir/vn/assessment-34.1.xml |
31 | 103d102 | 34 | 103d102 |
32 | < <LEX value="'s"/> | 35 | < <LEX value="'s"/> |
36 | diff /Users/hatkirby/Downloads/new_vn 2/assuming_position-50.xml datadir/vn/assuming_position-50.xml | ||
37 | 41,42c41 | ||
38 | < <SELRESTR Value="+" type="location"/> | ||
39 | < <SELRESTR Value="-" type="region"/> | ||
40 | --- | ||
41 | > <SELRESTR Value="+" type="non_region_location"/> | ||
42 | diff /Users/hatkirby/Downloads/new_vn 2/banish-10.2.xml datadir/vn/banish-10.2.xml | ||
43 | 35,36c35 | ||
44 | < <SELRESTR Value="+" type="location"/> | ||
45 | < <SELRESTR Value="-" type="region"/> | ||
46 | --- | ||
47 | > <SELRESTR Value="+" type="non_region_location"/> | ||
33 | diff /Users/hatkirby/Downloads/new_vn 2/battle-36.4.xml datadir/vn/battle-36.4.xml | 48 | diff /Users/hatkirby/Downloads/new_vn 2/battle-36.4.xml datadir/vn/battle-36.4.xml |
34 | 96c96 | 49 | 96c96 |
35 | < <SYNRESTR Value="+" type="what_extract"/> | 50 | < <SYNRESTR Value="+" type="what_extract"/> |
@@ -85,6 +100,20 @@ diff /Users/hatkirby/Downloads/new_vn 2/break-45.1.xml datadir/vn/break-45.1.xml | |||
85 | > <SYNRESTRS> | 100 | > <SYNRESTRS> |
86 | > <SYNRESTR Value="+" type="adjp"/> | 101 | > <SYNRESTR Value="+" type="adjp"/> |
87 | > </SYNRESTRS> | 102 | > </SYNRESTRS> |
103 | diff /Users/hatkirby/Downloads/new_vn 2/bring-11.3.xml datadir/vn/bring-11.3.xml | ||
104 | 27,30c27 | ||
105 | < <SELRESTRS> | ||
106 | < <SELRESTR Value="+" type="location"/> | ||
107 | < <SELRESTR Value="-" type="region"/> | ||
108 | < </SELRESTRS> | ||
109 | --- | ||
110 | > <SELRESTR Value="+" type="non_region_location"/> | ||
111 | diff /Users/hatkirby/Downloads/new_vn 2/butter-9.9.xml datadir/vn/butter-9.9.xml | ||
112 | 155,156c155 | ||
113 | < <SELRESTR Value="+" type="location"/> | ||
114 | < <SELRESTR Value="-" type="region"/> | ||
115 | --- | ||
116 | > <SELRESTR Value="+" type="non_region_location"/> | ||
88 | diff /Users/hatkirby/Downloads/new_vn 2/characterize-29.2.xml datadir/vn/characterize-29.2.xml | 117 | diff /Users/hatkirby/Downloads/new_vn 2/characterize-29.2.xml datadir/vn/characterize-29.2.xml |
89 | 107c107 | 118 | 107c107 |
90 | < <LEX value="as"/> | 119 | < <LEX value="as"/> |
@@ -104,6 +133,31 @@ diff /Users/hatkirby/Downloads/new_vn 2/characterize-29.2.xml datadir/vn/charact | |||
104 | > <SYNRESTR Value="+" type="adjp"/> | 133 | > <SYNRESTR Value="+" type="adjp"/> |
105 | > </SYNRESTRS> | 134 | > </SYNRESTRS> |
106 | > </NP> | 135 | > </NP> |
136 | diff /Users/hatkirby/Downloads/new_vn 2/cheat-10.6.xml datadir/vn/cheat-10.6.xml | ||
137 | 56,59c56 | ||
138 | < <SELRESTRS> | ||
139 | < <SELRESTR Value="+" type="location"/> | ||
140 | < <SELRESTR Value="-" type="region"/> | ||
141 | < </SELRESTRS> | ||
142 | --- | ||
143 | > <SELRESTR Value="+" type="non_region_location"/> | ||
144 | diff /Users/hatkirby/Downloads/new_vn 2/chew-39.2.xml datadir/vn/chew-39.2.xml | ||
145 | 37,38c37 | ||
146 | < <SELRESTR Value="+" type="comestible"/> | ||
147 | < <SELRESTR Value="+" type="solid"/> | ||
148 | --- | ||
149 | > <SELRESTR Value="+" type="solid_food"/> | ||
150 | 155,156c154 | ||
151 | < <SELRESTR Value="+" type="comestible"/> | ||
152 | < <SELRESTR Value="-" type="solid"/> | ||
153 | --- | ||
154 | > <SELRESTR Value="+" type="non_solid_food"/> | ||
155 | diff /Users/hatkirby/Downloads/new_vn 2/coil-9.6.xml datadir/vn/coil-9.6.xml | ||
156 | 22,23c22 | ||
157 | < <SELRESTR Value="+" type="nonrigid"/> | ||
158 | < <SELRESTR Value="+" type="elongated"/> | ||
159 | --- | ||
160 | > <SELRESTR Value="+" type="slinky"/> | ||
107 | diff /Users/hatkirby/Downloads/new_vn 2/coloring-24.xml datadir/vn/coloring-24.xml | 161 | diff /Users/hatkirby/Downloads/new_vn 2/coloring-24.xml datadir/vn/coloring-24.xml |
108 | 89c89,91 | 162 | 89c89,91 |
109 | < <SYNRESTRS/> | 163 | < <SYNRESTRS/> |
@@ -118,6 +172,11 @@ diff /Users/hatkirby/Downloads/new_vn 2/confess-37.10.xml datadir/vn/confess-37. | |||
118 | > <SYNRESTR Value="+" type="adjp"/> | 172 | > <SYNRESTR Value="+" type="adjp"/> |
119 | > </SYNRESTRS> | 173 | > </SYNRESTRS> |
120 | > </NP> | 174 | > </NP> |
175 | diff /Users/hatkirby/Downloads/new_vn 2/confine-92.xml datadir/vn/confine-92.xml | ||
176 | 18c18 | ||
177 | < <SELRESTRS> | ||
178 | --- | ||
179 | > <SELRESTRS logic="or"> | ||
121 | diff /Users/hatkirby/Downloads/new_vn 2/consider-29.9.xml datadir/vn/consider-29.9.xml | 180 | diff /Users/hatkirby/Downloads/new_vn 2/consider-29.9.xml datadir/vn/consider-29.9.xml |
122 | 191,193c191,193 | 181 | 191,193c191,193 |
123 | < <SYNRESTRS> | 182 | < <SYNRESTRS> |
@@ -195,6 +254,47 @@ diff /Users/hatkirby/Downloads/new_vn 2/declare-29.4.xml datadir/vn/declare-29.4 | |||
195 | > <SYNRESTRS> | 254 | > <SYNRESTRS> |
196 | > <SYNRESTR Value="+" type="adjp"/> | 255 | > <SYNRESTR Value="+" type="adjp"/> |
197 | > </SYNRESTRS> | 256 | > </SYNRESTRS> |
257 | diff /Users/hatkirby/Downloads/new_vn 2/devour-39.4.xml datadir/vn/devour-39.4.xml | ||
258 | 26,27c26 | ||
259 | < <SELRESTR Value="+" type="comestible"/> | ||
260 | < <SELRESTR Value="+" type="solid"/> | ||
261 | --- | ||
262 | > <SELRESTR Value="+" type="solid_food"/> | ||
263 | 67,68c66 | ||
264 | < <SELRESTR Value="+" type="comestible"/> | ||
265 | < <SELRESTR Value="-" type="solid"/> | ||
266 | --- | ||
267 | > <SELRESTR Value="+" type="non_solid_food"/> | ||
268 | diff /Users/hatkirby/Downloads/new_vn 2/drive-11.5.xml datadir/vn/drive-11.5.xml | ||
269 | 37,40c37 | ||
270 | < <SELRESTRS> | ||
271 | < <SELRESTR Value="+" type="location"/> | ||
272 | < <SELRESTR Value="-" type="region"/> | ||
273 | < </SELRESTRS> | ||
274 | --- | ||
275 | > <SELRESTR Value="+" type="non_region_location"/> | ||
276 | diff /Users/hatkirby/Downloads/new_vn 2/eat-39.1.xml datadir/vn/eat-39.1.xml | ||
277 | 24,25c24 | ||
278 | < <SELRESTR Value="+" type="comestible"/> | ||
279 | < <SELRESTR Value="+" type="solid"/> | ||
280 | --- | ||
281 | > <SELRESTR Value="+" type="solid_food"/> | ||
282 | 148,149c147 | ||
283 | < <SELRESTR Value="+" type="comestible"/> | ||
284 | < <SELRESTR Value="-" type="solid"/> | ||
285 | --- | ||
286 | > <SELRESTR Value="+" type="non_solid_food"/> | ||
287 | diff /Users/hatkirby/Downloads/new_vn 2/enforce-63.xml datadir/vn/enforce-63.xml | ||
288 | 11c11 | ||
289 | < <SELRESTRS> | ||
290 | --- | ||
291 | > <SELRESTRS logic="or"> | ||
292 | diff /Users/hatkirby/Downloads/new_vn 2/entity_specific_modes_being-47.2.xml datadir/vn/entity_specific_modes_being-47.2.xml | ||
293 | 35,36c35 | ||
294 | < <SELRESTR Value="+" type="location"/> | ||
295 | < <SELRESTR Value="-" type="region"/> | ||
296 | --- | ||
297 | > <SELRESTR Value="+" type="non_region_location"/> | ||
198 | diff /Users/hatkirby/Downloads/new_vn 2/estimate-34.2.xml datadir/vn/estimate-34.2.xml | 298 | diff /Users/hatkirby/Downloads/new_vn 2/estimate-34.2.xml datadir/vn/estimate-34.2.xml |
199 | 123a124 | 299 | 123a124 |
200 | > <LEX value="to be"/> | 300 | > <LEX value="to be"/> |
@@ -206,12 +306,53 @@ diff /Users/hatkirby/Downloads/new_vn 2/estimate-34.2.xml datadir/vn/estimate-34 | |||
206 | > <SYNRESTRS> | 306 | > <SYNRESTRS> |
207 | > <SYNRESTR Value="+" type="adjp"/> | 307 | > <SYNRESTR Value="+" type="adjp"/> |
208 | > </SYNRESTRS> | 308 | > </SYNRESTRS> |
309 | diff /Users/hatkirby/Downloads/new_vn 2/exchange-13.6.xml datadir/vn/exchange-13.6.xml | ||
310 | 329,330c329 | ||
311 | < <SELRESTR Value="+" type="location"/> | ||
312 | < <SELRESTR Value="-" type="region"/> | ||
313 | --- | ||
314 | > <SELRESTR Value="+" type="non_region_location"/> | ||
315 | diff /Users/hatkirby/Downloads/new_vn 2/exist-47.1.xml datadir/vn/exist-47.1.xml | ||
316 | 13,14c13 | ||
317 | < <SELRESTR Value="+" type="location"/> | ||
318 | < <SELRESTR Value="-" type="region"/> | ||
319 | --- | ||
320 | > <SELRESTR Value="+" type="non_region_location"/> | ||
321 | diff /Users/hatkirby/Downloads/new_vn 2/fill-9.8.xml datadir/vn/fill-9.8.xml | ||
322 | 132,133c132 | ||
323 | < <SELRESTR Value="+" type="location"/> | ||
324 | < <SELRESTR Value="-" type="region"/> | ||
325 | --- | ||
326 | > <SELRESTR Value="+" type="non_region_location"/> | ||
327 | diff /Users/hatkirby/Downloads/new_vn 2/funnel-9.3.xml datadir/vn/funnel-9.3.xml | ||
328 | 30,31c30 | ||
329 | < <SELRESTR Value="+" type="location"/> | ||
330 | < <SELRESTR Value="-" type="region"/> | ||
331 | --- | ||
332 | > <SELRESTR Value="+" type="non_region_location"/> | ||
209 | diff /Users/hatkirby/Downloads/new_vn 2/get-13.5.1.xml datadir/vn/get-13.5.1.xml | 333 | diff /Users/hatkirby/Downloads/new_vn 2/get-13.5.1.xml datadir/vn/get-13.5.1.xml |
210 | 55,56c55 | 334 | 55,56c55 |
211 | < <SELRESTR Value="-" type="location"/> | 335 | < <SELRESTR Value="-" type="location"/> |
212 | < <SELRESTR Value="-" type="region"/> | 336 | < <SELRESTR Value="-" type="region"/> |
213 | --- | 337 | --- |
214 | > <SELRESTR Value="+" type="currency"/> | 338 | > <SELRESTR Value="+" type="currency"/> |
339 | diff /Users/hatkirby/Downloads/new_vn 2/gobble-39.3.xml datadir/vn/gobble-39.3.xml | ||
340 | 23,24c23 | ||
341 | < <SELRESTR Value="+" type="comestible"/> | ||
342 | < <SELRESTR Value="+" type="solid"/> | ||
343 | --- | ||
344 | > <SELRESTR Value="+" type="solid_food"/> | ||
345 | 118,119c117 | ||
346 | < <SELRESTR Value="+" type="comestible"/> | ||
347 | < <SELRESTR Value="-" type="solid"/> | ||
348 | --- | ||
349 | > <SELRESTR Value="+" type="non_solid_food"/> | ||
350 | diff /Users/hatkirby/Downloads/new_vn 2/herd-47.5.2.xml datadir/vn/herd-47.5.2.xml | ||
351 | 29,30c29 | ||
352 | < <SELRESTR Value="+" type="concrete"/> | ||
353 | < <SELRESTR Value="+" type="plural"/> | ||
354 | --- | ||
355 | > <SELRESTR Value="+" type="group"/> | ||
215 | diff /Users/hatkirby/Downloads/new_vn 2/hit-18.1.xml datadir/vn/hit-18.1.xml | 356 | diff /Users/hatkirby/Downloads/new_vn 2/hit-18.1.xml datadir/vn/hit-18.1.xml |
216 | 234c234,236 | 357 | 234c234,236 |
217 | < <SYNRESTRS/> | 358 | < <SYNRESTRS/> |
@@ -257,6 +398,23 @@ diff /Users/hatkirby/Downloads/new_vn 2/judgment-33.xml datadir/vn/judgment-33.x | |||
257 | < </SYNRESTRS> | 398 | < </SYNRESTRS> |
258 | --- | 399 | --- |
259 | > <SYNRESTRS/> | 400 | > <SYNRESTRS/> |
401 | diff /Users/hatkirby/Downloads/new_vn 2/keep-15.2.xml datadir/vn/keep-15.2.xml | ||
402 | 24,25c24 | ||
403 | < <SELRESTR Value="+" type="location"/> | ||
404 | < <SELRESTR Value="-" type="region"/> | ||
405 | --- | ||
406 | > <SELRESTR Value="+" type="non_region_location"/> | ||
407 | diff /Users/hatkirby/Downloads/new_vn 2/leave-51.2.xml datadir/vn/leave-51.2.xml | ||
408 | 16,17c16 | ||
409 | < <SELRESTR Value="+" type="location"/> | ||
410 | < <SELRESTR Value="-" type="region"/> | ||
411 | --- | ||
412 | > <SELRESTR Value="+" type="non_region_location"/> | ||
413 | diff /Users/hatkirby/Downloads/new_vn 2/light_emission-43.1.xml datadir/vn/light_emission-43.1.xml | ||
414 | 31c31 | ||
415 | < <SELRESTR Value="-" type="animate"/> | ||
416 | --- | ||
417 | > <SELRESTR Value="+" type="inanimate"/> | ||
260 | diff /Users/hatkirby/Downloads/new_vn 2/manner_speaking-37.3.xml datadir/vn/manner_speaking-37.3.xml | 418 | diff /Users/hatkirby/Downloads/new_vn 2/manner_speaking-37.3.xml datadir/vn/manner_speaking-37.3.xml |
261 | 264c264,266 | 419 | 264c264,266 |
262 | < <SYNRESTRS/> | 420 | < <SYNRESTRS/> |
@@ -270,6 +428,17 @@ diff /Users/hatkirby/Downloads/new_vn 2/manner_speaking-37.3.xml datadir/vn/mann | |||
270 | > <SYNRESTRS> | 428 | > <SYNRESTRS> |
271 | > <SYNRESTR Value="+" type="quotation"/> | 429 | > <SYNRESTR Value="+" type="quotation"/> |
272 | > </SYNRESTRS> | 430 | > </SYNRESTRS> |
431 | diff /Users/hatkirby/Downloads/new_vn 2/matter-91.xml datadir/vn/matter-91.xml | ||
432 | 10c10 | ||
433 | < <SELRESTRS> | ||
434 | --- | ||
435 | > <SELRESTRS logic="or"> | ||
436 | diff /Users/hatkirby/Downloads/new_vn 2/modes_of_being_with_motion-47.3.xml datadir/vn/modes_of_being_with_motion-47.3.xml | ||
437 | 64,65c64 | ||
438 | < <SELRESTR Value="+" type="location"/> | ||
439 | < <SELRESTR Value="-" type="region"/> | ||
440 | --- | ||
441 | > <SELRESTR Value="+" type="non_region_location"/> | ||
273 | diff /Users/hatkirby/Downloads/new_vn 2/other_cos-45.4.xml datadir/vn/other_cos-45.4.xml | 442 | diff /Users/hatkirby/Downloads/new_vn 2/other_cos-45.4.xml datadir/vn/other_cos-45.4.xml |
274 | 534c534,536 | 443 | 534c534,536 |
275 | < <SYNRESTRS/> | 444 | < <SYNRESTRS/> |
@@ -277,6 +446,11 @@ diff /Users/hatkirby/Downloads/new_vn 2/other_cos-45.4.xml datadir/vn/other_cos- | |||
277 | > <SYNRESTRS> | 446 | > <SYNRESTRS> |
278 | > <SYNRESTR Value="+" type="adjp"/> | 447 | > <SYNRESTR Value="+" type="adjp"/> |
279 | > </SYNRESTRS> | 448 | > </SYNRESTRS> |
449 | diff /Users/hatkirby/Downloads/new_vn 2/pay-68.xml datadir/vn/pay-68.xml | ||
450 | 13c13 | ||
451 | < <SELRESTRS> | ||
452 | --- | ||
453 | > <SELRESTRS logic="or"> | ||
280 | diff /Users/hatkirby/Downloads/new_vn 2/pocket-9.10.xml datadir/vn/pocket-9.10.xml | 454 | diff /Users/hatkirby/Downloads/new_vn 2/pocket-9.10.xml datadir/vn/pocket-9.10.xml |
281 | 256c256,258 | 455 | 256c256,258 |
282 | < <SYNRESTRS/> | 456 | < <SYNRESTRS/> |
@@ -292,7 +466,24 @@ diff /Users/hatkirby/Downloads/new_vn 2/poison-42.2.xml datadir/vn/poison-42.2.x | |||
292 | > <SYNRESTR Value="+" type="adjp"/> | 466 | > <SYNRESTR Value="+" type="adjp"/> |
293 | > </SYNRESTRS> | 467 | > </SYNRESTRS> |
294 | diff /Users/hatkirby/Downloads/new_vn 2/pour-9.5.xml datadir/vn/pour-9.5.xml | 468 | diff /Users/hatkirby/Downloads/new_vn 2/pour-9.5.xml datadir/vn/pour-9.5.xml |
295 | 59,61c59,62 | 469 | 24,27c24 |
470 | < <SELRESTRS> | ||
471 | < <SELRESTR Value="+" type="concrete"/> | ||
472 | < <SELRESTR Value="+" type="plural"/> | ||
473 | < </SELRESTRS> | ||
474 | --- | ||
475 | > <SELRESTR Value="+" type="group"/> | ||
476 | 32,33c29 | ||
477 | < <SELRESTR Value="+" type="location"/> | ||
478 | < <SELRESTR Value="-" type="region"/> | ||
479 | --- | ||
480 | > <SELRESTR Value="+" type="non_region_location"/> | ||
481 | 39,40c35 | ||
482 | < <SELRESTR Value="+" type="location"/> | ||
483 | < <SELRESTR Value="-" type="region"/> | ||
484 | --- | ||
485 | > <SELRESTR Value="+" type="non_region_location"/> | ||
486 | 59,61c54,57 | ||
296 | < <SELRESTRS> | 487 | < <SELRESTRS> |
297 | < <SELRESTR Value="+" type="path"/> | 488 | < <SELRESTR Value="+" type="path"/> |
298 | < <SELRESTR Value="-" type="dest_dir"/> | 489 | < <SELRESTR Value="-" type="dest_dir"/> |
@@ -301,7 +492,7 @@ diff /Users/hatkirby/Downloads/new_vn 2/pour-9.5.xml datadir/vn/pour-9.5.xml | |||
301 | > <SELRESTR Value="+" type="dir"/> | 492 | > <SELRESTR Value="+" type="dir"/> |
302 | > <SELRESTR Value="+" type="src"/> | 493 | > <SELRESTR Value="+" type="src"/> |
303 | > <SELRESTR Value="+" type="dest_conf"/> | 494 | > <SELRESTR Value="+" type="dest_conf"/> |
304 | 157,160c158,162 | 495 | 157,160c153,157 |
305 | < <SELRESTRS> | 496 | < <SELRESTRS> |
306 | < <SELRESTR Value="+" type="path"/> | 497 | < <SELRESTR Value="+" type="path"/> |
307 | < <SELRESTR Value="-" type="dest_dir"/> | 498 | < <SELRESTR Value="-" type="dest_dir"/> |
@@ -319,6 +510,31 @@ diff /Users/hatkirby/Downloads/new_vn 2/push-12.xml datadir/vn/push-12.xml | |||
319 | > <SYNRESTRS> | 510 | > <SYNRESTRS> |
320 | > <SYNRESTR Value="+" type="adjp"/> | 511 | > <SYNRESTR Value="+" type="adjp"/> |
321 | > </SYNRESTRS> | 512 | > </SYNRESTRS> |
513 | diff /Users/hatkirby/Downloads/new_vn 2/put-9.1.xml datadir/vn/put-9.1.xml | ||
514 | 35,36c35 | ||
515 | < <SELRESTR Value="+" type="location"/> | ||
516 | < <SELRESTR Value="-" type="region"/> | ||
517 | --- | ||
518 | > <SELRESTR Value="+" type="non_region_location"/> | ||
519 | diff /Users/hatkirby/Downloads/new_vn 2/put_direction-9.4.xml datadir/vn/put_direction-9.4.xml | ||
520 | 30,31c30 | ||
521 | < <SELRESTR Value="+" type="location"/> | ||
522 | < <SELRESTR Value="-" type="region"/> | ||
523 | --- | ||
524 | > <SELRESTR Value="+" type="non_region_location"/> | ||
525 | diff /Users/hatkirby/Downloads/new_vn 2/put_spatial-9.2.xml datadir/vn/put_spatial-9.2.xml | ||
526 | 25,26c25 | ||
527 | < <SELRESTR Value="+" type="location"/> | ||
528 | < <SELRESTR Value="-" type="region"/> | ||
529 | --- | ||
530 | > <SELRESTR Value="+" type="non_region_location"/> | ||
531 | diff /Users/hatkirby/Downloads/new_vn 2/reach-51.8.xml datadir/vn/reach-51.8.xml | ||
532 | 12,13c12,13 | ||
533 | < <SELRESTRS> | ||
534 | < <SELRESTR Value="+" type="concrete"/> | ||
535 | --- | ||
536 | > <SELRESTRS logic="or"> | ||
537 | > <SELRESTR Value="+" type="animate"/> | ||
322 | diff /Users/hatkirby/Downloads/new_vn 2/roll-51.3.1.xml datadir/vn/roll-51.3.1.xml | 538 | diff /Users/hatkirby/Downloads/new_vn 2/roll-51.3.1.xml datadir/vn/roll-51.3.1.xml |
323 | 190c190,192 | 539 | 190c190,192 |
324 | < <SYNRESTRS/> | 540 | < <SYNRESTRS/> |
@@ -357,8 +573,23 @@ diff /Users/hatkirby/Downloads/new_vn 2/seem-109.xml datadir/vn/seem-109.xml | |||
357 | > <SYNRESTRS> | 573 | > <SYNRESTRS> |
358 | > <SYNRESTR Value="+" type="adjp"/> | 574 | > <SYNRESTR Value="+" type="adjp"/> |
359 | > </SYNRESTRS> | 575 | > </SYNRESTRS> |
576 | diff /Users/hatkirby/Downloads/new_vn 2/send-11.1.xml datadir/vn/send-11.1.xml | ||
577 | 41,44c41 | ||
578 | < <SELRESTRS> | ||
579 | < <SELRESTR Value="+" type="location"/> | ||
580 | < <SELRESTR Value="-" type="region"/> | ||
581 | < </SELRESTRS> | ||
582 | --- | ||
583 | > <SELRESTR Value="+" type="non_region_location"/> | ||
360 | diff /Users/hatkirby/Downloads/new_vn 2/slide-11.2.xml datadir/vn/slide-11.2.xml | 584 | diff /Users/hatkirby/Downloads/new_vn 2/slide-11.2.xml datadir/vn/slide-11.2.xml |
361 | 69,72c69,73 | 585 | 27,30c27 |
586 | < <SELRESTRS> | ||
587 | < <SELRESTR Value="+" type="location"/> | ||
588 | < <SELRESTR Value="-" type="region"/> | ||
589 | < </SELRESTRS> | ||
590 | --- | ||
591 | > <SELRESTR Value="+" type="non_region_location"/> | ||
592 | 69,72c66,70 | ||
362 | < <SELRESTRS> | 593 | < <SELRESTRS> |
363 | < <SELRESTR Value="+" type="path"/> | 594 | < <SELRESTR Value="+" type="path"/> |
364 | < <SELRESTR Value="-" type="dest_dir"/> | 595 | < <SELRESTR Value="-" type="dest_dir"/> |
@@ -369,7 +600,7 @@ diff /Users/hatkirby/Downloads/new_vn 2/slide-11.2.xml datadir/vn/slide-11.2.xml | |||
369 | > <SELRESTR Value="+" type="src"/> | 600 | > <SELRESTR Value="+" type="src"/> |
370 | > <SELRESTR Value="+" type="dest_conf"/> | 601 | > <SELRESTR Value="+" type="dest_conf"/> |
371 | > </SELRESTRS> | 602 | > </SELRESTRS> |
372 | 218,221c219,223 | 603 | 218,221c216,220 |
373 | < <SELRESTRS> | 604 | < <SELRESTRS> |
374 | < <SELRESTR Value="+" type="path"/> | 605 | < <SELRESTR Value="+" type="path"/> |
375 | < <SELRESTR Value="-" type="dest_dir"/> | 606 | < <SELRESTR Value="-" type="dest_dir"/> |
@@ -380,6 +611,22 @@ diff /Users/hatkirby/Downloads/new_vn 2/slide-11.2.xml datadir/vn/slide-11.2.xml | |||
380 | > <SELRESTR Value="+" type="src"/> | 611 | > <SELRESTR Value="+" type="src"/> |
381 | > <SELRESTR Value="+" type="dest_conf"/> | 612 | > <SELRESTR Value="+" type="dest_conf"/> |
382 | > </SELRESTRS> | 613 | > </SELRESTRS> |
614 | diff /Users/hatkirby/Downloads/new_vn 2/smell_emission-43.3.xml datadir/vn/smell_emission-43.3.xml | ||
615 | 12c12 | ||
616 | < <SELRESTR Value="-" type="animate"/> | ||
617 | --- | ||
618 | > <SELRESTR Value="+" type="inanimate"/> | ||
619 | diff /Users/hatkirby/Downloads/new_vn 2/sound_emission-43.2.xml datadir/vn/sound_emission-43.2.xml | ||
620 | 138c138 | ||
621 | < <SELRESTR Value="-" type="animate"/> | ||
622 | --- | ||
623 | > <SELRESTR Value="+" type="inanimate"/> | ||
624 | diff /Users/hatkirby/Downloads/new_vn 2/sound_existence-47.4.xml datadir/vn/sound_existence-47.4.xml | ||
625 | 21,22c21 | ||
626 | < <SELRESTR Value="+" type="location"/> | ||
627 | < <SELRESTR Value="-" type="region"/> | ||
628 | --- | ||
629 | > <SELRESTR Value="+" type="non_region_location"/> | ||
383 | diff /Users/hatkirby/Downloads/new_vn 2/spank-18.3.xml datadir/vn/spank-18.3.xml | 630 | diff /Users/hatkirby/Downloads/new_vn 2/spank-18.3.xml datadir/vn/spank-18.3.xml |
384 | 69a70,72 | 631 | 69a70,72 |
385 | > <THEMROLE type="Recipient"> | 632 | > <THEMROLE type="Recipient"> |
@@ -405,6 +652,12 @@ diff /Users/hatkirby/Downloads/new_vn 2/spank-18.3.xml datadir/vn/spank-18.3.xml | |||
405 | > <SYNRESTRS> | 652 | > <SYNRESTRS> |
406 | > <SYNRESTR Value="+" type="body_part"/> | 653 | > <SYNRESTR Value="+" type="body_part"/> |
407 | > </SYNRESTRS> | 654 | > </SYNRESTRS> |
655 | diff /Users/hatkirby/Downloads/new_vn 2/spatial_configuration-47.6.xml datadir/vn/spatial_configuration-47.6.xml | ||
656 | 66,67c66 | ||
657 | < <SELRESTR Value="+" type="location"/> | ||
658 | < <SELRESTR Value="-" type="region"/> | ||
659 | --- | ||
660 | > <SELRESTR Value="+" type="non_region_location"/> | ||
408 | diff /Users/hatkirby/Downloads/new_vn 2/split-23.2.xml datadir/vn/split-23.2.xml | 661 | diff /Users/hatkirby/Downloads/new_vn 2/split-23.2.xml datadir/vn/split-23.2.xml |
409 | 59c59 | 662 | 59c59 |
410 | < <PREP value="off off of from"> | 663 | < <PREP value="off off of from"> |
@@ -418,6 +671,41 @@ diff /Users/hatkirby/Downloads/new_vn 2/split-23.2.xml datadir/vn/split-23.2.xml | |||
418 | < <PREP value="off off of from"> | 671 | < <PREP value="off off of from"> |
419 | --- | 672 | --- |
420 | > <PREP value="off off_of from"> | 673 | > <PREP value="off off_of from"> |
674 | diff /Users/hatkirby/Downloads/new_vn 2/spray-9.7.xml datadir/vn/spray-9.7.xml | ||
675 | 19,20c19 | ||
676 | < <SELRESTR Value="+" type="location"/> | ||
677 | < <SELRESTR Value="-" type="region"/> | ||
678 | --- | ||
679 | > <SELRESTR Value="+" type="non_region_location"/> | ||
680 | 254,255c253 | ||
681 | < <SELRESTR Value="+" type="concrete"/> | ||
682 | < <SELRESTR Value="+" type="plural"/> | ||
683 | --- | ||
684 | > <SELRESTR Value="+" type="group"/> | ||
685 | diff /Users/hatkirby/Downloads/new_vn 2/steal-10.5.xml datadir/vn/steal-10.5.xml | ||
686 | 55,58c55 | ||
687 | < <SELRESTRS> | ||
688 | < <SELRESTR Value="+" type="location"/> | ||
689 | < <SELRESTR Value="-" type="region"/> | ||
690 | < </SELRESTRS> | ||
691 | --- | ||
692 | > <SELRESTR Value="+" type="non_region_location"/> | ||
693 | diff /Users/hatkirby/Downloads/new_vn 2/substance_emission-43.4.xml datadir/vn/substance_emission-43.4.xml | ||
694 | 40c40 | ||
695 | < <SELRESTR Value="-" type="animate"/> | ||
696 | --- | ||
697 | > <SELRESTR Value="+" type="inanimate"/> | ||
698 | diff /Users/hatkirby/Downloads/new_vn 2/swarm-47.5.1.xml datadir/vn/swarm-47.5.1.xml | ||
699 | 8,9c8 | ||
700 | < <SELRESTR Value="+" type="concrete"/> | ||
701 | < <SELRESTR Value="+" type="plural"/> | ||
702 | --- | ||
703 | > <SELRESTR Value="+" type="group"/> | ||
704 | 14,15c13 | ||
705 | < <SELRESTR Value="+" type="location"/> | ||
706 | < <SELRESTR Value="-" type="region"/> | ||
707 | --- | ||
708 | > <SELRESTR Value="+" type="non_region_location"/> | ||
421 | diff /Users/hatkirby/Downloads/new_vn 2/swat-18.2.xml datadir/vn/swat-18.2.xml | 709 | diff /Users/hatkirby/Downloads/new_vn 2/swat-18.2.xml datadir/vn/swat-18.2.xml |
422 | 264c264,266 | 710 | 264c264,266 |
423 | < <SYNRESTRS/> | 711 | < <SYNRESTRS/> |
@@ -432,12 +720,25 @@ diff /Users/hatkirby/Downloads/new_vn 2/swat-18.2.xml datadir/vn/swat-18.2.xml | |||
432 | > <SYNRESTR Value="+" type="adjp"/> | 720 | > <SYNRESTR Value="+" type="adjp"/> |
433 | > </SYNRESTRS> | 721 | > </SYNRESTRS> |
434 | diff /Users/hatkirby/Downloads/new_vn 2/tape-22.4.xml datadir/vn/tape-22.4.xml | 722 | diff /Users/hatkirby/Downloads/new_vn 2/tape-22.4.xml datadir/vn/tape-22.4.xml |
435 | 364c364,366 | 723 | 93,94c93 |
724 | < <SELRESTR Value="+" type="concrete"/> | ||
725 | < <SELRESTR Value="-" type="animate"/> | ||
726 | --- | ||
727 | > <SELRESTR Value="+" type="concrete_inanimate"/> | ||
728 | 364c363,365 | ||
436 | < <SYNRESTRS/> | 729 | < <SYNRESTRS/> |
437 | --- | 730 | --- |
438 | > <SYNRESTRS> | 731 | > <SYNRESTRS> |
439 | > <SYNRESTR Value="+" type="adjp"/> | 732 | > <SYNRESTR Value="+" type="adjp"/> |
440 | > </SYNRESTRS> | 733 | > </SYNRESTRS> |
734 | diff /Users/hatkirby/Downloads/new_vn 2/throw-17.1.xml datadir/vn/throw-17.1.xml | ||
735 | 27,30c27 | ||
736 | < <SELRESTRS> | ||
737 | < <SELRESTR Value="+" type="location"/> | ||
738 | < <SELRESTR Value="-" type="region"/> | ||
739 | < </SELRESTRS> | ||
740 | --- | ||
741 | > <SELRESTR Value="+" type="non_region_location"/> | ||
441 | diff /Users/hatkirby/Downloads/new_vn 2/vehicle-51.4.1.xml datadir/vn/vehicle-51.4.1.xml | 742 | diff /Users/hatkirby/Downloads/new_vn 2/vehicle-51.4.1.xml datadir/vn/vehicle-51.4.1.xml |
442 | 227c227,229 | 743 | 227c227,229 |
443 | < <SYNRESTRS/> | 744 | < <SYNRESTRS/> |
@@ -468,18 +769,32 @@ diff /Users/hatkirby/Downloads/new_vn 2/want-32.1.xml datadir/vn/want-32.1.xml | |||
468 | > <SYNRESTR Value="+" type="adjp"/> | 769 | > <SYNRESTR Value="+" type="adjp"/> |
469 | > </SYNRESTRS> | 770 | > </SYNRESTRS> |
470 | diff /Users/hatkirby/Downloads/new_vn 2/wipe_instr-10.4.2.xml datadir/vn/wipe_instr-10.4.2.xml | 771 | diff /Users/hatkirby/Downloads/new_vn 2/wipe_instr-10.4.2.xml datadir/vn/wipe_instr-10.4.2.xml |
471 | 178c178,180 | 772 | 26,27c26 |
773 | < <SELRESTR Value="+" type="concrete"/> | ||
774 | < <SELRESTR Value="-" type="animate"/> | ||
775 | --- | ||
776 | > <SELRESTR Value="+" type="concrete_inanimate"/> | ||
777 | 37,38c36 | ||
778 | < <SELRESTR Value="+" type="concrete"/> | ||
779 | < <SELRESTR Value="-" type="animate"/> | ||
780 | --- | ||
781 | > <SELRESTR Value="+" type="concrete_inanimate"/> | ||
782 | 178c176,178 | ||
472 | < <SYNRESTRS/> | 783 | < <SYNRESTRS/> |
473 | --- | 784 | --- |
474 | > <SYNRESTRS> | 785 | > <SYNRESTRS> |
475 | > <SYNRESTR Value="+" type="adjp"/> | 786 | > <SYNRESTR Value="+" type="adjp"/> |
476 | > </SYNRESTRS> | 787 | > </SYNRESTRS> |
477 | diff /Users/hatkirby/Downloads/new_vn 2/wipe_manner-10.4.1.xml datadir/vn/wipe_manner-10.4.1.xml | 788 | diff /Users/hatkirby/Downloads/new_vn 2/wipe_manner-10.4.1.xml datadir/vn/wipe_manner-10.4.1.xml |
478 | 198c198,199 | 789 | 37,38c37 |
790 | < <SELRESTR Value="+" type="concrete"/> | ||
791 | < <SELRESTR Value="-" type="animate"/> | ||
792 | --- | ||
793 | > <SELRESTR Value="+" type="concrete_inanimate"/> | ||
794 | 198c197 | ||
479 | < <SELRESTR Value="-" type="region"/> | 795 | < <SELRESTR Value="-" type="region"/> |
480 | --- | 796 | --- |
481 | > <SELRESTR Value="+" type="location"/> | 797 | > <SELRESTR Value="+" type="non_region_location"/> |
482 | > <SELRESTR Value="-" type="region"/> | ||
483 | diff /Users/hatkirby/Downloads/new_vn 2/wish-62.xml datadir/vn/wish-62.xml | 798 | diff /Users/hatkirby/Downloads/new_vn 2/wish-62.xml datadir/vn/wish-62.xml |
484 | 91a92 | 799 | 91a92 |
485 | > <LEX value="to be"/> | 800 | > <LEX value="to be"/> |
@@ -493,3 +808,8 @@ diff /Users/hatkirby/Downloads/new_vn 2/wish-62.xml datadir/vn/wish-62.xml | |||
493 | > </SYNRESTRS> | 808 | > </SYNRESTRS> |
494 | 122a124 | 809 | 122a124 |
495 | > <ADJ/> | 810 | > <ADJ/> |
811 | diff /Users/hatkirby/Downloads/new_vn 2/withdraw-82.xml datadir/vn/withdraw-82.xml | ||
812 | 7c7 | ||
813 | < <SELRESTRS> | ||
814 | --- | ||
815 | > <SELRESTRS logic="or"> | ||