summaryrefslogtreecommitdiffstats
path: root/out.h
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-01-05 15:37:23 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-01-05 15:37:23 +0000
commit49803152fb211a06850fbee706084bf34a370704 (patch)
tree4b5df6588a9bae17e3788b4610eb74e7a7f4c577 /out.h
parentf824bd1b5c997090ea6dee10eb77ccf96c57fc03 (diff)
downloadmandoc-49803152fb211a06850fbee706084bf34a370704.tar.gz
Stuff tbl_calc() into out.c so that it can be shared by all output modes
(isn't now, but will need to be, used by -T[x]html also). Necessitated a lot of churn in getting tbl_calc* code out of tbl_term.c and into out.c, including renaming some structures and so on. The abstraction is in having a pointer to a wrapper function for calculating string widths. The char devices use term_strlen and term_len; the others will probably just use strlen(). While at it, remove some superfluous assertions in the tbl code. This allows all tbl manuals to clear. Lastly, set the right-margin to be the maximum margin for each table span. This allows big, complicated tbl-pages like terminfo to be displayed. They're ugly, but they work.
Diffstat (limited to 'out.h')
-rw-r--r--out.h39
1 files changed, 25 insertions, 14 deletions
diff --git a/out.h b/out.h
index ee91b3d4..9802389f 100644
--- a/out.h
+++ b/out.h
@@ -21,6 +21,21 @@
__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,
@@ -40,11 +55,11 @@ enum roffdeco {
DECO_SPECIAL, /* special character */
DECO_SSPECIAL, /* single-char special */
DECO_RESERVED, /* reserved word */
- DECO_BOLD,
- DECO_ITALIC,
- DECO_ROMAN,
- DECO_PREVIOUS,
- DECO_NOSPACE,
+ 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
@@ -55,10 +70,6 @@ struct roffsu {
double scale;
};
-#define SCALE_INVERT(p) \
- do { (p)->scale = -(p)->scale; } \
- while (/* CONSTCOND */ 0)
-
#define SCALE_VS_INIT(p, v) \
do { (p)->unit = SCALE_VS; \
(p)->scale = (v); } \
@@ -69,11 +80,11 @@ struct roffsu {
(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);
+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
-#endif /*!HTML_H*/
+#endif /*!OUT_H*/