diff --git a/README.md b/README.md index dc53ab342..27c5348b2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-beta+6V23 'Krypton' (13 June 2022) +v10.1.0-beta+6V24 'Krypton' (16 June 2022) ## About Inform 7 diff --git a/build.txt b/build.txt index c3c7ebf14..570a3dd1d 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 13 June 2022 -Build Number: 6V23 +Build Date: 16 June 2022 +Build Number: 6V24 diff --git a/inbuild/supervisor-module/Chapter 7/Index Pages.w b/inbuild/supervisor-module/Chapter 7/Index Pages.w index 1df65e4b0..2c4c4aa94 100644 --- a/inbuild/supervisor-module/Chapter 7/Index Pages.w +++ b/inbuild/supervisor-module/Chapter 7/Index Pages.w @@ -317,11 +317,8 @@ until they put matters right. @ Standard rows have black text on striped background colours, these being the usual ones seen in Mac OS X applications such as iTunes. -@d FIRST_STRIPE_COLOUR "#ffffff" -@d SECOND_STRIPE_COLOUR "#f3f6fa" - @ = - HTML::begin_html_table(OUT, FIRST_STRIPE_COLOUR, TRUE, 0, 0, 2, 0, 0); + HTML::begin_html_table(OUT, I"stripeone", TRUE, 0, 0, 2, 0, 0); @; int stripe = 0; TEMPORARY_TEXT(current_author_name) @@ -331,9 +328,9 @@ the usual ones seen in Mac OS X applications such as iTunes. @; stripe = 1 - stripe; if (stripe == 0) - HTML::first_html_column_coloured(OUT, 0, SECOND_STRIPE_COLOUR, 0); + HTML::first_html_column_coloured(OUT, 0, I"stripetwo", 0); else - HTML::first_html_column_coloured(OUT, 0, FIRST_STRIPE_COLOUR, 0); + HTML::first_html_column_coloured(OUT, 0, I"stripeone", 0); @; HTML::end_html_row(OUT); } @@ -387,12 +384,10 @@ the usual ones seen in Mac OS X applications such as iTunes. @ Usually white text on a grey background. -@d CENSUS_TITLING_BG "#808080" - @ = int span = 4; if (d == SORT_CE_BY_TITLE) span = 3; - HTML::first_html_column_coloured(OUT, 0, CENSUS_TITLING_BG, span); + HTML::first_html_column_coloured(OUT, 0, I"tintedrow", span); HTML::begin_span(OUT, I"extensioncensusentry"); WRITE(" "); diff --git a/inform7/Internal/HTML/macos-platform.css b/inform7/Internal/HTML/macos-platform.css index 83057679d..7d4e44764 100644 --- a/inform7/Internal/HTML/macos-platform.css +++ b/inform7/Internal/HTML/macos-platform.css @@ -143,6 +143,19 @@ span.extensionindexerror { color: #ff8080; } +/* This is used in extension documentation, where an example is presented +in a slightly tinted box: */ + +table.extensionexample { + background-color: #f0f0f0; +} + +span.extensionexampleletter { + color: #202020; + font-size: 14px; + font-weight: bold; +} + /* Seen in problem messages: */ span.problemred { @@ -221,6 +234,18 @@ span.librarycardother { color: var(--library-card-other-colour); } +/* Generically used for "more details" boxes in the index: */ + +table.indexmorebox { + background-color: #e0e0e0; +} + +/* But not for activity contents: */ + +table.indexactivitycontents { + background-color: #e8e0c0; +} + /* For responses in index entries about rules: */ span.indexresponseletter { @@ -235,8 +260,16 @@ span.indexresponsetext { /* Used ubiquitously throughout the index for unemphasised text: */ +span.indexblack { + color: #000000; +} + span.indexgrey { - color: #808080; + color: #808080; +} + +span.indexdarkgrey { + color: #505050; } span.indexdullred { @@ -251,6 +284,54 @@ span.indexdullblue { color: #000080; } +/* Used in the numbering of levels of the World map in the Index */ + +span.indexmaplevelnumbers { + color: #c0c0c0; +} + +/* Used for the room squares in the World map in the Index (which is currently +a table with one row of one column) */ + +table.indexmaproom { + border-color: #000000; +} + +/* Used in the numbering of levels of the World map in the Index */ + +span.indexmaplevelnumbers { + color: #c0c0c0; +} + +/* Used e.g. for title rows in the Chart of basic kinds in the Index */ + +tr.headingrow { + background-color: #e0e0e0; +} + +/* Standard rows have black text on striped background colours, these being +the usual ones seen in Mac OS X applications such as iTunes. */ + +tr.stripeone { + background-color: #ffffff; +} + +tr.stripetwo { + background-color: #f3f6fa; +} + +tr.tintedrow { + background-color: #808080; +} + +/* In the Figures index, this is the background colour used behind images +(though in fact it will only be visible if the image fails to load, or uses +transparency): */ + +div.figureindexbox { + background-color: #6495ed; +} + /* To get the book-contents-page style leaders on the Contents element of the index to work, these must use the background colour of the body of the page, whatever that is: */ @@ -260,4 +341,4 @@ ul.leaders li.leaded span:first-child { } ul.leaders li.leaded span + span { background: var(--leaders-background-colour); -} \ No newline at end of file +} diff --git a/inform7/Internal/HTML/platform.css b/inform7/Internal/HTML/platform.css index e36710599..f70f7690b 100644 --- a/inform7/Internal/HTML/platform.css +++ b/inform7/Internal/HTML/platform.css @@ -116,6 +116,19 @@ span.extensionindexerror { color: #ff8080; } +/* This is used in extension documentation, where an example is presented +in a slightly tinted box: */ + +table.extensionexample { + background-color: #f0f0f0; +} + +span.extensionexampleletter { + color: #202020; + font-size: 14px; + font-weight: bold; +} + /* Seen in problem messages: */ span.problemred { @@ -194,6 +207,18 @@ span.librarycardother { color: #303030; } +/* Generically used for "more details" boxes in the index: */ + +table.indexmorebox { + background-color: #e0e0e0; +} + +/* But not for activity contents: */ + +table.indexactivitycontents { + background-color: #e8e0c0; +} + /* For responses in index entries about rules: */ span.indexresponseletter { @@ -208,10 +233,18 @@ span.indexresponsetext { /* Used ubiquitously throughout the index for unemphasised text: */ +span.indexblack { + color: #000000; +} + span.indexgrey { color: #808080; } +span.indexdarkgrey { + color: #505050; +} + span.indexdullred { color: #800000; } @@ -224,6 +257,48 @@ span.indexdullblue { color: #000080; } +/* Used for the room squares in the World map in the Index (which is currently +a table with one row of one column) */ + +table.indexmaproom { + border-color: #000000; +} + +/* Used in the numbering of levels of the World map in the Index */ + +span.indexmaplevelnumbers { + color: #c0c0c0; +} + +/* Used e.g. for title rows in the Chart of basic kinds in the Index */ + +tr.headingrow { + background-color: #e0e0e0; +} + +/* Standard rows have black text on striped background colours, these being +the usual ones seen in Mac OS X applications such as iTunes. */ + +tr.stripeone { + background-color: #ffffff; +} + +tr.stripetwo { + background-color: #f3f6fa; +} + +tr.tintedrow { + background-color: #808080; +} + +/* In the Figures index, this is the background colour used behind images +(though in fact it will only be visible if the image fails to load, or uses +transparency): */ + +div.figureindexbox { + background-color: #6495ed; +} + /* To get the book-contents-page style leaders on the Contents element of the index to work, these must use the background colour of the body of the page, whatever that is: */ diff --git a/inform7/Internal/HTML/windows-platform.css b/inform7/Internal/HTML/windows-platform.css index 0a31367d7..496376150 100755 --- a/inform7/Internal/HTML/windows-platform.css +++ b/inform7/Internal/HTML/windows-platform.css @@ -116,6 +116,19 @@ span.extensionindexerror { color: #ff8080; } +/* This is used in extension documentation, where an example is presented +in a slightly tinted box: */ + +table.extensionexample { + background-color: #f0f0f0; +} + +span.extensionexampleletter { + color: #202020; + font-size: 14px; + font-weight: bold; +} + /* Seen in problem messages: */ span.problemred { @@ -194,6 +207,18 @@ span.librarycardother { color: #303030; } +/* Generically used for "more details" boxes in the index: */ + +table.indexmorebox { + background-color: #e0e0e0; +} + +/* But not for activity contents: */ + +table.indexactivitycontents { + background-color: #e8e0c0; +} + /* For responses in index entries about rules: */ span.indexresponseletter { @@ -206,12 +231,20 @@ span.indexresponsetext { color: #000066; } -/* Used ubiquitously throughout the index for unemphasised text: */ +/* Used ubiquitously throughout the index and extension documentation: */ + +span.indexblack { + color: #000000; +} span.indexgrey { color: #808080; } +span.indexdarkgrey { + color: #505050; +} + span.indexdullred { color: #800000; } @@ -224,6 +257,48 @@ span.indexdullblue { color: #000080; } +/* Used for the room squares in the World map in the Index (which is currently +a table with one row of one column) */ + +table.indexmaproom { + border-color: #000000; +} + +/* Used in the numbering of levels of the World map in the Index */ + +span.indexmaplevelnumbers { + color: #c0c0c0; +} + +/* Used e.g. for title rows in the Chart of basic kinds in the Index */ + +tr.headingrow { + background-color: #e0e0e0; +} + +/* Standard rows have black text on striped background colours, these being +the usual ones seen in Mac OS X applications such as iTunes. */ + +tr.stripeone { + background-color: #ffffff; +} + +tr.stripetwo { + background-color: #f3f6fa; +} + +tr.tintedrow { + background-color: #808080; +} + +/* In the Figures index, this is the background colour used behind images +(though in fact it will only be visible if the image fails to load, or uses +transparency): */ + +div.figureindexbox { + background-color: #6495ed; +} + /* To get the book-contents-page style leaders on the Contents element of the index to work, these must use the background colour of the body of the page, whatever that is: */ diff --git a/inform7/Tests/Test Internals/_Results_Ideal/Index-Card.txt b/inform7/Tests/Test Internals/_Results_Ideal/Index-Card.txt index 44d34d0f3..72273acb0 100644 --- a/inform7/Tests/Test Internals/_Results_Ideal/Index-Card.txt +++ b/inform7/Tests/Test Internals/_Results_Ideal/Index-Card.txt @@ -1,5 +1,5 @@ 1. Cd -

