Handle output encoding for unicode, numbered and named escape sequences

[mandoc.git] / out.h

diff --git a/out.h b/out.h
index 9bf5357b309dd456056bb6c1d04316f167422259..de38ec1754af3f2180a1e5c4736546967e2a2733 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,4 +1,4 @@
-/*     $Id: out.h,v 1.18 2011/03/22 10:13:01 kristaps Exp $ */
+/*     $Id: out.h,v 1.24 2014/10/14 02:16:06 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,30 +31,10 @@ enum        roffscale {
        SCALE_MAX
 };
 
-enum   roffdeco {
-       DECO_NONE,
-       DECO_NUMBERED, /* numbered character */
-       DECO_SPECIAL, /* special character */
-       DECO_SSPECIAL, /* single-char special */
-       DECO_RESERVED, /* reserved word */
-       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
-};
-
-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 */
+       int              flags; /* layout flags, see tbl_cell */
 };
 
 struct roffsu {
@@ -80,22 +60,13 @@ __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);
-int              a2roffdeco(enum roffdeco *, const char **, size_t *);
-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 *, size_t);
 
 __END_DECLS