summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-09-07 17:51:09 -0400
committerJune McEnroe <june@causal.agency>2020-09-07 17:51:09 -0400
commit172d01a668fa5c5ca3410bf9dff37f64a366f620 (patch)
tree4db49c36a703124ff5bed3833739c390c8b2a591
parentHandle non-alignment tabs in line wrapping (diff)
downloadcatgirl-172d01a668fa5c5ca3410bf9dff37f64a366f620.tar.gz
catgirl-172d01a668fa5c5ca3410bf9dff37f64a366f620.zip
Let wrapped lines use the last column
-rw-r--r--buffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/buffer.c b/buffer.c
index 7478211..3795a24 100644
--- a/buffer.c
+++ b/buffer.c
@@ -138,10 +138,10 @@ static int flow(struct Lines *hard, int cols, const struct Line *soft) {
 			width += wcwidth(wc);
 		}
 
+		if (tab && width < cols) align = width;
+		if (iswspace(wc) && !tab) wrap = str;
 		if (width <= cols) {
-			if (tab && width < cols) align = width;
-			if (iswspace(wc) && !tab) wrap = str;
-			if (*str == '-') wrap = &str[1];
+			if (wc == L'-') wrap = &str[n];
 			str += n;
 			continue;
 		}
an='3' class='logmsg'> 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 God that makes the lexers so much simpler. 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 This simplifies some things, adds support for line number tag definitions, and should enable combining htagml with other preprocessors in the future. 2021-01-12Split fields by tab onlyJune McEnroe Also don't fail hard on non-forward-search definitions. 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 neovim is laggy as hell in my OpenBSD VM, so I switched to vi so I could type without getting frustrated. 2021-01-09Add c -t flag to print expression typeJune McEnroe Also add missing float case. 2021-01-05Update taglineJune McEnroe