On Linux, wcwidth() needs _XOPEN_SOURCE, or just _GNU_SOURCE for simplicity.

[mandoc.git] / out.h

diff --git a/out.h b/out.h
index 7b33b8fc14f66abe4fc3da0a22eef835dc3ecbe6..a1133edea76c3f94bc4624c145315894ebdf2e3b 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,4 +1,4 @@
-/*     $Id: out.h,v 1.19 2011/04/09 15:29:40 kristaps Exp $ */
+/*     $Id: out.h,v 1.23 2014/08/12 19:28:03 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,11 +31,6 @@ enum roffscale {
        SCALE_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 */
@@ -64,21 +59,12 @@ __BEGIN_DECLS
        while (/* CONSTCOND */ 0)
 
 #define        SCALE_HS_INIT(p, v) \
-       do { (p)->unit = SCALE_BU; \
+       do { (p)->unit = SCALE_EN; \
             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 
-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 *);
+int              a2roffsu(const char *, struct roffsu *, enum roffscale);
+void             tblcalc(struct rofftbl *tbl, const struct tbl_span *);
 
 __END_DECLS