===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.113
retrieving revision 1.117
diff -u -p -r1.113 -r1.117
--- mandoc/term.h	2015/04/04 17:47:18	1.113
+++ mandoc/term.h	2015/10/13 22:59:54	1.117
@@ -1,4 +1,4 @@
-/*	$Id: term.h,v 1.113 2015/04/04 17:47:18 schwarze Exp $ */
+/*	$Id: term.h,v 1.117 2015/10/13 22:59:54 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -53,6 +53,7 @@ struct	termp {
 	struct rofftbl	  tbl;		/* table configuration */
 	int		  synopsisonly; /* print the synopsis only */
 	int		  mdocstyle;	/* imitate mdoc(7) output */
+	size_t		  line;		/* Current output line number. */
 	size_t		  defindent;	/* Default indent for text. */
 	size_t		  defrmargin;	/* Right margin of the device. */
 	size_t		  lastrmargin;	/* Right margin before the last ll. */
@@ -67,23 +68,24 @@ struct	termp {
 	int		  overstep;	/* See termp_flushln(). */
 	int		  skipvsp;	/* Vertical space to skip. */
 	int		  flags;
-#define	TERMP_SENTENCE	 (1 << 1)	/* Space before a sentence. */
-#define	TERMP_NOSPACE	 (1 << 2)	/* No space before words. */
-#define	TERMP_NONOSPACE	 (1 << 3)	/* No space (no autounset). */
-#define	TERMP_NBRWORD	 (1 << 4)	/* Make next word nonbreaking. */
-#define	TERMP_KEEP	 (1 << 5)	/* Keep words together. */
-#define	TERMP_PREKEEP	 (1 << 6)	/* ...starting with the next one. */
-#define	TERMP_SKIPCHAR	 (1 << 7)	/* Skip the next character. */
+#define	TERMP_SENTENCE	 (1 << 0)	/* Space before a sentence. */
+#define	TERMP_NOSPACE	 (1 << 1)	/* No space before words. */
+#define	TERMP_NONOSPACE	 (1 << 2)	/* No space (no autounset). */
+#define	TERMP_NBRWORD	 (1 << 3)	/* Make next word nonbreaking. */
+#define	TERMP_KEEP	 (1 << 4)	/* Keep words together. */
+#define	TERMP_PREKEEP	 (1 << 5)	/* ...starting with the next one. */
+#define	TERMP_BACKAFTER	 (1 << 6)	/* Back up after next character. */
+#define	TERMP_BACKBEFORE (1 << 7)	/* Back up before next character. */
 #define	TERMP_NOBREAK	 (1 << 8)	/* See term_flushln(). */
-#define	TERMP_BRIND	 (1 << 9)	/* See term_flushln(). */
-#define	TERMP_DANGLE	 (1 << 10)	/* See term_flushln(). */
-#define	TERMP_HANG	 (1 << 11)	/* See term_flushln(). */
-#define	TERMP_NOSPLIT	 (1 << 12)	/* Do not break line before .An. */
-#define	TERMP_SPLIT	 (1 << 13)	/* Break line before .An. */
-#define	TERMP_NONEWLINE	 (1 << 14)	/* No line break in nofill mode. */
+#define	TERMP_BRTRSP	 (1 << 9)	/* See term_flushln(). */
+#define	TERMP_BRIND	 (1 << 10)	/* See term_flushln(). */
+#define	TERMP_DANGLE	 (1 << 11)	/* See term_flushln(). */
+#define	TERMP_HANG	 (1 << 12)	/* See term_flushln(). */
+#define	TERMP_NOSPLIT	 (1 << 13)	/* Do not break line before .An. */
+#define	TERMP_SPLIT	 (1 << 14)	/* Break line before .An. */
+#define	TERMP_NONEWLINE	 (1 << 15)	/* No line break in nofill mode. */
 	int		 *buf;		/* Output buffer. */
 	enum termenc	  enc;		/* Type of encoding. */
-	const struct mchars *symtab;	/* Character table. */
 	enum termfont	  fontl;	/* Last font set. */
 	enum termfont	 *fontq;	/* Symmetric fonts. */
 	int		  fontsz;	/* Allocated size of font stack */