===================================================================
RCS file: /cvs/mandoc/out.h,v
retrieving revision 1.10
retrieving revision 1.19
diff -u -p -r1.10 -r1.19
--- mandoc/out.h	2010/04/07 11:25:38	1.10
+++ mandoc/out.h	2011/04/09 15:29:40	1.19
@@ -1,6 +1,6 @@
-/*	$Id: out.h,v 1.10 2010/04/07 11:25:38 kristaps Exp $ */
+/*	$Id: out.h,v 1.19 2011/04/09 15:29:40 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * 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,66 +17,69 @@
 #ifndef OUT_H
 #define OUT_H
 
-#define	DATESIZ		24
-
-__BEGIN_DECLS
-
 enum	roffscale {
-	SCALE_CM,
-	SCALE_IN,
-	SCALE_PC,
-	SCALE_PT,
-	SCALE_EM,
-	SCALE_MM,
-	SCALE_EN,
-	SCALE_BU,
-	SCALE_VS,
-	SCALE_FS,
+	SCALE_CM, /* centimeters (c) */
+	SCALE_IN, /* inches (i) */
+	SCALE_PC, /* pica (P) */
+	SCALE_PT, /* points (p) */
+	SCALE_EM, /* ems (m) */
+	SCALE_MM, /* mini-ems (M) */
+	SCALE_EN, /* ens (n) */
+	SCALE_BU, /* default horizontal (u) */
+	SCALE_VS, /* default vertical (v) */
+	SCALE_FS, /* syn. for u (f) */
 	SCALE_MAX
 };
 
-enum	roffdeco {
-	DECO_NONE,
-	DECO_SPECIAL,
-	DECO_RESERVED,
-	DECO_BOLD,
-	DECO_ITALIC,
-	DECO_ROMAN,
-	DECO_PREVIOUS,
-	DECO_SIZE,
-	DECO_NOSPACE,
-	DECO_FONT, /* font */
-	DECO_FFONT, /* font family */
-	DECO_MAX
+enum	chars {
+	CHARS_ASCII, /* 7-bit ascii representation */
+	CHARS_HTML /* unicode values */
 };
 
+struct	roffcol {
+	size_t		 width; /* width of cell */
+	size_t		 decimal; /* decimal position in cell */
+};
+
 struct	roffsu {
 	enum roffscale	  unit;
 	double		  scale;
-	int		  pt;
 };
 
-#define	SCALE_INVERT(p) \
-	do { (p)->scale = -(p)->scale; } \
-	while (/* CONSTCOND */ 0)
+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 */
+};
+
+__BEGIN_DECLS
+
 #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 *, 
-			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);
+void	  	  time2a(time_t, char *, size_t);
+void	  	  tblcalc(struct rofftbl *tbl, const struct tbl_span *);
 
+void		 *chars_init(enum chars);
+const char	 *chars_num2char(const char *, size_t);
+const char	 *chars_spec2str(void *, const char *, size_t, size_t *);
+int		  chars_spec2cp(void *, const char *, size_t);
+const char	 *chars_res2str(void *, const char *, size_t, size_t *);
+int		  chars_res2cp(void *, const char *, size_t);
+void		  chars_free(void *);
+
 __END_DECLS
 
-#endif /*!HTML_H*/
+#endif /*!OUT_H*/