X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=grammar.h;h=a62c978d15705356dd9d5488ea7b7c0e88a43ce6;hb=HEAD;hp=c7807c532f2d0a6a9013e33474d2d0380374c96c;hpb=aec9e4131b092ed33213b9891e1dc2b9574edf99;p=informlib.git

diff --git a/grammar.h b/grammar.h
index c7807c5..a62c978 100644
--- a/grammar.h
+++ b/grammar.h
@@ -1,7 +1,9 @@
 ! ==============================================================================
 !   GRAMMAR:  Grammar table entries for the standard verbs library.
 !
-!   Supplied for use with Inform 6 -- Release 6.12.3 -- Serial number 190320
+!   Supplied for use with Inform 6 -- Release 6.12.5 -- Serial number 220219
+!
+!   Copyright Graham Nelson 1993-2004 and David Griffith 2012-2022
 !
 !   This file is free software: you can redistribute it and/or modify
 !   it under the terms of the GNU Affero General Public License as
@@ -96,9 +98,13 @@ Verb meta 'version'
 
 #Ifndef NO_PLACES;
 Verb meta 'objects'
-    *                                           -> Objects;
+    *                                           -> Objects
+    * 'tall'                                    -> ObjectsTall
+    * 'wide'                                    -> ObjectsWide;
 Verb meta 'places'
-    *                                           -> Places;
+    *                                           -> Places
+    * 'tall'                                    -> PlacesTall
+    * 'wide'                                    -> PlacesWide;
 #Endif; ! NO_PLACES
 
 ! ------------------------------------------------------------------------------
@@ -118,7 +124,7 @@ Verb meta 'changes'
 
 Verb meta 'gonear'
     * anynumber                                 -> GoNear
-    * noun                                      -> Gonear;
+    * noun                                      -> GoNear;
 
 
 Verb meta 'goto'
@@ -143,12 +149,12 @@ Verb meta 'showdict' 'dict'
     * topic                                     -> ShowDict;
 
 Verb meta 'showobj'
-    *                                           -> Showobj
-    * anynumber                                 -> Showobj
-    * multi                                     -> Showobj;
+    *                                           -> ShowObj
+    * anynumber                                 -> ShowObj
+    * multi                                     -> ShowObj;
 
 Verb meta 'showverb'
-    * special                                   -> Showverb;
+    * special                                   -> ShowVerb;
 
 Verb meta 'timers' 'daemons'
     *                                           -> TimersOn
@@ -185,7 +191,7 @@ Verb meta 'glklist'
 !  And now the game verbs.
 ! ------------------------------------------------------------------------------
 
-[ ADirection; if (noun in compass) rtrue; rfalse; ];
+[ ADirection; if (noun in Compass) rtrue; rfalse; ];
 
 Verb 'answer' 'say' 'shout' 'speak'
     * topic 'to' creature                       -> Answer;
@@ -219,6 +225,11 @@ Verb 'climb' 'scale'
     * noun                                      -> Climb
     * 'up'/'over' noun                          -> Climb;
 
+Verb 'carry'
+    * multi                                     -> Take
+    * multiinside 'from'/'off' noun             -> Remove
+    * 'inventory'                               -> Inv;
+
 Verb 'close' 'cover' 'shut'
     * noun                                      -> Close
     * 'up' noun                                 -> Close
@@ -239,7 +250,7 @@ Verb 'dig'
 
 
 Verb 'disrobe' 'doff' 'shed'
-    * held                                      -> Disrobe;
+    * multi                                     -> Disrobe;
 
 Verb 'drink' 'sip' 'swallow'
     * noun                                      -> Drink;
@@ -297,6 +308,11 @@ Verb 'go' 'run' 'walk'
     * 'in'/'inside'                             -> GoIn
     * 'into'/'in'/'inside'/'through' noun       -> Enter;
 
+Verb 'hold'
+    * multi                                     -> Take
+    * multiinside 'from'/'off' noun             -> Remove
+    * 'inventory'                               -> Inv;
+
 Verb 'in' 'inside'
     *                                           -> GoIn;
 
@@ -376,7 +392,7 @@ Verb 'push' 'clear' 'move' 'press' 'shift'
 Verb 'put'
     * multiexcept 'in'/'inside'/'into' noun     -> Insert
     * multiexcept 'on'/'onto' noun              -> PutOn
-    * 'on' held                                 -> Wear
+    * 'on' multiheld                            -> Wear
     * 'down' multiheld                          -> Drop
     * multiheld 'down'                          -> Drop;
 
@@ -386,8 +402,8 @@ Verb 'read'
     * topic 'in' noun                           -> Consult;
 
 Verb 'remove'
-    * held                                      -> Disrobe
-    * multi                                     -> Take
+    * worn                                      -> Disrobe
+    * multi                                     -> Remove
     * multiinside 'from' noun                   -> Remove;
 
 Verb 'rub' 'clean' 'dust' 'polish' 'scrub'
@@ -442,15 +458,15 @@ Verb 'swing'
     * 'on' noun                                 -> Swing;
 
 Verb 'switch'
-    * noun                                      -> Switchon
-    * noun 'on'                                 -> Switchon
-    * noun 'off'                                -> Switchoff
-    * 'on' noun                                 -> Switchon
-    * 'off' noun                                -> Switchoff;
+    * noun                                      -> SwitchOn
+    * noun 'on'                                 -> SwitchOn
+    * noun 'off'                                -> SwitchOff
+    * 'on' noun                                 -> SwitchOn
+    * 'off' noun                                -> SwitchOff;
 
-Verb 'take' 'carry' 'hold'
+Verb 'take'
     * multi                                     -> Take
-    * 'off' held                                -> Disrobe
+    * 'off' multiheld                           -> Disrobe
     * multiinside 'from'/'off' noun             -> Remove
     * 'inventory'                               -> Inv;
 
@@ -476,10 +492,10 @@ Verb 'transfer'
 
 Verb 'turn' 'rotate' 'screw' 'twist' 'unscrew'
     * noun                                      -> Turn
-    * noun 'on'                                 -> Switchon
-    * noun 'off'                                -> Switchoff
-    * 'on' noun                                 -> Switchon
-    * 'off' noun                                -> Switchoff;
+    * noun 'on'                                 -> SwitchOn
+    * noun 'off'                                -> SwitchOff
+    * 'on' noun                                 -> SwitchOn
+    * 'off' noun                                -> SwitchOff;
 
 Verb 'unlock'
     * noun 'with' held                          -> Unlock;
@@ -501,7 +517,7 @@ Verb 'wave'
     * 'at' noun                                 -> WaveHands;
 
 Verb 'wear' 'don'
-    * held                                      -> Wear;
+    * multiheld                                 -> Wear;
 
 Verb 'yes' 'y//'
     *                                           -> Yes;
@@ -555,6 +571,8 @@ Stub PrintTaskName     1;
 Stub PrintVerb         1;
 Stub TimePasses        0;
 Stub UnknownVerb       1;
+Stub AfterSave         1;
+Stub AfterRestore      1;
 
 #Ifdef TARGET_GLULX;
 Stub HandleGlkEvent    2;