===================================================================
RCS file: /cvs/mandoc/out.h,v
retrieving revision 1.8
retrieving revision 1.14
diff -u -p -r1.8 -r1.14
--- mandoc/out.h	2009/11/08 09:23:35	1.8
+++ mandoc/out.h	2010/07/21 20:35:03	1.14
@@ -1,6 +1,6 @@
-/*	$Id: out.h,v 1.8 2009/11/08 09:23:35 kristaps Exp $ */
+/*	$Id: out.h,v 1.14 2010/07/21 20:35:03 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -37,20 +37,22 @@ enum	roffscale {
 
 enum	roffdeco {
 	DECO_NONE,
-	DECO_SPECIAL,
-	DECO_RESERVED,
+	DECO_SPECIAL, /* special character */
+	DECO_SSPECIAL, /* single-char special */
+	DECO_RESERVED, /* reserved word */
 	DECO_BOLD,
 	DECO_ITALIC,
 	DECO_ROMAN,
 	DECO_PREVIOUS,
-	DECO_SIZE,
+	DECO_NOSPACE,
+	DECO_FONT, /* font */
+	DECO_FFONT, /* font family */
 	DECO_MAX
 };
 
 struct	roffsu {
 	enum roffscale	  unit;
 	double		  scale;
-	int		  pt;
 };
 
 #define	SCALE_INVERT(p) \
@@ -59,14 +61,12 @@ struct	roffsu {
 
 #define	SCALE_VS_INIT(p, v) \
 	do { (p)->unit = SCALE_VS; \
-	     (p)->scale = (v); \
-	     (p)->pt = 0; } \
+	     (p)->scale = (v); } \
 	while (/* CONSTCOND */ 0)
 
 #define	SCALE_HS_INIT(p, v) \
 	do { (p)->unit = SCALE_BU; \
-	     (p)->scale = (v); \
-	     (p)->pt = 0; } \
+	     (p)->scale = (v); } \
 	while (/* CONSTCOND */ 0)
 
 int		  a2roffsu(const char *,