+

Story title     diff --git a/inform7/Tests/Test Internals/_Results_Ideal/Index-Card2.txt b/inform7/Tests/Test Internals/_Results_Ideal/Index-Card2.txt index 8045e7c84..b83fd9dfd 100644 --- a/inform7/Tests/Test Internals/_Results_Ideal/Index-Card2.txt +++ b/inform7/Tests/Test Internals/_Results_Ideal/Index-Card2.txt @@ -1,5 +1,5 @@ 1. Cd -

+

Story title     diff --git a/inform7/Tests/Test Internals/_Results_Ideal/Index-Chart.txt b/inform7/Tests/Test Internals/_Results_Ideal/Index-Chart.txt index 56b271ae9..75aa535bd 100644 --- a/inform7/Tests/Test Internals/_Results_Ideal/Index-Chart.txt +++ b/inform7/Tests/Test Internals/_Results_Ideal/Index-Chart.txt @@ -1,11 +1,11 @@ 1. Ch - + - + @@ -22,7 +22,7 @@ under  - + @@ -74,7 +74,7 @@ - + @@ -91,7 +91,7 @@ cross - + @@ -108,7 +108,7 @@ tick - + @@ -125,7 +125,7 @@ tick - + @@ -142,7 +142,7 @@ tick - + @@ -159,7 +159,7 @@ tick - + @@ -176,7 +176,7 @@ tick - + @@ -193,7 +193,7 @@ tick - + @@ -210,7 +210,7 @@ tick - + @@ -227,7 +227,7 @@ tick - + @@ -244,7 +244,7 @@ tick - + @@ -261,7 +261,7 @@ tick - + @@ -278,7 +278,7 @@ tick - + @@ -295,7 +295,7 @@ tick - + @@ -312,7 +312,7 @@ tick - + @@ -329,7 +329,7 @@ tick - + @@ -346,7 +346,7 @@ tick - + @@ -363,12 +363,12 @@ tick - + - + @@ -385,7 +385,7 @@ tick - + @@ -402,7 +402,7 @@ tick - + @@ -419,7 +419,7 @@ tick - + @@ -436,7 +436,7 @@ tick - + @@ -453,7 +453,7 @@ cross - + @@ -470,7 +470,7 @@ cross - + @@ -487,7 +487,7 @@ cross - + @@ -504,7 +504,7 @@ cross - + @@ -521,7 +521,7 @@ tick - + @@ -538,7 +538,7 @@ tick - + @@ -555,7 +555,7 @@ tick - + @@ -572,7 +572,7 @@ cross - + @@ -589,7 +589,7 @@ cross - + @@ -606,7 +606,7 @@ cross - + @@ -623,7 +623,7 @@ cross - + @@ -640,7 +640,7 @@ cross - + @@ -657,7 +657,7 @@ cross - + @@ -674,7 +674,7 @@ tick - + @@ -691,7 +691,7 @@ cross - + @@ -708,7 +708,7 @@ tick - + @@ -725,12 +725,12 @@ tick - + - + @@ -747,7 +747,7 @@ tick - + @@ -764,7 +764,7 @@ tick - + @@ -781,7 +781,7 @@ tick - + @@ -798,7 +798,7 @@ tick - + @@ -815,12 +815,12 @@ tick - + - + @@ -837,12 +837,12 @@   - + - + @@ -850,7 +850,7 @@ { } - + @@ -858,7 +858,7 @@ always the default value of L - + @@ -866,7 +866,7 @@ a relation never holding - + @@ -874,7 +874,7 @@ the little-used do nothing rule - + @@ -882,7 +882,7 @@ the action-processing rules - + @@ -890,7 +890,7 @@ printing the name - + @@ -898,7 +898,7 @@ matching nothing - + @@ -906,7 +906,7 @@ -- - + @@ -914,7 +914,7 @@ -- - + @@ -1052,16 +1052,16 @@ and southwest, for instance; down and up.

 12 directions

basic kinds 
object [15]     
room [1]      
thing [2]     
door [1]      
mystic portal [1]      
container     
vehicle      
player's holdall      
supporter     
backdrop      
person [1]      
man     
woman     
animal     
device      
direction [12]      
region      
number       
real number       
time       
truth state      
text     
snippet      
unicode character     
action      
scene  [1]     
command parser error [25]     
dynasty  [4]     
use option     
response     
verb      
table name      
equation name     
rulebook outcome     
external file      
action name      
figure name  [1]     
sound name      
natural language [6]     
grammatical tense  [5]     
narrative viewpoint  [6]     
grammatical case  [2]     
grammatical gender  [3]     
making new kinds from old 
list of K      
phrase K -> L     
relation of K     
K based rule producing L      
K based rulebook producing L      
activity on K      
description of K      
K valued property     
K valued table column     
+

@@ -1077,13 +1077,13 @@ and southwest, for instance; down and up.
- ... + ... - ... + ...
- ... + ... - ... + ...
@@ -1143,16 +1143,16 @@ Like a scene in a play: a period of time which is usually tied to events in the

Matches: value, sayable value, understandable value, enumerated value

 25 command parser errors