Import v6.12.2 of the Inform 6 standard library

[informlib.git] / english.h

diff --git a/english.h b/english.h
index 13dfca818ff250c1c6b38a84a8c5eb4b9dd5b067..30031cb66b6863766701334478d274334b59ddb6 100644 (file)
--- a/english.h
+++ b/english.h
@@ -1,9 +1,9 @@
 ! ==============================================================================
 !   ENGLISH:  Language Definition File
 !
-!   Supplied for use with Inform 6 -- Release 6.12.1 -- Serial number 160605
+!   Supplied for use with Inform 6 -- Release 6.12.2 -- Serial number 180520
 !
-!   Copyright Graham Nelson 1993-2004 and David Griffith 2012-2016
+!   Copyright Graham Nelson 1993-2004 and David Griffith 2012-2018
 !
 !   This file is free software: you can redistribute it and/or modify
 !   it under the terms of the GNU Affero General Public License as
@@ -449,18 +449,18 @@ Constant COLON__TX      = ": ";
 [ CTheyreorThats obj;
     if (obj == player) {
        if (player provides narrative_voice) {
-           if (player.narrative_voice == 1) { print "I'm"; return; }
-           if (player.narrative_voice == 3) { CDefart(player); print "'s"; return; }
+           if (player.narrative_voice == 1) { Tense("I'm", "I was"); return; }
+           if (player.narrative_voice == 3) { CDefart(player); Tense("'s", " was"); return; }
        }
-       print "You're";
+       Tense("You're", "You were");
        return;
     }
-    if (obj has pluralname)            { print "They're"; return; }
-    if (obj has female)                        { print "She's"; return; }
+    if (obj has pluralname)            { Tense("They're", "They were"); return; }
+    if (obj has female)                        { Tense("She's", "She was"); return; }
     if (obj has male or animate) {
-        if (obj hasnt neuter)          { print "He's"; return; }
+        if (obj hasnt neuter)          { Tense("He's", "He was"); return; }
     }
-    print "That's";
+    Tense("That's", "That was");
 ];
 
 [ IsOrAre obj;
@@ -999,15 +999,15 @@ Constant COLON__TX      = ": ";
         21: print " (in ";
         22: print ", inside ";
     }
-  LMode1:   print " is now in its ";
+  LMode1:   print (string) Story, " is now in its ";
             if (initial_lookmode == 1) print "normal ";
             "~brief~ printing mode, which gives long descriptions
              of places never before visited and short descriptions otherwise.";
-  LMode2:   print " is now in its ";
+  LMode2:   print (string) Story, " is now in its ";
             if (initial_lookmode ~= 1 or 3) print "normal ";
             "~verbose~ mode, which always gives long descriptions
              of locations (even if you've been there before).";
-  LMode3:   print " is now in its ";
+  LMode3:   print (string) Story, " is now in its ";
             if (initial_lookmode == 3) print "normal ";
             "~superbrief~ mode, which always gives short descriptions
              of locations (even if you haven't been there before).";
@@ -1293,7 +1293,7 @@ Constant COLON__TX      = ": ";
     }
   ScriptOn: switch (n) {
         1:  "Transcripting is already on.";
-        2:  "Start of a transcript of";
+        2:  print "Start of a transcript of"; VersionSub();
         3:  "Attempt to begin transcript failed.";
     }
   Search: switch (n) {