diff --git a/README.md b/README.md index f47455e61..0109f4857 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-beta+6V01 'Krypton' (8 May 2022) +v10.1.0-beta+6V02 'Krypton' (9 May 2022) ## About Inform 7 diff --git a/build.txt b/build.txt index a5760a637..ccb596c0c 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: beta -Build Date: 8 May 2022 -Build Number: 6V01 +Build Date: 9 May 2022 +Build Number: 6V02 diff --git a/inform7/Internal/Extensions/Graham Nelson/Unicode Full Character Names.i7x b/inform7/Internal/Extensions/Graham Nelson/Unicode Full Character Names.i7x index f946d4173..d0590f1bb 100644 --- a/inform7/Internal/Extensions/Graham Nelson/Unicode Full Character Names.i7x +++ b/inform7/Internal/Extensions/Graham Nelson/Unicode Full Character Names.i7x @@ -2702,7 +2702,7 @@ circled ideograph financial translates into Unicode as 12950. circled ideograph fire translates into Unicode as 12939. circled ideograph five translates into Unicode as 12932. circled ideograph four translates into Unicode as 12931. -circled ideograph have translates into Unicode as 12946. +(circled ideograph have) translates into Unicode as 12946. circled ideograph high translates into Unicode as 12964. circled ideograph item translates into Unicode as 12960. circled ideograph labor translates into Unicode as 12952. @@ -9659,7 +9659,7 @@ parenthesized ideograph financial translates into Unicode as 12854. parenthesized ideograph fire translates into Unicode as 12843. parenthesized ideograph five translates into Unicode as 12836. parenthesized ideograph four translates into Unicode as 12835. -parenthesized ideograph have translates into Unicode as 12850. +(parenthesized ideograph have) translates into Unicode as 12850. parenthesized ideograph labor translates into Unicode as 12856. parenthesized ideograph metal translates into Unicode as 12846. parenthesized ideograph moon translates into Unicode as 12842. diff --git a/inform7/assertions-module/Chapter 3/Translation Requests.w b/inform7/assertions-module/Chapter 3/Translation Requests.w index 694de21a7..00ba46419 100644 --- a/inform7/assertions-module/Chapter 3/Translation Requests.w +++ b/inform7/assertions-module/Chapter 3/Translation Requests.w @@ -133,8 +133,8 @@ generated anyway; Inform authors never type them. = ::= - | ==> { pass 1 } - ... ==> { -1, - } + ( ... ) | + ... ::= | ==> { UnicodeLiterals::max(R[1]), - } @@ -156,7 +156,8 @@ generated anyway; Inform authors never type them. int cc = <>; (SP); - if ((<> != -1) && (<> != cc)) { + wording CN = GET_RW(, 1); + if (((CN)) && (<> != cc)) { StandardProblems::sentence_problem(Task::syntax_tree(), _p_(PM_UnicodeAlready), "this Unicode character name has already been translated", @@ -164,7 +165,7 @@ generated anyway; Inform authors never type them. return FALSE; } - Nouns::new_proper_noun(SP, NEUTER_GENDER, ADD_TO_LEXICON_NTOPT, MISCELLANEOUS_MC, + Nouns::new_proper_noun(CN, NEUTER_GENDER, ADD_TO_LEXICON_NTOPT, MISCELLANEOUS_MC, Diagrams::new_PROPER_NOUN(OP), Task::language_of_syntax()); @h Translation into Inter.