diff --git a/README.md b/README.md index b788700b2..f219c4d5a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -[Version](notes/versioning.md): 10.2.0-beta+6X02 'Krypton' (13 August 2023) +[Version](notes/versioning.md): 10.2.0-beta+6X03 'Krypton' (18 August 2023) ## About Inform diff --git a/build.txt b/build.txt index 43791e30e..8298805a5 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 13 August 2023 -Build Number: 6X02 +Build Date: 18 August 2023 +Build Number: 6X03 diff --git a/docs/supervisor-module/7-dr.html b/docs/supervisor-module/7-dr.html index 0c4557adb..19faea73b 100644 --- a/docs/supervisor-module/7-dr.html +++ b/docs/supervisor-module/7-dr.html @@ -772,9 +772,11 @@ had its infamous PNG transparency bug.) 
 void DocumentationRenderer::render_text(OUTPUT_STREAM, text_stream *text) {
-    markdown_item *md = MarkdownParser::inline(text);
+    markdown_item *md = Markdown::parse(text);
     HTML_OPEN_WITH("span", "class=\"markdowncontent\"");
-    MarkdownRenderer::go(OUT, md);
+    if (md) md = md->down;
+    if ((md) && (md->type == PARAGRAPH_MIT))
+        Markdown::render(OUT, md->down);  we don't want the paragraph tags
     HTML_CLOSE("span");
 }
