diff options
author | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
---|---|---|
committer | Petter Rodhelind <petter.rodhelind@gmail.com> | 2020-01-14 11:41:08 +0100 |
commit | 02d7aa8915f9c3a3288dab01f321eb94ba219e3b (patch) | |
tree | f053238978479e408a2b83571443e132f30586ab /src/cmd/tbl/ti.c | |
parent | c0c9d8f883dfd3a7f5a74499d91bb95884b15873 (diff) | |
parent | 3d1382b98a502d0c34d5ba2c462396acc515016e (diff) | |
download | plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.gz plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.tar.bz2 plan9port-02d7aa8915f9c3a3288dab01f321eb94ba219e3b.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/cmd/tbl/ti.c')
-rw-r--r-- | src/cmd/tbl/ti.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/cmd/tbl/ti.c b/src/cmd/tbl/ti.c index ef995bbb..d4a2ab4d 100644 --- a/src/cmd/tbl/ti.c +++ b/src/cmd/tbl/ti.c @@ -9,9 +9,9 @@ interv(int i, int c) if (c >= ncol || c == 0) { if (dboxflg) { - if (i == 0) + if (i == 0) return(BOT); - if (i >= nlin) + if (i >= nlin) return(TOP); return(THRU); } @@ -23,11 +23,11 @@ interv(int i, int c) kl = 0; else kl = lefdata(allh(i) ? i + 1 : i, c); - if (ku == 2 && kl == 2) + if (ku == 2 && kl == 2) return(THRU); - if (ku == 2) + if (ku == 2) return(TOP); - if (kl == BOT) + if (kl == BOT) return(2); return(0); } @@ -45,7 +45,7 @@ interh(int i, int c) return(RIGHT); return(THRU); } - if (i >= nlin) + if (i >= nlin) return(0); kl = c > 0 ? thish (i, c - 1) : 0; if (kl <= 1 && i > 0 && allh(up1(i))) @@ -53,11 +53,11 @@ interh(int i, int c) kr = thish(i, c); if (kr <= 1 && i > 0 && allh(up1(i))) kr = c > 0 ? thish(up1(i), c) : 0; - if (kl == '=' && kr == '=') + if (kl == '=' && kr == '=') return(THRU); - if (kl == '=') + if (kl == '=') return(LEFT); - if (kr == '=') + if (kr == '=') return(RIGHT); return(0); } @@ -67,9 +67,7 @@ int up1(int i) { i--; - while (instead[i] && i > 0) + while (instead[i] && i > 0) i--; return(i); } - - |