From 2445e3d16b39a6b25ef750bebec2f1352b9e0daa Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Thu, 1 Jul 2021 00:33:52 +0100 Subject: [PATCH] Tested out the localisation dictionary-reader --- README.md | 2 +- build.txt | 4 +- docs/core-module/1-wtc.html | 6 +++ docs/html-module/2-if.html | 10 +++++ docs/index-module/2-ifs.html | 2 +- docs/index-module/2-ii.html | 6 +-- inform7/Figures/timings-diagnostics.txt | 38 +++++++++---------- .../{Basic-Index.txt => Basic.indext} | 0 .../{Standard-Index.txt => Standard.indext} | 5 +++ .../core-module/Chapter 1/What To Compile.w | 6 +++ .../Chapter 2/Index Interpreter.w | 6 +-- .../html-module/Chapter 2/Installed Files.w | 8 ++++ 12 files changed, 64 insertions(+), 29 deletions(-) rename inform7/Internal/Miscellany/{Basic-Index.txt => Basic.indext} (100%) rename inform7/Internal/Miscellany/{Standard-Index.txt => Standard.indext} (88%) diff --git a/README.md b/README.md index 964345e28..eba9c9c62 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-alpha.1+6S56 'Krypton' (29 June 2021) +v10.1.0-alpha.1+6S57 'Krypton' (1 July 2021) ## About Inform 7 diff --git a/build.txt b/build.txt index 6d07fbf21..6cec0d572 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: alpha.1 -Build Date: 29 June 2021 -Build Number: 6S56 +Build Date: 1 July 2021 +Build Number: 6S57 diff --git a/docs/core-module/1-wtc.html b/docs/core-module/1-wtc.html index 3c9b67725..8fd3f397f 100644 --- a/docs/core-module/1-wtc.html +++ b/docs/core-module/1-wtc.html @@ -542,6 +542,12 @@ flag stays FALSEvoid Task::produce_index(void) { inform_project *project = Task::project(); if (do_not_generate_index == FALSE) { + dictionary *D = Dictionaries::new(32, TRUE); + InterpretIndex::read_into_dictionary( + InstalledFiles::index_structure_file( + Projects::index_structure(project)), + D); + Dictionaries::log(DL, D); InterpretIndex::generate_from_structure_file( Filenames::in( Languages::path_to_bundle( diff --git a/docs/html-module/2-if.html b/docs/html-module/2-if.html index f1958be0e..e9648b1fb 100644 --- a/docs/html-module/2-if.html +++ b/docs/html-module/2-if.html @@ -127,7 +127,17 @@ but they're just plain old files, and are not managed by Inbuild as "copies". internal_error("unknown installation resource file"); return NULL; } + +

§2. This directory also holds the Basic.indext and Standard.indext index +structure files, but in principle we allow a wider range of these to exist, so: +

+
+filename *InstalledFiles::index_structure_file(text_stream *leaf) {
+    pathname *internal = INSTALLED_FILES_HTML_CALLBACK();
+    pathname *misc = Pathnames::down(internal, I"Miscellany");
+    return Filenames::in(misc, leaf);
+}