Add -Owidth=width option to mandoc -Tascii. Asked for by joerg@ about a

thousand years ago.  Note that this is normalised to >=60.

1 files changed, 25 insertions, 6 deletions

diff --git a/term.c b/term.c
index 02f69d9f..faa70675 100644
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.140 2010/05/25 12:37:20 kristaps Exp $ */
+/*	$Id: term.c,v 1.141 2010/06/07 10:52:44 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -22,6 +22,7 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -35,7 +36,7 @@
 #include "mdoc.h"
 #include "main.h"
 
-static	struct termp	 *term_alloc(enum termenc, size_t);
+static	struct termp	 *term_alloc(char *, enum termenc);
 static	void		  term_free(struct termp *);
 static	void		  spec(struct termp *, const char *, size_t);
 static	void		  res(struct termp *, const char *, size_t);
@@ -46,10 +47,10 @@ static	void		  encode(struct termp *, const char *, size_t);
 
 
 void *
-ascii_alloc(size_t width)
+ascii_alloc(char *outopts)
 {
 
-	return(term_alloc(TERMENC_ASCII, width));
+	return(term_alloc(outopts, TERMENC_ASCII));
 }
 
 
@@ -75,17 +76,35 @@ term_free(struct termp *p)
 
 
 static struct termp *
-term_alloc(enum termenc enc, size_t width)
+term_alloc(char *outopts, enum termenc enc)
 {
-	struct termp *p;
+	struct termp	*p;
+	const char	*toks[2];
+	char		*v;
+	size_t		 width;
+
+	toks[0] = "width";
+	toks[1] = NULL;
 
 	p = calloc(1, sizeof(struct termp));
 	if (NULL == p) {
 		perror(NULL);
 		exit(EXIT_FAILURE);
 	}
+
 	p->tabwidth = 5;
 	p->enc = enc;
+	width = 80;
+
+	while (outopts && *outopts)
+		switch (getsubopt(&outopts, UNCONST(toks), &v)) {
+		case (0):
+			width = atoi(v);
+			break;
+		default:
+			break;
+		}
+
 	/* Enforce some lower boundary. */
 	if (width < 60)
 		width = 60;