summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--bin/htagml.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/bin/htagml.c b/bin/htagml.c
index e104649f..7db101ce 100644
--- a/bin/htagml.c
+++ b/bin/htagml.c
@@ -61,6 +61,17 @@ static size_t escape(bool esc, const char *ptr, size_t len) {
 	return len;
 }
 
+static char *hstrstr(char *haystack, char *needle) {
+	while (haystack) {
+		char *elem = strchr(haystack, '<');
+		char *match = strstr(haystack, needle);
+		if (!match) return NULL;
+		if (!elem || match < elem) return match;
+		haystack = strchr(elem, '>');
+	}
+	return NULL;
+}
+
 int main(int argc, char *argv[]) {
 	bool pre = false;
 	bool pipe = false;
@@ -157,10 +168,10 @@ int main(int argc, char *argv[]) {
 		}
 
 		char *text = tag->tag;
-		char *match = strstr(buf, text);
+		char *match = (pipe ? hstrstr(buf, text) : strstr(buf, text));
 		if (!match && tag->tag[0] == 'M') {
 			text = "main";
-			match = strstr(buf, text);
+			match = (pipe ? hstrstr(buf, text) : strstr(buf, text));
 		}
 		if (match) escape(!pipe, buf, match - buf);
 		printf("<a class=\"tag\" id=\"");
05c016&follow=1'>Use hilex for bin HTMLJune McEnroe 2021-01-12Don't output a pre in hilex by defaultJune McEnroe 2021-01-12Move hilex out of hilex directoryJune McEnroe 2021-01-12Consolidate hilex formatters into hilex.cJune McEnroe 2021-01-12Remove hacky tagging from hilexJune McEnroe 2021-01-12Add htagml -iJune McEnroe 2021-01-12Render tag index in HTMLJune McEnroe 2021-01-12Add htagml -xJune McEnroe 2021-01-12Prevent matching the same tag twiceJune McEnroe 2021-01-12Process htagml file line by lineJune McEnroe 2021-01-12Split fields by tab onlyJune McEnroe 2021-01-12List both Makefile and html.sh under README.7June McEnroe 2021-01-12Add htagml exampleJune McEnroe 2021-01-12Use mandoc and htagml for bin htmlJune McEnroe 2021-01-12Add htagmlJune McEnroe 2021-01-12Replace causal.agency with a simple mdoc pageJune McEnroe 2021-01-11Publish "Using vi"June McEnroe 2021-01-11Enable diff.colorMovedJune McEnroe 2021-01-10Set less search case-insensitiveJune McEnroe 2021-01-10Set EXINITJune McEnroe 2021-01-09Add c -t flag to print expression typeJune McEnroe 2021-01-05Update taglineJune McEnroe