From 0777d0bc51fcf7ecff67521cfde1448cf08947b2 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Wed, 13 Jan 2021 16:50:59 -0500
Subject: Try to return make substitutions as single tokens

---
 bin/make.l | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/make.l b/bin/make.l
index eee150b9..a2d63e5b 100644
--- a/bin/make.l
+++ b/bin/make.l
@@ -78,6 +78,11 @@ operator [:!]|::
 "#"([^\\\n]|"\\"[^\n]|"\\\n")* { return Comment; }
 
 <*>{
+	"$"("{"|"(")/[^$] {
+		depth++;
+		BEGIN(Variable);
+		yymore();
+	}
 	"$"("{"|"(") {
 		depth++;
 		BEGIN(Variable);
@@ -86,7 +91,7 @@ operator [:!]|::
 	"$". { return Subst; }
 }
 <Variable>{
-	"}"|")" {
+	[^${}()]*"}"|")" {
 		if (!--depth) BEGIN(pop);
 		return Subst;
 	}
-- 
cgit 1.4.1

ches'><option value='master' selected='selected'>master</option>
</optgroup></select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>dontfiles
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/src/'>summary</a> <a href='/src/refs/?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b'>refs</a> <a class='active' href='/src/log/www/photo.causal.agency/2024-07-06/000005110013.txt?follow=1'>log</a> <a href='/src/tree/www/photo.causal.agency/2024-07-06/000005110013.txt?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b'>tree</a> <a href='/src/commit/www/photo.causal.agency/2024-07-06/000005110013.txt?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b&amp;follow=1'>commit</a> <a href='/src/diff/www/photo.causal.agency/2024-07-06/000005110013.txt?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/www/photo.causal.agency/2024-07-06/000005110013.txt'>
<input type='hidden' name='id' value='8ea9dab6596567a6a4d769afe6f7071a3beb7c9b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b&amp;follow=1'>root</a>/<a href='/src/log/www?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b&amp;follow=1'>www</a>/<a href='/src/log/www/photo.causal.agency?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b&amp;follow=1'>photo.causal.agency</a>/<a href='/src/log/www/photo.causal.agency/2024-07-06?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b&amp;follow=1'>2024-07-06</a>/<a href='/src/log/www/photo.causal.agency/2024-07-06/000005110013.txt?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b&amp;follow=1'>000005110013.txt</a> (<a href='/src/log/www/photo.causal.agency/2024-07-06/000005110013.txt?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/www/photo.causal.agency/2024-07-06/000005110013.txt?id=8ea9dab6596567a6a4d769afe6f7071a3beb7c9b&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2025-04-18 17:53:37 -0400'>2025-04-18</span></td><td><a href='/src/commit/www/photo.causal.agency/fx-3/lens?id=f49f4df17c47a3addb4c5f7a4ec4cb616c797eae&amp;follow=1'>Add camera template folders</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2025-04-13 17:16:06 -0400'>2025-04-13</span></td><td><a href='/src/commit/txt/books.txt?id=79ce1bd6a644654032cd497bc6f5486207c32906&amp;follow=1'>Add A Half-Built Garden</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2025-04-13 00:11:30 -0400'>2025-04-13</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=b5625267e7c485f4c3b6ff23da8d03b55afc8e00&amp;follow=1'>Also hide lens for trips if it hasn't changed</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2025-04-12 23:54:34 -0400'>2025-04-12</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=75e63dd751685b1799cdd2c693eec66b5d23c4a2&amp;follow=1'>Don't list lens in trips if fixed</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2025-04-12 23:54:16 -0400'>2025-04-12</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=d6af298143f24c952941601183bbb616ae86b9ab&amp;follow=1'>Allow setting exposures when loading film</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2025-04-08 22:12:22 -0400'>2025-04-08</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=71921ba8af7b567d128ba257cf9cddfef6f8bdf6&amp;follow=1'>Those were supposed to be en-dashes...</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2025-04-08 21:54:00 -0400'>2025-04-08</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=348e7e1042f4706cdc1f87b2b4bbb969e3f791f2&amp;follow=1'>Generate pages per roll</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2025-04-08 20:34:55 -0400'>2025-04-08</span></td><td><a href='/src/commit/www/photo.causal.agency/2025-03-23/lens?id=833ced4d3acff92ddb5f400d4bd19b7d2950d1f6&amp;follow=1'>Add metadata from many rolls of film</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2025-03-25 22:16:15 -0400'>2025-03-25</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=4de2e36bc2c165102db6a1a64974399d8e8d90b1&amp;follow=1'>Add emoji for lens, replace all f/'s</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-12-29 23:38:30 -0500'>2024-12-29</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-12-28/lens?id=a1ce71dcd1d46119de3390970ac7864511cd36f6&amp;follow=1'>Add photos from December 28</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-12-29 23:38:05 -0500'>2024-12-29</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=ef8f3bec4b008b94495ef2888a38729cb96ee9cc&amp;follow=1'>Fancify the manual lens text</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-12-28 15:47:08 -0500'>2024-12-28</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=931c560140b15c07946d9061def1c6fb03f00cc3&amp;follow=1'>Update film preset list with what I expect to keep shooting</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-12-28 15:40:40 -0500'>2024-12-28</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-12-21/lens?id=ff3adddef3e8e28f67fbc7c0ccd15a76abae157d&amp;follow=1'>Add the past few months of rolls of film</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-11-13 15:22:49 -0500'>2024-11-13</span></td><td><a href='/src/commit/txt/books.txt?id=f4a32088203435496babe006a18ba6c4ca1d083c&amp;follow=1'>Add Tea with the Black Dragon</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-11-05 20:43:34 -0500'>2024-11-05</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-23/lens?id=1fd0682a0f2eea92867b20502c70716b1400f33f&amp;follow=1'>Add a bunch of photos</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-12 23:37:16 -0400'>2024-10-12</span></td><td><a href='/src/commit/www/text.causal.agency/Makefile?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;follow=1'>Publish "film review"</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-12 17:53:09 -0400'>2024-10-12</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-06/lens?id=300e2dd0e4cea019f0d247b90226fdf3fa5759c7&amp;follow=1'>Add photos from October 6</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-12 10:28:02 -0400'>2024-10-12</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-05/lens?id=8896a95764f011c24d0817c07e23bfa4887f7da1&amp;follow=1'>Add photos from October 5</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-09 22:12:27 -0400'>2024-10-09</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-01/lens?id=a147012a38017ee519ce35b3acbb0e55f3638f7b&amp;follow=1'>Add photos from October 1</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-07 19:16:29 -0400'>2024-10-07</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-29/lens?id=1dde71aa57ac73f9f15b8a9666c36b2173bb4592&amp;follow=1'>Add photos from September 29</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-07 18:05:03 -0400'>2024-10-07</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-28/lens?id=078d89ff74d02fd854f8de93fe225e6670644d50&amp;follow=1'>Add photos from September 28</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-10-07 14:57:20 -0400'>2024-10-07</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-22/lens?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>Add photos from September 22</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-25 10:05:37 -0400'>2024-09-25</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-15/lens?id=1a4a0628513359733a2450cf38e73166f7e5cbe6&amp;follow=1'>Add photos from September 15</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 18:06:38 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-14/lens?id=16992208ec0549fdbc776da35c9f799126d15d89&amp;follow=1'>Add photos from September 14</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 10:13:27 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-12/lens?id=de6decda3177ae64859be30d68ba1e3c4c132ec1&amp;follow=1'>Add photos from September 12</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 09:50:19 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-07/lens?id=49a105101493f4dd51259dd62dcbd24df0909bd3&amp;follow=1'>Add photos from September 7</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 09:48:24 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=55728948b94a17b99fabeb1c61d20c5ef18c7f73&amp;follow=1'>Allow not having descriptions</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-23 17:44:15 -0400'>2024-09-23</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=9a38d0932d64b4a2ed5a6a2499490094d3bf8e7e&amp;follow=1'>Automatically select the last used lens for a body</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-19 23:20:42 -0400'>2024-09-19</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-05/lens?id=894873c86c5397a92499de39b4c52b5e99801441&amp;follow=1'>Add photos from September 5</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-15 16:02:27 -0400'>2024-09-15</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=32b69f7df4c155d7a09f140a53c3b39a330027e4&amp;follow=1'>Add some more film stocks to the list</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-13 20:06:35 -0400'>2024-09-13</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-02/lens?id=45e859f37e503f2c85a3085a628226831e394b7b&amp;follow=1'>Add photos from September 2</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-13 12:54:24 -0400'>2024-09-13</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=57e90a2d8f5f9b6385ffeb0e0e7b3237cb395b80&amp;follow=1'>Add Fomapan 200 to films list</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-10 20:30:28 -0400'>2024-09-10</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-08-29/lens?id=1134af7da7776a0631995094a9225ce3541a9518&amp;follow=1'>Add August 29 picnic photos</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:44:08 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=775260288133dc90bb600785772ac931854aa618&amp;follow=1'>Apply some bold to trips rendering</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:38:22 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=dd7fda85bcc69cd4cd35e006cffabf3bdf765104&amp;follow=1'>Render trips hopefully more efficiently</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:26:18 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=02cac2ffadee1d3f66426bb48a64aea78907878c&amp;follow=1'>Allow removing bodies and lenses</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 10:59:25 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=2c25b7204ecab1be0d128d984eabe35b10a3a418&amp;follow=1'>Limit body width so it looks less silly on desktop</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-07 21:02:03 -0400'>2024-09-07</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=74df90da35ed7886c4067fae700c9db1d3b2ef0a&amp;follow=1'>Handle no film being loaded</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-07 20:58:45 -0400'>2024-09-07</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=a7f8aa5246afbf9c01ca295bdd2af0e11faeb7d3&amp;follow=1'>Fancy up the text a little</a></td><td>June McEnroe