Skip to content

Commit

Permalink
Update to Inform 10.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
TobyLobster committed Sep 2, 2022
1 parent ba8f685 commit aa36446
Show file tree
Hide file tree
Showing 142 changed files with 13,592 additions and 13,591 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inform/Inform-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
<key>CFBundleSignature</key>
<string>INfm</string>
<key>CFBundleVersion</key>
<string>1.82.1</string>
<string>1.82.2</string>
<key>InformConfiguration</key>
<dict>
<key>AvailableInterpreters</key>
Expand Down
4 changes: 2 additions & 2 deletions inform/Inform.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion inform/Resources/en.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion inform/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Binary file modified inform/StagingArea/Contents/MacOS/6L02/cBlorb
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/6L02/ni
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/6L38/cBlorb
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/6L38/ni
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/6M62/cBlorb
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/6M62/ni
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/cBlorb
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/inform6
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/intest
Binary file not shown.
Binary file modified inform/StagingArea/Contents/MacOS/ni
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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.'
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "BasicInformExtrasKit",
"version": "10.1.1"
"version": "10.1.2"
},
"kit-details": {
"has-priority": 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -121,15 +119,13 @@ 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;
spaces(2*process_rulebook_count);
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;
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "BasicInformKit",
"version": "10.1.1"
"version": "10.1.2"
},
"needs": [ {
"unless": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "CommandParserKit",
"version": "10.1.1"
"version": "10.1.2"
},
"needs": [ {
"need": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "EnglishLanguageKit",
"version": "10.1.1"
"version": "10.1.2"
},
"needs": [ {
"need": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"is": {
"type": "kit",
"title": "WorldModelKit",
"version": "10.1.1"
"version": "10.1.2"
},
"needs": [ {
"need": {
Expand Down
36 changes: 18 additions & 18 deletions inform/StagingArea/Contents/Resources/en.lproj/Rdoc1.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,32 +82,32 @@
<p class="sectionheading">§1.1. Preface</p>
<p><span class="boldface">The Inform Recipe Book</span> 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 <span class="boldface">Writing with Inform</span>, 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 &quot;yellow paper&quot;, while the manual is on &quot;white paper&quot;.</p>
<p>The Recipe Book assumes that the reader already knows the basics covered in Chapters 1 and 2 of <span class="italic">Writing with Inform</span>: 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:</p>
<!--START CODE "c9275"-->
<blockquote class="code"><p class="quoted"><a id="c9275"></a>&quot;The Power of the Keys&quot;
</p>
</blockquote>
<!--END CODE-->
<!--START CODE "c9276"-->
<blockquote class="code"><p class="quoted"><a id="c9276"></a>Afterlife is a room. &quot;Fluffy white clouds gather round you here in the afterlife.&quot; The Pearly Gates are a door in Afterlife. &quot;The Pearly Gates - large, white, wrought-iron and splendidly monumental - stand above you.&quot; Heaven is a room. The Gates are above the Afterlife and below Heaven.
<blockquote class="code"><p class="quoted"><a id="c9276"></a>&quot;The Power of the Keys&quot;
</p>
</blockquote>
<!--END CODE-->
<!--START CODE "c9277"-->
<blockquote class="code"><p class="quoted"><a id="c9277"></a>St Peter is a man in the Afterlife. &quot;St Peter, cheery if absent-minded, studies his celestial clipboard.&quot;
<blockquote class="code"><p class="quoted"><a id="c9277"></a>Afterlife is a room. &quot;Fluffy white clouds gather round you here in the afterlife.&quot; The Pearly Gates are a door in Afterlife. &quot;The Pearly Gates - large, white, wrought-iron and splendidly monumental - stand above you.&quot; Heaven is a room. The Gates are above the Afterlife and below Heaven.
</p>
</blockquote>
<!--END CODE-->
<!--START CODE "c9278"-->
<blockquote class="code"><p class="quoted"><a id="c9278"></a>Before going through the Pearly Gates:
<blockquote class="code"><p class="quoted"><a id="c9278"></a>St Peter is a man in the Afterlife. &quot;St Peter, cheery if absent-minded, studies his celestial clipboard.&quot;
</p>
</blockquote>
<!--END CODE-->
<!--START CODE "c9279"-->
<blockquote class="code"><p class="quoted"><a id="c9279"></a>Before going through the Pearly Gates:
<br>
&#160;&#160;&#160;&#160;say &quot;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.'&quot;;
<br>
&#160;&#160;&#160;&#160;end the story.
</p>
</blockquote>
<!--END CODE-->
<!--START CODE "c9279"-->
<blockquote class="code"><p class="quoted"><a id="c9279"></a>Test me with &quot;enter gates&quot;.
<!--START CODE "c9280"-->
<blockquote class="code"><p class="quoted"><a id="c9280"></a>Test me with &quot;enter gates&quot;.
</p>
</blockquote>
<!--END CODE-->
Expand Down Expand Up @@ -150,8 +150,8 @@
<p>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 &quot;scratch&quot; project file for temporary trials like this, clearing all its text and starting again with each new test.)</p>
<p>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.</p>
<p>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:</p>
<!--START CODE "c9280_128"-->
<blockquote class="code"><p class="quoted"><a id="c9280_128"></a><img alt="asterisk.png" src="inform:/doc_images/asterisk.png" /> - A simple example, fairly easily guessed.
<!--START CODE "c9281_128"-->
<blockquote class="code"><p class="quoted"><a id="c9281_128"></a><img alt="asterisk.png" src="inform:/doc_images/asterisk.png" /> - A simple example, fairly easily guessed.
<br>
<img alt="asterisk.png" src="inform:/doc_images/asterisk.png" /> <img alt="asterisk.png" src="inform:/doc_images/asterisk.png" /> - A complicated or surprising example.
<br>
Expand Down Expand Up @@ -189,18 +189,18 @@
</table>

<div class="egpanel" id="example248" style="display: none;">
<!--START CODE "c9281_248"-->
<blockquote class="code"><p class="quoted"><a id="c9281_248"></a><a href="javascript:pasteCode('[=0x0022=]Midsummer Day[=0x0022=][=0x000A=][=0x000A=]East of the Garden is the Gazebo. Above is the Treehouse. A billiards table is in the Gazebo. On it is a trophy cup. A starting pistol is in the cup. In the Treehouse is a container called a cardboard box.[=0x000A=][=0x000A=]Test me with [=0x0022=]up / x box / d / e / x table / x cup / x pistol / get cup[=0x0022=].[=0x000A=]\n')"><img alt="[email protected]" src="inform:/doc_images/[email protected]" width="13" height="13"></a> <a href="javascript:createNewProject('[=0x0022=]Midsummer Day[=0x0022=][=0x000A=][=0x000A=]East of the Garden is the Gazebo. Above is the Treehouse. A billiards table is in the Gazebo. On it is a trophy cup. A starting pistol is in the cup. In the Treehouse is a container called a cardboard box.[=0x000A=][=0x000A=]Test me with [=0x0022=]up / x box / d / e / x table / x cup / x pistol / get cup[=0x0022=].[=0x000A=]\n', 'Example - Midsummer Day')"><img alt="[email protected]" src="inform:/doc_images/[email protected]" width="26" height="13"></a>&nbsp;&nbsp; &quot;Midsummer Day&quot;
<!--START CODE "c9282_248"-->
<blockquote class="code"><p class="quoted"><a id="c9282_248"></a><a href="javascript:pasteCode('[=0x0022=]Midsummer Day[=0x0022=][=0x000A=][=0x000A=]East of the Garden is the Gazebo. Above is the Treehouse. A billiards table is in the Gazebo. On it is a trophy cup. A starting pistol is in the cup. In the Treehouse is a container called a cardboard box.[=0x000A=][=0x000A=]Test me with [=0x0022=]up / x box / d / e / x table / x cup / x pistol / get cup[=0x0022=].[=0x000A=]\n')"><img alt="[email protected]" src="inform:/doc_images/[email protected]" width="13" height="13"></a> <a href="javascript:createNewProject('[=0x0022=]Midsummer Day[=0x0022=][=0x000A=][=0x000A=]East of the Garden is the Gazebo. Above is the Treehouse. A billiards table is in the Gazebo. On it is a trophy cup. A starting pistol is in the cup. In the Treehouse is a container called a cardboard box.[=0x000A=][=0x000A=]Test me with [=0x0022=]up / x box / d / e / x table / x cup / x pistol / get cup[=0x0022=].[=0x000A=]\n', 'Example - Midsummer Day')"><img alt="[email protected]" src="inform:/doc_images/[email protected]" width="26" height="13"></a>&nbsp;&nbsp; &quot;Midsummer Day&quot;
</p>
</blockquote>
<!--END CODE-->
<!--START CODE "c9282_248"-->
<blockquote class="code"><p class="quoted"><a id="c9282_248"></a>East of the Garden is the Gazebo. Above is the Treehouse. A billiards table is in the Gazebo. On it is a trophy cup. A starting pistol is in the cup. In the Treehouse is a container called a cardboard box.
<!--START CODE "c9283_248"-->
<blockquote class="code"><p class="quoted"><a id="c9283_248"></a>East of the Garden is the Gazebo. Above is the Treehouse. A billiards table is in the Gazebo. On it is a trophy cup. A starting pistol is in the cup. In the Treehouse is a container called a cardboard box.
</p>
</blockquote>
<!--END CODE-->
<!--START CODE "c9283_248"-->
<blockquote class="code"><p class="quoted"><a id="c9283_248"></a>Test me with &quot;up / x box / d / e / x table / x cup / x pistol / get cup&quot;.
<!--START CODE "c9284_248"-->
<blockquote class="code"><p class="quoted"><a id="c9284_248"></a>Test me with &quot;up / x box / d / e / x table / x cup / x pistol / get cup&quot;.
</p>
</blockquote>
<!--END CODE-->
Expand Down
Loading

0 comments on commit aa36446

Please sign in to comment.