From 60cc499743f7dc74e80d15732013f620683cef9f Mon Sep 17 00:00:00 2001 From: Graham Nelson Date: Thu, 28 Apr 2022 16:25:04 +0100 Subject: [PATCH] Corrected link to GitHub Pages --- README.md | 8 ++++---- Tangled/inweb.c | 2 +- foundation-module/Chapter 4/Preprocessor.w | 2 +- scripts/inweb.rmscript | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 7252486..a519f7b 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,9 @@ where it manages a 300,000-line code base. Literate programming is a methodology created by Donald Knuth in the late 1970s. A literate program, or "web", is written as a narrative intended to be readable by humans as well as by other programs. Inweb is itself written as -a web, and its human-readable form is a [companion website to this one](docs/index.html). +a web, and its human-readable form is a [companion website to this one](https://ganelson.github.io/inweb/index.html). -For the Inweb manual, see [★ inweb/Preliminaries](docs/inweb/M-iti). +For the Inweb manual, see [★ inweb/Preliminaries](https://ganelson.github.io/inweb/inweb/M-iti). __Disclaimer__. Because this is a private repository (until the next public release of Inform, when it will open), its GitHub pages server cannot be @@ -121,10 +121,10 @@ programs, such as the [Intest testing tool](https://github.com/ganelson/intest) and the [Inform compiler and related tools](https://github.com/ganelson/inform). This library is called "Foundation", and has its own web -here: [★ foundation-module](docs/foundation-module/index.html). +here: [★ foundation-module](https://ganelson.github.io/inweb/foundation-module/index.html). A small executable for running unit tests against Foundation is also included: -[★ foundation-test](docs/foundation-test/index.html). +[★ foundation-test](https://ganelson.github.io/inweb/foundation-test/index.html). ## Testing Inweb diff --git a/Tangled/inweb.c b/Tangled/inweb.c index bf29a26..524e40e 100644 --- a/Tangled/inweb.c +++ b/Tangled/inweb.c @@ -11471,7 +11471,7 @@ void Preprocessor__expand(text_stream *text, text_file_position *tfp, preprocess text_stream *value = mr.exp[1]; text_stream *remainder = NULL; match_results mr3 = Regexp__create_mr(); - if (Regexp__match(&mr3, value, L"(%c+?) *(%C+: *%c*)")) { + if (Regexp__match(&mr3, value, L"(%c+?) *(%C+:[^/]%c*)")) { value = mr3.exp[0]; remainder = mr3.exp[1]; } diff --git a/foundation-module/Chapter 4/Preprocessor.w b/foundation-module/Chapter 4/Preprocessor.w index c432b52..6454108 100644 --- a/foundation-module/Chapter 4/Preprocessor.w +++ b/foundation-module/Chapter 4/Preprocessor.w @@ -356,7 +356,7 @@ So you can have |in: {WHATEVER}| but not |{WHATEVER}: this|. text_stream *value = mr.exp[1]; text_stream *remainder = NULL; match_results mr3 = Regexp::create_mr(); - if (Regexp::match(&mr3, value, L"(%c+?) *(%C+: *%c*)")) { + if (Regexp::match(&mr3, value, L"(%c+?) *(%C+:[^/]%c*)")) { value = mr3.exp[0]; remainder = mr3.exp[1]; } diff --git a/scripts/inweb.rmscript b/scripts/inweb.rmscript index a409795..c62b3ad 100644 --- a/scripts/inweb.rmscript +++ b/scripts/inweb.rmscript @@ -11,7 +11,7 @@ programs than CWEB, and since 2004 has been the tool used by the [Inform programming language project](https://github.com/ganelson/inform), where it manages a 300,000-line code base. -{set name: GITHUBPAGESLINK value: docs} +{set name: GITHUBPAGESLINK value: https://ganelson.github.io/inweb} {set name: WEBICON value: ★} {set name: DOCICON value: ▶}