From 7b93e89280b29bf8985aec93d64a5b8fa1dcdcd4 Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Sun, 28 Jun 2020 15:48:23 +0100 Subject: [PATCH] Improved weaving of @default keyword --- Chapter 3/The Weaver.w | 3 + Tangled/inweb.c | 1647 ++++++++++++++++++------------------ docs/goldbach/goldbach.pdf | Bin 251998 -> 251998 bytes docs/inweb/3-tw.html | 3 + 4 files changed, 832 insertions(+), 821 deletions(-) diff --git a/Chapter 3/The Weaver.w b/Chapter 3/The Weaver.w index 2c1a282..ae765b9 100644 --- a/Chapter 3/The Weaver.w +++ b/Chapter 3/The Weaver.w @@ -522,6 +522,9 @@ example, or flush left. (Regexp::match(&mr, matter, L"@define (%c*)"))) { Str::copy(prefatory, I"define"); Str::copy(matter, mr.exp[0]); + } else if (Regexp::match(&mr, matter, L"@default (%c*)")) { + Str::copy(prefatory, I"default"); + Str::copy(matter, mr.exp[0]); } else if ((Regexp::match(&mr, matter, L"@e (%c*)")) || (Regexp::match(&mr, matter, L"@enum (%c*)"))) { Str::copy(prefatory, I"enum"); diff --git a/Tangled/inweb.c b/Tangled/inweb.c index 2cf088d..d8389f4 100644 --- a/Tangled/inweb.c +++ b/Tangled/inweb.c @@ -3759,21 +3759,21 @@ int Collater__cmp_owners(text_stream *O1, text_stream *O2) ; int Weaver__weave(weave_order *wv) ; #line 42 "inweb/Chapter 3/The Weaver.w" int Weaver__weave_inner(weave_order *wv, heterogeneous_tree *tree, tree_node *body) ; -#line 566 "inweb/Chapter 3/The Weaver.w" +#line 569 "inweb/Chapter 3/The Weaver.w" void Weaver__show_endnotes_on_previous_paragraph(heterogeneous_tree *tree, weave_order *wv, tree_node *ap, paragraph *P) ; -#line 681 "inweb/Chapter 3/The Weaver.w" +#line 684 "inweb/Chapter 3/The Weaver.w" void Weaver__show_function_usage(heterogeneous_tree *tree, weave_order *wv, tree_node *ap, paragraph *P, language_function *fn, int as_list) ; -#line 746 "inweb/Chapter 3/The Weaver.w" +#line 749 "inweb/Chapter 3/The Weaver.w" void Weaver__weave_subheading(heterogeneous_tree *tree, weave_order *wv, tree_node *ap, text_stream *text) ; -#line 752 "inweb/Chapter 3/The Weaver.w" +#line 755 "inweb/Chapter 3/The Weaver.w" void Weaver__change_material(heterogeneous_tree *tree, weaver_state *state, int new_material, int plainly, programming_language *pl) ; -#line 764 "inweb/Chapter 3/The Weaver.w" +#line 767 "inweb/Chapter 3/The Weaver.w" void Weaver__change_material_for_para(heterogeneous_tree *tree, weaver_state *state) ; -#line 772 "inweb/Chapter 3/The Weaver.w" +#line 775 "inweb/Chapter 3/The Weaver.w" void Weaver__figure(heterogeneous_tree *tree, weave_order *wv, tree_node *ap, text_stream *figname, int w, int h) ; -#line 778 "inweb/Chapter 3/The Weaver.w" +#line 781 "inweb/Chapter 3/The Weaver.w" void Weaver__commentary_text(heterogeneous_tree *tree, weave_order *wv, tree_node *ap, text_stream *matter) ; -#line 788 "inweb/Chapter 3/The Weaver.w" +#line 791 "inweb/Chapter 3/The Weaver.w" int Weaver__weave_table_of_contents(heterogeneous_tree *tree, tree_node *ap, section *S) ; #line 12 "inweb/Chapter 3/The Weaver of Text.w" void TextWeaver__commentary_text(heterogeneous_tree *tree, tree_node *ap, text_stream *matter) ; @@ -4937,6 +4937,7 @@ text_stream *TL_IS_629 = NULL; text_stream *TL_IS_630 = NULL; text_stream *TL_IS_631 = NULL; text_stream *TL_IS_632 = NULL; +text_stream *TL_IS_633 = NULL; void register_tangled_text_literals(void); #line 57 "inweb/foundation-module/Chapter 2/Streams.w" #define WRITE(args...) Writers__printf(OUT, args) @@ -7984,11 +7985,11 @@ int CommandLine__read_pair_p(text_stream *opt, text_stream *opt_val, int N, ; innocuous = TRUE; break; case VERSION_CLSW: { PRINT("inweb"); - char *svn = "7-alpha.1+1A46"; + char *svn = "7-alpha.1+1A47"; if (svn[0]) PRINT(" version %s", svn); char *vname = "Escape to Danger"; if (vname[0]) PRINT(" '%s'", vname); - char *d = "27 June 2020"; + char *d = "28 June 2020"; if (d[0]) PRINT(" (%s)", d); PRINT("\n"); innocuous = TRUE; break; @@ -20253,9 +20254,12 @@ int Weaver__weave_inner(weave_order *wv, heterogeneous_tree *tree, tree_node *bo (Regexp__match(&mr, matter, L"@define (%c*)"))) { Str__copy(prefatory, TL_IS_233); Str__copy(matter, mr.exp[0]); + } else if (Regexp__match(&mr, matter, L"@default (%c*)")) { + Str__copy(prefatory, TL_IS_234); + Str__copy(matter, mr.exp[0]); } else if ((Regexp__match(&mr, matter, L"@e (%c*)")) || (Regexp__match(&mr, matter, L"@enum (%c*)"))) { - Str__copy(prefatory, TL_IS_234); + Str__copy(prefatory, TL_IS_235); Str__copy(matter, mr.exp[0]); } Regexp__dispose_of(&mr); @@ -20273,7 +20277,7 @@ int Weaver__weave_inner(weave_order *wv, heterogeneous_tree *tree, tree_node *bo { -#line 534 "inweb/Chapter 3/The Weaver.w" +#line 537 "inweb/Chapter 3/The Weaver.w" TEMPORARY_TEXT(OUT) int taken = LanguageMethods__weave_code_line(OUT, S->sect_language, wv, W, C, S, L, matter, concluding_comment); @@ -20290,7 +20294,7 @@ int Weaver__weave_inner(weave_order *wv, heterogeneous_tree *tree, tree_node *bo { -#line 545 "inweb/Chapter 3/The Weaver.w" +#line 548 "inweb/Chapter 3/The Weaver.w" match_results mr = Regexp__create_mr(); while (Regexp__match(&mr, matter, L"(%c*?)%@%<(%c*?)%@%>(%c*)")) { para_macro *pmac = Macros__find_by_name(mr.exp[1], S); @@ -20378,62 +20382,62 @@ int Weaver__weave_inner(weave_order *wv, heterogeneous_tree *tree, tree_node *bo #line 127 "inweb/Chapter 3/The Weaver.w" -#line 566 "inweb/Chapter 3/The Weaver.w" +#line 569 "inweb/Chapter 3/The Weaver.w" void Weaver__show_endnotes_on_previous_paragraph(heterogeneous_tree *tree, weave_order *wv, tree_node *ap, paragraph *P) { tree_node *body = ap; - theme_tag *T = Tags__find_by_name(TL_IS_235, FALSE); + theme_tag *T = Tags__find_by_name(TL_IS_236, FALSE); if ((T) && (Tags__tagged_with(P, T))) { -#line 584 "inweb/Chapter 3/The Weaver.w" +#line 587 "inweb/Chapter 3/The Weaver.w" tree_node *E = WeaveTree__endnote(tree); Trees__make_child(E, body); ap = E; - TextWeaver__commentary_text(tree, ap, TL_IS_236); + TextWeaver__commentary_text(tree, ap, TL_IS_237); TEMPORARY_TEXT(url) int ext = FALSE; if (Colonies__resolve_reference_in_weave(url, NULL, wv->weave_to, - TL_IS_237, wv->weave_web->md, NULL, &ext)) - Trees__make_child(WeaveTree__url(tree, url, TL_IS_238, ext), ap); + TL_IS_238, wv->weave_web->md, NULL, &ext)) + Trees__make_child(WeaveTree__url(tree, url, TL_IS_239, ext), ap); else - TextWeaver__commentary_text(tree, ap, TL_IS_239); + TextWeaver__commentary_text(tree, ap, TL_IS_240); DISCARD_TEXT(url) - TextWeaver__commentary_text(tree, ap, TL_IS_240); + TextWeaver__commentary_text(tree, ap, TL_IS_241); } -#line 571 "inweb/Chapter 3/The Weaver.w" +#line 574 "inweb/Chapter 3/The Weaver.w" ; Tags__show_endnote_on_ifdefs(tree, ap, P); if (P->defines_macro) { -#line 598 "inweb/Chapter 3/The Weaver.w" +#line 601 "inweb/Chapter 3/The Weaver.w" tree_node *E = WeaveTree__endnote(tree); Trees__make_child(E, body); ap = E; - TextWeaver__commentary_text(tree, ap, TL_IS_241); + TextWeaver__commentary_text(tree, ap, TL_IS_242); int ct = 0; macro_usage *mu; LOOP_OVER_LINKED_LIST(mu, macro_usage, P->defines_macro->macro_usages) ct++; - if (ct == 1) TextWeaver__commentary_text(tree, ap, TL_IS_242); + if (ct == 1) TextWeaver__commentary_text(tree, ap, TL_IS_243); else { int k = 0, used_flag = FALSE; LOOP_OVER_LINKED_LIST(mu, macro_usage, P->defines_macro->macro_usages) if (P != mu->used_in_paragraph) { if (used_flag) { - if (k < ct-1) TextWeaver__commentary_text(tree, ap, TL_IS_243); - else TextWeaver__commentary_text(tree, ap, TL_IS_244); + if (k < ct-1) TextWeaver__commentary_text(tree, ap, TL_IS_244); + else TextWeaver__commentary_text(tree, ap, TL_IS_245); } else { - TextWeaver__commentary_text(tree, ap, TL_IS_245); + TextWeaver__commentary_text(tree, ap, TL_IS_246); } Trees__make_child(WeaveTree__locale(tree, mu->used_in_paragraph, NULL), ap); used_flag = TRUE; k++; switch (mu->multiplicity) { case 1: break; - case 2: TextWeaver__commentary_text(tree, ap, TL_IS_246); break; - case 3: TextWeaver__commentary_text(tree, ap, TL_IS_247); break; - case 4: TextWeaver__commentary_text(tree, ap, TL_IS_248); break; - case 5: TextWeaver__commentary_text(tree, ap, TL_IS_249); break; + case 2: TextWeaver__commentary_text(tree, ap, TL_IS_247); break; + case 3: TextWeaver__commentary_text(tree, ap, TL_IS_248); break; + case 4: TextWeaver__commentary_text(tree, ap, TL_IS_249); break; + case 5: TextWeaver__commentary_text(tree, ap, TL_IS_250); break; default: { TEMPORARY_TEXT(mt) WRITE_TO(mt, " (%d times)", mu->multiplicity); @@ -20444,30 +20448,30 @@ void Weaver__show_endnotes_on_previous_paragraph(heterogeneous_tree *tree, } } } - TextWeaver__commentary_text(tree, ap, TL_IS_250); + TextWeaver__commentary_text(tree, ap, TL_IS_251); } -#line 574 "inweb/Chapter 3/The Weaver.w" +#line 577 "inweb/Chapter 3/The Weaver.w" ; language_function *fn; LOOP_OVER_LINKED_LIST(fn, language_function, P->functions) { -#line 637 "inweb/Chapter 3/The Weaver.w" +#line 640 "inweb/Chapter 3/The Weaver.w" if (fn->usage_described == FALSE) Weaver__show_function_usage(tree, wv, ap, P, fn, FALSE); } -#line 577 "inweb/Chapter 3/The Weaver.w" +#line 580 "inweb/Chapter 3/The Weaver.w" ; language_type *st; LOOP_OVER_LINKED_LIST(st, language_type, P->structures) { -#line 641 "inweb/Chapter 3/The Weaver.w" +#line 644 "inweb/Chapter 3/The Weaver.w" tree_node *E = WeaveTree__endnote(tree); Trees__make_child(E, body); ap = E; - TextWeaver__commentary_text(tree, ap, TL_IS_251); + TextWeaver__commentary_text(tree, ap, TL_IS_252); TextWeaver__commentary_text(tree, ap, st->structure_name); section *S; @@ -20491,25 +20495,25 @@ void Weaver__show_endnotes_on_previous_paragraph(heterogeneous_tree *tree, usage_count++; if (S != P->under_section) external++; } - if (external == 0) TextWeaver__commentary_text(tree, ap, TL_IS_252); + if (external == 0) TextWeaver__commentary_text(tree, ap, TL_IS_253); else { - TextWeaver__commentary_text(tree, ap, TL_IS_253); + TextWeaver__commentary_text(tree, ap, TL_IS_254); int c = 0; LOOP_OVER(S, section) if ((S->scratch_flag) && (S != P->under_section)) { - if (c++ > 0) TextWeaver__commentary_text(tree, ap, TL_IS_254); + if (c++ > 0) TextWeaver__commentary_text(tree, ap, TL_IS_255); TextWeaver__commentary_text(tree, ap, S->md->sect_range); } - if (P->under_section->scratch_flag) TextWeaver__commentary_text(tree, ap, TL_IS_255); + if (P->under_section->scratch_flag) TextWeaver__commentary_text(tree, ap, TL_IS_256); } - TextWeaver__commentary_text(tree, ap, TL_IS_256); + TextWeaver__commentary_text(tree, ap, TL_IS_257); } -#line 580 "inweb/Chapter 3/The Weaver.w" +#line 583 "inweb/Chapter 3/The Weaver.w" ; } -#line 681 "inweb/Chapter 3/The Weaver.w" +#line 684 "inweb/Chapter 3/The Weaver.w" void Weaver__show_function_usage(heterogeneous_tree *tree, weave_order *wv, tree_node *ap, paragraph *P, language_function *fn, int as_list) { tree_node *body = ap; @@ -20520,7 +20524,7 @@ void Weaver__show_function_usage(heterogeneous_tree *tree, weave_order *wv, if (as_list == FALSE) { tree_node *E = WeaveTree__endnote(tree); Trees__make_child(E, body); ap = E; - TextWeaver__commentary_text(tree, ap, TL_IS_257); + TextWeaver__commentary_text(tree, ap, TL_IS_258); TextWeaver__commentary_text(tree, ap, fn->function_name); } int used_flag = FALSE; @@ -20532,9 +20536,9 @@ void Weaver__show_function_usage(heterogeneous_tree *tree, weave_order *wv, (P->under_section == hteu->usage_recorded_at->under_section)) { -#line 720 "inweb/Chapter 3/The Weaver.w" +#line 723 "inweb/Chapter 3/The Weaver.w" if (as_list == FALSE) { - if (used_flag == FALSE) TextWeaver__commentary_text(tree, ap, TL_IS_262); + if (used_flag == FALSE) TextWeaver__commentary_text(tree, ap, TL_IS_263); } used_flag = TRUE; section *S = hteu->usage_recorded_at->under_section; @@ -20542,69 +20546,69 @@ void Weaver__show_function_usage(heterogeneous_tree *tree, weave_order *wv, count_under = 0; if (last_cited_in) { if (as_list == FALSE) { - if (last_cited_in != P->under_section) TextWeaver__commentary_text(tree, ap, TL_IS_263); - else TextWeaver__commentary_text(tree, ap, TL_IS_264); + if (last_cited_in != P->under_section) TextWeaver__commentary_text(tree, ap, TL_IS_264); + else TextWeaver__commentary_text(tree, ap, TL_IS_265); } else { Trees__make_child(WeaveTree__linebreak(tree), ap); } } TextWeaver__commentary_text(tree, ap, hteu->usage_recorded_at->under_section->md->sect_title); - if (as_list == FALSE) TextWeaver__commentary_text(tree, ap, TL_IS_265); - else TextWeaver__commentary_text(tree, ap, TL_IS_266); + if (as_list == FALSE) TextWeaver__commentary_text(tree, ap, TL_IS_266); + else TextWeaver__commentary_text(tree, ap, TL_IS_267); } - if (count_under++ > 0) TextWeaver__commentary_text(tree, ap, TL_IS_267); - Trees__make_child(WeaveTree__locale(tree, hteu->usage_recorded_at, NULL), ap); - last_cited_in = hteu->usage_recorded_at->under_section; - -} -#line 701 "inweb/Chapter 3/The Weaver.w" -; - LOOP_OVER_LINKED_LIST(hteu, hash_table_entry_usage, hte->usages) - if (P->under_section != hteu->usage_recorded_at->under_section) - -{ -#line 720 "inweb/Chapter 3/The Weaver.w" - if (as_list == FALSE) { - if (used_flag == FALSE) TextWeaver__commentary_text(tree, ap, TL_IS_262); - } - used_flag = TRUE; - section *S = hteu->usage_recorded_at->under_section; - if ((S != last_cited_in) && (S != P->under_section)) { - count_under = 0; - if (last_cited_in) { - if (as_list == FALSE) { - if (last_cited_in != P->under_section) TextWeaver__commentary_text(tree, ap, TL_IS_263); - else TextWeaver__commentary_text(tree, ap, TL_IS_264); - } else { - Trees__make_child(WeaveTree__linebreak(tree), ap); - } - } - TextWeaver__commentary_text(tree, ap, hteu->usage_recorded_at->under_section->md->sect_title); - if (as_list == FALSE) TextWeaver__commentary_text(tree, ap, TL_IS_265); - else TextWeaver__commentary_text(tree, ap, TL_IS_266); - } - if (count_under++ > 0) TextWeaver__commentary_text(tree, ap, TL_IS_267); + if (count_under++ > 0) TextWeaver__commentary_text(tree, ap, TL_IS_268); Trees__make_child(WeaveTree__locale(tree, hteu->usage_recorded_at, NULL), ap); last_cited_in = hteu->usage_recorded_at->under_section; } #line 704 "inweb/Chapter 3/The Weaver.w" +; + LOOP_OVER_LINKED_LIST(hteu, hash_table_entry_usage, hte->usages) + if (P->under_section != hteu->usage_recorded_at->under_section) + +{ +#line 723 "inweb/Chapter 3/The Weaver.w" + if (as_list == FALSE) { + if (used_flag == FALSE) TextWeaver__commentary_text(tree, ap, TL_IS_263); + } + used_flag = TRUE; + section *S = hteu->usage_recorded_at->under_section; + if ((S != last_cited_in) && (S != P->under_section)) { + count_under = 0; + if (last_cited_in) { + if (as_list == FALSE) { + if (last_cited_in != P->under_section) TextWeaver__commentary_text(tree, ap, TL_IS_264); + else TextWeaver__commentary_text(tree, ap, TL_IS_265); + } else { + Trees__make_child(WeaveTree__linebreak(tree), ap); + } + } + TextWeaver__commentary_text(tree, ap, hteu->usage_recorded_at->under_section->md->sect_title); + if (as_list == FALSE) TextWeaver__commentary_text(tree, ap, TL_IS_266); + else TextWeaver__commentary_text(tree, ap, TL_IS_267); + } + if (count_under++ > 0) TextWeaver__commentary_text(tree, ap, TL_IS_268); + Trees__make_child(WeaveTree__locale(tree, hteu->usage_recorded_at, NULL), ap); + last_cited_in = hteu->usage_recorded_at->under_section; + +} +#line 707 "inweb/Chapter 3/The Weaver.w" ; if (used_flag == FALSE) { if (as_list == FALSE) { - TextWeaver__commentary_text(tree, ap, TL_IS_258); - } else { TextWeaver__commentary_text(tree, ap, TL_IS_259); + } else { + TextWeaver__commentary_text(tree, ap, TL_IS_260); } } if (as_list == FALSE) { if ((last_cited_in != P->under_section) && (last_cited_in)) - TextWeaver__commentary_text(tree, ap, TL_IS_260); - TextWeaver__commentary_text(tree, ap, TL_IS_261); + TextWeaver__commentary_text(tree, ap, TL_IS_261); + TextWeaver__commentary_text(tree, ap, TL_IS_262); } } -#line 746 "inweb/Chapter 3/The Weaver.w" +#line 749 "inweb/Chapter 3/The Weaver.w" void Weaver__weave_subheading(heterogeneous_tree *tree, weave_order *wv, tree_node *ap, text_stream *text) { tree_node *D = WeaveTree__subheading(tree, text); @@ -20642,7 +20646,7 @@ void Weaver__commentary_text(heterogeneous_tree *tree, weave_order *wv, TextWeaver__commentary_text(tree, ap, matter); } -#line 788 "inweb/Chapter 3/The Weaver.w" +#line 791 "inweb/Chapter 3/The Weaver.w" int Weaver__weave_table_of_contents(heterogeneous_tree *tree, tree_node *ap, section *S) { int noteworthy = 0; @@ -20681,8 +20685,8 @@ void TextWeaver__commentary_r(heterogeneous_tree *tree, tree_node *ap, text_stre weave_order *wv = C->wv; text_stream *code_in_comments_notation = Bibliographic__get_datum(wv->weave_web->md, - (in_code)?(TL_IS_268):(TL_IS_269)); - if (Str__ne(code_in_comments_notation, TL_IS_270)) + (in_code)?(TL_IS_269):(TL_IS_270)); + if (Str__ne(code_in_comments_notation, TL_IS_271)) { #line 51 "inweb/Chapter 3/The Weaver of Text.w" for (int i=0; i < Str__len(matter); i++) { @@ -20707,8 +20711,8 @@ void TextWeaver__commentary_r(heterogeneous_tree *tree, tree_node *ap, text_stre int display_flag = TRUE; text_stream *tex_notation = Bibliographic__get_datum(wv->weave_web->md, - TL_IS_271); - if (Str__ne(tex_notation, TL_IS_272)) + TL_IS_272); + if (Str__ne(tex_notation, TL_IS_273)) { #line 99 "inweb/Chapter 3/The Weaver of Text.w" int N = Str__len(tex_notation); @@ -20743,8 +20747,8 @@ void TextWeaver__commentary_r(heterogeneous_tree *tree, tree_node *ap, text_stre ; display_flag = FALSE; tex_notation = Bibliographic__get_datum(wv->weave_web->md, - TL_IS_273); - if (Str__ne(tex_notation, TL_IS_274)) + TL_IS_274); + if (Str__ne(tex_notation, TL_IS_275)) { #line 99 "inweb/Chapter 3/The Weaver of Text.w" int N = Str__len(tex_notation); @@ -20779,8 +20783,8 @@ void TextWeaver__commentary_r(heterogeneous_tree *tree, tree_node *ap, text_stre ; text_stream *xref_notation = Bibliographic__get_datum(wv->weave_web->md, - TL_IS_275); - if (Str__ne(xref_notation, TL_IS_276)) + TL_IS_276); + if (Str__ne(xref_notation, TL_IS_277)) { #line 150 "inweb/Chapter 3/The Weaver of Text.w" int N = Str__len(xref_notation); @@ -20840,8 +20844,8 @@ void TextWeaver__commentary_r(heterogeneous_tree *tree, tree_node *ap, text_stre { #line 68 "inweb/Chapter 3/The Weaver of Text.w" for (int i=0; i < Str__len(matter); i++) { - if ((Str__includes_at(matter, i, TL_IS_277)) || - (Str__includes_at(matter, i, TL_IS_278))) { + if ((Str__includes_at(matter, i, TL_IS_278)) || + (Str__includes_at(matter, i, TL_IS_279))) { TEMPORARY_TEXT(before) Str__copy(before, matter); Str__truncate(before, i); TEMPORARY_TEXT(after) @@ -20889,7 +20893,7 @@ void TextWeaver__commentary_r(heterogeneous_tree *tree, tree_node *ap, text_stre Trees__make_child(WeaveTree__footnote_cue(tree, F->cue_text), ap); TextWeaver__commentary_r(tree, ap, after, within, in_code); } else { - Main__error_in_web(TL_IS_279, wv->current_weave_line); + Main__error_in_web(TL_IS_280, wv->current_weave_line); } } DISCARD_TEXT(before) @@ -20943,8 +20947,8 @@ void TextWeaver__source_code(heterogeneous_tree *tree, tree_node *ap, { #line 261 "inweb/Chapter 3/The Weaver of Text.w" - if ((Str__includes_at(matter, i, TL_IS_282)) || - (Str__includes_at(matter, i, TL_IS_283))) { + if ((Str__includes_at(matter, i, TL_IS_283)) || + (Str__includes_at(matter, i, TL_IS_284))) { TEMPORARY_TEXT(after) Str__substr(after, Str__at(matter, i), Str__end(matter)); match_results mr = Regexp__create_mr(); @@ -20962,8 +20966,8 @@ void TextWeaver__source_code(heterogeneous_tree *tree, tree_node *ap, #line 237 "inweb/Chapter 3/The Weaver of Text.w" ; text_stream *xref_notation = Bibliographic__get_datum(wv->weave_web->md, - TL_IS_280); - if (Str__ne(xref_notation, TL_IS_281)) + TL_IS_281); + if (Str__ne(xref_notation, TL_IS_282)) { #line 277 "inweb/Chapter 3/The Weaver of Text.w" @@ -21100,7 +21104,7 @@ void Tangler__tangle(web *W, tangle_target *target, filename *dest_file) { { #line 87 "inweb/Chapter 3/The Tangler.w" - if (L->owning_paragraph == NULL) Main__error_in_web(TL_IS_284, L); + if (L->owning_paragraph == NULL) Main__error_in_web(TL_IS_285, L); else Tags__open_ifdefs(OUT, L->owning_paragraph); LanguageMethods__start_definition(OUT, lang, L->text_operand, @@ -21122,7 +21126,7 @@ void Tangler__tangle(web *W, tangle_target *target, filename *dest_file) { { #line 87 "inweb/Chapter 3/The Tangler.w" - if (L->owning_paragraph == NULL) Main__error_in_web(TL_IS_284, L); + if (L->owning_paragraph == NULL) Main__error_in_web(TL_IS_285, L); else Tags__open_ifdefs(OUT, L->owning_paragraph); LanguageMethods__start_definition(OUT, lang, L->text_operand, @@ -21243,7 +21247,7 @@ void Tangler__tangle_line(OUTPUT_STREAM, text_stream *original, section *S, sour LanguageMethods__after_macro_expansion(OUT, lang, pmac); LanguageMethods__insert_line_marker(OUT, lang, L); } else { - Main__error_in_web(TL_IS_285, L); + Main__error_in_web(TL_IS_286, L); WRITE_TO(STDERR, "Macro is '%S'\n", temp); LanguageMethods__comment(OUT, lang, temp); /* recover by putting macro name in comment */ } @@ -21313,7 +21317,7 @@ programming_language *Languages__find_by_name(text_stream *lname, web *W, #line 27 "inweb/Chapter 4/Programming Languages.w" filename *F = NULL; if (W) { - pathname *P = Pathnames__down(W->md->path_to_web, TL_IS_286); + pathname *P = Pathnames__down(W->md->path_to_web, TL_IS_287); { #line 43 "inweb/Chapter 4/Programming Languages.w" @@ -21363,7 +21367,7 @@ programming_language *Languages__find_by_name(text_stream *lname, web *W, #line 54 "inweb/Chapter 4/Programming Languages.w" programming_language *Languages__default(web *W) { - return Languages__find_by_name(TL_IS_287, W, TRUE); + return Languages__find_by_name(TL_IS_288, W, TRUE); } void Languages__show(OUTPUT_STREAM) { @@ -21405,7 +21409,7 @@ void Languages__read_definitions(pathname *P) { } pathname *Languages__default_directory(void) { - return Pathnames__down(path_to_inweb, TL_IS_288); + return Pathnames__down(path_to_inweb, TL_IS_289); } #line 148 "inweb/Chapter 4/Programming Languages.w" @@ -21465,7 +21469,7 @@ programming_language *Languages__read_definition(filename *F) { { #line 219 "inweb/Chapter 4/Programming Languages.w" if (pl->C_like) CLike__make_c_like(pl); - if (Str__eq(pl->language_name, TL_IS_289)) InCSupport__add_features(pl); + if (Str__eq(pl->language_name, TL_IS_290)) InCSupport__add_features(pl); ACMESupport__add_fallbacks(pl); } @@ -21487,7 +21491,7 @@ void Languages__read_definition_line(text_stream *line, text_file_position *tfp, if (state->current_block) { #line 327 "inweb/Chapter 4/Programming Languages.w" - if (Str__eq(line, TL_IS_321)) { + if (Str__eq(line, TL_IS_322)) { state->current_block = state->current_block->parent; } else if (Regexp__match(&mr, line, L"characters {")) { colouring_rule *rule = Languages__new_rule(state->current_block); @@ -21503,7 +21507,7 @@ void Languages__read_definition_line(text_stream *line, text_file_position *tfp, } else if (Regexp__match(&mr, line, L"runs of (%c+) {")) { colouring_rule *rule = Languages__new_rule(state->current_block); int r = UNQUOTED_COLOUR; - if (Str__ne(mr.exp[0], TL_IS_322)) r = Languages__colour(mr.exp[0], tfp); + if (Str__ne(mr.exp[0], TL_IS_323)) r = Languages__colour(mr.exp[0], tfp); rule->execute_block = Languages__new_block(state->current_block, r); state->current_block = rule->execute_block; } else if (Regexp__match(&mr, line, L"instances of (%c+) {")) { @@ -21558,66 +21562,66 @@ void Languages__read_definition_line(text_stream *line, text_file_position *tfp, Languages__reserved(pl, Languages__text(mr.exp[0], tfp, FALSE), RESERVED_COLOUR, tfp); } else if (Regexp__match(&mr, line, L"(%c+) *: *(%c+?)")) { text_stream *key = mr.exp[0], *value = Str__duplicate(mr.exp[1]); - if (Str__eq(key, TL_IS_290)) pl->language_name = Languages__text(value, tfp, TRUE); - else if (Str__eq(key, TL_IS_291)) - pl->language_details = Languages__text(value, tfp, TRUE); + if (Str__eq(key, TL_IS_291)) pl->language_name = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_292)) - pl->file_extension = Languages__text(value, tfp, TRUE); + pl->language_details = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_293)) - pl->line_comment = Languages__text(value, tfp, TRUE); + pl->file_extension = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_294)) - pl->whole_line_comment = Languages__text(value, tfp, TRUE); + pl->line_comment = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_295)) - pl->multiline_comment_open = Languages__text(value, tfp, TRUE); + pl->whole_line_comment = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_296)) - pl->multiline_comment_close = Languages__text(value, tfp, TRUE); + pl->multiline_comment_open = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_297)) - pl->string_literal = Languages__text(value, tfp, TRUE); + pl->multiline_comment_close = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_298)) - pl->string_literal_escape = Languages__text(value, tfp, TRUE); + pl->string_literal = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_299)) - pl->character_literal = Languages__text(value, tfp, TRUE); + pl->string_literal_escape = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_300)) - pl->character_literal_escape = Languages__text(value, tfp, TRUE); + pl->character_literal = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_301)) - pl->binary_literal_prefix = Languages__text(value, tfp, TRUE); + pl->character_literal_escape = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_302)) - pl->octal_literal_prefix = Languages__text(value, tfp, TRUE); + pl->binary_literal_prefix = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_303)) - pl->hexadecimal_literal_prefix = Languages__text(value, tfp, TRUE); + pl->octal_literal_prefix = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_304)) - pl->negative_literal_prefix = Languages__text(value, tfp, TRUE); + pl->hexadecimal_literal_prefix = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_305)) - pl->shebang = Languages__text(value, tfp, TRUE); + pl->negative_literal_prefix = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_306)) - pl->line_marker = Languages__text(value, tfp, TRUE); + pl->shebang = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_307)) - pl->before_macro_expansion = Languages__text(value, tfp, TRUE); + pl->line_marker = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_308)) - pl->after_macro_expansion = Languages__text(value, tfp, TRUE); + pl->before_macro_expansion = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_309)) - pl->start_definition = Languages__text(value, tfp, TRUE); + pl->after_macro_expansion = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_310)) - pl->prolong_definition = Languages__text(value, tfp, TRUE); + pl->start_definition = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_311)) - pl->end_definition = Languages__text(value, tfp, TRUE); + pl->prolong_definition = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_312)) - pl->start_ifdef = Languages__text(value, tfp, TRUE); + pl->end_definition = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_313)) - pl->start_ifndef = Languages__text(value, tfp, TRUE); + pl->start_ifdef = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_314)) - pl->end_ifdef = Languages__text(value, tfp, TRUE); + pl->start_ifndef = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_315)) - pl->end_ifndef = Languages__text(value, tfp, TRUE); + pl->end_ifdef = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_316)) - pl->C_like = Languages__boolean(value, tfp); + pl->end_ifndef = Languages__text(value, tfp, TRUE); else if (Str__eq(key, TL_IS_317)) - pl->suppress_disclaimer = Languages__boolean(value, tfp); + pl->C_like = Languages__boolean(value, tfp); else if (Str__eq(key, TL_IS_318)) - pl->supports_namespaces = Languages__boolean(value, tfp); + pl->suppress_disclaimer = Languages__boolean(value, tfp); else if (Str__eq(key, TL_IS_319)) - Languages__regexp(pl->function_notation, value, tfp); + pl->supports_namespaces = Languages__boolean(value, tfp); else if (Str__eq(key, TL_IS_320)) + Languages__regexp(pl->function_notation, value, tfp); + else if (Str__eq(key, TL_IS_321)) Languages__regexp(pl->type_notation, value, tfp); else { Errors__in_text_file("unknown property name before ':'", tfp); @@ -21727,7 +21731,7 @@ void Languages__parse_rule(language_reader_state *state, text_stream *premiss, { #line 537 "inweb/Chapter 4/Programming Languages.w" - if (Str__eq(action, TL_IS_323)) { + if (Str__eq(action, TL_IS_324)) { rule->execute_block = Languages__new_block(state->current_block, WHOLE_LINE_CRULE_RUN); state->current_block = rule->execute_block; @@ -21740,7 +21744,7 @@ void Languages__parse_rule(language_reader_state *state, text_stream *premiss, rule->set_prefix_to_colour = rule->set_to_colour; } else if (Str__get_first_char(action) == '!') { rule->set_to_colour = Languages__colour(action, tfp); - } else if (Str__eq(action, TL_IS_324)) { + } else if (Str__eq(action, TL_IS_325)) { rule->debug = TRUE; } else { Errors__in_text_file("action after '=>' illegible", tfp); @@ -21775,17 +21779,17 @@ int Languages__colour(text_stream *T, text_file_position *tfp) { Errors__in_text_file("colour names must begin with !", tfp); return PLAIN_COLOUR; } - if (Str__eq(T, TL_IS_325)) return STRING_COLOUR; - else if (Str__eq(T, TL_IS_326)) return FUNCTION_COLOUR; - else if (Str__eq(T, TL_IS_327)) return DEFINITION_COLOUR; - else if (Str__eq(T, TL_IS_328)) return RESERVED_COLOUR; - else if (Str__eq(T, TL_IS_329)) return ELEMENT_COLOUR; - else if (Str__eq(T, TL_IS_330)) return IDENTIFIER_COLOUR; - else if (Str__eq(T, TL_IS_331)) return CHARACTER_COLOUR; - else if (Str__eq(T, TL_IS_332)) return CONSTANT_COLOUR; - else if (Str__eq(T, TL_IS_333)) return PLAIN_COLOUR; - else if (Str__eq(T, TL_IS_334)) return EXTRACT_COLOUR; - else if (Str__eq(T, TL_IS_335)) return COMMENT_COLOUR; + if (Str__eq(T, TL_IS_326)) return STRING_COLOUR; + else if (Str__eq(T, TL_IS_327)) return FUNCTION_COLOUR; + else if (Str__eq(T, TL_IS_328)) return DEFINITION_COLOUR; + else if (Str__eq(T, TL_IS_329)) return RESERVED_COLOUR; + else if (Str__eq(T, TL_IS_330)) return ELEMENT_COLOUR; + else if (Str__eq(T, TL_IS_331)) return IDENTIFIER_COLOUR; + else if (Str__eq(T, TL_IS_332)) return CHARACTER_COLOUR; + else if (Str__eq(T, TL_IS_333)) return CONSTANT_COLOUR; + else if (Str__eq(T, TL_IS_334)) return PLAIN_COLOUR; + else if (Str__eq(T, TL_IS_335)) return EXTRACT_COLOUR; + else if (Str__eq(T, TL_IS_336)) return COMMENT_COLOUR; else { Errors__in_text_file("no such !colour", tfp); return PLAIN_COLOUR; @@ -21794,8 +21798,8 @@ int Languages__colour(text_stream *T, text_file_position *tfp) { #line 628 "inweb/Chapter 4/Programming Languages.w" int Languages__boolean(text_stream *T, text_file_position *tfp) { - if (Str__eq(T, TL_IS_336)) return TRUE; - else if (Str__eq(T, TL_IS_337)) return FALSE; + if (Str__eq(T, TL_IS_337)) return TRUE; + else if (Str__eq(T, TL_IS_338)) return FALSE; else { Errors__in_text_file("must be true or false", tfp); return FALSE; @@ -21853,7 +21857,6 @@ text_stream *Languages__text(text_stream *T, text_file_position *tfp, int allow) } if (bareword) { int rw = FALSE; - if (Str__eq(V, TL_IS_338)) rw = TRUE; if (Str__eq(V, TL_IS_339)) rw = TRUE; if (Str__eq(V, TL_IS_340)) rw = TRUE; if (Str__eq(V, TL_IS_341)) rw = TRUE; @@ -21875,6 +21878,7 @@ text_stream *Languages__text(text_stream *T, text_file_position *tfp, int allow) if (Str__eq(V, TL_IS_357)) rw = TRUE; if (Str__eq(V, TL_IS_358)) rw = TRUE; if (Str__eq(V, TL_IS_359)) rw = TRUE; + if (Str__eq(V, TL_IS_360)) rw = TRUE; if (rw) { TEMPORARY_TEXT(err) @@ -21973,7 +21977,7 @@ language_type *Functions__new_struct(web *W, text_stream *name, source_line *L) { #line 40 "inweb/Chapter 4/Types and Functions.w" - Tags__add_by_name(L->owning_paragraph, TL_IS_360); + Tags__add_by_name(L->owning_paragraph, TL_IS_361); ADD_TO_LINKED_LIST(str, language_type, W->language_types); ADD_TO_LINKED_LIST(str, language_type, L->owning_paragraph->structures); @@ -22086,7 +22090,7 @@ language_function *Functions__new_function(text_stream *fname, source_line *L) { fn->within_namespace = TRUE; } else if ((Str__eq_wide_string(fname, L"main")) && (Str__eq_wide_string(ambient_namespace, L"Main::"))) - declared_namespace = TL_IS_361; + declared_namespace = TL_IS_362; if ((Str__ne(declared_namespace, ambient_namespace)) && (L->owning_paragraph->placed_very_early == FALSE)) { TEMPORARY_TEXT(err_mess) @@ -22199,7 +22203,7 @@ void LanguageMethods__disclaimer(text_stream *OUT, programming_language *pl, web int rv = FALSE; INT_METHOD_CALL_WITHOUT_ARGUMENTS(rv, pl, SUPPRESS_DISCLAIMER_TAN_MTID); if (rv == FALSE) - LanguageMethods__comment(OUT, pl, TL_IS_362); + LanguageMethods__comment(OUT, pl, TL_IS_363); } #line 127 "inweb/Chapter 4/Language Methods.w" @@ -22222,7 +22226,7 @@ void LanguageMethods__start_definition(OUTPUT_STREAM, programming_language *pl, int rv = FALSE; INT_METHOD_CALL(rv, pl, START_DEFN_TAN_MTID, OUT, term, start, S, L); if (rv == FALSE) - Main__error_in_web(TL_IS_363, L); + Main__error_in_web(TL_IS_364, L); } void LanguageMethods__prolong_definition(OUTPUT_STREAM, programming_language *pl, @@ -22230,7 +22234,7 @@ void LanguageMethods__prolong_definition(OUTPUT_STREAM, programming_language *pl int rv = FALSE; INT_METHOD_CALL(rv, pl, PROLONG_DEFN_TAN_MTID, OUT, more, S, L); if (rv == FALSE) - Main__error_in_web(TL_IS_364, L); + Main__error_in_web(TL_IS_365, L); } void LanguageMethods__end_definition(OUTPUT_STREAM, programming_language *pl, @@ -22387,9 +22391,9 @@ int LanguageMethods__syntax_colour(programming_language *pl, int rv = FALSE; programming_language *colour_as = pl; if (L->category == TEXT_EXTRACT_LCAT) colour_as = L->colour_as; - theme_tag *T = Tags__find_by_name(TL_IS_365, FALSE); + theme_tag *T = Tags__find_by_name(TL_IS_366, FALSE); if ((T) && (Tags__tagged_with(L->owning_paragraph, T))) { - programming_language *prepl = Languages__find_by_name(TL_IS_366, wv->weave_web, FALSE); + programming_language *prepl = Languages__find_by_name(TL_IS_367, wv->weave_web, FALSE); if ((L->category == PREFORM_LCAT) || (L->category == PREFORM_GRAMMAR_LCAT)) if (prepl) colour_as = prepl; } @@ -22728,7 +22732,7 @@ void ACMESupport__parse_functions(programming_language *self, web *W) { #line 287 "inweb/Chapter 4/ACME Support.w" void ACMESupport__post_analysis(programming_language *self, web *W) { int check_namespaces = FALSE; - if (Str__eq_wide_string(Bibliographic__get_datum(W->md, TL_IS_367), L"On")) + if (Str__eq_wide_string(Bibliographic__get_datum(W->md, TL_IS_368), L"On")) check_namespaces = TRUE; language_function *fn; LOOP_OVER(fn, language_function) { @@ -22748,11 +22752,11 @@ void ACMESupport__post_analysis(programming_language *self, web *W) { && (fn->call_freely == FALSE)) { if (fn->within_namespace) Main__error_in_web( - TL_IS_368, + TL_IS_369, fn->function_header_at); else Main__error_in_web( - TL_IS_369, + TL_IS_370, fn->function_header_at); } } @@ -23225,7 +23229,7 @@ void CLike__parse_types(programming_language *self, web *W) { if (Regexp__match(&mr, L->text, L"typedef struct (%i+) %c*{%c*")) { current_str = Functions__new_struct(W, mr.exp[0], L); - Tags__add_by_name(L->owning_paragraph, TL_IS_370); + Tags__add_by_name(L->owning_paragraph, TL_IS_371); } else if ((Str__get_first_char(L->text) == '}') && (current_str)) { current_str->typedef_ends = L; current_str = NULL; @@ -23360,14 +23364,14 @@ void CLike__parse_functions(programming_language *self, web *W) { if ((Regexp__match(&mr, L->text, L" *#ifn*def %c+")) || (Regexp__match(&mr, L->text, L" *#IFN*DEF %c+"))) { if (cc_sp >= MAX_CONDITIONAL_COMPILATION_STACK) - Main__error_in_web(TL_IS_372, L); + Main__error_in_web(TL_IS_373, L); else cc_stack[cc_sp++] = L; } if ((Regexp__match(&mr, L->text, L" *#endif *")) || (Regexp__match(&mr, L->text, L" *#ENDIF *"))) { if (cc_sp <= 0) - Main__error_in_web(TL_IS_373, L); + Main__error_in_web(TL_IS_374, L); else cc_sp--; } @@ -23461,7 +23465,7 @@ void CLike__parse_functions(programming_language *self, web *W) { ; } if (cc_sp > 0) - Main__error_in_web(TL_IS_371, NULL); + Main__error_in_web(TL_IS_372, NULL); } #line 314 "inweb/Chapter 4/C-Like Languages.w" @@ -23625,7 +23629,7 @@ void InCSupport__further_parsing(programming_language *self, web *W) { { #line 218 "inweb/Chapter 4/InC Support.w" - Tags__add_by_name(L->owning_paragraph, TL_IS_374); + Tags__add_by_name(L->owning_paragraph, TL_IS_375); source_line *AL; for (AL = L; (AL) && (AL->category == CODE_BODY_LCAT); AL = AL->next_line) { if (Regexp__string_is_white_space(AL->text)) break; @@ -24143,8 +24147,8 @@ preform_nonterminal *InCSupport__nonterminal_by_name(text_stream *name) { #line 765 "inweb/Chapter 4/InC Support.w" text_stream *InCSupport__nonterminal_variable_identifier(text_stream *name) { - if (Str__eq_wide_string(name, L"r")) return TL_IS_375; - if (Str__eq_wide_string(name, L"rp")) return TL_IS_376; + if (Str__eq_wide_string(name, L"r")) return TL_IS_376; + if (Str__eq_wide_string(name, L"rp")) return TL_IS_377; nonterminal_variable *ntv; LOOP_OVER(ntv, nonterminal_variable) if (Str__eq(ntv->ntv_name, name)) @@ -24156,7 +24160,7 @@ text_stream *InCSupport__nonterminal_variable_identifier(text_stream *name) { void InCSupport__additional_tangling(programming_language *self, web *W, tangle_target *target) { if (NUMBER_CREATED(preform_nonterminal) > 0) { pathname *P = Reader__tangled_folder(W); - filename *Syntax = Filenames__in(P, TL_IS_377); + filename *Syntax = Filenames__in(P, TL_IS_378); text_stream TO_struct; text_stream *OUT = &TO_struct; @@ -24167,8 +24171,8 @@ void InCSupport__additional_tangling(programming_language *self, web *W, tangle_ WRITE("[Preform syntax generated by inweb: do not edit.]\n\n"); - if (Bibliographic__data_exists(W->md, TL_IS_378)) - WRITE("language %S\n", Bibliographic__get_datum(W->md, TL_IS_379)); + if (Bibliographic__data_exists(W->md, TL_IS_379)) + WRITE("language %S\n", Bibliographic__get_datum(W->md, TL_IS_380)); { @@ -24469,99 +24473,99 @@ tree_node_type *weave_maths_node_type = NULL; heterogeneous_tree *WeaveTree__new_tree(weave_order *wv) { if (weave_tree_type == NULL) { - weave_tree_type = Trees__new_type(TL_IS_380, NULL); + weave_tree_type = Trees__new_type(TL_IS_381, NULL); weave_document_node_type = - Trees__new_node_type(TL_IS_381, weave_document_node_CLASS, NULL); + Trees__new_node_type(TL_IS_382, weave_document_node_CLASS, NULL); weave_head_node_type = - Trees__new_node_type(TL_IS_382, weave_head_node_CLASS, NULL); + Trees__new_node_type(TL_IS_383, weave_head_node_CLASS, NULL); weave_body_node_type = - Trees__new_node_type(TL_IS_383, weave_body_node_CLASS, NULL); + Trees__new_node_type(TL_IS_384, weave_body_node_CLASS, NULL); weave_tail_node_type = - Trees__new_node_type(TL_IS_384, weave_tail_node_CLASS, NULL); + Trees__new_node_type(TL_IS_385, weave_tail_node_CLASS, NULL); weave_chapter_footer_node_type = - Trees__new_node_type(TL_IS_385, weave_chapter_footer_node_CLASS, NULL); + Trees__new_node_type(TL_IS_386, weave_chapter_footer_node_CLASS, NULL); weave_chapter_header_node_type = - Trees__new_node_type(TL_IS_386, weave_chapter_header_node_CLASS, NULL); + Trees__new_node_type(TL_IS_387, weave_chapter_header_node_CLASS, NULL); weave_section_footer_node_type = - Trees__new_node_type(TL_IS_387, weave_section_footer_node_CLASS, NULL); + Trees__new_node_type(TL_IS_388, weave_section_footer_node_CLASS, NULL); weave_section_header_node_type = - Trees__new_node_type(TL_IS_388, weave_section_header_node_CLASS, NULL); + Trees__new_node_type(TL_IS_389, weave_section_header_node_CLASS, NULL); weave_section_purpose_node_type = - Trees__new_node_type(TL_IS_389, weave_section_purpose_node_CLASS, NULL); + Trees__new_node_type(TL_IS_390, weave_section_purpose_node_CLASS, NULL); weave_subheading_node_type = - Trees__new_node_type(TL_IS_390, weave_subheading_node_CLASS, NULL); + Trees__new_node_type(TL_IS_391, weave_subheading_node_CLASS, NULL); weave_bar_node_type = - Trees__new_node_type(TL_IS_391, weave_bar_node_CLASS, NULL); + Trees__new_node_type(TL_IS_392, weave_bar_node_CLASS, NULL); weave_pagebreak_node_type = - Trees__new_node_type(TL_IS_392, weave_pagebreak_node_CLASS, NULL); + Trees__new_node_type(TL_IS_393, weave_pagebreak_node_CLASS, NULL); weave_linebreak_node_type = - Trees__new_node_type(TL_IS_393, weave_linebreak_node_CLASS, NULL); + Trees__new_node_type(TL_IS_394, weave_linebreak_node_CLASS, NULL); weave_paragraph_heading_node_type = - Trees__new_node_type(TL_IS_394, weave_paragraph_heading_node_CLASS, NULL); + Trees__new_node_type(TL_IS_395, weave_paragraph_heading_node_CLASS, NULL); weave_endnote_node_type = - Trees__new_node_type(TL_IS_395, weave_endnote_node_CLASS, NULL); + Trees__new_node_type(TL_IS_396, weave_endnote_node_CLASS, NULL); weave_figure_node_type = - Trees__new_node_type(TL_IS_396, weave_figure_node_CLASS, NULL); + Trees__new_node_type(TL_IS_397, weave_figure_node_CLASS, NULL); weave_audio_node_type = - Trees__new_node_type(TL_IS_397, weave_audio_node_CLASS, NULL); + Trees__new_node_type(TL_IS_398, weave_audio_node_CLASS, NULL); weave_video_node_type = - Trees__new_node_type(TL_IS_398, weave_video_node_CLASS, NULL); + Trees__new_node_type(TL_IS_399, weave_video_node_CLASS, NULL); weave_download_node_type = - Trees__new_node_type(TL_IS_399, weave_download_node_CLASS, NULL); + Trees__new_node_type(TL_IS_400, weave_download_node_CLASS, NULL); weave_material_node_type = - Trees__new_node_type(TL_IS_400, weave_material_node_CLASS, NULL); + Trees__new_node_type(TL_IS_401, weave_material_node_CLASS, NULL); weave_embed_node_type = - Trees__new_node_type(TL_IS_401, weave_embed_node_CLASS, NULL); + Trees__new_node_type(TL_IS_402, weave_embed_node_CLASS, NULL); weave_pmac_node_type = - Trees__new_node_type(TL_IS_402, weave_pmac_node_CLASS, NULL); + Trees__new_node_type(TL_IS_403, weave_pmac_node_CLASS, NULL); weave_vskip_node_type = - Trees__new_node_type(TL_IS_403, weave_vskip_node_CLASS, NULL); + Trees__new_node_type(TL_IS_404, weave_vskip_node_CLASS, NULL); weave_chapter_node_type = - Trees__new_node_type(TL_IS_404, weave_chapter_node_CLASS, NULL); + Trees__new_node_type(TL_IS_405, weave_chapter_node_CLASS, NULL); weave_section_node_type = - Trees__new_node_type(TL_IS_405, weave_section_node_CLASS, NULL); + Trees__new_node_type(TL_IS_406, weave_section_node_CLASS, NULL); weave_code_line_node_type = - Trees__new_node_type(TL_IS_406, weave_code_line_node_CLASS, NULL); + Trees__new_node_type(TL_IS_407, weave_code_line_node_CLASS, NULL); weave_function_usage_node_type = - Trees__new_node_type(TL_IS_407, weave_function_usage_node_CLASS, NULL); + Trees__new_node_type(TL_IS_408, weave_function_usage_node_CLASS, NULL); weave_commentary_node_type = - Trees__new_node_type(TL_IS_408, weave_commentary_node_CLASS, NULL); + Trees__new_node_type(TL_IS_409, weave_commentary_node_CLASS, NULL); weave_carousel_slide_node_type = - Trees__new_node_type(TL_IS_409, weave_carousel_slide_node_CLASS, NULL); + Trees__new_node_type(TL_IS_410, weave_carousel_slide_node_CLASS, NULL); weave_toc_node_type = - Trees__new_node_type(TL_IS_410, weave_toc_node_CLASS, NULL); + Trees__new_node_type(TL_IS_411, weave_toc_node_CLASS, NULL); weave_toc_line_node_type = - Trees__new_node_type(TL_IS_411, weave_toc_line_node_CLASS, NULL); + Trees__new_node_type(TL_IS_412, weave_toc_line_node_CLASS, NULL); weave_chapter_title_page_node_type = - Trees__new_node_type(TL_IS_412, weave_chapter_title_page_node_CLASS, NULL); + Trees__new_node_type(TL_IS_413, weave_chapter_title_page_node_CLASS, NULL); weave_defn_node_type = - Trees__new_node_type(TL_IS_413, weave_defn_node_CLASS, NULL); + Trees__new_node_type(TL_IS_414, weave_defn_node_CLASS, NULL); weave_source_code_node_type = - Trees__new_node_type(TL_IS_414, weave_source_code_node_CLASS, NULL); + Trees__new_node_type(TL_IS_415, weave_source_code_node_CLASS, NULL); weave_url_node_type = - Trees__new_node_type(TL_IS_415, weave_url_node_CLASS, NULL); + Trees__new_node_type(TL_IS_416, weave_url_node_CLASS, NULL); weave_footnote_cue_node_type = - Trees__new_node_type(TL_IS_416, weave_footnote_cue_node_CLASS, NULL); + Trees__new_node_type(TL_IS_417, weave_footnote_cue_node_CLASS, NULL); weave_begin_footnote_text_node_type = - Trees__new_node_type(TL_IS_417, weave_begin_footnote_text_node_CLASS, NULL); + Trees__new_node_type(TL_IS_418, weave_begin_footnote_text_node_CLASS, NULL); weave_display_line_node_type = - Trees__new_node_type(TL_IS_418, weave_display_line_node_CLASS, NULL); + Trees__new_node_type(TL_IS_419, weave_display_line_node_CLASS, NULL); weave_function_defn_node_type = - Trees__new_node_type(TL_IS_419, weave_function_defn_node_CLASS, NULL); + Trees__new_node_type(TL_IS_420, weave_function_defn_node_CLASS, NULL); weave_item_node_type = - Trees__new_node_type(TL_IS_420, weave_item_node_CLASS, NULL); + Trees__new_node_type(TL_IS_421, weave_item_node_CLASS, NULL); weave_grammar_index_node_type = - Trees__new_node_type(TL_IS_421, weave_grammar_index_node_CLASS, NULL); + Trees__new_node_type(TL_IS_422, weave_grammar_index_node_CLASS, NULL); weave_inline_node_type = - Trees__new_node_type(TL_IS_422, weave_inline_node_CLASS, NULL); + Trees__new_node_type(TL_IS_423, weave_inline_node_CLASS, NULL); weave_locale_node_type = - Trees__new_node_type(TL_IS_423, weave_locale_node_CLASS, NULL); + Trees__new_node_type(TL_IS_424, weave_locale_node_CLASS, NULL); weave_maths_node_type = - Trees__new_node_type(TL_IS_424, weave_maths_node_CLASS, NULL); + Trees__new_node_type(TL_IS_425, weave_maths_node_CLASS, NULL); weave_verbatim_node_type = - Trees__new_node_type(TL_IS_425, weave_verbatim_node_CLASS, NULL); + Trees__new_node_type(TL_IS_426, weave_verbatim_node_CLASS, NULL); } heterogeneous_tree *tree = Trees__new(weave_tree_type); Trees__make_root(tree, WeaveTree__document(tree, wv)); @@ -24971,7 +24975,7 @@ void Formats__render(text_stream *OUT, heterogeneous_tree *tree, filename *into) filename *F = Patterns__find_template(C->wv->pattern, template); TEMPORARY_TEXT(interior) VOID_METHOD_CALL(wf, RENDER_FOR_MTID, interior, tree); - Bibliographic__set_datum(C->wv->weave_web->md, TL_IS_426, interior); + Bibliographic__set_datum(C->wv->weave_web->md, TL_IS_427, interior); if (F) Collater__for_order(OUT, C->wv, F, into); else WRITE("%S", interior); DISCARD_TEXT(interior) @@ -25025,7 +25029,7 @@ int Formats__substitute_post_processing_data(OUTPUT_STREAM, weave_order *wv, #line 9 "inweb/Chapter 5/Plain Text Format.w" void PlainText__create(void) { - weave_format *wf = Formats__create_weave_format(TL_IS_427, TL_IS_428); + weave_format *wf = Formats__create_weave_format(TL_IS_428, TL_IS_429); METHOD_ADD(wf, RENDER_FOR_MTID, PlainText__render); } @@ -25349,7 +25353,7 @@ int PlainText__render_visit(tree_node *N, void *state, int L) { #line 9 "inweb/Chapter 5/TeX Format.w" void TeX__create(void) { - weave_format *wf = Formats__create_weave_format(TL_IS_429, TL_IS_430); + weave_format *wf = Formats__create_weave_format(TL_IS_430, TL_IS_431); METHOD_ADD(wf, RENDER_FOR_MTID, TeX__render_TeX); METHOD_ADD(wf, PREFORM_DOCUMENT_FOR_MTID, TeX__preform_document); } @@ -25427,7 +25431,7 @@ int TeX__render_visit(tree_node *N, void *state, int L) { { #line 115 "inweb/Chapter 5/TeX Format.w" weave_chapter_header_node *C = RETRIEVE_POINTER_weave_chapter_header_node(N->content); - if (Str__ne(C->chap->md->ch_range, TL_IS_431)) { + if (Str__ne(C->chap->md->ch_range, TL_IS_432)) { TeX__general_heading(OUT, trs->wv, FIRST_IN_LINKED_LIST(section, C->chap->sections), NULL, C->chap->md->ch_title, 3, FALSE); @@ -25501,7 +25505,7 @@ int TeX__render_visit(tree_node *N, void *state, int L) { weave_paragraph_heading_node *C = RETRIEVE_POINTER_weave_paragraph_heading_node(N->content); TeX__general_heading(OUT, trs->wv, C->para->under_section, - C->para, TL_IS_432, 0, FALSE); + C->para, TL_IS_433, 0, FALSE); } #line 76 "inweb/Chapter 5/TeX Format.w" @@ -25531,7 +25535,7 @@ int TeX__render_visit(tree_node *N, void *state, int L) { #line 172 "inweb/Chapter 5/TeX Format.w" weave_figure_node *C = RETRIEVE_POINTER_weave_figure_node(N->content); filename *F = Filenames__in( - Pathnames__down(trs->wv->weave_web->md->path_to_web, TL_IS_433), + Pathnames__down(trs->wv->weave_web->md->path_to_web, TL_IS_434), C->figname); WRITE("\\pdfximage"); if (C->w >= 0) WRITE(" width %d cm{%f}\n", C->w/POINTS_PER_CM, F); @@ -25938,23 +25942,23 @@ void TeX__general_heading(text_stream *OUT, weave_order *wv, { #line 443 "inweb/Chapter 5/TeX Format.w" switch (weight) { - case 0: TeX_macro = TL_IS_434; break; - case 1: TeX_macro = TL_IS_435; break; - case 2: TeX_macro = TL_IS_436; break; - default: TeX_macro = TL_IS_437; break; + case 0: TeX_macro = TL_IS_435; break; + case 1: TeX_macro = TL_IS_436; break; + case 2: TeX_macro = TL_IS_437; break; + default: TeX_macro = TL_IS_438; break; } if (wv->theme_match) { switch (weight) { - case 0: TeX_macro = TL_IS_438; break; - case 1: TeX_macro = TL_IS_439; break; - case 2: TeX_macro = TL_IS_440; break; - default: TeX_macro = TL_IS_441; break; + case 0: TeX_macro = TL_IS_439; break; + case 1: TeX_macro = TL_IS_440; break; + case 2: TeX_macro = TL_IS_441; break; + default: TeX_macro = TL_IS_442; break; } } if (no_skip) { switch (weight) { - case 0: TeX_macro = TL_IS_442; break; - case 1: TeX_macro = TL_IS_443; break; + case 0: TeX_macro = TL_IS_443; break; + case 1: TeX_macro = TL_IS_444; break; } } @@ -26191,7 +26195,7 @@ void HTMLFormat__create(void) { { #line 15 "inweb/Chapter 5/HTML Formats.w" - weave_format *wf = Formats__create_weave_format(TL_IS_444, TL_IS_445); + weave_format *wf = Formats__create_weave_format(TL_IS_445, TL_IS_446); METHOD_ADD(wf, RENDER_FOR_MTID, HTMLFormat__render); } @@ -26200,7 +26204,7 @@ void HTMLFormat__create(void) { { #line 19 "inweb/Chapter 5/HTML Formats.w" - weave_format *wf = Formats__create_weave_format(TL_IS_446, TL_IS_447); + weave_format *wf = Formats__create_weave_format(TL_IS_447, TL_IS_448); METHOD_ADD(wf, RENDER_FOR_MTID, HTMLFormat__render_EPUB); METHOD_ADD(wf, BEGIN_WEAVING_FOR_MTID, HTMLFormat__begin_weaving_EPUB); METHOD_ADD(wf, END_WEAVING_FOR_MTID, HTMLFormat__end_weaving_EPUB); @@ -26224,10 +26228,10 @@ HTML_render_state HTMLFormat__initial_state(text_stream *OUT, weave_order *wv, hrs.carousel_number = 1; hrs.slide_number = -1; hrs.slide_of = -1; - hrs.copy_rule = Assets__new_rule(NULL, TL_IS_448, TL_IS_449, NULL); + hrs.copy_rule = Assets__new_rule(NULL, TL_IS_449, TL_IS_450, NULL); - Swarm__ensure_plugin(wv, TL_IS_450); - hrs.colours = Swarm__ensure_colour_scheme(wv, TL_IS_451, TL_IS_452); + Swarm__ensure_plugin(wv, TL_IS_451); + hrs.colours = Swarm__ensure_colour_scheme(wv, TL_IS_452, TL_IS_453); return hrs; } @@ -26244,7 +26248,7 @@ void HTMLFormat__render_EPUB(weave_format *self, text_stream *OUT, heterogeneous HTML__declare_as_HTML(OUT, TRUE); HTML_render_state hrs = HTMLFormat__initial_state(OUT, C->wv, TRUE, C->wv->weave_to); Trees__traverse_from(tree->root, &HTMLFormat__render_visit, (void *) &hrs, 0); - Epub__note_page(C->wv->weave_web->as_ebook, C->wv->weave_to, C->wv->booklet_title, TL_IS_453); + Epub__note_page(C->wv->weave_web->as_ebook, C->wv->weave_to, C->wv->booklet_title, TL_IS_454); HTML__completed(OUT); } @@ -26301,16 +26305,16 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { if (hrs->EPUB_flag == FALSE) { weave_section_header_node *C = RETRIEVE_POINTER_weave_section_header_node(N->content); - Swarm__ensure_plugin(hrs->wv, TL_IS_454); + Swarm__ensure_plugin(hrs->wv, TL_IS_455); HTML_OPEN_WITH("div", "class=\"breadcrumbs\""); HTML_OPEN_WITH("ul", "class=\"crumbs\""); Colonies__drop_initial_breadcrumbs(OUT, hrs->wv->weave_to, hrs->wv->breadcrumbs); - text_stream *bct = Bibliographic__get_datum(hrs->wv->weave_web->md, TL_IS_455); - if (Str__len(Bibliographic__get_datum(hrs->wv->weave_web->md, TL_IS_456)) > 0) - bct = Bibliographic__get_datum(hrs->wv->weave_web->md, TL_IS_457); + text_stream *bct = Bibliographic__get_datum(hrs->wv->weave_web->md, TL_IS_456); + if (Str__len(Bibliographic__get_datum(hrs->wv->weave_web->md, TL_IS_457)) > 0) + bct = Bibliographic__get_datum(hrs->wv->weave_web->md, TL_IS_458); if (hrs->wv->self_contained == FALSE) { - Colonies__write_breadcrumb(OUT, bct, TL_IS_458); + Colonies__write_breadcrumb(OUT, bct, TL_IS_459); if (hrs->wv->weave_web->md->chaptered) { TEMPORARY_TEXT(chapter_link) WRITE_TO(chapter_link, "index.html#%s%S", @@ -26373,7 +26377,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { chapter *Ch; LOOP_OVER_LINKED_LIST(Ch, chapter, hrs->wv->weave_web->chapters) { if (Ch->md->imported == FALSE) { - if (Str__ne(Ch->md->ch_range, TL_IS_459)) { + if (Str__ne(Ch->md->ch_range, TL_IS_460)) { if (Ch == C->sect->owning_chapter) { HTML_OPEN_WITH("li", "class=\"progresscurrentchapter\""); } else { @@ -26402,7 +26406,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { else if (on) PUT_TO(label, Str__get(pos)); } if (Str__eq(Bibliographic__get_datum(hrs->wv->weave_web->md, - TL_IS_460), TL_IS_461)) + TL_IS_461), TL_IS_462)) Str__delete_first_character(label); if (S == C->sect) { HTML_OPEN_WITH("li", "class=\"progresscurrent\""); @@ -26529,7 +26533,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { #line 315 "inweb/Chapter 5/HTML Formats.w" weave_figure_node *C = RETRIEVE_POINTER_weave_figure_node(N->content); filename *F = Filenames__in( - Pathnames__down(hrs->wv->weave_web->md->path_to_web, TL_IS_462), + Pathnames__down(hrs->wv->weave_web->md->path_to_web, TL_IS_463), C->figname); filename *RF = Filenames__from_text(C->figname); HTML_OPEN_WITH("p", "class=\"center-p\""); @@ -26547,7 +26551,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { #line 328 "inweb/Chapter 5/HTML Formats.w" weave_audio_node *C = RETRIEVE_POINTER_weave_audio_node(N->content); filename *F = Filenames__in( - Pathnames__down(hrs->wv->weave_web->md->path_to_web, TL_IS_463), + Pathnames__down(hrs->wv->weave_web->md->path_to_web, TL_IS_464), C->audio_name); Assets__include_asset(OUT, hrs->copy_rule, hrs->wv->weave_web, F, NULL, hrs->wv->pattern, hrs->wv->weave_to); @@ -26567,7 +26571,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { #line 343 "inweb/Chapter 5/HTML Formats.w" weave_video_node *C = RETRIEVE_POINTER_weave_video_node(N->content); filename *F = Filenames__in( - Pathnames__down(hrs->wv->weave_web->md->path_to_web, TL_IS_464), + Pathnames__down(hrs->wv->weave_web->md->path_to_web, TL_IS_465), C->video_name); Assets__include_asset(OUT, hrs->copy_rule, hrs->wv->weave_web, F, NULL, hrs->wv->pattern, hrs->wv->weave_to); @@ -26594,14 +26598,14 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { #line 365 "inweb/Chapter 5/HTML Formats.w" weave_download_node *C = RETRIEVE_POINTER_weave_download_node(N->content); filename *F = Filenames__in( - Pathnames__down(hrs->wv->weave_web->md->path_to_web, TL_IS_465), + Pathnames__down(hrs->wv->weave_web->md->path_to_web, TL_IS_466), C->download_name); - filename *TF = Patterns__find_file_in_subdirectory(hrs->wv->pattern, TL_IS_466, - TL_IS_467); + filename *TF = Patterns__find_file_in_subdirectory(hrs->wv->pattern, TL_IS_467, + TL_IS_468); if (TF == NULL) { - Main__error_in_web(TL_IS_468, hrs->wv->current_weave_line); + Main__error_in_web(TL_IS_469, hrs->wv->current_weave_line); } else { - Swarm__ensure_plugin(hrs->wv, TL_IS_469); + Swarm__ensure_plugin(hrs->wv, TL_IS_470); Assets__include_asset(OUT, hrs->copy_rule, hrs->wv->weave_web, F, NULL, hrs->wv->pattern, hrs->wv->weave_to); TEMPORARY_TEXT(url) @@ -26615,11 +26619,11 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { WRITE_TO(size, " ("); if (Str__len(C->filetype) > 0) WRITE_TO(size, "%S, ", C->filetype); int x = 0, y = 0; - text_stream *unit = TL_IS_474; x = N; y = 0; - if (N > 1) { unit = TL_IS_475; } - if (N >= 1024) { unit = TL_IS_476; x = 10*N/1024; y = x%10; x = x/10; } - if (N >= 1024*1024) { unit = TL_IS_477; x = 10*N/1024/1024; y = x%10; x = x/10; } - if (N >= 1024*1024*1024) { unit = TL_IS_478; x = 10*N/1024/1024/1024; y = x%10; x = x/10; } + text_stream *unit = TL_IS_475; x = N; y = 0; + if (N > 1) { unit = TL_IS_476; } + if (N >= 1024) { unit = TL_IS_477; x = 10*N/1024; y = x%10; x = x/10; } + if (N >= 1024*1024) { unit = TL_IS_478; x = 10*N/1024/1024; y = x%10; x = x/10; } + if (N >= 1024*1024*1024) { unit = TL_IS_479; x = 10*N/1024/1024/1024; y = x%10; x = x/10; } WRITE_TO(size, "%d", x); if (y > 0) WRITE_TO(size, ".%d", y); WRITE_TO(size, "%S", unit); @@ -26628,11 +26632,11 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { } #line 382 "inweb/Chapter 5/HTML Formats.w" - else Main__error_in_web(TL_IS_470, + else Main__error_in_web(TL_IS_471, hrs->wv->current_weave_line); - Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_471, C->download_name); - Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_472, url); - Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_473, size); + Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_472, C->download_name); + Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_473, url); + Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_474, size); Collater__for_web_and_pattern(OUT, hrs->wv->weave_web, hrs->wv->pattern, TF, hrs->into_file); WRITE("\n"); @@ -26902,20 +26906,20 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { { #line 532 "inweb/Chapter 5/HTML Formats.w" weave_embed_node *C = RETRIEVE_POINTER_weave_embed_node(N->content); - text_stream *CH = TL_IS_479; - text_stream *CW = TL_IS_480; + text_stream *CH = TL_IS_480; + text_stream *CW = TL_IS_481; if (C->w > 0) { Str__clear(CW); WRITE_TO(CW, "%d", C->w); } if (C->h > 0) { Str__clear(CH); WRITE_TO(CH, "%d", C->h); } TEMPORARY_TEXT(embed_leaf) WRITE_TO(embed_leaf, "%S.html", C->service); - filename *F = Patterns__find_file_in_subdirectory(hrs->wv->pattern, TL_IS_481, embed_leaf); + filename *F = Patterns__find_file_in_subdirectory(hrs->wv->pattern, TL_IS_482, embed_leaf); DISCARD_TEXT(embed_leaf) if (F == NULL) { - Main__error_in_web(TL_IS_482, hrs->wv->current_weave_line); + Main__error_in_web(TL_IS_483, hrs->wv->current_weave_line); } else { - Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_483, C->ID); - Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_484, CW); - Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_485, CH); + Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_484, C->ID); + Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_485, CW); + Bibliographic__set_datum(hrs->wv->weave_web->md, TL_IS_486, CH); HTML_OPEN_WITH("p", "class=\"center-p\""); Collater__for_web_and_pattern(OUT, hrs->wv->weave_web, hrs->wv->pattern, F, hrs->into_file); @@ -26935,7 +26939,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { if (C->defn == FALSE) { TEMPORARY_TEXT(url) Colonies__paragraph_URL(url, P, hrs->wv->weave_to); - HTML__begin_link_with_class(OUT, TL_IS_486, url); + HTML__begin_link_with_class(OUT, TL_IS_487, url); DISCARD_TEXT(url) } HTML_OPEN_WITH("span", "class=\"%s\"", @@ -26995,7 +26999,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { { #line 592 "inweb/Chapter 5/HTML Formats.w" weave_function_usage_node *C = RETRIEVE_POINTER_weave_function_usage_node(N->content); - HTML__begin_link_with_class(OUT, TL_IS_487, C->url); + HTML__begin_link_with_class(OUT, TL_IS_488, C->url); HTMLFormat__change_colour(OUT, FUNCTION_COLOUR, hrs->colours); WRITE("%S", C->fn->function_name); HTMLFormat__change_colour(OUT, -1, hrs->colours); @@ -27033,17 +27037,17 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { { #line 620 "inweb/Chapter 5/HTML Formats.w" weave_carousel_slide_node *C = RETRIEVE_POINTER_weave_carousel_slide_node(N->content); - Swarm__ensure_plugin(hrs->wv, TL_IS_488); + Swarm__ensure_plugin(hrs->wv, TL_IS_489); TEMPORARY_TEXT(carousel_id) TEMPORARY_TEXT(carousel_dots_id) text_stream *caption_class = NULL; - text_stream *slide_count_class = TL_IS_489; + text_stream *slide_count_class = TL_IS_490; switch (C->caption_command) { - case CAROUSEL_CMD: caption_class = TL_IS_490; break; - case CAROUSEL_ABOVE_CMD: caption_class = TL_IS_491; - slide_count_class = TL_IS_492; break; - case CAROUSEL_BELOW_CMD: caption_class = TL_IS_493; - slide_count_class = TL_IS_494; break; + case CAROUSEL_CMD: caption_class = TL_IS_491; break; + case CAROUSEL_ABOVE_CMD: caption_class = TL_IS_492; + slide_count_class = TL_IS_493; break; + case CAROUSEL_BELOW_CMD: caption_class = TL_IS_494; + slide_count_class = TL_IS_495; break; } WRITE_TO(carousel_id, "carousel-no-%d", hrs->carousel_number); WRITE_TO(carousel_dots_id, "carousel-dots-no-%d", hrs->carousel_number); @@ -27204,7 +27208,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { { #line 746 "inweb/Chapter 5/HTML Formats.w" weave_url_node *C = RETRIEVE_POINTER_weave_url_node(N->content); - HTML__begin_link_with_class(OUT, (C->external)?TL_IS_495:TL_IS_496, C->url); + HTML__begin_link_with_class(OUT, (C->external)?TL_IS_496:TL_IS_497, C->url); WRITE("%S", C->content); HTML__end_link(OUT); @@ -27284,7 +27288,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { weave_function_defn_node *C = RETRIEVE_POINTER_weave_function_defn_node(N->content); if ((Functions__used_elsewhere(C->fn)) && (hrs->EPUB_flag == FALSE)) { - Swarm__ensure_plugin(hrs->wv, TL_IS_497); + Swarm__ensure_plugin(hrs->wv, TL_IS_498); HTMLFormat__change_colour(OUT, FUNCTION_COLOUR, hrs->colours); WRITE("%S", C->fn->function_name); WRITE(""); @@ -27326,7 +27330,7 @@ int HTMLFormat__render_visit(tree_node *N, void *state, int L) { { #line 827 "inweb/Chapter 5/HTML Formats.w" weave_item_node *C = RETRIEVE_POINTER_weave_item_node(N->content); - if (Str__eq(C->label, TL_IS_498)) WRITE("● "); + if (Str__eq(C->label, TL_IS_499)) WRITE("● "); else if (Str__len(C->label) > 0) WRITE("(%S) ", C->label); else WRITE(" "); @@ -27481,9 +27485,9 @@ void HTMLFormat__escape_text(text_stream *OUT, text_stream *id) { #line 964 "inweb/Chapter 5/HTML Formats.w" int HTMLFormat__begin_weaving_EPUB(weave_format *wf, web *W, weave_pattern *pattern) { TEMPORARY_TEXT(T) - WRITE_TO(T, "%S", Bibliographic__get_datum(W->md, TL_IS_499)); + WRITE_TO(T, "%S", Bibliographic__get_datum(W->md, TL_IS_500)); W->as_ebook = Epub__new(T, "P"); - filename *CSS = Patterns__find_file_in_subdirectory(pattern, TL_IS_500, TL_IS_501); + filename *CSS = Patterns__find_file_in_subdirectory(pattern, TL_IS_501, TL_IS_502); Epub__use_CSS_throughout(W->as_ebook, CSS); Epub__attach_metadata(W->as_ebook, L"identifier", T); DISCARD_TEXT(T) @@ -27500,7 +27504,7 @@ void HTMLFormat__end_weaving_EPUB(weave_format *wf, web *W, weave_pattern *patte #line 9 "inweb/Chapter 5/Debugging Format.w" void Debugging__create(void) { - weave_format *wf = Formats__create_weave_format(TL_IS_502, TL_IS_503); + weave_format *wf = Formats__create_weave_format(TL_IS_503, TL_IS_504); METHOD_ADD(wf, RENDER_FOR_MTID, Debugging__render); } @@ -27974,7 +27978,7 @@ tex_results *TeXUtilities__new_results(weave_order *wv, filename *CF) { res->tex_error_count = 0; res->page_count = 0; res->pdf_size = 0; - res->PDF_filename = Filenames__set_extension(CF, TL_IS_504); + res->PDF_filename = Filenames__set_extension(CF, TL_IS_505); return res; } @@ -28170,7 +28174,7 @@ void TeXUtilities__remove_math_mode_range(OUTPUT_STREAM, text_stream *text, int i++; while ((i < Str__len(text)) && (Characters__isalpha(Str__get_at(text, i)))) PUT_TO(macro, Str__get_at(text, i++)); - if (Str__eq(macro, TL_IS_505)) + if (Str__eq(macro, TL_IS_506)) { #line 364 "inweb/Chapter 5/TeX Utilities.w" if (Str__get_at(text, i) == '\\') { @@ -28178,8 +28182,8 @@ void TeXUtilities__remove_math_mode_range(OUTPUT_STREAM, text_stream *text, int i++; while ((i < Str__len(text)) && (Characters__isalpha(Str__get_at(text, i)))) PUT_TO(macro, Str__get_at(text, i++)); - if (Str__eq(macro, TL_IS_601)) PUT((wchar_t) 0x2204); - else if (Str__eq(macro, TL_IS_602)) { PUT((wchar_t) 0x00AC); PUT((wchar_t) 0x2200); } + if (Str__eq(macro, TL_IS_602)) PUT((wchar_t) 0x2204); + else if (Str__eq(macro, TL_IS_603)) { PUT((wchar_t) 0x00AC); PUT((wchar_t) 0x2200); } else { PRINT("Don't know how to apply '\\not' to '\\%S'\n", macro); } @@ -28193,99 +28197,99 @@ void TeXUtilities__remove_math_mode_range(OUTPUT_STREAM, text_stream *text, int else { #line 251 "inweb/Chapter 5/TeX Utilities.w" - if (Str__eq(macro, TL_IS_506)) WRITE("<="); - else if (Str__eq(macro, TL_IS_507)) WRITE(">="); - else if (Str__eq(macro, TL_IS_508)) WRITE("~"); - else if (Str__eq(macro, TL_IS_509)) WRITE(""); + if (Str__eq(macro, TL_IS_507)) WRITE("<="); + else if (Str__eq(macro, TL_IS_508)) WRITE(">="); + else if (Str__eq(macro, TL_IS_509)) WRITE("~"); else if (Str__eq(macro, TL_IS_510)) WRITE(""); else if (Str__eq(macro, TL_IS_511)) WRITE(""); - else if (Str__eq(macro, TL_IS_512)) WRITE("=>"); - else if (Str__eq(macro, TL_IS_513)) WRITE("<=>"); - else if (Str__eq(macro, TL_IS_514)) WRITE("-->"); + else if (Str__eq(macro, TL_IS_512)) WRITE(""); + else if (Str__eq(macro, TL_IS_513)) WRITE("=>"); + else if (Str__eq(macro, TL_IS_514)) WRITE("<=>"); else if (Str__eq(macro, TL_IS_515)) WRITE("-->"); else if (Str__eq(macro, TL_IS_516)) WRITE("-->"); - else if (Str__eq(macro, TL_IS_517)) WRITE("<--"); + else if (Str__eq(macro, TL_IS_517)) WRITE("-->"); else if (Str__eq(macro, TL_IS_518)) WRITE("<--"); - else if (Str__eq(macro, TL_IS_519)) WRITE("{"); - else if (Str__eq(macro, TL_IS_520)) WRITE("|"); - else if (Str__eq(macro, TL_IS_521)) WRITE("}"); - else if (Str__eq(macro, TL_IS_522)) WRITE("."); - else if (Str__eq(macro, TL_IS_523)) WRITE("..."); + else if (Str__eq(macro, TL_IS_519)) WRITE("<--"); + else if (Str__eq(macro, TL_IS_520)) WRITE("{"); + else if (Str__eq(macro, TL_IS_521)) WRITE("|"); + else if (Str__eq(macro, TL_IS_522)) WRITE("}"); + else if (Str__eq(macro, TL_IS_523)) WRITE("."); else if (Str__eq(macro, TL_IS_524)) WRITE("..."); - else if (Str__eq(macro, TL_IS_525)) WRITE("*"); - else if (Str__eq(macro, TL_IS_526)) WRITE(" "); - else if (Str__eq(macro, TL_IS_527)) WRITE(" "); - else if (Str__eq(macro, TL_IS_528)) WRITE("TeX"); - else if (Str__eq(macro, TL_IS_529)) WRITE("!="); + else if (Str__eq(macro, TL_IS_525)) WRITE("..."); + else if (Str__eq(macro, TL_IS_526)) WRITE("*"); + else if (Str__eq(macro, TL_IS_527)) WRITE(" "); + else if (Str__eq(macro, TL_IS_528)) WRITE(" "); + else if (Str__eq(macro, TL_IS_529)) WRITE("TeX"); else if (Str__eq(macro, TL_IS_530)) WRITE("!="); - else if (Str__eq(macro, TL_IS_531)) WRITE("l"); - else if (Str__eq(macro, TL_IS_532)) WRITE("log"); - else if (Str__eq(macro, TL_IS_533)) WRITE("exp"); - else if (Str__eq(macro, TL_IS_534)) WRITE("sin"); - else if (Str__eq(macro, TL_IS_535)) WRITE("cos"); - else if (Str__eq(macro, TL_IS_536)) WRITE("tan"); - else if (Str__eq(macro, TL_IS_537)) WRITE("T"); - else if (Str__eq(macro, TL_IS_538)) PUT((wchar_t) 0x0391); - else if (Str__eq(macro, TL_IS_539)) PUT((wchar_t) 0x0392); - else if (Str__eq(macro, TL_IS_540)) PUT((wchar_t) 0x0393); - else if (Str__eq(macro, TL_IS_541)) PUT((wchar_t) 0x0394); - else if (Str__eq(macro, TL_IS_542)) PUT((wchar_t) 0x0395); - else if (Str__eq(macro, TL_IS_543)) PUT((wchar_t) 0x0396); - else if (Str__eq(macro, TL_IS_544)) PUT((wchar_t) 0x0397); - else if (Str__eq(macro, TL_IS_545)) PUT((wchar_t) 0x0398); - else if (Str__eq(macro, TL_IS_546)) PUT((wchar_t) 0x0399); - else if (Str__eq(macro, TL_IS_547)) PUT((wchar_t) 0x039A); - else if (Str__eq(macro, TL_IS_548)) PUT((wchar_t) 0x039B); - else if (Str__eq(macro, TL_IS_549)) PUT((wchar_t) 0x039C); - else if (Str__eq(macro, TL_IS_550)) PUT((wchar_t) 0x039D); - else if (Str__eq(macro, TL_IS_551)) PUT((wchar_t) 0x039E); - else if (Str__eq(macro, TL_IS_552)) PUT((wchar_t) 0x039F); - else if (Str__eq(macro, TL_IS_553)) PUT((wchar_t) 0x03A0); - else if (Str__eq(macro, TL_IS_554)) PUT((wchar_t) 0x03A1); - else if (Str__eq(macro, TL_IS_555)) PUT((wchar_t) 0x03A2); - else if (Str__eq(macro, TL_IS_556)) PUT((wchar_t) 0x03A3); - else if (Str__eq(macro, TL_IS_557)) PUT((wchar_t) 0x03A4); - else if (Str__eq(macro, TL_IS_558)) PUT((wchar_t) 0x03A5); - else if (Str__eq(macro, TL_IS_559)) PUT((wchar_t) 0x03A6); - else if (Str__eq(macro, TL_IS_560)) PUT((wchar_t) 0x03A7); - else if (Str__eq(macro, TL_IS_561)) PUT((wchar_t) 0x03A8); - else if (Str__eq(macro, TL_IS_562)) PUT((wchar_t) 0x03A9); - else if (Str__eq(macro, TL_IS_563)) PUT((wchar_t) 0x03B1); - else if (Str__eq(macro, TL_IS_564)) PUT((wchar_t) 0x03B2); - else if (Str__eq(macro, TL_IS_565)) PUT((wchar_t) 0x03B3); - else if (Str__eq(macro, TL_IS_566)) PUT((wchar_t) 0x03B4); - else if (Str__eq(macro, TL_IS_567)) PUT((wchar_t) 0x03B5); - else if (Str__eq(macro, TL_IS_568)) PUT((wchar_t) 0x03B6); - else if (Str__eq(macro, TL_IS_569)) PUT((wchar_t) 0x03B7); - else if (Str__eq(macro, TL_IS_570)) PUT((wchar_t) 0x03B8); - else if (Str__eq(macro, TL_IS_571)) PUT((wchar_t) 0x03B9); - else if (Str__eq(macro, TL_IS_572)) PUT((wchar_t) 0x03BA); - else if (Str__eq(macro, TL_IS_573)) PUT((wchar_t) 0x03BB); - else if (Str__eq(macro, TL_IS_574)) PUT((wchar_t) 0x03BC); - else if (Str__eq(macro, TL_IS_575)) PUT((wchar_t) 0x03BD); - else if (Str__eq(macro, TL_IS_576)) PUT((wchar_t) 0x03BE); - else if (Str__eq(macro, TL_IS_577)) PUT((wchar_t) 0x03BF); - else if (Str__eq(macro, TL_IS_578)) PUT((wchar_t) 0x03C0); - else if (Str__eq(macro, TL_IS_579)) PUT((wchar_t) 0x03C1); - else if (Str__eq(macro, TL_IS_580)) PUT((wchar_t) 0x03C2); - else if (Str__eq(macro, TL_IS_581)) PUT((wchar_t) 0x03C3); - else if (Str__eq(macro, TL_IS_582)) PUT((wchar_t) 0x03C4); - else if (Str__eq(macro, TL_IS_583)) PUT((wchar_t) 0x03C5); - else if (Str__eq(macro, TL_IS_584)) PUT((wchar_t) 0x03C6); - else if (Str__eq(macro, TL_IS_585)) PUT((wchar_t) 0x03C7); - else if (Str__eq(macro, TL_IS_586)) PUT((wchar_t) 0x03C8); - else if (Str__eq(macro, TL_IS_587)) PUT((wchar_t) 0x03C9); - else if (Str__eq(macro, TL_IS_588)) PUT((wchar_t) 0x2203); - else if (Str__eq(macro, TL_IS_589)) PUT((wchar_t) 0x2208); - else if (Str__eq(macro, TL_IS_590)) PUT((wchar_t) 0x2200); - else if (Str__eq(macro, TL_IS_591)) PUT((wchar_t) 0x2229); - else if (Str__eq(macro, TL_IS_592)) PUT((wchar_t) 0x2205); - else if (Str__eq(macro, TL_IS_593)) PUT((wchar_t) 0x2286); - else if (Str__eq(macro, TL_IS_594)) PUT((wchar_t) 0x2227); - else if (Str__eq(macro, TL_IS_595)) PUT((wchar_t) 0x2228); - else if (Str__eq(macro, TL_IS_596)) PUT((wchar_t) 0x00AC); - else if (Str__eq(macro, TL_IS_597)) PUT((wchar_t) 0x03A3); - else if (Str__eq(macro, TL_IS_598)) PUT((wchar_t) 0x03A0); + else if (Str__eq(macro, TL_IS_531)) WRITE("!="); + else if (Str__eq(macro, TL_IS_532)) WRITE("l"); + else if (Str__eq(macro, TL_IS_533)) WRITE("log"); + else if (Str__eq(macro, TL_IS_534)) WRITE("exp"); + else if (Str__eq(macro, TL_IS_535)) WRITE("sin"); + else if (Str__eq(macro, TL_IS_536)) WRITE("cos"); + else if (Str__eq(macro, TL_IS_537)) WRITE("tan"); + else if (Str__eq(macro, TL_IS_538)) WRITE("T"); + else if (Str__eq(macro, TL_IS_539)) PUT((wchar_t) 0x0391); + else if (Str__eq(macro, TL_IS_540)) PUT((wchar_t) 0x0392); + else if (Str__eq(macro, TL_IS_541)) PUT((wchar_t) 0x0393); + else if (Str__eq(macro, TL_IS_542)) PUT((wchar_t) 0x0394); + else if (Str__eq(macro, TL_IS_543)) PUT((wchar_t) 0x0395); + else if (Str__eq(macro, TL_IS_544)) PUT((wchar_t) 0x0396); + else if (Str__eq(macro, TL_IS_545)) PUT((wchar_t) 0x0397); + else if (Str__eq(macro, TL_IS_546)) PUT((wchar_t) 0x0398); + else if (Str__eq(macro, TL_IS_547)) PUT((wchar_t) 0x0399); + else if (Str__eq(macro, TL_IS_548)) PUT((wchar_t) 0x039A); + else if (Str__eq(macro, TL_IS_549)) PUT((wchar_t) 0x039B); + else if (Str__eq(macro, TL_IS_550)) PUT((wchar_t) 0x039C); + else if (Str__eq(macro, TL_IS_551)) PUT((wchar_t) 0x039D); + else if (Str__eq(macro, TL_IS_552)) PUT((wchar_t) 0x039E); + else if (Str__eq(macro, TL_IS_553)) PUT((wchar_t) 0x039F); + else if (Str__eq(macro, TL_IS_554)) PUT((wchar_t) 0x03A0); + else if (Str__eq(macro, TL_IS_555)) PUT((wchar_t) 0x03A1); + else if (Str__eq(macro, TL_IS_556)) PUT((wchar_t) 0x03A2); + else if (Str__eq(macro, TL_IS_557)) PUT((wchar_t) 0x03A3); + else if (Str__eq(macro, TL_IS_558)) PUT((wchar_t) 0x03A4); + else if (Str__eq(macro, TL_IS_559)) PUT((wchar_t) 0x03A5); + else if (Str__eq(macro, TL_IS_560)) PUT((wchar_t) 0x03A6); + else if (Str__eq(macro, TL_IS_561)) PUT((wchar_t) 0x03A7); + else if (Str__eq(macro, TL_IS_562)) PUT((wchar_t) 0x03A8); + else if (Str__eq(macro, TL_IS_563)) PUT((wchar_t) 0x03A9); + else if (Str__eq(macro, TL_IS_564)) PUT((wchar_t) 0x03B1); + else if (Str__eq(macro, TL_IS_565)) PUT((wchar_t) 0x03B2); + else if (Str__eq(macro, TL_IS_566)) PUT((wchar_t) 0x03B3); + else if (Str__eq(macro, TL_IS_567)) PUT((wchar_t) 0x03B4); + else if (Str__eq(macro, TL_IS_568)) PUT((wchar_t) 0x03B5); + else if (Str__eq(macro, TL_IS_569)) PUT((wchar_t) 0x03B6); + else if (Str__eq(macro, TL_IS_570)) PUT((wchar_t) 0x03B7); + else if (Str__eq(macro, TL_IS_571)) PUT((wchar_t) 0x03B8); + else if (Str__eq(macro, TL_IS_572)) PUT((wchar_t) 0x03B9); + else if (Str__eq(macro, TL_IS_573)) PUT((wchar_t) 0x03BA); + else if (Str__eq(macro, TL_IS_574)) PUT((wchar_t) 0x03BB); + else if (Str__eq(macro, TL_IS_575)) PUT((wchar_t) 0x03BC); + else if (Str__eq(macro, TL_IS_576)) PUT((wchar_t) 0x03BD); + else if (Str__eq(macro, TL_IS_577)) PUT((wchar_t) 0x03BE); + else if (Str__eq(macro, TL_IS_578)) PUT((wchar_t) 0x03BF); + else if (Str__eq(macro, TL_IS_579)) PUT((wchar_t) 0x03C0); + else if (Str__eq(macro, TL_IS_580)) PUT((wchar_t) 0x03C1); + else if (Str__eq(macro, TL_IS_581)) PUT((wchar_t) 0x03C2); + else if (Str__eq(macro, TL_IS_582)) PUT((wchar_t) 0x03C3); + else if (Str__eq(macro, TL_IS_583)) PUT((wchar_t) 0x03C4); + else if (Str__eq(macro, TL_IS_584)) PUT((wchar_t) 0x03C5); + else if (Str__eq(macro, TL_IS_585)) PUT((wchar_t) 0x03C6); + else if (Str__eq(macro, TL_IS_586)) PUT((wchar_t) 0x03C7); + else if (Str__eq(macro, TL_IS_587)) PUT((wchar_t) 0x03C8); + else if (Str__eq(macro, TL_IS_588)) PUT((wchar_t) 0x03C9); + else if (Str__eq(macro, TL_IS_589)) PUT((wchar_t) 0x2203); + else if (Str__eq(macro, TL_IS_590)) PUT((wchar_t) 0x2208); + else if (Str__eq(macro, TL_IS_591)) PUT((wchar_t) 0x2200); + else if (Str__eq(macro, TL_IS_592)) PUT((wchar_t) 0x2229); + else if (Str__eq(macro, TL_IS_593)) PUT((wchar_t) 0x2205); + else if (Str__eq(macro, TL_IS_594)) PUT((wchar_t) 0x2286); + else if (Str__eq(macro, TL_IS_595)) PUT((wchar_t) 0x2227); + else if (Str__eq(macro, TL_IS_596)) PUT((wchar_t) 0x2228); + else if (Str__eq(macro, TL_IS_597)) PUT((wchar_t) 0x00AC); + else if (Str__eq(macro, TL_IS_598)) PUT((wchar_t) 0x03A3); + else if (Str__eq(macro, TL_IS_599)) PUT((wchar_t) 0x03A0); else { if (Str__len(macro) > 0) { int suspect = TRUE; @@ -28295,8 +28299,8 @@ void TeXUtilities__remove_math_mode_range(OUTPUT_STREAM, text_stream *text, int if ((c >= 'a') && (c <= 'z')) continue; suspect = FALSE; } - if (Str__eq(macro, TL_IS_599)) suspect = FALSE; if (Str__eq(macro, TL_IS_600)) suspect = FALSE; + if (Str__eq(macro, TL_IS_601)) suspect = FALSE; if (suspect) PRINT("[Passing through unknown TeX macro \\%S:\n %S\n", macro, text); } @@ -28453,7 +28457,7 @@ void Makefiles__scan_makefile_line(text_stream *line, text_file_position *tfp, v { #line 139 "inweb/Chapter 6/Makefiles.w" WRITE("%S", mr.exp[0]); - Makefiles__repeat(OUT, TL_IS_603, FALSE, mr.exp[1], FALSE, NULL, tfp, MS, marker, TL_IS_604); + Makefiles__repeat(OUT, TL_IS_604, FALSE, mr.exp[1], FALSE, NULL, tfp, MS, marker, TL_IS_605); WRITE("%S\n", mr.exp[2]); MS->last_line_was_blank = FALSE; Regexp__dispose_of(&mr); @@ -28475,7 +28479,7 @@ void Makefiles__scan_makefile_line(text_stream *line, text_file_position *tfp, v { #line 139 "inweb/Chapter 6/Makefiles.w" WRITE("%S", mr.exp[0]); - Makefiles__repeat(OUT, TL_IS_603, FALSE, mr.exp[1], FALSE, NULL, tfp, MS, marker, TL_IS_604); + Makefiles__repeat(OUT, TL_IS_604, FALSE, mr.exp[1], FALSE, NULL, tfp, MS, marker, TL_IS_605); WRITE("%S\n", mr.exp[2]); MS->last_line_was_blank = FALSE; Regexp__dispose_of(&mr); @@ -28497,7 +28501,7 @@ void Makefiles__scan_makefile_line(text_stream *line, text_file_position *tfp, v { #line 139 "inweb/Chapter 6/Makefiles.w" WRITE("%S", mr.exp[0]); - Makefiles__repeat(OUT, TL_IS_603, FALSE, mr.exp[1], FALSE, NULL, tfp, MS, marker, TL_IS_604); + Makefiles__repeat(OUT, TL_IS_604, FALSE, mr.exp[1], FALSE, NULL, tfp, MS, marker, TL_IS_605); WRITE("%S\n", mr.exp[2]); MS->last_line_was_blank = FALSE; Regexp__dispose_of(&mr); @@ -28515,7 +28519,7 @@ void Makefiles__scan_makefile_line(text_stream *line, text_file_position *tfp, v { #line 156 "inweb/Chapter 6/Makefiles.w" WRITE("INWEB = "); Makefiles__pathname_slashed(OUT, path_to_inweb); WRITE("/Tangled/inweb\n"); - pathname *path_to_intest = Pathnames__down(Pathnames__up(path_to_inweb), TL_IS_606); + pathname *path_to_intest = Pathnames__down(Pathnames__up(path_to_inweb), TL_IS_607); WRITE("INTEST = "); Makefiles__pathname_slashed(OUT, path_to_intest); WRITE("/Tangled/intest\n"); if (MS->for_web) { WRITE("MYNAME = %S\n", Pathnames__directory_name(MS->for_web->md->path_to_web)); @@ -28532,7 +28536,7 @@ void Makefiles__scan_makefile_line(text_stream *line, text_file_position *tfp, v if (Regexp__match(&mr, line, L" *{platform-settings} *")) { #line 147 "inweb/Chapter 6/Makefiles.w" - filename *prototype = Filenames__in(path_to_inweb, TL_IS_605); + filename *prototype = Filenames__in(path_to_inweb, TL_IS_606); MS->allow_commands = FALSE; TextFiles__read(prototype, FALSE, "can't open make settings file", TRUE, Makefiles__scan_makefile_line, NULL, MS); @@ -28819,7 +28823,7 @@ void Makefiles__repeat(OUTPUT_STREAM, text_stream *prefix, int every_time, text_ int c = 0; LOOP_OVER(M, module) { if ((M->origin_marker == over) && - ((Str__eq(tag, TL_IS_607)) || (Str__eq(tag, M->module_tag)))) { + ((Str__eq(tag, TL_IS_608)) || (Str__eq(tag, M->module_tag)))) { if ((prefix) && ((c++ > 0) || (every_time))) WRITE("%S", prefix); if (matter) { TEMPORARY_TEXT(line) @@ -28873,7 +28877,7 @@ void Git__copy_gitignore_line(text_stream *line, text_file_position *tfp, void * { #line 44 "inweb/Chapter 6/Git Support.w" filename *prototype = - Filenames__in(path_to_inweb_materials, TL_IS_608); + Filenames__in(path_to_inweb_materials, TL_IS_609); TextFiles__read(prototype, FALSE, "can't open make settings file", TRUE, Git__copy_gitignore_line, NULL, MS); Regexp__dispose_of(&mr); @@ -28907,11 +28911,11 @@ void Readme__write(filename *from, filename *to) { write_state ws; ws.current_definition = NULL; ws.known_macros = NEW_LINKED_LIST(macro); - macro *V = Readme__new_macro(TL_IS_609, NULL, NULL); + macro *V = Readme__new_macro(TL_IS_610, NULL, NULL); ADD_TO_LINKED_LIST(V, macro, ws.known_macros); - macro *P = Readme__new_macro(TL_IS_610, NULL, NULL); + macro *P = Readme__new_macro(TL_IS_611, NULL, NULL); ADD_TO_LINKED_LIST(P, macro, ws.known_macros); - macro *A = Readme__new_macro(TL_IS_611, NULL, NULL); + macro *A = Readme__new_macro(TL_IS_612, NULL, NULL); ADD_TO_LINKED_LIST(A, macro, ws.known_macros); ws.stack_frame = NULL; text_stream file_to; @@ -28947,7 +28951,7 @@ void Readme__write_helper(text_stream *text, text_file_position *tfp, void *stat } } else { Readme__expand_material(ws, OUT, text, tfp); - Readme__expand_material(ws, OUT, TL_IS_612, tfp); + Readme__expand_material(ws, OUT, TL_IS_613, tfp); } Regexp__dispose_of(&mr); } @@ -29078,26 +29082,11 @@ void Readme__expand_at(write_state *ws, text_stream *OUT, text_stream *macro_nam #line 204 "inweb/Chapter 6/Readme Writeme.w" void Readme__expand_macro(write_state *ws, text_stream *OUT, macro *M, text_file_position *tfp) { - if (Str__eq(M->name, TL_IS_613)) + if (Str__eq(M->name, TL_IS_614)) { #line 215 "inweb/Chapter 6/Readme Writeme.w" if (ws->stack_frame->no_pars != 1) Errors__in_text_file("@version takes 1 parameter", tfp); - else { - TEMPORARY_TEXT(program) - Readme__expand_material(ws, program, ws->stack_frame->pars[0], tfp); - Readme__write_var(OUT, program, TL_IS_616); - DISCARD_TEXT(program) - } - -} -#line 205 "inweb/Chapter 6/Readme Writeme.w" - - else if (Str__eq(M->name, TL_IS_614)) -{ -#line 225 "inweb/Chapter 6/Readme Writeme.w" - if (ws->stack_frame->no_pars != 1) - Errors__in_text_file("@purpose takes 1 parameter", tfp); else { TEMPORARY_TEXT(program) Readme__expand_material(ws, program, ws->stack_frame->pars[0], tfp); @@ -29106,10 +29095,25 @@ void Readme__expand_macro(write_state *ws, text_stream *OUT, macro *M, text_file } } -#line 206 "inweb/Chapter 6/Readme Writeme.w" +#line 205 "inweb/Chapter 6/Readme Writeme.w" else if (Str__eq(M->name, TL_IS_615)) { +#line 225 "inweb/Chapter 6/Readme Writeme.w" + if (ws->stack_frame->no_pars != 1) + Errors__in_text_file("@purpose takes 1 parameter", tfp); + else { + TEMPORARY_TEXT(program) + Readme__expand_material(ws, program, ws->stack_frame->pars[0], tfp); + Readme__write_var(OUT, program, TL_IS_618); + DISCARD_TEXT(program) + } + +} +#line 206 "inweb/Chapter 6/Readme Writeme.w" + + else if (Str__eq(M->name, TL_IS_616)) +{ #line 235 "inweb/Chapter 6/Readme Writeme.w" if (ws->stack_frame->no_pars != 2) Errors__in_text_file("@var takes 2 parameters", tfp); @@ -29137,8 +29141,8 @@ void Readme__expand_macro(write_state *ws, text_stream *OUT, macro *M, text_file void Readme__write_var(text_stream *OUT, text_stream *program, text_stream *datum) { writeme_asset *A = Readme__find_asset(program); if (A->if_web) WRITE("%S", Bibliographic__get_datum(A->if_web, datum)); - else if (Str__eq(datum, TL_IS_618)) WRITE("%S", A->date); - else if (Str__eq(datum, TL_IS_619)) WRITE("%S", A->version); + else if (Str__eq(datum, TL_IS_619)) WRITE("%S", A->date); + else if (Str__eq(datum, TL_IS_620)) WRITE("%S", A->version); } #line 273 "inweb/Chapter 6/Readme Writeme.w" @@ -29169,7 +29173,7 @@ writeme_asset *Readme__find_asset(text_stream *program) { A->if_web = WebMetadata__get_without_modules(Pathnames__from_text(program), NULL); } else { filename *I6_vn = Filenames__in( - Pathnames__down(Pathnames__from_text(program), TL_IS_620), TL_IS_621); + Pathnames__down(Pathnames__from_text(program), TL_IS_621), TL_IS_622); if (TextFiles__exists(I6_vn)) { #line 310 "inweb/Chapter 6/Readme Writeme.w" @@ -29179,7 +29183,7 @@ writeme_asset *Readme__find_asset(text_stream *program) { } #line 295 "inweb/Chapter 6/Readme Writeme.w" ; - filename *template_vn = Filenames__in(Pathnames__from_text(program), TL_IS_622); + filename *template_vn = Filenames__in(Pathnames__from_text(program), TL_IS_623); if (TextFiles__exists(template_vn)) { #line 314 "inweb/Chapter 6/Readme Writeme.w" @@ -29189,7 +29193,7 @@ writeme_asset *Readme__find_asset(text_stream *program) { } #line 297 "inweb/Chapter 6/Readme Writeme.w" ; - filename *rmt_vn = Filenames__in(Pathnames__from_text(program), TL_IS_623); + filename *rmt_vn = Filenames__in(Pathnames__from_text(program), TL_IS_624); if (TextFiles__exists(rmt_vn)) { #line 318 "inweb/Chapter 6/Readme Writeme.w" @@ -29199,7 +29203,7 @@ writeme_asset *Readme__find_asset(text_stream *program) { } #line 299 "inweb/Chapter 6/Readme Writeme.w" ; - rmt_vn = Filenames__in(Pathnames__from_text(program), TL_IS_624); + rmt_vn = Filenames__in(Pathnames__from_text(program), TL_IS_625); if (TextFiles__exists(rmt_vn)) { #line 318 "inweb/Chapter 6/Readme Writeme.w" @@ -29274,7 +29278,7 @@ void Readme__readme_harvester(text_stream *text, text_file_position *tfp, void * void Colonies__load(filename *F) { colony *C = CREATE(colony); C->members = NEW_LINKED_LIST(colony_member); - C->home = TL_IS_625; + C->home = TL_IS_626; C->assets_path = NULL; C->patterns_path = NULL; colony_reader_state crs; @@ -29298,8 +29302,8 @@ void Colonies__read_line(text_stream *line, text_file_position *tfp, void *v_crs match_results mr = Regexp__create_mr(); if (Regexp__match(&mr, line, L"(%c*?): \"*(%C+)\" at \"(%c*)\" in \"(%c*)\"")) { colony_member *CM = CREATE(colony_member); - if (Str__eq(mr.exp[0], TL_IS_626)) CM->web_rather_than_module = TRUE; - else if (Str__eq(mr.exp[0], TL_IS_627)) CM->web_rather_than_module = FALSE; + if (Str__eq(mr.exp[0], TL_IS_627)) CM->web_rather_than_module = TRUE; + else if (Str__eq(mr.exp[0], TL_IS_628)) CM->web_rather_than_module = FALSE; else { CM->web_rather_than_module = FALSE; Errors__in_text_file("text before ':' must be 'web' or 'module'", tfp); @@ -29307,7 +29311,7 @@ void Colonies__read_line(text_stream *line, text_file_position *tfp, void *v_crs CM->name = Str__duplicate(mr.exp[1]); CM->path = Str__duplicate(mr.exp[2]); CM->home_leaf = Str__new(); - if (Str__suffix_eq(CM->path, TL_IS_628, 6)) { + if (Str__suffix_eq(CM->path, TL_IS_629, 6)) { filename *F = Filenames__from_text(CM->path); Filenames__write_unextended_leafname(CM->home_leaf, F); WRITE_TO(CM->home_leaf, ".html"); @@ -29447,7 +29451,7 @@ module *Colonies__as_module(colony_member *CM, source_line *L, web_md *Wm) { #line 254 "inweb/Chapter 6/Colonies.w" filename *F = NULL; pathname *P = NULL; - if (Str__suffix_eq(CM->path, TL_IS_629, 6)) + if (Str__suffix_eq(CM->path, TL_IS_630, 6)) F = Filenames__from_text(CM->path); else P = Pathnames__from_text(CM->path); @@ -29474,7 +29478,7 @@ text_stream *Colonies__home(void) { colony *C; LOOP_OVER(C, colony) return C->home; - return TL_IS_630; + return TL_IS_631; } pathname *Colonies__assets_path(void) { @@ -29651,7 +29655,7 @@ int Colonies__resolve_reference_in_weave_inner(text_stream *url, text_stream *ti DISCARD_TEXT(err) return FALSE; } else if (N > 1) { - Main__error_in_web(TL_IS_631, L); + Main__error_in_web(TL_IS_632, L); WebModules__named_reference(&found_M, &found_Sm, &bare_module_name, title, search_M, text, TRUE); return FALSE; @@ -29734,7 +29738,7 @@ void Colonies__paragraph_URL(OUTPUT_STREAM, paragraph *P, filename *from) { if (P == NULL) internal_error("no para"); section *to_S = P->under_section; module *to_M = to_S->md->owning_module; - if (Str__ne(to_M->module_name, TL_IS_632)) { + if (Str__ne(to_M->module_name, TL_IS_633)) { colony_member *to_C = Colonies__find(to_M->module_name); if (to_C) { pathname *from_path = Filenames__up(from); @@ -29997,403 +30001,404 @@ void register_tangled_text_literals(void) { TL_IS_231 = Str__literal(L"Preform"); TL_IS_232 = Str__literal(L"Preform"); TL_IS_233 = Str__literal(L"define"); - TL_IS_234 = Str__literal(L"enum"); - TL_IS_235 = Str__literal(L"Preform"); - TL_IS_236 = Str__literal(L"This is "); - TL_IS_237 = Str__literal(L"words: About Preform"); - TL_IS_238 = Str__literal(L"Preform grammar"); + TL_IS_234 = Str__literal(L"default"); + TL_IS_235 = Str__literal(L"enum"); + TL_IS_236 = Str__literal(L"Preform"); + TL_IS_237 = Str__literal(L"This is "); + TL_IS_238 = Str__literal(L"words: About Preform"); TL_IS_239 = Str__literal(L"Preform grammar"); - TL_IS_240 = Str__literal(L", not regular C code."); - TL_IS_241 = Str__literal(L"This code is "); - TL_IS_242 = Str__literal(L"never used"); - TL_IS_243 = Str__literal(L", "); - TL_IS_244 = Str__literal(L" and "); - TL_IS_245 = Str__literal(L"used in "); - TL_IS_246 = Str__literal(L" (twice)"); - TL_IS_247 = Str__literal(L" (three times)"); - TL_IS_248 = Str__literal(L" (four times)"); - TL_IS_249 = Str__literal(L" (five times)"); - TL_IS_250 = Str__literal(L"."); - TL_IS_251 = Str__literal(L"The structure "); - TL_IS_252 = Str__literal(L" is private to this section"); - TL_IS_253 = Str__literal(L" is accessed in "); - TL_IS_254 = Str__literal(L", "); - TL_IS_255 = Str__literal(L" and here"); - TL_IS_256 = Str__literal(L"."); - TL_IS_257 = Str__literal(L"The function "); - TL_IS_258 = Str__literal(L" appears nowhere else"); - TL_IS_259 = Str__literal(L"none"); - TL_IS_260 = Str__literal(L")"); - TL_IS_261 = Str__literal(L"."); - TL_IS_262 = Str__literal(L" is used in "); - TL_IS_263 = Str__literal(L"), "); - TL_IS_264 = Str__literal(L", "); - TL_IS_265 = Str__literal(L" ("); - TL_IS_266 = Str__literal(L" - "); - TL_IS_267 = Str__literal(L", "); - TL_IS_268 = Str__literal(L"Code In Code Comments Notation"); - TL_IS_269 = Str__literal(L"Code In Commentary Notation"); - TL_IS_270 = Str__literal(L"Off"); - TL_IS_271 = Str__literal(L"TeX Mathematics Displayed Notation"); - TL_IS_272 = Str__literal(L"Off"); - TL_IS_273 = Str__literal(L"TeX Mathematics Notation"); - TL_IS_274 = Str__literal(L"Off"); - TL_IS_275 = Str__literal(L"Cross-References Notation"); - TL_IS_276 = Str__literal(L"Off"); - TL_IS_277 = Str__literal(L"http://"); - TL_IS_278 = Str__literal(L"https://"); - TL_IS_279 = Str__literal(L"this is a cue for a missing note"); - TL_IS_280 = Str__literal(L"Cross-References Notation"); - TL_IS_281 = Str__literal(L"Off"); - TL_IS_282 = Str__literal(L"http://"); - TL_IS_283 = Str__literal(L"https://"); - TL_IS_284 = Str__literal(L"misplaced definition"); - TL_IS_285 = Str__literal(L"unknown macro"); - TL_IS_286 = Str__literal(L"Dialects"); - TL_IS_287 = Str__literal(L"C"); - TL_IS_288 = Str__literal(L"Languages"); - TL_IS_289 = Str__literal(L"InC"); - TL_IS_290 = Str__literal(L"Name"); - TL_IS_291 = Str__literal(L"Details"); - TL_IS_292 = Str__literal(L"Extension"); - TL_IS_293 = Str__literal(L"Line Comment"); - TL_IS_294 = Str__literal(L"Whole Line Comment"); - TL_IS_295 = Str__literal(L"Multiline Comment Open"); - TL_IS_296 = Str__literal(L"Multiline Comment Close"); - TL_IS_297 = Str__literal(L"String Literal"); - TL_IS_298 = Str__literal(L"String Literal Escape"); - TL_IS_299 = Str__literal(L"Character Literal"); - TL_IS_300 = Str__literal(L"Character Literal Escape"); - TL_IS_301 = Str__literal(L"Binary Literal Prefix"); - TL_IS_302 = Str__literal(L"Octal Literal Prefix"); - TL_IS_303 = Str__literal(L"Hexadecimal Literal Prefix"); - TL_IS_304 = Str__literal(L"Negative Literal Prefix"); - TL_IS_305 = Str__literal(L"Shebang"); - TL_IS_306 = Str__literal(L"Line Marker"); - TL_IS_307 = Str__literal(L"Before Named Paragraph Expansion"); - TL_IS_308 = Str__literal(L"After Named Paragraph Expansion"); - TL_IS_309 = Str__literal(L"Start Definition"); - TL_IS_310 = Str__literal(L"Prolong Definition"); - TL_IS_311 = Str__literal(L"End Definition"); - TL_IS_312 = Str__literal(L"Start Ifdef"); - TL_IS_313 = Str__literal(L"Start Ifndef"); - TL_IS_314 = Str__literal(L"End Ifdef"); - TL_IS_315 = Str__literal(L"End Ifndef"); - TL_IS_316 = Str__literal(L"C-Like"); - TL_IS_317 = Str__literal(L"Suppress Disclaimer"); - TL_IS_318 = Str__literal(L"Supports Namespaces"); - TL_IS_319 = Str__literal(L"Function Declaration Notation"); - TL_IS_320 = Str__literal(L"Type Declaration Notation"); - TL_IS_321 = Str__literal(L"}"); - TL_IS_322 = Str__literal(L"unquoted"); - TL_IS_323 = Str__literal(L"{"); - TL_IS_324 = Str__literal(L"debug"); - TL_IS_325 = Str__literal(L"!string"); - TL_IS_326 = Str__literal(L"!function"); - TL_IS_327 = Str__literal(L"!definition"); - TL_IS_328 = Str__literal(L"!reserved"); - TL_IS_329 = Str__literal(L"!element"); - TL_IS_330 = Str__literal(L"!identifier"); - TL_IS_331 = Str__literal(L"!character"); - TL_IS_332 = Str__literal(L"!constant"); - TL_IS_333 = Str__literal(L"!plain"); - TL_IS_334 = Str__literal(L"!extract"); - TL_IS_335 = Str__literal(L"!comment"); - TL_IS_336 = Str__literal(L"true"); - TL_IS_337 = Str__literal(L"false"); - TL_IS_338 = Str__literal(L"both"); - TL_IS_339 = Str__literal(L"brackets"); - TL_IS_340 = Str__literal(L"characters"); - TL_IS_341 = Str__literal(L"coloured"); - TL_IS_342 = Str__literal(L"colouring"); - TL_IS_343 = Str__literal(L"debug"); - TL_IS_344 = Str__literal(L"false"); - TL_IS_345 = Str__literal(L"in"); - TL_IS_346 = Str__literal(L"instances"); - TL_IS_347 = Str__literal(L"keyword"); - TL_IS_348 = Str__literal(L"matches"); - TL_IS_349 = Str__literal(L"matching"); - TL_IS_350 = Str__literal(L"not"); - TL_IS_351 = Str__literal(L"of"); - TL_IS_352 = Str__literal(L"on"); - TL_IS_353 = Str__literal(L"optionally"); - TL_IS_354 = Str__literal(L"prefix"); - TL_IS_355 = Str__literal(L"runs"); - TL_IS_356 = Str__literal(L"spaced"); - TL_IS_357 = Str__literal(L"suffix"); - TL_IS_358 = Str__literal(L"true"); - TL_IS_359 = Str__literal(L"unquoted"); - TL_IS_360 = Str__literal(L"Structures"); - TL_IS_361 = Str__literal(L"Main::"); - TL_IS_362 = Str__literal(L"Tangled output generated by inweb: do not edit"); - TL_IS_363 = Str__literal(L"this programming language does not support @d"); - TL_IS_364 = Str__literal(L"this programming language does not support multiline @d"); - TL_IS_365 = Str__literal(L"Preform"); + TL_IS_240 = Str__literal(L"Preform grammar"); + TL_IS_241 = Str__literal(L", not regular C code."); + TL_IS_242 = Str__literal(L"This code is "); + TL_IS_243 = Str__literal(L"never used"); + TL_IS_244 = Str__literal(L", "); + TL_IS_245 = Str__literal(L" and "); + TL_IS_246 = Str__literal(L"used in "); + TL_IS_247 = Str__literal(L" (twice)"); + TL_IS_248 = Str__literal(L" (three times)"); + TL_IS_249 = Str__literal(L" (four times)"); + TL_IS_250 = Str__literal(L" (five times)"); + TL_IS_251 = Str__literal(L"."); + TL_IS_252 = Str__literal(L"The structure "); + TL_IS_253 = Str__literal(L" is private to this section"); + TL_IS_254 = Str__literal(L" is accessed in "); + TL_IS_255 = Str__literal(L", "); + TL_IS_256 = Str__literal(L" and here"); + TL_IS_257 = Str__literal(L"."); + TL_IS_258 = Str__literal(L"The function "); + TL_IS_259 = Str__literal(L" appears nowhere else"); + TL_IS_260 = Str__literal(L"none"); + TL_IS_261 = Str__literal(L")"); + TL_IS_262 = Str__literal(L"."); + TL_IS_263 = Str__literal(L" is used in "); + TL_IS_264 = Str__literal(L"), "); + TL_IS_265 = Str__literal(L", "); + TL_IS_266 = Str__literal(L" ("); + TL_IS_267 = Str__literal(L" - "); + TL_IS_268 = Str__literal(L", "); + TL_IS_269 = Str__literal(L"Code In Code Comments Notation"); + TL_IS_270 = Str__literal(L"Code In Commentary Notation"); + TL_IS_271 = Str__literal(L"Off"); + TL_IS_272 = Str__literal(L"TeX Mathematics Displayed Notation"); + TL_IS_273 = Str__literal(L"Off"); + TL_IS_274 = Str__literal(L"TeX Mathematics Notation"); + TL_IS_275 = Str__literal(L"Off"); + TL_IS_276 = Str__literal(L"Cross-References Notation"); + TL_IS_277 = Str__literal(L"Off"); + TL_IS_278 = Str__literal(L"http://"); + TL_IS_279 = Str__literal(L"https://"); + TL_IS_280 = Str__literal(L"this is a cue for a missing note"); + TL_IS_281 = Str__literal(L"Cross-References Notation"); + TL_IS_282 = Str__literal(L"Off"); + TL_IS_283 = Str__literal(L"http://"); + TL_IS_284 = Str__literal(L"https://"); + TL_IS_285 = Str__literal(L"misplaced definition"); + TL_IS_286 = Str__literal(L"unknown macro"); + TL_IS_287 = Str__literal(L"Dialects"); + TL_IS_288 = Str__literal(L"C"); + TL_IS_289 = Str__literal(L"Languages"); + TL_IS_290 = Str__literal(L"InC"); + TL_IS_291 = Str__literal(L"Name"); + TL_IS_292 = Str__literal(L"Details"); + TL_IS_293 = Str__literal(L"Extension"); + TL_IS_294 = Str__literal(L"Line Comment"); + TL_IS_295 = Str__literal(L"Whole Line Comment"); + TL_IS_296 = Str__literal(L"Multiline Comment Open"); + TL_IS_297 = Str__literal(L"Multiline Comment Close"); + TL_IS_298 = Str__literal(L"String Literal"); + TL_IS_299 = Str__literal(L"String Literal Escape"); + TL_IS_300 = Str__literal(L"Character Literal"); + TL_IS_301 = Str__literal(L"Character Literal Escape"); + TL_IS_302 = Str__literal(L"Binary Literal Prefix"); + TL_IS_303 = Str__literal(L"Octal Literal Prefix"); + TL_IS_304 = Str__literal(L"Hexadecimal Literal Prefix"); + TL_IS_305 = Str__literal(L"Negative Literal Prefix"); + TL_IS_306 = Str__literal(L"Shebang"); + TL_IS_307 = Str__literal(L"Line Marker"); + TL_IS_308 = Str__literal(L"Before Named Paragraph Expansion"); + TL_IS_309 = Str__literal(L"After Named Paragraph Expansion"); + TL_IS_310 = Str__literal(L"Start Definition"); + TL_IS_311 = Str__literal(L"Prolong Definition"); + TL_IS_312 = Str__literal(L"End Definition"); + TL_IS_313 = Str__literal(L"Start Ifdef"); + TL_IS_314 = Str__literal(L"Start Ifndef"); + TL_IS_315 = Str__literal(L"End Ifdef"); + TL_IS_316 = Str__literal(L"End Ifndef"); + TL_IS_317 = Str__literal(L"C-Like"); + TL_IS_318 = Str__literal(L"Suppress Disclaimer"); + TL_IS_319 = Str__literal(L"Supports Namespaces"); + TL_IS_320 = Str__literal(L"Function Declaration Notation"); + TL_IS_321 = Str__literal(L"Type Declaration Notation"); + TL_IS_322 = Str__literal(L"}"); + TL_IS_323 = Str__literal(L"unquoted"); + TL_IS_324 = Str__literal(L"{"); + TL_IS_325 = Str__literal(L"debug"); + TL_IS_326 = Str__literal(L"!string"); + TL_IS_327 = Str__literal(L"!function"); + TL_IS_328 = Str__literal(L"!definition"); + TL_IS_329 = Str__literal(L"!reserved"); + TL_IS_330 = Str__literal(L"!element"); + TL_IS_331 = Str__literal(L"!identifier"); + TL_IS_332 = Str__literal(L"!character"); + TL_IS_333 = Str__literal(L"!constant"); + TL_IS_334 = Str__literal(L"!plain"); + TL_IS_335 = Str__literal(L"!extract"); + TL_IS_336 = Str__literal(L"!comment"); + TL_IS_337 = Str__literal(L"true"); + TL_IS_338 = Str__literal(L"false"); + TL_IS_339 = Str__literal(L"both"); + TL_IS_340 = Str__literal(L"brackets"); + TL_IS_341 = Str__literal(L"characters"); + TL_IS_342 = Str__literal(L"coloured"); + TL_IS_343 = Str__literal(L"colouring"); + TL_IS_344 = Str__literal(L"debug"); + TL_IS_345 = Str__literal(L"false"); + TL_IS_346 = Str__literal(L"in"); + TL_IS_347 = Str__literal(L"instances"); + TL_IS_348 = Str__literal(L"keyword"); + TL_IS_349 = Str__literal(L"matches"); + TL_IS_350 = Str__literal(L"matching"); + TL_IS_351 = Str__literal(L"not"); + TL_IS_352 = Str__literal(L"of"); + TL_IS_353 = Str__literal(L"on"); + TL_IS_354 = Str__literal(L"optionally"); + TL_IS_355 = Str__literal(L"prefix"); + TL_IS_356 = Str__literal(L"runs"); + TL_IS_357 = Str__literal(L"spaced"); + TL_IS_358 = Str__literal(L"suffix"); + TL_IS_359 = Str__literal(L"true"); + TL_IS_360 = Str__literal(L"unquoted"); + TL_IS_361 = Str__literal(L"Structures"); + TL_IS_362 = Str__literal(L"Main::"); + TL_IS_363 = Str__literal(L"Tangled output generated by inweb: do not edit"); + TL_IS_364 = Str__literal(L"this programming language does not support @d"); + TL_IS_365 = Str__literal(L"this programming language does not support multiline @d"); TL_IS_366 = Str__literal(L"Preform"); - TL_IS_367 = Str__literal(L"Namespaces"); - TL_IS_368 = Str__literal(L"Being internally called, this function mustn't belong to a :: namespace"); - TL_IS_369 = Str__literal(L"Being externally called, this function must belong to a :: namespace"); - TL_IS_370 = Str__literal(L"Structures"); - TL_IS_371 = Str__literal(L"program ended with conditional compilation open"); - TL_IS_372 = Str__literal(L"conditional compilation too deeply nested"); - TL_IS_373 = Str__literal(L"found #endif without #ifdef or #ifndef"); - TL_IS_374 = Str__literal(L"Preform"); - TL_IS_375 = Str__literal(L"most_recent_result"); - TL_IS_376 = Str__literal(L"most_recent_result_p"); - TL_IS_377 = Str__literal(L"Syntax.preform"); - TL_IS_378 = Str__literal(L"Preform Language"); + TL_IS_367 = Str__literal(L"Preform"); + TL_IS_368 = Str__literal(L"Namespaces"); + TL_IS_369 = Str__literal(L"Being internally called, this function mustn't belong to a :: namespace"); + TL_IS_370 = Str__literal(L"Being externally called, this function must belong to a :: namespace"); + TL_IS_371 = Str__literal(L"Structures"); + TL_IS_372 = Str__literal(L"program ended with conditional compilation open"); + TL_IS_373 = Str__literal(L"conditional compilation too deeply nested"); + TL_IS_374 = Str__literal(L"found #endif without #ifdef or #ifndef"); + TL_IS_375 = Str__literal(L"Preform"); + TL_IS_376 = Str__literal(L"most_recent_result"); + TL_IS_377 = Str__literal(L"most_recent_result_p"); + TL_IS_378 = Str__literal(L"Syntax.preform"); TL_IS_379 = Str__literal(L"Preform Language"); - TL_IS_380 = Str__literal(L"weave tree"); - TL_IS_381 = Str__literal(L"document"); - TL_IS_382 = Str__literal(L"head"); - TL_IS_383 = Str__literal(L"body"); - TL_IS_384 = Str__literal(L"tail"); - TL_IS_385 = Str__literal(L"chapter footer"); - TL_IS_386 = Str__literal(L"chapter header"); - TL_IS_387 = Str__literal(L"section footer"); - TL_IS_388 = Str__literal(L"section header"); - TL_IS_389 = Str__literal(L"section purpose"); - TL_IS_390 = Str__literal(L"subheading"); - TL_IS_391 = Str__literal(L"bar"); - TL_IS_392 = Str__literal(L"pagebreak"); - TL_IS_393 = Str__literal(L"linebreak"); - TL_IS_394 = Str__literal(L"paragraph"); - TL_IS_395 = Str__literal(L"endnote"); - TL_IS_396 = Str__literal(L"figure"); - TL_IS_397 = Str__literal(L"audio"); - TL_IS_398 = Str__literal(L"video"); - TL_IS_399 = Str__literal(L"download"); - TL_IS_400 = Str__literal(L"material"); - TL_IS_401 = Str__literal(L"embed"); - TL_IS_402 = Str__literal(L"pmac"); - TL_IS_403 = Str__literal(L"vskip"); - TL_IS_404 = Str__literal(L"chapter"); - TL_IS_405 = Str__literal(L"section"); - TL_IS_406 = Str__literal(L"code line"); - TL_IS_407 = Str__literal(L"function usage"); - TL_IS_408 = Str__literal(L"commentary"); - TL_IS_409 = Str__literal(L"carousel slide"); - TL_IS_410 = Str__literal(L"toc"); - TL_IS_411 = Str__literal(L"toc line"); - TL_IS_412 = Str__literal(L"chapter_title_page"); - TL_IS_413 = Str__literal(L"defn"); - TL_IS_414 = Str__literal(L"source_code"); - TL_IS_415 = Str__literal(L"url"); - TL_IS_416 = Str__literal(L"footnote_cue"); - TL_IS_417 = Str__literal(L"footnote"); - TL_IS_418 = Str__literal(L"display line"); - TL_IS_419 = Str__literal(L"function defn"); - TL_IS_420 = Str__literal(L"item"); - TL_IS_421 = Str__literal(L"grammar index"); - TL_IS_422 = Str__literal(L"inline"); - TL_IS_423 = Str__literal(L"locale"); - TL_IS_424 = Str__literal(L"mathematics"); - TL_IS_425 = Str__literal(L"verbatim"); - TL_IS_426 = Str__literal(L"Weave Content"); - TL_IS_427 = Str__literal(L"plain"); - TL_IS_428 = Str__literal(L".txt"); - TL_IS_429 = Str__literal(L"TeX"); - TL_IS_430 = Str__literal(L".tex"); - TL_IS_431 = Str__literal(L"S"); - TL_IS_432 = Str__literal(L""); - TL_IS_433 = Str__literal(L"Figures"); - TL_IS_434 = Str__literal(L"weavesection"); - TL_IS_435 = Str__literal(L"weavesections"); - TL_IS_436 = Str__literal(L"weavesectionss"); - TL_IS_437 = Str__literal(L"weavesectionsss"); - TL_IS_438 = Str__literal(L"tweavesection"); - TL_IS_439 = Str__literal(L"tweavesections"); - TL_IS_440 = Str__literal(L"tweavesectionss"); - TL_IS_441 = Str__literal(L"tweavesectionsss"); - TL_IS_442 = Str__literal(L"nsweavesection"); - TL_IS_443 = Str__literal(L"nsweavesections"); - TL_IS_444 = Str__literal(L"HTML"); - TL_IS_445 = Str__literal(L".html"); - TL_IS_446 = Str__literal(L"ePub"); - TL_IS_447 = Str__literal(L".html"); - TL_IS_448 = Str__literal(L""); - TL_IS_449 = Str__literal(L"private copy"); - TL_IS_450 = Str__literal(L"Base"); - TL_IS_451 = Str__literal(L"Colours"); - TL_IS_452 = Str__literal(L""); + TL_IS_380 = Str__literal(L"Preform Language"); + TL_IS_381 = Str__literal(L"weave tree"); + TL_IS_382 = Str__literal(L"document"); + TL_IS_383 = Str__literal(L"head"); + TL_IS_384 = Str__literal(L"body"); + TL_IS_385 = Str__literal(L"tail"); + TL_IS_386 = Str__literal(L"chapter footer"); + TL_IS_387 = Str__literal(L"chapter header"); + TL_IS_388 = Str__literal(L"section footer"); + TL_IS_389 = Str__literal(L"section header"); + TL_IS_390 = Str__literal(L"section purpose"); + TL_IS_391 = Str__literal(L"subheading"); + TL_IS_392 = Str__literal(L"bar"); + TL_IS_393 = Str__literal(L"pagebreak"); + TL_IS_394 = Str__literal(L"linebreak"); + TL_IS_395 = Str__literal(L"paragraph"); + TL_IS_396 = Str__literal(L"endnote"); + TL_IS_397 = Str__literal(L"figure"); + TL_IS_398 = Str__literal(L"audio"); + TL_IS_399 = Str__literal(L"video"); + TL_IS_400 = Str__literal(L"download"); + TL_IS_401 = Str__literal(L"material"); + TL_IS_402 = Str__literal(L"embed"); + TL_IS_403 = Str__literal(L"pmac"); + TL_IS_404 = Str__literal(L"vskip"); + TL_IS_405 = Str__literal(L"chapter"); + TL_IS_406 = Str__literal(L"section"); + TL_IS_407 = Str__literal(L"code line"); + TL_IS_408 = Str__literal(L"function usage"); + TL_IS_409 = Str__literal(L"commentary"); + TL_IS_410 = Str__literal(L"carousel slide"); + TL_IS_411 = Str__literal(L"toc"); + TL_IS_412 = Str__literal(L"toc line"); + TL_IS_413 = Str__literal(L"chapter_title_page"); + TL_IS_414 = Str__literal(L"defn"); + TL_IS_415 = Str__literal(L"source_code"); + TL_IS_416 = Str__literal(L"url"); + TL_IS_417 = Str__literal(L"footnote_cue"); + TL_IS_418 = Str__literal(L"footnote"); + TL_IS_419 = Str__literal(L"display line"); + TL_IS_420 = Str__literal(L"function defn"); + TL_IS_421 = Str__literal(L"item"); + TL_IS_422 = Str__literal(L"grammar index"); + TL_IS_423 = Str__literal(L"inline"); + TL_IS_424 = Str__literal(L"locale"); + TL_IS_425 = Str__literal(L"mathematics"); + TL_IS_426 = Str__literal(L"verbatim"); + TL_IS_427 = Str__literal(L"Weave Content"); + TL_IS_428 = Str__literal(L"plain"); + TL_IS_429 = Str__literal(L".txt"); + TL_IS_430 = Str__literal(L"TeX"); + TL_IS_431 = Str__literal(L".tex"); + TL_IS_432 = Str__literal(L"S"); + TL_IS_433 = Str__literal(L""); + TL_IS_434 = Str__literal(L"Figures"); + TL_IS_435 = Str__literal(L"weavesection"); + TL_IS_436 = Str__literal(L"weavesections"); + TL_IS_437 = Str__literal(L"weavesectionss"); + TL_IS_438 = Str__literal(L"weavesectionsss"); + TL_IS_439 = Str__literal(L"tweavesection"); + TL_IS_440 = Str__literal(L"tweavesections"); + TL_IS_441 = Str__literal(L"tweavesectionss"); + TL_IS_442 = Str__literal(L"tweavesectionsss"); + TL_IS_443 = Str__literal(L"nsweavesection"); + TL_IS_444 = Str__literal(L"nsweavesections"); + TL_IS_445 = Str__literal(L"HTML"); + TL_IS_446 = Str__literal(L".html"); + TL_IS_447 = Str__literal(L"ePub"); + TL_IS_448 = Str__literal(L".html"); + TL_IS_449 = Str__literal(L""); + TL_IS_450 = Str__literal(L"private copy"); + TL_IS_451 = Str__literal(L"Base"); + TL_IS_452 = Str__literal(L"Colours"); TL_IS_453 = Str__literal(L""); - TL_IS_454 = Str__literal(L"Breadcrumbs"); - TL_IS_455 = Str__literal(L"Title"); - TL_IS_456 = Str__literal(L"Short Title"); + TL_IS_454 = Str__literal(L""); + TL_IS_455 = Str__literal(L"Breadcrumbs"); + TL_IS_456 = Str__literal(L"Title"); TL_IS_457 = Str__literal(L"Short Title"); - TL_IS_458 = Str__literal(L"index.html"); - TL_IS_459 = Str__literal(L"S"); - TL_IS_460 = Str__literal(L"Sequential Section Ranges"); - TL_IS_461 = Str__literal(L"On"); - TL_IS_462 = Str__literal(L"Figures"); - TL_IS_463 = Str__literal(L"Audio"); - TL_IS_464 = Str__literal(L"Video"); - TL_IS_465 = Str__literal(L"Downloads"); - TL_IS_466 = Str__literal(L"Embedding"); - TL_IS_467 = Str__literal(L"Download.html"); - TL_IS_468 = Str__literal(L"Downloads are not supported"); - TL_IS_469 = Str__literal(L"Downloads"); - TL_IS_470 = Str__literal(L"Download file missing or empty"); - TL_IS_471 = Str__literal(L"File Name"); - TL_IS_472 = Str__literal(L"File URL"); - TL_IS_473 = Str__literal(L"File Details"); - TL_IS_474 = Str__literal(L" byte"); - TL_IS_475 = Str__literal(L" bytes"); - TL_IS_476 = Str__literal(L"kB"); - TL_IS_477 = Str__literal(L"MB"); - TL_IS_478 = Str__literal(L"GB"); - TL_IS_479 = Str__literal(L"405"); - TL_IS_480 = Str__literal(L"720"); - TL_IS_481 = Str__literal(L"Embedding"); - TL_IS_482 = Str__literal(L"This is not a supported service"); - TL_IS_483 = Str__literal(L"Content ID"); - TL_IS_484 = Str__literal(L"Content Width"); - TL_IS_485 = Str__literal(L"Content Height"); - TL_IS_486 = Str__literal(L"named-paragraph-link"); - TL_IS_487 = Str__literal(L"function-link"); - TL_IS_488 = Str__literal(L"Carousel"); - TL_IS_489 = Str__literal(L"carousel-number"); - TL_IS_490 = Str__literal(L"carousel-caption"); - TL_IS_491 = Str__literal(L"carousel-caption-above"); - TL_IS_492 = Str__literal(L"carousel-number-above"); - TL_IS_493 = Str__literal(L"carousel-caption-below"); - TL_IS_494 = Str__literal(L"carousel-number-below"); - TL_IS_495 = Str__literal(L"external"); - TL_IS_496 = Str__literal(L"internal"); - TL_IS_497 = Str__literal(L"Popups"); - TL_IS_498 = Str__literal(L"*"); - TL_IS_499 = Str__literal(L"Title"); - TL_IS_500 = Str__literal(L"Base"); - TL_IS_501 = Str__literal(L"Base.css"); - TL_IS_502 = Str__literal(L"TestingInweb"); - TL_IS_503 = Str__literal(L".txt"); - TL_IS_504 = Str__literal(L".pdf"); - TL_IS_505 = Str__literal(L"not"); - TL_IS_506 = Str__literal(L"leq"); - TL_IS_507 = Str__literal(L"geq"); - TL_IS_508 = Str__literal(L"sim"); - TL_IS_509 = Str__literal(L"hbox"); - TL_IS_510 = Str__literal(L"left"); - TL_IS_511 = Str__literal(L"right"); - TL_IS_512 = Str__literal(L"Rightarrow"); - TL_IS_513 = Str__literal(L"Leftrightarrow"); - TL_IS_514 = Str__literal(L"to"); - TL_IS_515 = Str__literal(L"rightarrow"); - TL_IS_516 = Str__literal(L"longrightarrow"); - TL_IS_517 = Str__literal(L"leftarrow"); - TL_IS_518 = Str__literal(L"longleftarrow"); - TL_IS_519 = Str__literal(L"lbrace"); - TL_IS_520 = Str__literal(L"mid"); - TL_IS_521 = Str__literal(L"rbrace"); - TL_IS_522 = Str__literal(L"cdot"); - TL_IS_523 = Str__literal(L"cdots"); - TL_IS_524 = Str__literal(L"dots"); - TL_IS_525 = Str__literal(L"times"); - TL_IS_526 = Str__literal(L"quad"); - TL_IS_527 = Str__literal(L"qquad"); - TL_IS_528 = Str__literal(L"TeX"); - TL_IS_529 = Str__literal(L"neq"); - TL_IS_530 = Str__literal(L"noteq"); - TL_IS_531 = Str__literal(L"ell"); - TL_IS_532 = Str__literal(L"log"); - TL_IS_533 = Str__literal(L"exp"); - TL_IS_534 = Str__literal(L"sin"); - TL_IS_535 = Str__literal(L"cos"); - TL_IS_536 = Str__literal(L"tan"); - TL_IS_537 = Str__literal(L"top"); - TL_IS_538 = Str__literal(L"Alpha"); - TL_IS_539 = Str__literal(L"Beta"); - TL_IS_540 = Str__literal(L"Gamma"); - TL_IS_541 = Str__literal(L"Delta"); - TL_IS_542 = Str__literal(L"Epsilon"); - TL_IS_543 = Str__literal(L"Zeta"); - TL_IS_544 = Str__literal(L"Eta"); - TL_IS_545 = Str__literal(L"Theta"); - TL_IS_546 = Str__literal(L"Iota"); - TL_IS_547 = Str__literal(L"Kappa"); - TL_IS_548 = Str__literal(L"Lambda"); - TL_IS_549 = Str__literal(L"Mu"); - TL_IS_550 = Str__literal(L"Nu"); - TL_IS_551 = Str__literal(L"Xi"); - TL_IS_552 = Str__literal(L"Omicron"); - TL_IS_553 = Str__literal(L"Pi"); - TL_IS_554 = Str__literal(L"Rho"); - TL_IS_555 = Str__literal(L"Varsigma"); - TL_IS_556 = Str__literal(L"Sigma"); - TL_IS_557 = Str__literal(L"Tau"); - TL_IS_558 = Str__literal(L"Upsilon"); - TL_IS_559 = Str__literal(L"Phi"); - TL_IS_560 = Str__literal(L"Chi"); - TL_IS_561 = Str__literal(L"Psi"); - TL_IS_562 = Str__literal(L"Omega"); - TL_IS_563 = Str__literal(L"alpha"); - TL_IS_564 = Str__literal(L"beta"); - TL_IS_565 = Str__literal(L"gamma"); - TL_IS_566 = Str__literal(L"delta"); - TL_IS_567 = Str__literal(L"epsilon"); - TL_IS_568 = Str__literal(L"zeta"); - TL_IS_569 = Str__literal(L"eta"); - TL_IS_570 = Str__literal(L"theta"); - TL_IS_571 = Str__literal(L"iota"); - TL_IS_572 = Str__literal(L"kappa"); - TL_IS_573 = Str__literal(L"lambda"); - TL_IS_574 = Str__literal(L"mu"); - TL_IS_575 = Str__literal(L"nu"); - TL_IS_576 = Str__literal(L"xi"); - TL_IS_577 = Str__literal(L"omicron"); - TL_IS_578 = Str__literal(L"pi"); - TL_IS_579 = Str__literal(L"rho"); - TL_IS_580 = Str__literal(L"varsigma"); - TL_IS_581 = Str__literal(L"sigma"); - TL_IS_582 = Str__literal(L"tau"); - TL_IS_583 = Str__literal(L"upsilon"); - TL_IS_584 = Str__literal(L"phi"); - TL_IS_585 = Str__literal(L"chi"); - TL_IS_586 = Str__literal(L"psi"); - TL_IS_587 = Str__literal(L"omega"); - TL_IS_588 = Str__literal(L"exists"); - TL_IS_589 = Str__literal(L"in"); - TL_IS_590 = Str__literal(L"forall"); - TL_IS_591 = Str__literal(L"cap"); - TL_IS_592 = Str__literal(L"emptyset"); - TL_IS_593 = Str__literal(L"subseteq"); - TL_IS_594 = Str__literal(L"land"); - TL_IS_595 = Str__literal(L"lor"); - TL_IS_596 = Str__literal(L"lnot"); - TL_IS_597 = Str__literal(L"sum"); - TL_IS_598 = Str__literal(L"prod"); - TL_IS_599 = Str__literal(L"n"); - TL_IS_600 = Str__literal(L"t"); - TL_IS_601 = Str__literal(L"exists"); - TL_IS_602 = Str__literal(L"forall"); - TL_IS_603 = Str__literal(L" "); - TL_IS_604 = Str__literal(L"all"); - TL_IS_605 = Str__literal(L"platform-settings.mk"); - TL_IS_606 = Str__literal(L"intest"); - TL_IS_607 = Str__literal(L"all"); - TL_IS_608 = Str__literal(L"gitignorescript.txt"); - TL_IS_609 = Str__literal(L"version"); - TL_IS_610 = Str__literal(L"purpose"); - TL_IS_611 = Str__literal(L"var"); - TL_IS_612 = Str__literal(L"\n"); - TL_IS_613 = Str__literal(L"version"); - TL_IS_614 = Str__literal(L"purpose"); - TL_IS_615 = Str__literal(L"var"); - TL_IS_616 = Str__literal(L"Version Number"); - TL_IS_617 = Str__literal(L"Purpose"); - TL_IS_618 = Str__literal(L"Build Date"); - TL_IS_619 = Str__literal(L"Version Number"); - TL_IS_620 = Str__literal(L"inform6"); - TL_IS_621 = Str__literal(L"header.h"); - TL_IS_622 = Str__literal(L"(manifest).txt"); - TL_IS_623 = Str__literal(L"README.txt"); - TL_IS_624 = Str__literal(L"README.md"); - TL_IS_625 = Str__literal(L"docs"); - TL_IS_626 = Str__literal(L"web"); - TL_IS_627 = Str__literal(L"module"); - TL_IS_628 = Str__literal(L".inweb"); + TL_IS_458 = Str__literal(L"Short Title"); + TL_IS_459 = Str__literal(L"index.html"); + TL_IS_460 = Str__literal(L"S"); + TL_IS_461 = Str__literal(L"Sequential Section Ranges"); + TL_IS_462 = Str__literal(L"On"); + TL_IS_463 = Str__literal(L"Figures"); + TL_IS_464 = Str__literal(L"Audio"); + TL_IS_465 = Str__literal(L"Video"); + TL_IS_466 = Str__literal(L"Downloads"); + TL_IS_467 = Str__literal(L"Embedding"); + TL_IS_468 = Str__literal(L"Download.html"); + TL_IS_469 = Str__literal(L"Downloads are not supported"); + TL_IS_470 = Str__literal(L"Downloads"); + TL_IS_471 = Str__literal(L"Download file missing or empty"); + TL_IS_472 = Str__literal(L"File Name"); + TL_IS_473 = Str__literal(L"File URL"); + TL_IS_474 = Str__literal(L"File Details"); + TL_IS_475 = Str__literal(L" byte"); + TL_IS_476 = Str__literal(L" bytes"); + TL_IS_477 = Str__literal(L"kB"); + TL_IS_478 = Str__literal(L"MB"); + TL_IS_479 = Str__literal(L"GB"); + TL_IS_480 = Str__literal(L"405"); + TL_IS_481 = Str__literal(L"720"); + TL_IS_482 = Str__literal(L"Embedding"); + TL_IS_483 = Str__literal(L"This is not a supported service"); + TL_IS_484 = Str__literal(L"Content ID"); + TL_IS_485 = Str__literal(L"Content Width"); + TL_IS_486 = Str__literal(L"Content Height"); + TL_IS_487 = Str__literal(L"named-paragraph-link"); + TL_IS_488 = Str__literal(L"function-link"); + TL_IS_489 = Str__literal(L"Carousel"); + TL_IS_490 = Str__literal(L"carousel-number"); + TL_IS_491 = Str__literal(L"carousel-caption"); + TL_IS_492 = Str__literal(L"carousel-caption-above"); + TL_IS_493 = Str__literal(L"carousel-number-above"); + TL_IS_494 = Str__literal(L"carousel-caption-below"); + TL_IS_495 = Str__literal(L"carousel-number-below"); + TL_IS_496 = Str__literal(L"external"); + TL_IS_497 = Str__literal(L"internal"); + TL_IS_498 = Str__literal(L"Popups"); + TL_IS_499 = Str__literal(L"*"); + TL_IS_500 = Str__literal(L"Title"); + TL_IS_501 = Str__literal(L"Base"); + TL_IS_502 = Str__literal(L"Base.css"); + TL_IS_503 = Str__literal(L"TestingInweb"); + TL_IS_504 = Str__literal(L".txt"); + TL_IS_505 = Str__literal(L".pdf"); + TL_IS_506 = Str__literal(L"not"); + TL_IS_507 = Str__literal(L"leq"); + TL_IS_508 = Str__literal(L"geq"); + TL_IS_509 = Str__literal(L"sim"); + TL_IS_510 = Str__literal(L"hbox"); + TL_IS_511 = Str__literal(L"left"); + TL_IS_512 = Str__literal(L"right"); + TL_IS_513 = Str__literal(L"Rightarrow"); + TL_IS_514 = Str__literal(L"Leftrightarrow"); + TL_IS_515 = Str__literal(L"to"); + TL_IS_516 = Str__literal(L"rightarrow"); + TL_IS_517 = Str__literal(L"longrightarrow"); + TL_IS_518 = Str__literal(L"leftarrow"); + TL_IS_519 = Str__literal(L"longleftarrow"); + TL_IS_520 = Str__literal(L"lbrace"); + TL_IS_521 = Str__literal(L"mid"); + TL_IS_522 = Str__literal(L"rbrace"); + TL_IS_523 = Str__literal(L"cdot"); + TL_IS_524 = Str__literal(L"cdots"); + TL_IS_525 = Str__literal(L"dots"); + TL_IS_526 = Str__literal(L"times"); + TL_IS_527 = Str__literal(L"quad"); + TL_IS_528 = Str__literal(L"qquad"); + TL_IS_529 = Str__literal(L"TeX"); + TL_IS_530 = Str__literal(L"neq"); + TL_IS_531 = Str__literal(L"noteq"); + TL_IS_532 = Str__literal(L"ell"); + TL_IS_533 = Str__literal(L"log"); + TL_IS_534 = Str__literal(L"exp"); + TL_IS_535 = Str__literal(L"sin"); + TL_IS_536 = Str__literal(L"cos"); + TL_IS_537 = Str__literal(L"tan"); + TL_IS_538 = Str__literal(L"top"); + TL_IS_539 = Str__literal(L"Alpha"); + TL_IS_540 = Str__literal(L"Beta"); + TL_IS_541 = Str__literal(L"Gamma"); + TL_IS_542 = Str__literal(L"Delta"); + TL_IS_543 = Str__literal(L"Epsilon"); + TL_IS_544 = Str__literal(L"Zeta"); + TL_IS_545 = Str__literal(L"Eta"); + TL_IS_546 = Str__literal(L"Theta"); + TL_IS_547 = Str__literal(L"Iota"); + TL_IS_548 = Str__literal(L"Kappa"); + TL_IS_549 = Str__literal(L"Lambda"); + TL_IS_550 = Str__literal(L"Mu"); + TL_IS_551 = Str__literal(L"Nu"); + TL_IS_552 = Str__literal(L"Xi"); + TL_IS_553 = Str__literal(L"Omicron"); + TL_IS_554 = Str__literal(L"Pi"); + TL_IS_555 = Str__literal(L"Rho"); + TL_IS_556 = Str__literal(L"Varsigma"); + TL_IS_557 = Str__literal(L"Sigma"); + TL_IS_558 = Str__literal(L"Tau"); + TL_IS_559 = Str__literal(L"Upsilon"); + TL_IS_560 = Str__literal(L"Phi"); + TL_IS_561 = Str__literal(L"Chi"); + TL_IS_562 = Str__literal(L"Psi"); + TL_IS_563 = Str__literal(L"Omega"); + TL_IS_564 = Str__literal(L"alpha"); + TL_IS_565 = Str__literal(L"beta"); + TL_IS_566 = Str__literal(L"gamma"); + TL_IS_567 = Str__literal(L"delta"); + TL_IS_568 = Str__literal(L"epsilon"); + TL_IS_569 = Str__literal(L"zeta"); + TL_IS_570 = Str__literal(L"eta"); + TL_IS_571 = Str__literal(L"theta"); + TL_IS_572 = Str__literal(L"iota"); + TL_IS_573 = Str__literal(L"kappa"); + TL_IS_574 = Str__literal(L"lambda"); + TL_IS_575 = Str__literal(L"mu"); + TL_IS_576 = Str__literal(L"nu"); + TL_IS_577 = Str__literal(L"xi"); + TL_IS_578 = Str__literal(L"omicron"); + TL_IS_579 = Str__literal(L"pi"); + TL_IS_580 = Str__literal(L"rho"); + TL_IS_581 = Str__literal(L"varsigma"); + TL_IS_582 = Str__literal(L"sigma"); + TL_IS_583 = Str__literal(L"tau"); + TL_IS_584 = Str__literal(L"upsilon"); + TL_IS_585 = Str__literal(L"phi"); + TL_IS_586 = Str__literal(L"chi"); + TL_IS_587 = Str__literal(L"psi"); + TL_IS_588 = Str__literal(L"omega"); + TL_IS_589 = Str__literal(L"exists"); + TL_IS_590 = Str__literal(L"in"); + TL_IS_591 = Str__literal(L"forall"); + TL_IS_592 = Str__literal(L"cap"); + TL_IS_593 = Str__literal(L"emptyset"); + TL_IS_594 = Str__literal(L"subseteq"); + TL_IS_595 = Str__literal(L"land"); + TL_IS_596 = Str__literal(L"lor"); + TL_IS_597 = Str__literal(L"lnot"); + TL_IS_598 = Str__literal(L"sum"); + TL_IS_599 = Str__literal(L"prod"); + TL_IS_600 = Str__literal(L"n"); + TL_IS_601 = Str__literal(L"t"); + TL_IS_602 = Str__literal(L"exists"); + TL_IS_603 = Str__literal(L"forall"); + TL_IS_604 = Str__literal(L" "); + TL_IS_605 = Str__literal(L"all"); + TL_IS_606 = Str__literal(L"platform-settings.mk"); + TL_IS_607 = Str__literal(L"intest"); + TL_IS_608 = Str__literal(L"all"); + TL_IS_609 = Str__literal(L"gitignorescript.txt"); + TL_IS_610 = Str__literal(L"version"); + TL_IS_611 = Str__literal(L"purpose"); + TL_IS_612 = Str__literal(L"var"); + TL_IS_613 = Str__literal(L"\n"); + TL_IS_614 = Str__literal(L"version"); + TL_IS_615 = Str__literal(L"purpose"); + TL_IS_616 = Str__literal(L"var"); + TL_IS_617 = Str__literal(L"Version Number"); + TL_IS_618 = Str__literal(L"Purpose"); + TL_IS_619 = Str__literal(L"Build Date"); + TL_IS_620 = Str__literal(L"Version Number"); + TL_IS_621 = Str__literal(L"inform6"); + TL_IS_622 = Str__literal(L"header.h"); + TL_IS_623 = Str__literal(L"(manifest).txt"); + TL_IS_624 = Str__literal(L"README.txt"); + TL_IS_625 = Str__literal(L"README.md"); + TL_IS_626 = Str__literal(L"docs"); + TL_IS_627 = Str__literal(L"web"); + TL_IS_628 = Str__literal(L"module"); TL_IS_629 = Str__literal(L".inweb"); - TL_IS_630 = Str__literal(L"docs"); - TL_IS_631 = Str__literal(L"Multiple cross-references might be meant here"); - TL_IS_632 = Str__literal(L"(main)"); + TL_IS_630 = Str__literal(L".inweb"); + TL_IS_631 = Str__literal(L"docs"); + TL_IS_632 = Str__literal(L"Multiple cross-references might be meant here"); + TL_IS_633 = Str__literal(L"(main)"); } diff --git a/docs/goldbach/goldbach.pdf b/docs/goldbach/goldbach.pdf index e782c48063f40c680f9846b338440aee5fc5ed11..01ce14054e05ff5222eb5a435ed95e6beecf9eed 100644 GIT binary patch delta 112 zcmcb&f&bnH{)QID7N#xCf+tx`O)LzJri-0qmV+?2Tb^WI$Lnll;$m)WZe-}V&>%NX6Rz( iX5nUN;Noa#>FQ`^YHns`U}9jWU_(gBcCG8oCX4_gj~%=K diff --git a/docs/inweb/3-tw.html b/docs/inweb/3-tw.html index 8ddebf9..b3c22ed 100644 --- a/docs/inweb/3-tw.html +++ b/docs/inweb/3-tw.html @@ -705,6 +705,9 @@ example, or flush left. (Regexp::match(&mr, matter, L"@define (%c*)"))) { Str::copy(prefatory, I"define"); Str::copy(matter, mr.exp[0]); + } else if (Regexp::match(&mr, matter, L"@default (%c*)")) { + Str::copy(prefatory, I"default"); + Str::copy(matter, mr.exp[0]); } else if ((Regexp::match(&mr, matter, L"@e (%c*)")) || (Regexp::match(&mr, matter, L"@enum (%c*)"))) { Str::copy(prefatory, I"enum");