mandoc: Simplify the roff(7) .ce and .rj terminal formatter by using the

[schwarze@mandoc.bsd.lv]

Log Message:
-----------
Simplify the roff(7) .ce and .rj terminal formatter by using the
new TERMP_CENTER and TERMP_RIGHT flags.  No functional change.

Modified Files:
--------------
    mandoc:
        roff_term.c

Revision Data
-------------
Index: roff_term.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/roff_term.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lroff_term.c -Lroff_term.c -u -p -r1.18 -r1.19
--- roff_term.c
+++ roff_term.c
@@ -1,6 +1,6 @@
 /*	$Id$ */
 /*
- * Copyright (c) 2010,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010,2014,2015,2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -79,27 +79,16 @@ static void
 roff_term_pre_ce(ROFF_TERM_ARGS)
 {
 	const struct roff_node	*nc1, *nc2;
-	size_t			 len, lm;
 
 	roff_term_pre_br(p, n);
-	lm = p->tcol->offset;
+	p->flags |= n->tok == ROFF_ce ? TERMP_CENTER : TERMP_RIGHT;
 	nc1 = n->child->next;
 	while (nc1 != NULL) {
 		nc2 = nc1;
-		len = 0;
 		do {
-			if (nc2->type == ROFFT_TEXT) {
-				if (len)
-					len++;
-				len += term_strlen(p, nc2->string);
-			}
 			nc2 = nc2->next;
 		} while (nc2 != NULL && (nc2->type != ROFFT_TEXT ||
 		    (nc2->flags & NODE_LINE) == 0));
-		p->tcol->offset = len >= p->tcol->rmargin ? 0 :
-		    lm + len >= p->tcol->rmargin ? p->tcol->rmargin - len :
-		    n->tok == ROFF_rj ? p->tcol->rmargin - len :
-		    (lm + p->tcol->rmargin - len) / 2;
 		while (nc1 != nc2) {
 			if (nc1->type == ROFFT_TEXT)
 				term_word(p, nc1->string);
@@ -110,7 +99,7 @@ roff_term_pre_ce(ROFF_TERM_ARGS)
 		p->flags |= TERMP_NOSPACE;
 		term_flushln(p);
 	}
-	p->tcol->offset = lm;
+	p->flags &= ~(TERMP_CENTER | TERMP_RIGHT);
 }
 
 static void
--
 To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv