From 0854be5e9dfc059280afe0625f53ac23757fa60c Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Thu, 4 Apr 2024 23:27:24 +0100 Subject: [PATCH] Minor bug in Markdown to HTML rendering fixed --- README.md | 2 +- build.txt | 4 +-- docs/foundation-module/5-im.html | 25 +++++++++++------- docs/goldbach/goldbach.pdf | Bin 251986 -> 251998 bytes .../Chapter 5/Inform-Flavoured Markdown.w | 25 +++++++++++------- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 0ae8bed..c6d69ef 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inweb 7.2.1 -[Version](notes/versioning.md): 7.2.1-beta+1B60 'Escape to Danger' (14 March 2024) +[Version](notes/versioning.md): 7.2.1-beta+1B61 'Escape to Danger' (4 April 2024) ## About Inweb diff --git a/build.txt b/build.txt index 3d21d82..3fae2b8 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 14 March 2024 -Build Number: 1B60 +Build Date: 4 April 2024 +Build Number: 1B61 diff --git a/docs/foundation-module/5-im.html b/docs/foundation-module/5-im.html index 7221cc7..cb3f771 100644 --- a/docs/foundation-module/5-im.html +++ b/docs/foundation-module/5-im.html @@ -1084,19 +1084,24 @@

HTML_OPEN_WITH("blockquote", "class=\"extract-inform7\""); if (GENERAL_POINTER_IS_NULL(md->user_state) == FALSE) { markdown_item *first = RETRIEVE_POINTER_markdown_item(md->user_state); - TEMPORARY_TEXT(accumulated) - for (markdown_item *ch = md; ch; ch = ch->next) { - if (ch->type == CODE_BLOCK_MIT) { - if (GENERAL_POINTER_IS_NULL(ch->user_state) == FALSE) { - markdown_item *latest = RETRIEVE_POINTER_markdown_item(ch->user_state); - if (first == latest) WRITE_TO(accumulated, "%S", ch->stashed); + if (first == md) { + TEMPORARY_TEXT(accumulated) + for (markdown_item *ch = first; ch; ch = ch->next) { + if (ch->type == CODE_BLOCK_MIT) { + if (GENERAL_POINTER_IS_NULL(ch->user_state) == FALSE) { + markdown_item *latest = RETRIEVE_POINTER_markdown_item(ch->user_state); + if (first == latest) { + if (ch != first) WRITE_TO(accumulated, "\n"); + WRITE_TO(accumulated, "%S", ch->stashed); + } + } } } + #ifdef HTML_MODULE + PasteButtons::paste_text_new_style(OUT, accumulated); + #endif + DISCARD_TEXT(accumulated) } - #ifdef HTML_MODULE - PasteButtons::paste_text_new_style(OUT, accumulated); - #endif - DISCARD_TEXT(accumulated) } TEMPORARY_TEXT(colouring) programming_language *default_language = Languages::find_by_name(I"Inform", NULL, FALSE); diff --git a/docs/goldbach/goldbach.pdf b/docs/goldbach/goldbach.pdf index be2621e7aea677e5dbf2a8dd2f4720974f8b7aa8..9e4f256197829329a071bf341c17a4b88acdf471 100644 GIT binary patch delta 344 zcmcb#f&bnH{)QID7N#xCyeExK3`~rSjm!-VwG9l_4Gh#Zx%7SWQ(O{DQWZ2@tc(nd zfC|u*Y&SW{yqwqB)X~Yrz|73i($Lw^#MsHm+|iu|IISsA! zbwVi~T(Q;LnRRb8_`YbBd-?H-dhU&O+ZP9{rX))LS|GnFpuOu$$rE(kBVZ0Dc5US}QJ`02K{M*Y`E^75+Ei>I63U{>HXGUQTKb@g}S0sy~l Bfjuser_state) == FALSE) { markdown_item *first = RETRIEVE_POINTER_markdown_item(md->user_state); - TEMPORARY_TEXT(accumulated) - for (markdown_item *ch = md; ch; ch = ch->next) { - if (ch->type == CODE_BLOCK_MIT) { - if (GENERAL_POINTER_IS_NULL(ch->user_state) == FALSE) { - markdown_item *latest = RETRIEVE_POINTER_markdown_item(ch->user_state); - if (first == latest) WRITE_TO(accumulated, "%S", ch->stashed); + if (first == md) { + TEMPORARY_TEXT(accumulated) + for (markdown_item *ch = first; ch; ch = ch->next) { + if (ch->type == CODE_BLOCK_MIT) { + if (GENERAL_POINTER_IS_NULL(ch->user_state) == FALSE) { + markdown_item *latest = RETRIEVE_POINTER_markdown_item(ch->user_state); + if (first == latest) { + if (ch != first) WRITE_TO(accumulated, "\n"); + WRITE_TO(accumulated, "%S", ch->stashed); + } + } } } + #ifdef HTML_MODULE + PasteButtons::paste_text_new_style(OUT, accumulated); + #endif + DISCARD_TEXT(accumulated) } - #ifdef HTML_MODULE - PasteButtons::paste_text_new_style(OUT, accumulated); - #endif - DISCARD_TEXT(accumulated) } TEMPORARY_TEXT(colouring) programming_language *default_language = Languages::find_by_name(I"Inform", NULL, FALSE);