===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.189
retrieving revision 1.192
diff -u -p -r1.189 -r1.192
--- mandoc/roff.c	2013/12/30 18:44:06	1.189
+++ mandoc/roff.c	2014/02/14 22:27:41	1.192
@@ -1,7 +1,7 @@
-/*	$Id: roff.c,v 1.189 2013/12/30 18:44:06 schwarze Exp $ */
+/*	$Id: roff.c,v 1.192 2014/02/14 22:27:41 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2014 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
@@ -109,6 +109,7 @@ struct	roffreg {
 struct	roff {
 	enum mparset	 parsetype; /* requested parse type */
 	struct mparse	*parse; /* parse point */
+	int		 quick; /* skip standard macro deletion */
 	struct roffnode	*last; /* leaf of stack */
 	enum roffrule	 rstack[RSTACK_MAX]; /* stack of !`ie' rules */
 	char		 control; /* control character */
@@ -191,6 +192,7 @@ static	int		 roff_getnum(const char *, int *, int *);
 static	int		 roff_getop(const char *, int *, char *);
 static	int		 roff_getregn(const struct roff *,
 				const char *, size_t);
+static	int		 roff_getregro(const char *name);
 static	const char	*roff_getstrn(const struct roff *, 
 				const char *, size_t);
 static	enum rofferr	 roff_it(ROFF_ARGS);
@@ -447,14 +449,9 @@ roff_free1(struct roff *r)
 void
 roff_reset(struct roff *r)
 {
-	int		 i;
 
 	roff_free1(r);
-
 	r->control = 0;
-
-	for (i = 0; i < PREDEFS_MAX; i++) 
-		roff_setstr(r, predefs[i].name, predefs[i].str, 0);
 }
 
 
@@ -468,21 +465,18 @@ roff_free(struct roff *r)
 
 
 struct roff *
-roff_alloc(enum mparset type, struct mparse *parse)
+roff_alloc(enum mparset type, struct mparse *parse, int quick)
 {
 	struct roff	*r;
-	int		 i;
 
 	r = mandoc_calloc(1, sizeof(struct roff));
 	r->parsetype = type;
 	r->parse = parse;
+	r->quick = quick;
 	r->rstackpos = -1;
 	
 	roffhash_init();
 
-	for (i = 0; i < PREDEFS_MAX; i++) 
-		roff_setstr(r, predefs[i].name, predefs[i].str, 0);
-
 	return(r);
 }
 
@@ -1387,11 +1381,46 @@ roff_setreg(struct roff *r, const char *name, int val,
 		reg->val = val;
 }
 
+/*
+ * Handle some predefined read-only number registers.
+ * For now, return -1 if the requested register is not predefined;
+ * in case a predefined read-only register having the value -1
+ * were to turn up, another special value would have to be chosen.
+ */
+static int
+roff_getregro(const char *name)
+{
+
+	switch (*name) {
+	case ('A'):  /* ASCII approximation mode is always off. */
+		return(0);
+	case ('g'):  /* Groff compatibility mode is always on. */
+		return(1);
+	case ('H'):  /* Fixed horizontal resolution. */
+		return (24);
+	case ('j'):  /* Always adjust left margin only. */
+		return(0);
+	case ('T'):  /* Some output device is always defined. */
+		return(1);
+	case ('V'):  /* Fixed vertical resolution. */
+		return (40);
+	default:
+		return (-1);
+	}
+}
+
 int
 roff_getreg(const struct roff *r, const char *name)
 {
 	struct roffreg	*reg;
+	int		 val;
 
+	if ('.' == name[0] && '\0' != name[1] && '\0' == name[2]) {
+		val = roff_getregro(name + 1);
+		if (-1 != val)
+			return (val);
+	}
+
 	for (reg = r->regtab; reg; reg = reg->next)
 		if (0 == strcmp(name, reg->key.p))
 			return(reg->val);
@@ -1403,7 +1432,14 @@ static int
 roff_getregn(const struct roff *r, const char *name, size_t len)
 {
 	struct roffreg	*reg;
+	int		 val;
 
+	if ('.' == name[0] && 2 == len) {
+		val = roff_getregro(name + 1);
+		if (-1 != val)
+			return (val);
+	}
+
 	for (reg = r->regtab; reg; reg = reg->next)
 		if (len == reg->key.sz &&
 		    0 == strncmp(name, reg->key.p, len))
@@ -1497,7 +1533,7 @@ roff_Dd(ROFF_ARGS)
 {
 	const char *const	*cp;
 
-	if (MPARSE_MDOC != r->parsetype)
+	if (0 == r->quick && MPARSE_MDOC != r->parsetype)
 		for (cp = __mdoc_reserved; *cp; cp++)
 			roff_setstr(r, *cp, NULL, 0);
 
@@ -1510,7 +1546,7 @@ roff_TH(ROFF_ARGS)
 {
 	const char *const	*cp;
 
-	if (MPARSE_MDOC != r->parsetype)
+	if (0 == r->quick && MPARSE_MDOC != r->parsetype)
 		for (cp = __man_reserved; *cp; cp++)
 			roff_setstr(r, *cp, NULL, 0);
 
@@ -1901,11 +1937,17 @@ static const char *
 roff_getstrn(const struct roff *r, const char *name, size_t len)
 {
 	const struct roffkv *n;
+	int i;
 
 	for (n = r->strtab; n; n = n->next)
 		if (0 == strncmp(name, n->key.p, len) && 
 				'\0' == n->key.p[(int)len])
 			return(n->val.p);
+
+	for (i = 0; i < PREDEFS_MAX; i++)
+		if (0 == strncmp(name, predefs[i].name, len) &&
+				'\0' == predefs[i].name[(int)len])
+			return(predefs[i].str);
 
 	return(NULL);
 }