implement roff(7) .rj (right justify) request

7 files changed, 39 insertions, 32 deletions

diff --git a/mdoc_man.c b/mdoc_man.c
index 31545eff..a16523f6 100644
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -125,14 +125,15 @@ static	void	  print_count(int *);
 static	void	  print_node(DECL_ARGS);
 
 static	const void_fp roff_manacts[ROFF_MAX] = {
-	pre_br,
-	pre_onearg,
-	pre_ft,
-	pre_onearg,
-	pre_onearg,
-	pre_sp,
-	pre_ta,
-	pre_onearg,
+	pre_br,		/* br */
+	pre_onearg,	/* ce */
+	pre_ft,		/* ft */
+	pre_onearg,	/* ll */
+	pre_onearg,	/* mc */
+	pre_onearg,	/* rj */
+	pre_sp,		/* sp */
+	pre_ta,		/* ta */
+	pre_onearg,	/* ti */
 };
 
 static	const struct manact __manacts[MDOC_MAX - MDOC_Dd] = {
diff --git a/roff.7 b/roff.7
index 5bf16141..5905ce06 100644
--- a/roff.7
+++ b/roff.7
@@ -1477,7 +1477,9 @@ This is a Heirloom extension and currently ignored.
 Justify the next
 .Ar N
 input lines to the right margin without filling.
-Currently ignored.
+.Ar N
+defaults to 1.
+An argument of 0 or less ends right adjustment.
 .It Ic \&rm Ar macroname
 Remove a request, macro or string.
 .It Ic \&rn Ar oldname newname
diff --git a/roff.c b/roff.c
index 1da0d242..fe53be97 100644
--- a/roff.c
+++ b/roff.c
@@ -222,8 +222,8 @@ static	enum rofferr	 roff_userdef(ROFF_ARGS);
 
 const char *__roff_name[MAN_MAX + 1] = {
 	"br",		"ce",		"ft",		"ll",
-	"mc",		"sp",		"ta",		"ti",
-	NULL,
+	"mc",		"rj",		"sp",		"ta",
+	"ti",		NULL,
 	"ab",		"ad",		"af",		"aln",
 	"als",		"am",		"am1",		"ami",
 	"ami1",		"as",		"as1",		"asciify",
@@ -267,7 +267,7 @@ const char *__roff_name[MAN_MAX + 1] = {
 	"pn",		"pnr",		"po",		"ps",
 	"psbb",		"pshape",	"pso",		"ptr",
 	"pvs",		"rchar",	"rd",		"recursionlimit",
-	"return",	"rfschar",	"rhang",	"rj",
+	"return",	"rfschar",	"rhang",
 	"rm",		"rn",		"rnn",		"rr",
 	"rs",		"rt",		"schar",	"sentchar",
 	"shc",		"shift",	"sizes",	"so",
@@ -334,6 +334,7 @@ static	struct roffmac	 roffs[TOKEN_NONE] = {
 	{ roff_onearg, NULL, NULL, 0 },  /* ft */
 	{ roff_onearg, NULL, NULL, 0 },  /* ll */
 	{ roff_onearg, NULL, NULL, 0 },  /* mc */
+	{ roff_onearg, NULL, NULL, 0 },  /* rj */
 	{ roff_onearg, NULL, NULL, 0 },  /* sp */
 	{ roff_manyarg, NULL, NULL, 0 },  /* ta */
 	{ roff_onearg, NULL, NULL, 0 },  /* ti */
@@ -511,7 +512,6 @@ static	struct roffmac	 roffs[TOKEN_NONE] = {
 	{ roff_unsupp, NULL, NULL, 0 },  /* return */
 	{ roff_unsupp, NULL, NULL, 0 },  /* rfschar */
 	{ roff_line_ignore, NULL, NULL, 0 },  /* rhang */
-	{ roff_line_ignore, NULL, NULL, 0 },  /* rj */
 	{ roff_rm, NULL, NULL, 0 },  /* rm */
 	{ roff_rn, NULL, NULL, 0 },  /* rn */
 	{ roff_unsupp, NULL, NULL, 0 },  /* rnn */
@@ -1549,7 +1549,7 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
 	/* Tables ignore most macros. */
 
 	if (r->tbl != NULL && (t == TOKEN_NONE || t == ROFF_TS ||
-	    t == ROFF_br || t == ROFF_ce || t == ROFF_sp)) {
+	    t == ROFF_br || t == ROFF_ce || t == ROFF_rj || t == ROFF_sp)) {
 		mandoc_msg(MANDOCERR_TBLMACRO, r->parse,
 		    ln, pos, buf->buf + spos);
 		if (t != TOKEN_NONE)
@@ -2880,7 +2880,7 @@ roff_onearg(ROFF_ARGS)
 	    (tok == ROFF_sp || tok == ROFF_ti))
 		man_breakscope(r->man, tok);
 
-	if (tok == ROFF_ce && roffce_node != NULL) {
+	if (roffce_node != NULL && (tok == ROFF_ce || tok == ROFF_rj)) {
 		r->man->last = roffce_node;
 		r->man->next = ROFF_NEXT_SIBLING;
 	}
@@ -2901,8 +2901,8 @@ roff_onearg(ROFF_ARGS)
 		roff_word_alloc(r->man, ln, pos, buf->buf + pos);
 	}
 
-	if (tok == ROFF_ce) {
-		if (r->man->last->tok == ROFF_ce) {
+	if (tok == ROFF_ce || tok == ROFF_rj) {
+		if (r->man->last->type == ROFFT_ELEM) {
 			roff_word_alloc(r->man, ln, pos, "1");
 			r->man->last->flags |= NODE_NOSRC;
 		}
diff --git a/roff.h b/roff.h
index 6b383c9a..19106341 100644
--- a/roff.h
+++ b/roff.h
@@ -77,6 +77,7 @@ enum	roff_tok {
 	ROFF_ft,
 	ROFF_ll,
 	ROFF_mc,
+	ROFF_rj,
 	ROFF_sp,
 	ROFF_ta,
 	ROFF_ti,
@@ -257,7 +258,6 @@ enum	roff_tok {
 	ROFF_return,
 	ROFF_rfschar,
 	ROFF_rhang,
-	ROFF_rj,
 	ROFF_rm,
 	ROFF_rn,
 	ROFF_rnn,
diff --git a/roff_html.c b/roff_html.c
index 30c49db3..9e30bedd 100644
--- a/roff_html.c
+++ b/roff_html.c
@@ -38,6 +38,7 @@ static	const roff_html_pre_fp roff_html_pre_acts[ROFF_MAX] = {
 	NULL,  /* ft */
 	NULL,  /* ll */
 	NULL,  /* mc */
+	roff_html_pre_ce,  /* rj */
 	roff_html_pre_sp,  /* sp */
 	NULL,  /* ta */
 	NULL,  /* ti */
diff --git a/roff_term.c b/roff_term.c
index d2375c3c..83c2b16e 100644
--- a/roff_term.c
+++ b/roff_term.c
@@ -42,6 +42,7 @@ static	const roff_term_pre_fp roff_term_pre_acts[ROFF_MAX] = {
 	roff_term_pre_ft,  /* ft */
 	roff_term_pre_ll,  /* ll */
 	roff_term_pre_mc,  /* mc */
+	roff_term_pre_ce,  /* rj */
 	roff_term_pre_sp,  /* sp */
 	roff_term_pre_ta,  /* ta */
 	roff_term_pre_ti,  /* ti */
@@ -69,33 +70,34 @@ roff_term_pre_br(ROFF_TERM_ARGS)
 static void
 roff_term_pre_ce(ROFF_TERM_ARGS)
 {
-	const struct roff_node	*nch;
+	const struct roff_node	*nc1, *nc2;
 	size_t			 len, lm;
 
 	roff_term_pre_br(p, n);
 	lm = p->tcol->offset;
-	n = n->child->next;
-	while (n != NULL) {
-		nch = n;
+	nc1 = n->child->next;
+	while (nc1 != NULL) {
+		nc2 = nc1;
 		len = 0;
 		do {
-			if (n->type == ROFFT_TEXT) {
+			if (nc2->type == ROFFT_TEXT) {
 				if (len)
 					len++;
-				len += term_strlen(p, nch->string);
+				len += term_strlen(p, nc2->string);
 			}
-			nch = nch->next;
-		} while (nch != NULL && (n->type != ROFFT_TEXT ||
-		    (n->flags & NODE_LINE) == 0));
+			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 (n != nch) {
-			if (n->type == ROFFT_TEXT)
-				term_word(p, n->string);
+		while (nc1 != nc2) {
+			if (nc1->type == ROFFT_TEXT)
+				term_word(p, nc1->string);
 			else
-				roff_term_pre(p, n);
-			n = n->next;
+				roff_term_pre(p, nc1);
+			nc1 = nc1->next;
 		}
 		p->flags |= TERMP_NOSPACE;
 		term_flushln(p);
diff --git a/roff_validate.c b/roff_validate.c
index 0ca69e5b..7b8d3beb 100644
--- a/roff_validate.c
+++ b/roff_validate.c
@@ -36,6 +36,7 @@ static	const roff_valid_fp roff_valids[ROFF_MAX] = {
 	roff_valid_ft,  /* ft */
 	NULL,  /* ll */
 	NULL,  /* mc */
+	NULL,  /* rj */
 	NULL,  /* sp */
 	NULL,  /* ta */
 	NULL,  /* ti */