Put tbl_alloc function right into the addspan() one, as this is the only

[mandoc.git] / out.h

diff --git a/out.h b/out.h
index b5eb7c81af77493c222a11652cafb0257e8abf94..ebd70188b93ebfa8e05e6cdb2bdb663b257a67b1 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,6 +1,6 @@
-/*     $Id: out.h,v 1.10 2010/04/07 11:25:38 kristaps Exp $ */
+/*     $Id: out.h,v 1.16 2011/01/30 16:05:37 schwarze 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -21,6 +21,21 @@
 
 __BEGIN_DECLS
 
 
 __BEGIN_DECLS
 

+struct roffcol {
+       size_t           width; /* width of cell */
+       size_t           decimal; /* decimal position in cell */
+};
+
+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 */
+};
+

 enum   roffscale {
        SCALE_CM,
        SCALE_IN,
 enum   roffscale {
        SCALE_CM,
        SCALE_IN,


@@ -37,14 +52,15 @@ enum        roffscale {
 
 enum   roffdeco {
        DECO_NONE,
 
 enum   roffdeco {
        DECO_NONE,

-       DECO_SPECIAL,
-       DECO_RESERVED,
-       DECO_BOLD,
-       DECO_ITALIC,
-       DECO_ROMAN,
-       DECO_PREVIOUS,
-       DECO_SIZE,
-       DECO_NOSPACE,
+       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
        DECO_FONT, /* font */
        DECO_FFONT, /* font family */
        DECO_MAX


@@ -53,30 +69,23 @@ enum        roffdeco {
 struct roffsu {
        enum roffscale    unit;
        double            scale;
 struct roffsu {
        enum roffscale    unit;
        double            scale;

-       int               pt;

 };
 
 };
 

-#define        SCALE_INVERT(p) \
-       do { (p)->scale = -(p)->scale; } \
-       while (/* CONSTCOND */ 0)
-

 #define        SCALE_VS_INIT(p, v) \
        do { (p)->unit = SCALE_VS; \
 #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; \
        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)
 
        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);
+int      a2roffdeco(enum roffdeco *, const char **, size_t *);
+void     time2a(time_t, char *, size_t);
+void     tblcalc(struct rofftbl *tbl, const struct tbl_span *);

 
 __END_DECLS
 
 
 __END_DECLS
 

-#endif /*!HTML_H*/
+#endif /*!OUT_H*/