style message about missing .Fn markup; inspired by mdoclint

[mandoc.git] / out.h

diff --git a/out.h b/out.h
index a1133edea76c3f94bc4624c145315894ebdf2e3b..ac617b32633e57776a6c3ca7c46ca6a7a371d36f 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,6 +1,7 @@
-/*     $Id: out.h,v 1.23 2014/08/12 19:28:03 schwarze Exp $ */
+/*     $Id: out.h,v 1.29 2017/06/08 18:11:22 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
@@ -14,8 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef OUT_H
-#define OUT_H
 
 enum   roffscale {
        SCALE_CM, /* centimeters (c) */
@@ -34,6 +33,7 @@ enum  roffscale {
 struct roffcol {
        size_t           width; /* width of cell */
        size_t           decimal; /* decimal position in cell */
+       int              flags; /* layout flags, see tbl_cell */
 };
 
 struct roffsu {
@@ -41,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); } \
@@ -63,9 +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 *);
 
-__END_DECLS
+struct tbl_span;
 
-#endif /*!OUT_H*/
+const char      *a2roffsu(const char *, struct roffsu *, enum roffscale);
+void             tblcalc(struct rofftbl *tbl,
+                       const struct tbl_span *, size_t);