diff --git a/inbuild/supervisor-module/Chapter 7/Documentation Renderer.w b/inbuild/supervisor-module/Chapter 7/Documentation Renderer.w index dc3fe705c..11295a57d 100644 --- a/inbuild/supervisor-module/Chapter 7/Documentation Renderer.w +++ b/inbuild/supervisor-module/Chapter 7/Documentation Renderer.w @@ -656,9 +656,11 @@ had its infamous PNG transparency bug.) = void DocumentationRenderer::render_text(OUTPUT_STREAM, text_stream *text) { - markdown_item *md = MarkdownParser::inline(text); + markdown_item *md = Markdown::parse(text); HTML_OPEN_WITH("span", "class=\"markdowncontent\""); - MarkdownRenderer::go(OUT, md); + if (md) md = md->down; + if ((md) && (md->type == PARAGRAPH_MIT)) + Markdown::render(OUT, md->down); /* we don't want the paragraph tags */ HTML_CLOSE("span"); } diff --git a/inform7/Figures/memory-diagnostics.txt b/inform7/Figures/memory-diagnostics.txt index fc3304c76..945842713 100644 --- a/inform7/Figures/memory-diagnostics.txt +++ b/inform7/Figures/memory-diagnostics.txt @@ -1,11 +1,11 @@ -Total memory consumption was 141494K = 138 MB +Total memory consumption was 141888K = 139 MB - ---- was used for 2123273 objects, in 374928 frames in 0 x 800K = 0K = 0 MB: + ---- was used for 2128973 objects, in 374985 frames in 0 x 800K = 0K = 0 MB: - 29.8% inter_tree_node_array 60 x 8192 = 491520 objects, 43255680 bytes - 18.9% text_stream_array 4884 x 100 = 488400 objects, 27506688 bytes - 17.5% linked_list 45356 objects, 25399360 bytes - 9.9% inter_symbol_array 135 x 1024 = 138240 objects, 14381280 bytes + 29.7% inter_tree_node_array 60 x 8192 = 491520 objects, 43255680 bytes + 19.1% text_stream_array 4930 x 100 = 493000 objects, 27765760 bytes + 17.4% linked_list 45356 objects, 25399360 bytes + 9.8% inter_symbol_array 135 x 1024 = 138240 objects, 14381280 bytes 9.6% inter_error_stash_array 107 x 1024 = 109568 objects, 14028128 bytes 7.3% parse_node 133796 objects, 10703680 bytes 5.2% verb_conjugation 164 objects, 7610912 bytes @@ -18,7 +18,7 @@ Total memory consumption was 141494K = 138 MB 1.4% inter_name_generator_array 51 x 1000 = 51000 objects, 2041632 bytes 1.2% package_request 21344 objects, 1878272 bytes 1.2% vocabulary_entry_array 163 x 100 = 16300 objects, 1830816 bytes - 1.0% dict_entry_array 491 x 100 = 49100 objects, 1586912 bytes + 1.1% dict_entry_array 502 x 100 = 50200 objects, 1622464 bytes 1.0% inter_symbols_table 26925 objects, 1507800 bytes 1.0% match_trie_array 11 x 1000 = 11000 objects, 1496352 bytes 0.9% i6_schema_array 24 x 100 = 2400 objects, 1440768 bytes @@ -26,7 +26,7 @@ Total memory consumption was 141494K = 138 MB 0.7% map_data 677 objects, 1137360 bytes 0.7% id_body 979 objects, 1119976 bytes 0.7% adjective_meaning 208 objects, 1030016 bytes - 0.7% inter_schema_node 9066 objects, 1015392 bytes + 0.6% inter_schema_node 9066 objects, 1015392 bytes 0.6% excerpt_meaning 3164 objects, 987168 bytes 0.6% production 3985 objects, 924520 bytes 0.6% ptoken 8652 objects, 899808 bytes @@ -65,8 +65,8 @@ Total memory consumption was 141494K = 138 MB ---- spatial_data 677 objects, 64992 bytes ---- kind_constructor 79 objects, 64464 bytes ---- linked_list_item_array 4 x 1000 = 4000 objects, 64128 bytes - ---- scenes_rcd_data 1958 objects, 62656 bytes ---- actions_rcd_data 1958 objects, 62656 bytes + ---- scenes_rcd_data 1958 objects, 62656 bytes ---- booking 868 objects, 62496 bytes ---- kind_macro_definition 9 objects, 62280 bytes ---- command_grammar 130 objects, 58240 bytes @@ -149,30 +149,30 @@ Total memory consumption was 141494K = 138 MB ---- either_or_property_data 62 objects, 3968 bytes ---- method_set 109 objects, 3488 bytes ---- definition 48 objects, 3456 bytes - ---- submodule_request 86 objects, 3440 bytes ---- property_setting_bp_data 86 objects, 3440 bytes + ---- submodule_request 86 objects, 3440 bytes ---- kind_constructor_comparison_schema_array 1 x 100 objects, 3232 bytes ---- target_vm 21 objects, 3024 bytes ---- JSON_type 39 objects, 2808 bytes ---- JSON_single_requirement 55 objects, 2640 bytes - ---- part_of_inference_data 79 objects, 2528 bytes ---- parentage_inference_data 79 objects, 2528 bytes - ---- kind_constructor_casting_rule_array 1 x 100 objects, 2432 bytes + ---- part_of_inference_data 79 objects, 2528 bytes ---- kind_constructor_instance_rule_array 1 x 100 objects, 2432 bytes + ---- kind_constructor_casting_rule_array 1 x 100 objects, 2432 bytes ---- equation_symbol 30 objects, 2400 bytes ---- scene 1 object, 2352 bytes ---- build_step 28 objects, 2016 bytes - ---- compiler_feature 30 objects, 1680 bytes ---- pronoun_usage 42 objects, 1680 bytes + ---- compiler_feature 30 objects, 1680 bytes ---- table_contribution_array 1 x 100 objects, 1632 bytes ---- inform_pipeline 24 objects, 1536 bytes ---- inbuild_requirement 37 objects, 1480 bytes ---- noun_filter_token 22 objects, 1408 bytes - ---- special_meaning_holder 35 objects, 1400 bytes ---- inter_node_array 35 objects, 1400 bytes + ---- special_meaning_holder 35 objects, 1400 bytes ---- JSON_requirement 42 objects, 1344 bytes - ---- table_column 16 objects, 1280 bytes ---- constant_phrase 20 objects, 1280 bytes + ---- table_column 16 objects, 1280 bytes ---- invocation_options_array 1 x 100 objects, 1224 bytes ---- direction_inference_data 30 objects, 1200 bytes ---- inbuild_search_result 29 objects, 1160 bytes @@ -194,10 +194,10 @@ Total memory consumption was 141494K = 138 MB ---- relation_guard 5 objects, 640 bytes ---- implication 13 objects, 624 bytes ---- chapter_md 7 objects, 616 bytes - ---- code_generation 1 object, 576 bytes ---- cdoc_paragraph 18 objects, 576 bytes - ---- generated_segment 14 objects, 560 bytes + ---- code_generation 1 object, 576 bytes ---- module 7 objects, 560 bytes + ---- generated_segment 14 objects, 560 bytes ---- inter_warehouse_room 10 objects, 560 bytes ---- inter_annotation_form 14 objects, 560 bytes ---- rulebook_outcome 17 objects, 544 bytes @@ -208,62 +208,62 @@ Total memory consumption was 141494K = 138 MB ---- bp_family 14 objects, 448 bytes ---- source_file 5 objects, 440 bytes ---- inference_family 11 objects, 440 bytes - ---- article_usage 8 objects, 384 bytes ---- tree_node_type 8 objects, 384 bytes - ---- tree_inventory 1 object, 320 bytes - ---- grammatical_category 8 objects, 320 bytes + ---- article_usage 8 objects, 384 bytes ---- module_request 8 objects, 320 bytes - ---- door_dir_notice 5 objects, 320 bytes ---- pronoun 8 objects, 320 bytes + ---- door_dir_notice 5 objects, 320 bytes ---- cached_kind_declaration 8 objects, 320 bytes + ---- grammatical_category 8 objects, 320 bytes + ---- tree_inventory 1 object, 320 bytes ---- inter_pipeline 1 object, 312 bytes - ---- up_family 9 objects, 288 bytes ---- compiled_documentation 3 objects, 288 bytes + ---- up_family 9 objects, 288 bytes ---- cdoc_code_sample 6 objects, 288 bytes - ---- compilation_unit 5 objects, 280 bytes + ---- contents_entry 7 objects, 280 bytes ---- explicit_bp_data 5 objects, 280 bytes ---- door_to_notice 5 objects, 280 bytes - ---- contents_entry 7 objects, 280 bytes - ---- verb_usage_tier 5 objects, 240 bytes + ---- compilation_unit 5 objects, 280 bytes ---- kit_dependency 5 objects, 240 bytes + ---- verb_usage_tier 5 objects, 240 bytes ---- inform_project 1 object, 232 bytes - ---- local_block_value 4 objects, 224 bytes ---- adjective_meaning_family 7 objects, 224 bytes + ---- local_block_value 4 objects, 224 bytes ---- test_scenario 1 object, 216 bytes ---- release_instructions 1 object, 208 bytes ---- build_skill 5 objects, 200 bytes ---- code_generator 5 objects, 200 bytes ---- attachment_instruction 5 objects, 200 bytes - ---- cdoc_example 4 objects, 192 bytes - ---- element_activation 6 objects, 192 bytes ---- plural_dictionary_entry 4 objects, 192 bytes + ---- element_activation 6 objects, 192 bytes + ---- cdoc_example 4 objects, 192 bytes ---- cdoc_heading 3 objects, 168 bytes ---- cdoc_passage 7 objects, 168 bytes ---- inter_architecture 4 objects, 160 bytes - ---- inference_subject_family 5 objects, 160 bytes ---- imperative_defn_family 4 objects, 160 bytes + ---- inference_subject_family 5 objects, 160 bytes ---- inbuild_nest 3 objects, 120 bytes ---- heterogeneous_tree 3 objects, 120 bytes ---- inform_language 1 object, 104 bytes - ---- compile_task_data 1 object, 80 bytes - ---- group_together_function 2 objects, 80 bytes ---- article 2 objects, 80 bytes + ---- group_together_function 2 objects, 80 bytes + ---- compile_task_data 1 object, 80 bytes + ---- inter_warehouse 1 object, 56 bytes ---- figures_data 1 object, 56 bytes ---- build_methodology 1 object, 56 bytes - ---- inter_warehouse 1 object, 56 bytes - ---- I6_generation_data 1 object, 48 bytes - ---- HTML_file_state 1 object, 48 bytes ---- star_invention 1 object, 48 bytes ---- inform_kit_ittt 1 object, 48 bytes - ---- target_pragma_setting 1 object, 40 bytes + ---- I6_generation_data 1 object, 48 bytes + ---- HTML_file_state 1 object, 48 bytes ---- tree_type 1 object, 40 bytes ---- by_function_bp_data 1 object, 40 bytes - ---- kind_template_definition 1 object, 40 bytes ---- loop_over_scope 1 object, 40 bytes + ---- kind_template_definition 1 object, 40 bytes + ---- target_pragma_setting 1 object, 40 bytes 100.0% was used for memory not allocated for objects: - 62.8% text stream storage 91023636 bytes in 508856 claims + 62.9% text stream storage 91427752 bytes in 513467 claims 3.7% dictionary storage 5481984 bytes in 7756 claims ---- sorting 2624 bytes in 531 claims 4.9% source text 7200000 bytes in 3 claims @@ -281,5 +281,5 @@ Total memory consumption was 141494K = 138 MB ---- code generation workspace for objects 3488 bytes in 19 claims 0.1% emitter array storage 281184 bytes in 2006 claims --134.-6% was overhead - -195029568 bytes = -190458K = -185 MB +-134.-4% was overhead - -195324192 bytes = -190746K = -186 MB diff --git a/inform7/Figures/timings-diagnostics.txt b/inform7/Figures/timings-diagnostics.txt index 68d0f7e5b..de0b2bb32 100644 --- a/inform7/Figures/timings-diagnostics.txt +++ b/inform7/Figures/timings-diagnostics.txt @@ -1,30 +1,29 @@ 100.0% in inform7 run - 67.6% in compilation to Inter - 45.5% in //Sequence::undertake_queued_tasks// - 4.0% in //MajorNodes::pre_pass// - 3.6% in //MajorNodes::pass_1// + 68.3% in compilation to Inter + 46.1% in //Sequence::undertake_queued_tasks// + 4.1% in //MajorNodes::pre_pass// + 3.4% in //MajorNodes::pass_1// 2.2% in //RTPhrasebook::compile_entries// - 1.8% in //ImperativeDefinitions::assess_all// - 1.4% in //RTKindConstructors::compile// + 1.9% in //ImperativeDefinitions::assess_all// + 1.5% in //RTKindConstructors::compile// 1.1% in //Sequence::lint_inter// - 0.7% in //ImperativeDefinitions::compile_first_block// - 0.7% in //Sequence::undertake_queued_tasks// 0.3% in //CompletionModule::compile// + 0.3% in //ImperativeDefinitions::compile_first_block// 0.3% in //MajorNodes::pass_2// 0.3% in //RTKindConstructors::compile_permissions// 0.3% in //Sequence::undertake_queued_tasks// + 0.3% in //Sequence::undertake_queued_tasks// 0.3% in //World::stage_V// - 4.4% not specifically accounted for - 27.5% in running Inter pipeline - 9.1% in step 14/15: generate inform6 -> auto.inf - 6.9% in step 5/15: load-binary-kits - 5.8% in step 6/15: make-synoptic-module - 1.8% in step 9/15: make-identifiers-unique - 0.3% in step 11/15: eliminate-redundant-labels + 5.0% not specifically accounted for + 27.0% in running Inter pipeline + 8.7% in step 14/15: generate inform6 -> auto.inf + 7.2% in step 5/15: load-binary-kits + 5.7% in step 6/15: make-synoptic-module + 1.9% in step 9/15: make-identifiers-unique 0.3% in step 12/15: eliminate-redundant-operations 0.3% in step 4/15: compile-splats 0.3% in step 7/15: shorten-wiring 0.3% in step 8/15: detect-indirect-calls - 1.8% not specifically accounted for - 4.0% in supervisor + 1.9% not specifically accounted for + 3.8% in supervisor 0.8% not specifically accounted for diff --git a/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json b/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json index a7ffa7edb..4ff7d3dbd 100644 --- a/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json +++ b/inform7/Internal/Inter/Architecture16Kit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "Architecture16Kit", - "version": "10.2.0-beta+6X02" + "version": "10.2.0-beta+6X03" }, "compatibility": "16-bit", "kit-details": { diff --git a/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json b/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json index 85b8a0e81..bccbfad7f 100644 --- a/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json +++ b/inform7/Internal/Inter/Architecture32Kit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "Architecture32Kit", - "version": "10.2.0-beta+6X02" + "version": "10.2.0-beta+6X03" }, "compatibility": "32-bit", "kit-details": { diff --git a/inform7/Internal/Inter/BasicInformKit/kit_metadata.json b/inform7/Internal/Inter/BasicInformKit/kit_metadata.json index 015e1bca9..e313ccbaa 100644 --- a/inform7/Internal/Inter/BasicInformKit/kit_metadata.json +++ b/inform7/Internal/Inter/BasicInformKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "BasicInformKit", - "version": "10.2.0-beta+6X02" + "version": "10.2.0-beta+6X03" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/CommandParserKit/kit_metadata.json b/inform7/Internal/Inter/CommandParserKit/kit_metadata.json index 89ed53506..c530c85bc 100644 --- a/inform7/Internal/Inter/CommandParserKit/kit_metadata.json +++ b/inform7/Internal/Inter/CommandParserKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "CommandParserKit", - "version": "10.2.0-beta+6X02" + "version": "10.2.0-beta+6X03" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json b/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json index b8f7767e2..ee82f90de 100644 --- a/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json +++ b/inform7/Internal/Inter/EnglishLanguageKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "EnglishLanguageKit", - "version": "10.2.0-beta+6X02" + "version": "10.2.0-beta+6X03" }, "needs": [ { "need": { diff --git a/inform7/Internal/Inter/WorldModelKit/kit_metadata.json b/inform7/Internal/Inter/WorldModelKit/kit_metadata.json index 70a046212..f88880243 100644 --- a/inform7/Internal/Inter/WorldModelKit/kit_metadata.json +++ b/inform7/Internal/Inter/WorldModelKit/kit_metadata.json @@ -2,7 +2,7 @@ "is": { "type": "kit", "title": "WorldModelKit", - "version": "10.2.0-beta+6X02" + "version": "10.2.0-beta+6X03" }, "needs": [ { "need": {