diff --git a/README.md b/README.md index b48a91fd..775513fa 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Inform is free, with no strings attached. What you make with it is yours, to pub App Version | Inform Version | Release Date | Description ------------ | -------------- | ------------ | :--------------------------------------- +1.82.2 | 10.1.2 | 2022‑09‑02 | Official release, supporting Inform 10.1.2 1.82.1 | 10.1.1 | 2022‑08‑21 | Official release, supporting Inform 10.1.1 1.82.0 | 10.1.0 | 2022‑08‑20 | Official release, supporting Inform 10.1.0 1.81.0‑beta1 | 10.1.0 (beta) | 2022‑07‑30 | This is a Beta. Colour Schemes, Dark mode, Basic Inform, Apple Silicon native support. diff --git a/configure.py b/configure.py index dfcb31a9..6af9be4e 100755 --- a/configure.py +++ b/configure.py @@ -9,8 +9,8 @@ # Version numbers app_version_number = "1.82" -app_version_build_number = app_version_number + ".1" -inform_source_version = "10.1.1" +app_version_build_number = app_version_number + ".2" +inform_source_version = "10.1.2" full_version = app_version_number + "/6.41/" + inform_source_version # Helper functions diff --git a/inform/Inform-Info.plist b/inform/Inform-Info.plist index 92e4682c..e49f3403 100644 --- a/inform/Inform-Info.plist +++ b/inform/Inform-Info.plist @@ -264,7 +264,7 @@ CFBundleSignature INfm CFBundleVersion - 1.82.1 + 1.82.2 InformConfiguration AvailableInterpreters diff --git a/inform/Inform.xcodeproj/project.pbxproj b/inform/Inform.xcodeproj/project.pbxproj index f4cdeb06..54f59e39 100644 --- a/inform/Inform.xcodeproj/project.pbxproj +++ b/inform/Inform.xcodeproj/project.pbxproj @@ -2872,7 +2872,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.82.1; + CURRENT_PROJECT_VERSION = 1.82.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 97V36B3QYK; ENABLE_HARDENED_RUNTIME = YES; @@ -2936,7 +2936,7 @@ CODE_SIGN_IDENTITY = "Developer ID Application"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1.82.1; + CURRENT_PROJECT_VERSION = 1.82.2; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_POSTPROCESSING = YES; DEVELOPMENT_TEAM = 97V36B3QYK; diff --git a/inform/Resources/en.lproj/InfoPlist.strings b/inform/Resources/en.lproj/InfoPlist.strings index 45bfd7f9..16a4c437 100644 --- a/inform/Resources/en.lproj/InfoPlist.strings +++ b/inform/Resources/en.lproj/InfoPlist.strings @@ -1,7 +1,7 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Inform"; -CFBundleGetInfoString = "Inform version 1.82/6.41/10.1.1"; +CFBundleGetInfoString = "Inform version 1.82/6.41/10.1.2"; "uk.org.logicalshift.zoom.skein" = "Skein file"; "org.inform-fiction.project" = "Inform project"; "org.inform-fiction.inform7.extension" = "Inform 7 extension file"; diff --git a/inform/Resources/en.lproj/Localizable.strings b/inform/Resources/en.lproj/Localizable.strings index 9a0b4a8f..6949e77c 100644 --- a/inform/Resources/en.lproj/Localizable.strings +++ b/inform/Resources/en.lproj/Localizable.strings @@ -304,7 +304,7 @@ Extensions that are in system directories cannot be deleted."; "This action cannot be undone." = "This action cannot be undone."; /* Toolbar name and version */ -"Build Version" = "10.1.1"; +"Build Version" = "10.1.2"; "Build %@" = "Build %@"; "Inform" = "Inform"; diff --git a/inform/StagingArea/Contents/MacOS/6L02/cBlorb b/inform/StagingArea/Contents/MacOS/6L02/cBlorb index 3b75dc32..e1fa5950 100755 Binary files a/inform/StagingArea/Contents/MacOS/6L02/cBlorb and b/inform/StagingArea/Contents/MacOS/6L02/cBlorb differ diff --git a/inform/StagingArea/Contents/MacOS/6L02/ni b/inform/StagingArea/Contents/MacOS/6L02/ni index f78938a9..845f4fb5 100755 Binary files a/inform/StagingArea/Contents/MacOS/6L02/ni and b/inform/StagingArea/Contents/MacOS/6L02/ni differ diff --git a/inform/StagingArea/Contents/MacOS/6L38/cBlorb b/inform/StagingArea/Contents/MacOS/6L38/cBlorb index 328ffa8f..d9a084a9 100755 Binary files a/inform/StagingArea/Contents/MacOS/6L38/cBlorb and b/inform/StagingArea/Contents/MacOS/6L38/cBlorb differ diff --git a/inform/StagingArea/Contents/MacOS/6L38/ni b/inform/StagingArea/Contents/MacOS/6L38/ni index c525f443..b12cc865 100755 Binary files a/inform/StagingArea/Contents/MacOS/6L38/ni and b/inform/StagingArea/Contents/MacOS/6L38/ni differ diff --git a/inform/StagingArea/Contents/MacOS/6M62/cBlorb b/inform/StagingArea/Contents/MacOS/6M62/cBlorb index 7fb11d8e..b0b62b59 100755 Binary files a/inform/StagingArea/Contents/MacOS/6M62/cBlorb and b/inform/StagingArea/Contents/MacOS/6M62/cBlorb differ diff --git a/inform/StagingArea/Contents/MacOS/6M62/ni b/inform/StagingArea/Contents/MacOS/6M62/ni index 634d3c0c..e6ae0dd9 100755 Binary files a/inform/StagingArea/Contents/MacOS/6M62/ni and b/inform/StagingArea/Contents/MacOS/6M62/ni differ diff --git a/inform/StagingArea/Contents/MacOS/cBlorb b/inform/StagingArea/Contents/MacOS/cBlorb index 5ee6704f..a770565a 100755 Binary files a/inform/StagingArea/Contents/MacOS/cBlorb and b/inform/StagingArea/Contents/MacOS/cBlorb differ diff --git a/inform/StagingArea/Contents/MacOS/inform6 b/inform/StagingArea/Contents/MacOS/inform6 index b7846a47..7873569b 100755 Binary files a/inform/StagingArea/Contents/MacOS/inform6 and b/inform/StagingArea/Contents/MacOS/inform6 differ diff --git a/inform/StagingArea/Contents/MacOS/intest b/inform/StagingArea/Contents/MacOS/intest index 2a0b9ce0..4838309d 100755 Binary files a/inform/StagingArea/Contents/MacOS/intest and b/inform/StagingArea/Contents/MacOS/intest differ diff --git a/inform/StagingArea/Contents/MacOS/ni b/inform/StagingArea/Contents/MacOS/ni index faf7a817..c0fed66b 100755 Binary files a/inform/StagingArea/Contents/MacOS/ni and b/inform/StagingArea/Contents/MacOS/ni differ diff --git a/inform/StagingArea/Contents/Resources/App/Compilers/retrospective.txt b/inform/StagingArea/Contents/Resources/App/Compilers/retrospective.txt index 05fd203a..ad93f667 100644 --- a/inform/StagingArea/Contents/Resources/App/Compilers/retrospective.txt +++ b/inform/StagingArea/Contents/Resources/App/Compilers/retrospective.txt @@ -1,5 +1,5 @@ '****','Current','With this option set, Inform always uses the latest version of the language to compile your project.' -'10.1.0', 'Inform 10.1.0, April 2022','With this option set, Inform always compiles your project using version 10.1.0. While largely the same language to users, this version has a completely rewritten compiler tool-chain, in preparation for future development.' +'10.1', 'Inform 10.1, August 2022','With this option set, Inform always compiles your project using version 10.1. While largely the same language to users, this version has a completely rewritten compiler tool-chain, in preparation for future development.' '6M62','Inform 9.3 (6M62), December 2015','With this option set, Inform always compiles your project using version 9.3. It was most notable for many bug fixes.' '6L38','Inform 9.2 (6L38), August 2014','With this option set, Inform always compiles your project using version 9.2. Though mostly a maintenance update, it also made a few minor clarifications to the language.' '6L02','Inform 9.1 (6L02), May 2014','With this option set, Inform always compiles your project using version 9.1. That was a major new version of the Inform language, with improvements across the board. First public release in which indexed text and text were unified into a single kind.' diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformExtrasKit/kit_metadata.json b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformExtrasKit/kit_metadata.json index 240e434b..6291069a 100644 --- a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformExtrasKit/kit_metadata.json +++ b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformExtrasKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "BasicInformExtrasKit", - "version": "10.1.1" + "version": "10.1.2" }, "kit-details": { "has-priority": 1 diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/Sections/MStack.i6t b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/Sections/MStack.i6t index 300215d0..76aad41a 100644 --- a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/Sections/MStack.i6t +++ b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/Sections/MStack.i6t @@ -176,27 +176,16 @@ where it is to be written, of course: that would corrupt the sentinel. @h Rulebook Variables. Each rulebook has a slate of variables, usually empty, with ID number the same as the rulebook's own ID number. (Rulebook IDs number upwards from 0 -in order of creation in the source text.) The associated creator functions, -usually null, are stored in an array if there is no problem about memory -usage, but with a switch statement if |MEMORY_ECONOMY| is in force; this -costs a very small amount of time, but saves 1K of readable memory. +in order of creation in the source text.) = [ MStack_CreateRBVars rb cr; - #ifdef MEMORY_ECONOMY; cr = MStack_GetRBVarCreator(rb); - #ifnot; - cr = rulebook_var_creators-->rb; - #endif; if (cr) Mstack_Create_Frame(cr, rb); ]; [ MStack_DestroyRBVars rb cr; - #ifdef MEMORY_ECONOMY; cr = MStack_GetRBVarCreator(rb); - #ifnot; - cr = rulebook_var_creators-->rb; - #endif; if (cr) Mstack_Destroy_Frame(cr, rb); ]; diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/Sections/Rulebooks.i6t b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/Sections/Rulebooks.i6t index e892e893..c629c6f0 100644 --- a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/Sections/Rulebooks.i6t +++ b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/Sections/Rulebooks.i6t @@ -98,12 +98,10 @@ Global debugging_rules = false; ! Are we tracing rule invocations? spv = parameter_value; parameter_value = parameter; ! we won't need parameter again, so can reuse it parameter = debugging_rules; - #ifndef MEMORY_ECONOMY; if (debugging_rules) { DebugRulebooks(rulebook, parameter); process_rulebook_count = process_rulebook_count + debugging_rules; } - #endif; if ((rulebook >= 0) && (rulebook < NUMBER_RULEBOOKS_CREATED)) { rv = rulebooks_array-->rulebook; if (rv ~= EMPTY_RULEBOOK) { @@ -121,7 +119,6 @@ Global debugging_rules = false; ! Are we tracing rule invocations? else if (rv) rv = rulebook; } if (rv) { - #ifndef MEMORY_ECONOMY; if (debugging_rules) { process_rulebook_count = process_rulebook_count - debugging_rules; if (process_rulebook_count < 0) process_rulebook_count = 0; @@ -129,7 +126,6 @@ Global debugging_rules = false; ! Are we tracing rule invocations? if (latest_rule_result-->0 == RS_SUCCEEDS) print "[stopped: success]^"; if (latest_rule_result-->0 == RS_FAILS) print "[stopped: fail]^"; } - #endif; } else { if (debugging_rules) process_rulebook_count = process_rulebook_count - debugging_rules; diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-16.interb b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-16.interb index e931d47d..a1609803 100644 Binary files a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-16.interb and b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-16.interb differ diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-16d.interb b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-16d.interb index 4b0d90ee..78a51736 100644 Binary files a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-16d.interb and b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-16d.interb differ diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-32.interb b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-32.interb index 9f35a1ea..2a1902e6 100644 Binary files a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-32.interb and b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-32.interb differ diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-32d.interb b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-32d.interb index de1c6e5a..856f675a 100644 Binary files a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-32d.interb and b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/arch-32d.interb differ diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/kit_metadata.json b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/kit_metadata.json index adf4ee91..dd835dd4 100644 --- a/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/kit_metadata.json +++ b/inform/StagingArea/Contents/Resources/Internal/Inter/BasicInformKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "BasicInformKit", - "version": "10.1.1" + "version": "10.1.2" }, "needs": [ { "unless": { diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/CommandParserKit/kit_metadata.json b/inform/StagingArea/Contents/Resources/Internal/Inter/CommandParserKit/kit_metadata.json index 2f367be7..d8f4e1a9 100644 --- a/inform/StagingArea/Contents/Resources/Internal/Inter/CommandParserKit/kit_metadata.json +++ b/inform/StagingArea/Contents/Resources/Internal/Inter/CommandParserKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "CommandParserKit", - "version": "10.1.1" + "version": "10.1.2" }, "needs": [ { "need": { diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/EnglishLanguageKit/kit_metadata.json b/inform/StagingArea/Contents/Resources/Internal/Inter/EnglishLanguageKit/kit_metadata.json index 2f61a91d..a58d32ea 100644 --- a/inform/StagingArea/Contents/Resources/Internal/Inter/EnglishLanguageKit/kit_metadata.json +++ b/inform/StagingArea/Contents/Resources/Internal/Inter/EnglishLanguageKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "EnglishLanguageKit", - "version": "10.1.1" + "version": "10.1.2" }, "needs": [ { "need": { diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/Sections/Actions.i6t b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/Sections/Actions.i6t index f48e48d3..b7f62990 100644 --- a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/Sections/Actions.i6t +++ b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/Sections/Actions.i6t @@ -394,11 +394,9 @@ more discussion of this. switch (rv) { RS_SUCCEEDS: print "succeeded"; RS_FAILS: print "failed"; - #IFNDEF MEMORY_ECONOMY; if (reason_the_action_failed) print " the ", (RulePrintingRule) reason_the_action_failed; - #ENDIF; default: print "ended without result"; } print "]^"; say__p = 1; diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-16.interb b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-16.interb index 49c0167b..1f927af4 100644 Binary files a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-16.interb and b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-16.interb differ diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-16d.interb b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-16d.interb index bc145cc0..50223fb2 100644 Binary files a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-16d.interb and b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-16d.interb differ diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-32.interb b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-32.interb index bd3347b0..e1180b56 100644 Binary files a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-32.interb and b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-32.interb differ diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-32d.interb b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-32d.interb index aae8ed90..ccc69167 100644 Binary files a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-32d.interb and b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/arch-32d.interb differ diff --git a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/kit_metadata.json b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/kit_metadata.json index 3f0a9dca..b5e37dcd 100644 --- a/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/kit_metadata.json +++ b/inform/StagingArea/Contents/Resources/Internal/Inter/WorldModelKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "WorldModelKit", - "version": "10.1.1" + "version": "10.1.2" }, "needs": [ { "need": { diff --git a/inform/StagingArea/Contents/Resources/en.lproj/Rdoc1.html b/inform/StagingArea/Contents/Resources/en.lproj/Rdoc1.html index 53dcc174..c9c211bb 100644 --- a/inform/StagingArea/Contents/Resources/en.lproj/Rdoc1.html +++ b/inform/StagingArea/Contents/Resources/en.lproj/Rdoc1.html @@ -82,23 +82,23 @@

