===================================================================
RCS file: /cvs/mandoc/out.h,v
retrieving revision 1.14
retrieving revision 1.17
diff -u -p -r1.14 -r1.17
--- mandoc/out.h	2010/07/21 20:35:03	1.14
+++ mandoc/out.h	2011/03/07 01:35:51	1.17
@@ -1,6 +1,6 @@
-/*	$Id: out.h,v 1.14 2010/07/21 20:35:03 kristaps Exp $ */
+/*	$Id: out.h,v 1.17 2011/03/07 01:35:51 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 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
@@ -17,10 +17,23 @@
 #ifndef OUT_H
 #define OUT_H
 
-#define	DATESIZ		24
-
 __BEGIN_DECLS
 
+struct	roffcol {
+	size_t		 width; /* width of cell */
+	size_t		 decimal; /* decimal position in cell */
+};
+
+typedef	size_t (*tbl_strlen)(const char *, void *);
+typedef	size_t (*tbl_len)(size_t, void *);
+
+struct	rofftbl {
+	tbl_strlen	 slen; /* calculate string length */
+	tbl_len		 len; /* produce width of empty space */
+	struct roffcol	*cols; /* master column specifiers */
+	void		*arg; /* passed to slen and len */
+};
+
 enum	roffscale {
 	SCALE_CM,
 	SCALE_IN,
@@ -37,14 +50,15 @@ enum	roffscale {
 
 enum	roffdeco {
 	DECO_NONE,
+	DECO_NUMBERED, /* numbered character */
 	DECO_SPECIAL, /* special character */
 	DECO_SSPECIAL, /* single-char special */
 	DECO_RESERVED, /* reserved word */
-	DECO_BOLD,
-	DECO_ITALIC,
-	DECO_ROMAN,
-	DECO_PREVIOUS,
-	DECO_NOSPACE,
+	DECO_BOLD, /* bold font */
+	DECO_ITALIC, /* italic font */
+	DECO_ROMAN, /* "normal" undecorated font */
+	DECO_PREVIOUS, /* revert to previous font */
+	DECO_NOSPACE, /* suppress spacing */
 	DECO_FONT, /* font */
 	DECO_FFONT, /* font family */
 	DECO_MAX
@@ -55,10 +69,6 @@ struct	roffsu {
 	double		  scale;
 };
 
-#define	SCALE_INVERT(p) \
-	do { (p)->scale = -(p)->scale; } \
-	while (/* CONSTCOND */ 0)
-
 #define	SCALE_VS_INIT(p, v) \
 	do { (p)->unit = SCALE_VS; \
 	     (p)->scale = (v); } \
@@ -69,11 +79,11 @@ struct	roffsu {
 	     (p)->scale = (v); } \
 	while (/* CONSTCOND */ 0)
 
-int		  a2roffsu(const char *, 
-			struct roffsu *, enum roffscale);
-int		  a2roffdeco(enum roffdeco *, const char **, size_t *);
-void		  time2a(time_t, char *, size_t);
+int	  a2roffsu(const char *, struct roffsu *, enum roffscale);
+int	  a2roffdeco(enum roffdeco *, const char **, size_t *);
+void	  time2a(time_t, char *, size_t);
+void	  tblcalc(struct rofftbl *tbl, const struct tbl_span *);
 
 __END_DECLS
 
-#endif /*!HTML_H*/
+#endif /*!OUT_H*/