summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-07-16 13:17:51 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-07-16 13:17:51 +0000
commite2499b83d7cb9ea91422b22a43415a5d3e9270b4 (patch)
treec1303830ae0b0df706eb1c1a0cc05d919203b520
parentaebdcef58e30d0ed35533f2cd4165612d8571e7e (diff)
downloadmandoc-e2499b83d7cb9ea91422b22a43415a5d3e9270b4.tar.gz
Subtle fixes correcting vis count with erroneously-decorated whitespace.
-rw-r--r--mdoc_action.c15
-rw-r--r--term.c8
2 files changed, 4 insertions, 19 deletions
diff --git a/mdoc_action.c b/mdoc_action.c
index 5b4a9564..b3e471fc 100644
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -298,11 +298,6 @@ post_lb(POST_ARGS)
char *buf;
size_t sz;
- /*
- * FIXME: this must be broken apart into a series of TEXT nodes,
- * each containing a single word.
- */
-
assert(MDOC_TEXT == m->last->child->type);
p = mdoc_a2lib(m->last->child->string);
if (NULL == p) {
@@ -331,11 +326,6 @@ post_st(POST_ARGS)
{
const char *p;
- /*
- * FIXME: this must be broken apart into a series of TEXT nodes,
- * each containing a single word.
- */
-
assert(MDOC_TEXT == m->last->child->type);
p = mdoc_a2st(m->last->child->string);
assert(p);
@@ -353,11 +343,6 @@ post_at(POST_ARGS)
struct mdoc_node *n;
const char *p;
- /*
- * FIXME: this must be broken apart into a series of TEXT nodes,
- * each containing a single word.
- */
-
if (m->last->child) {
assert(MDOC_TEXT == m->last->child->type);
p = mdoc_a2att(m->last->child->string);
diff --git a/term.c b/term.c
index 63772132..9b194fe4 100644
--- a/term.c
+++ b/term.c
@@ -252,10 +252,10 @@ term_flushln(struct termp *p)
/* LINTED */
for (j = i, vsz = 0; j < (int)p->col; j++) {
- if (' ' == p->buf[j])
+ if (' ' == p->buf[j])
break;
else if (8 == p->buf[j])
- j += 1;
+ vsz--;
else
vsz++;
}
@@ -549,8 +549,8 @@ term_chara(struct termp *p, char c)
static void
term_encodea(struct termp *p, char c)
{
-
- if (TERMP_STYLE & p->flags) {
+
+ if (' ' != c && TERMP_STYLE & p->flags) {
if (TERMP_BOLD & p->flags) {
term_chara(p, c);
term_chara(p, 8);