§1.1. Preface

The Inform Recipe Book is one of two interlinked books included with Inform 7: a comprehensive collection of examples, showing the practical use of Inform. The other book is Writing with Inform, a systematic manual for the software. If you are reading this within the Inform application, you will see that the Recipe Book pages are on "yellow paper", while the manual is on "white paper".

The Recipe Book assumes that the reader already knows the basics covered in Chapters 1 and 2 of Writing with Inform: enough to get simple projects working in the Inform application. It's helpful, but not necessary, to have some familiarity with the main ingredients of Inform. For instance, the reader who can play and test the following source text, and who can take a guess at what it ought to do, should be fine:

- -

"The Power of the Keys" -

-
- -

Afterlife is a room. "Fluffy white clouds gather round you here in the afterlife." The Pearly Gates are a door in Afterlife. "The Pearly Gates - large, white, wrought-iron and splendidly monumental - stand above you." Heaven is a room. The Gates are above the Afterlife and below Heaven. +

"The Power of the Keys"

-

St Peter is a man in the Afterlife. "St Peter, cheery if absent-minded, studies his celestial clipboard." +

Afterlife is a room. "Fluffy white clouds gather round you here in the afterlife." The Pearly Gates are a door in Afterlife. "The Pearly Gates - large, white, wrought-iron and splendidly monumental - stand above you." Heaven is a room. The Gates are above the Afterlife and below Heaven.

