From a8ceef8126ddd507b8f5a6e3a20a542fa1244252 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 3 Dec 2021 15:51:06 -0500
Subject: Show weeks plus days

---
 bin/when.y | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/when.y b/bin/when.y
index 882fe60c..a9f6d1ed 100644
--- a/bin/when.y
+++ b/bin/when.y
@@ -139,8 +139,12 @@ static void printScalar(struct tm scalar) {
 		printf("%dw ", scalar.tm_mday / 7);
 	}
 	if (scalar.tm_yday && scalar.tm_mon) {
-		if (scalar.tm_yday % 7 == 0) {
-			printf("(%dw) ", scalar.tm_yday / 7);
+		if (scalar.tm_yday >= 7) {
+			printf("(%dw", scalar.tm_yday / 7);
+			if (scalar.tm_yday % 7) {
+				printf(" %dd", scalar.tm_yday % 7);
+			}
+			printf(") ");
 		}
 		printf("(%dd) ", scalar.tm_yday);
 	}
-- 
cgit 1.4.1

='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=57e1744deee8ca461551a67edbdd5cdafa7b83ba'>refs</a> <a class='active' href='/src/log/bin/dash/src/var.c?showmsg=1&amp;follow=1'>log</a> <a href='/src/tree/bin/dash/src/var.c?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba'>tree</a> <a href='/src/commit/bin/dash/src/var.c?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;follow=1'>commit</a> <a href='/src/diff/bin/dash/src/var.c?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/bin/dash/src/var.c'>
<input type='hidden' name='id' value='57e1744deee8ca461551a67edbdd5cdafa7b83ba'/><input type='hidden' name='showmsg' value='1'/><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=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/src/log/bin?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;showmsg=1&amp;follow=1'>bin</a>/<a href='/src/log/bin/dash?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;showmsg=1&amp;follow=1'>dash</a>/<a href='/src/log/bin/dash/src?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;showmsg=1&amp;follow=1'>src</a>/<a href='/src/log/bin/dash/src/var.c?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;showmsg=1&amp;follow=1'>var.c</a> (<a href='/src/log/bin/dash/src/var.c?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/bin/dash/src/var.c?id=57e1744deee8ca461551a67edbdd5cdafa7b83ba&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2021-01-19 21:27:23 -0500'>2021-01-19</span></td><td class='logsubject'><a href='/src/commit/bin/htagml.c?id=a3ee3ce9314d95f939c9bd39dd8b83becd4c7fc5&amp;follow=1'>Map tags to IDs using only [[:alnum:]-._]</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-01-19 20:54:06 -0500'>2021-01-19</span></td><td class='logsubject'><a href='/src/commit/bin/man1/hilex.1?id=ab6181ade55645c10e94593505c30b968d2f5b9f&amp;follow=1'>Don't use a pager if reading standard input</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2021-01-19 20:15:13 -0500'>2021-01-19</span></td><td class='logsubject'><a href='/src/commit/bin/man1/hilex.1?id=0193f411a44b7f20e97a93d52274582043589c2e&amp;follow=1'>Support BSD make syntax and match *.am</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
These don't really go together, but...


</td></tr>
<tr class='logheader'><td><span title='2021-01-19 19:40:31 -0500'>2021-01-19</span></td><td class='logsubject'><a href='/src/commit/bin/make.l?id=a4ef89693d688b37d359d1328189946388c83836&amp;follow=1'>Match tab following escaped newline in make assignments</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Otherwise it ends up going into Shell state.


</td></tr>
<tr class='logheader'><td><span title='2021-01-18 21:33:21 -0500'>2021-01-18</span></td><td class='logsubject'><a href='/src/commit/bin/man1/hilex.1?id=f1ffecec87e5734c50ac4a9cb9ddd93611ea8c47&amp;follow=1'>Allow matching lexers using first input line</a></td><td>June McEnroe