===================================================================
RCS file: /cvs/mandoc/term.h,v
retrieving revision 1.48
retrieving revision 1.50
diff -u -p -r1.48 -r1.50
--- mandoc/term.h	2009/10/18 13:34:17	1.48
+++ mandoc/term.h	2009/11/05 08:40:16	1.50
@@ -1,4 +1,4 @@
-/*	$Id: term.h,v 1.48 2009/10/18 13:34:17 kristaps Exp $ */
+/*	$Id: term.h,v 1.50 2009/11/05 08:40:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -43,6 +43,10 @@ struct	termp {
 #define	TERMP_ANPREC	 (1 << 13)	/* See termp_an_pre(). */
 	int		  bold;
 	int		  under;
+	int		  metafont;	/* See do_escaped(). */
+#define	METAF_BOLD	 (1 << 0)
+#define	METAF_UNDER	 (1 << 1)
+	int		  metamask;	/* See do_escaped(). */
 	char		 *buf;		/* Output buffer. */
 	enum termenc	  enc;		/* Type of encoding. */
 	void		 *symtab;	/* Encoded-symbol table. */
@@ -53,8 +57,8 @@ void		  term_vspace(struct termp *);
 void		  term_word(struct termp *, const char *);
 void		  term_flushln(struct termp *);
 
-int		  a2width(const char *);
-int		  a2height(const char *);
+size_t		  term_hspan(const struct roffsu *);
+size_t		  term_vspan(const struct roffsu *);
 
 __END_DECLS