From d8de2ba24de115db630f0d1fe57dc0e8ca27bd72 Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Sat, 7 May 2022 11:32:57 +0100 Subject: [PATCH] Fix for Jira bug I7-2085 --- inform7/Internal/HTML/xrefs.txt | 2 +- inter/final-module/Chapter 4/Inform 6 Code.w | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/inform7/Internal/HTML/xrefs.txt b/inform7/Internal/HTML/xrefs.txt index dd6830fe73..d45cbe3b41 100644 --- a/inform7/Internal/HTML/xrefs.txt +++ b/inform7/Internal/HTML/xrefs.txt @@ -33,7 +33,7 @@ ph_defaultvalue _ doc62 "4.11" "4.11. Default values of kinds" PM_EmptyKind VARIABLES var_location _ doc63 "4.12" "4.12. Values that vary" PM_TooManyDuplicates _ doc65 "4.14" "4.14. Duplicates" PM_ComplexEvery PM_AssemblyRegress PM_AssemblyLoop _ doc66 "4.15" "4.15. Assemblies and body parts" -PM_TSWithPunctuation PM_TSWithComma _ doc69 "5.1" "5.1. Text with substitutions" +PM_TSWithPunctuation _ doc69 "5.1" "5.1. Text with substitutions" phs_bracket phs_closebracket phs_apostrophe phs_quotemark _ doc70 "5.2" "5.2. How Inform reads quoted text" ph_say phs_a phs_A phs_the phs_The _ doc71 "5.3" "5.3. Text which names things" phs_numwords phs_s _ doc72 "5.4" "5.4. Text with numbers" diff --git a/inter/final-module/Chapter 4/Inform 6 Code.w b/inter/final-module/Chapter 4/Inform 6 Code.w index edef5730c9..7c80ca6281 100644 --- a/inter/final-module/Chapter 4/Inform 6 Code.w +++ b/inter/final-module/Chapter 4/Inform 6 Code.w @@ -704,17 +704,13 @@ a constant 1, 2 or 3, or else plain roman is all you get. break; case STYLE_BIP: { inter_tree_node *N = InterTree::first_child(P); - if ((Inode::is(N, CONSTANT_IST)) && - (ConstantInstruction::list_format(N) == CONST_LIST_FORMAT_NONE)) { - inter_ti style = InterValuePairs::to_number(ConstantInstruction::constant(N)); - switch (style) { - case 1: WRITE("style bold"); break; - case 2: WRITE("style underline"); break; - case 3: WRITE("style reverse"); break; - default: WRITE("style roman"); - } - } else { - WRITE("style roman"); + inter_pair pair = ValInstruction::value(N); + inter_ti style = InterValuePairs::to_number(pair); + switch (style) { + case 1: WRITE("style bold"); break; + case 2: WRITE("style underline"); break; + case 3: WRITE("style reverse"); break; + default: WRITE("style roman"); } break; }