From ef517b4cb0473c2cd6bc60e41139e6f3517c00aa Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 7 Feb 2019 03:33:56 -0500 Subject: Add Escape class to hi --- bin/hi.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/hi.c b/bin/hi.c index 936a8fec..328578f5 100644 --- a/bin/hi.c +++ b/bin/hi.c @@ -32,6 +32,7 @@ enum Class { Keyword, Macro, String, + Escape, Comment, Todo, ClassCount, @@ -54,12 +55,17 @@ static const struct Syntax CSyntax[] = { { Keyword, .subexp = 2, .pattern = CKB"(case|default)"CKB }, { Macro, .pattern = "^#.*" }, { String, .pattern = "^#include (<.*>)", .subexp = 1 }, - { String, .pattern = "[LUu]?'([^']|\\\\')*'", }, - { String, .pattern = "([LUu]|u8)?\"([^\"]|\\\\\")*\"", }, - { Comment, .pattern = "//.*", }, + { String, .pattern = "[LUu]?'([^']|\\\\')*'" }, + { String, .pattern = "([LUu]|u8)?\"([^\"]|\\\\\")*\"" }, + { Escape, .parent = String, .pattern = "\\\\['\"?\\abfnrtv]" }, + { Escape, .parent = String, .pattern = "\\\\[0-7]{1,3}" }, + { Escape, .parent = String, .pattern = "\\\\x[0-9A-Fa-f]+" }, + { Escape, .parent = String, .pattern = "\\\\u[0-9A-Fa-f]{4}" }, + { Escape, .parent = String, .pattern = "\\\\U[0-9A-Fa-f]{8}" }, + { Comment, .pattern = "//.*" }, { Comment, .pattern = "/\\*", .pattend = "\\*/" }, { Comment, .pattern = "^#if 0", .pattend = "^#endif" }, - { Todo, .pattern = "FIXME|TODO|XXX", .parent = Comment }, + { Todo, .parent = Comment, .pattern = "FIXME|TODO|XXX" }, }; static const struct Language { @@ -132,6 +138,7 @@ static const enum SGR Style[ClassCount][2] = { [Keyword] = { Reset, White }, [Macro] = { Reset, Green }, [String] = { Reset, Cyan }, + [Escape] = { Reset, Default }, [Comment] = { Reset, Blue }, [Todo] = { Bold, Blue }, }; @@ -200,6 +207,7 @@ static void htmlDocumentHeader(const char *path) { ".hi.Keyword { color: dimgray; }\n" ".hi.Macro { color: green; }\n" ".hi.String { color: teal; }\n" + ".hi.Escape { color: black; }\n" ".hi.Comment { color: navy; }\n" ".hi.Todo { color: navy; font-weight: bold }\n" "\n" -- cgit 1.4.1 4-13 00:11:30 -0400'>4 daysAlso hide lens for trips if it hasn't changedJune McEnroe 4 daysDon't list lens in trips if fixedJune McEnroe 4 daysAllow setting exposures when loading filmJune McEnroe 8 daysThose were supposed to be en-dashes...June McEnroe 8 daysGenerate pages per rollJune McEnroe 8 daysAdd metadata from many rolls of filmJune McEnroe 2025-03-25Add emoji for lens, replace all f/'sJune McEnroe 2024-12-29Add photos from December 28June McEnroe 2024-12-29Fancify the manual lens textJune McEnroe 2024-12-28Update film preset list with what I expect to keep shootingJune McEnroe 2024-12-28Add the past few months of rolls of filmJune McEnroe 2024-11-13Add Tea with the Black DragonJune McEnroe I found this in a box on the side of the road being thrown own. It's decent pulp but nothing special. Not even as racist as I expected it to be. Also as one might guess, the author using their initials is a woman, so I only broke one of my rules when it comes to book selection. 2024-11-05Add a bunch of photosJune McEnroe 2024-10-12Publish "film review"June McEnroe 2024-10-12Add photos from October 6June McEnroe 2024-10-12Add photos from October 5June McEnroe 2024-10-09Add photos from October 1June McEnroe Ok the first 3 are from September 29 but I didn't want to spoil the black and white roll. 2024-10-07Add photos from September 29June McEnroe 2024-10-07Add photos from September 28June McEnroe 2024-10-07Add photos from September 22June McEnroe 2024-09-25Add photos from September 15June McEnroe 2024-09-24Add photos from September 14June McEnroe 2024-09-24Add photos from September 12June McEnroe 2024-09-24Add photos from September 7June McEnroe 2024-09-24Allow not having descriptionsJune McEnroe I'm sorry, I can't keep writing descriptions. It makes posting photos take too long, I often don't know the words for what I'm looking at, and a good description is an entirely different work of art than the photo I took, and I'm just a photographer. It's visual art. 2024-09-23Automatically select the last used lens for a bodyJune McEnroe 2024-09-19Add photos from September 5June McEnroe Had to prefix the folder number onto these file names manually because they must have come out of a different scanner or something. 2024-09-15Add some more film stocks to the listJune McEnroe 2024-09-13Add photos from September 2June McEnroe 2024-09-13Add Fomapan 200 to films listJune McEnroe 2024-09-10Add August 29 picnic photosJune McEnroe 2024-09-08Apply some bold to trips renderingJune McEnroe This seems easier to visually scan. The only other thing I'd like is a nicer date rendering but JavaScript is useless for that. 2024-09-08Render trips hopefully more efficientlyJune McEnroe 2024-09-08Allow removing bodies and lensesJune McEnroe 2024-09-08Limit body width so it looks less silly on desktopJune McEnroe 2024-09-07Handle no film being loadedJune McEnroe 2024-09-07Fancy up the text a littleJune McEnroe