-

Before going through the Pearly Gates: +

St Peter is a man in the Afterlife. "St Peter, cheery if absent-minded, studies his celestial clipboard." +

+
+ + +

Before going through the Pearly Gates:
    say "St Peter coughs disarmingly. 'If you'd read your Bible,' he says, 'you might recall Revelation 21:21 saying that the twelve gates were twelve pearls, each gate being made from a single pearl. I really don't know why people keep imagining it like the entrance to some sort of public park - oh, well. In you go.'";
@@ -106,8 +106,8 @@

- -

Test me with "enter gates". + +

Test me with "enter gates".

@@ -150,8 +150,8 @@

In most cases, typing the single command TEST ME will play through a few moves to show off the effect being demonstrated. (You may find it convenient to create a "scratch" project file for temporary trials like this, clearing all its text and starting again with each new test.)

As part of the testing process which verifies a new build of Inform, each example in turn is extracted from this documentation, translated, played through, and the resulting transcript mechanically checked. So the examples may even work as claimed. But the flesh is weak, and there are bound to be glitches. We would welcome reports, so that future editions can be corrected.

Each example is loosely graded by difficulty: if they were exercises in a textbook, the asterisks would indicate how many marks each question scores. As a general rule:

- -

asterisk.png - A simple example, fairly easily guessed. + +

asterisk.png - A simple example, fairly easily guessed.
asterisk.png asterisk.png - A complicated or surprising example.
@@ -189,18 +189,18 @@