===================================================================
RCS file: /cvs/mandoc/out.h,v
retrieving revision 1.25
retrieving revision 1.30
diff -u -p -r1.25 -r1.30
--- mandoc/out.h	2014/12/01 04:05:32	1.25
+++ mandoc/out.h	2017/06/12 20:14:18	1.30
@@ -1,6 +1,7 @@
-/*	$Id: out.h,v 1.25 2014/12/01 04:05:32 schwarze Exp $ */
+/*	$Id: out.h,v 1.30 2017/06/12 20:14:18 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -40,18 +41,18 @@ struct	roffsu {
 	double		  scale;
 };
 
+typedef	size_t	(*tbl_sulen)(const struct roffsu *, void *);
 typedef	size_t	(*tbl_strlen)(const char *, void *);
 typedef	size_t	(*tbl_len)(size_t, void *);
 
 struct	rofftbl {
+	tbl_sulen	 sulen; /* calculate scaling unit length */
 	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 */
+	void		*arg; /* passed to sulen, slen, and len */
 };
 
-__BEGIN_DECLS
-
 #define	SCALE_VS_INIT(p, v) \
 	do { (p)->unit = SCALE_VS; \
 	     (p)->scale = (v); } \
@@ -62,8 +63,9 @@ __BEGIN_DECLS
 	     (p)->scale = (v); } \
 	while (/* CONSTCOND */ 0)
 
-int		  a2roffsu(const char *, struct roffsu *, enum roffscale);
-void		  tblcalc(struct rofftbl *tbl,
-			const struct tbl_span *, size_t);
 
-__END_DECLS
+struct	tbl_span;
+
+const char	 *a2roffsu(const char *, struct roffsu *, enum roffscale);
+void		  tblcalc(struct rofftbl *tbl,
+			const struct tbl_span *, size_t, size_t);