ifhub/inform7
1
0
Fork 0
mirror of https://github.com/ganelson/inform.git synced 2024-07-05 08:34:22 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'extension-doc-example-section-fix' into html-tag-matching

Browse source
This commit is contained in:
Nathanael Nerode 2022-06-04 14:29:36 -04:00
parent 80fa37219e a33b685428
commit 7a7f9335e3
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/html-module/Chapter 2/Documentation Renderer.w
View file

@ -144,14 +144,15 @@ extension, enabling them to be lettered as Example A to Example Z.)
= =
void DocumentationRenderer::table_of_contents(wording W, OUTPUT_STREAM, text_stream *base_leafname) { void DocumentationRenderer::table_of_contents(wording W, OUTPUT_STREAM, text_stream *base_leafname) {
int heading_count = 0, chapter_count = 0, section_count = 0, example_count = 0; int heading_count = 0, chapter_count = 0, section_count = 0, example_count = 0, indentation = 0;
LOOP_THROUGH_WORDING(i, W) { LOOP_THROUGH_WORDING(i, W) {
int edhl, asterisks; int edhl, asterisks;
wording NW = EMPTY_WORDING, RUBW = EMPTY_WORDING; wording NW = EMPTY_WORDING, RUBW = EMPTY_WORDING;
if (Lexer::word(i) == PARBREAK_V) { if (Lexer::word(i) == PARBREAK_V) {
while (Lexer::word(i) == PARBREAK_V) i++; while (Lexer::word(i) == PARBREAK_V) i++;
if (i>Wordings::last_wn(W)) break; if (i>Wordings::last_wn(W)) break;
if (DocumentationRenderer::extension_documentation_heading( @<Determine indentation of new paragraph@>;
if (indentation == 0 && DocumentationRenderer::extension_documentation_heading(
Wordings::from(W, i), &edhl, &NW)) { Wordings::from(W, i), &edhl, &NW)) {
heading_count++; heading_count++;
if (heading_count == 1) { if (heading_count == 1) {
@ -270,7 +271,7 @@ int DocumentationRenderer::set_body_text(wording W, OUTPUT_STREAM,
while (Lexer::word(i) == PARBREAK_V) i++; while (Lexer::word(i) == PARBREAK_V) i++;
if (i>Wordings::last_wn(W)) break; /* treat multiple paragraph breaks as one */ if (i>Wordings::last_wn(W)) break; /* treat multiple paragraph breaks as one */
@<Determine indentation of new paragraph@>; @<Determine indentation of new paragraph@>;
if (DocumentationRenderer::extension_documentation_heading(Wordings::from(W, i), &edhl, &NW)) { if (indentation == 0 && DocumentationRenderer::extension_documentation_heading(Wordings::from(W, i), &edhl, &NW)) {
heading_count++; heading_count++;
if (edhl == 1) { if (edhl == 1) {
chapter_count++; section_count = 0; chapter_count++; section_count = 0;