aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/term.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
commitbf0fd15ae05f0d1f622f054ecae840faf241f779 (patch)
treeaa88b35aa528af6c11b69d7104e19ba9ffdc98da /term.h
parent998b7b2d7e3596d70b5afa642e37a5a7dd4ab6a3 (diff)
downloadmandoc-bf0fd15ae05f0d1f622f054ecae840faf241f779.tar.gz
mandoc-bf0fd15ae05f0d1f622f054ecae840faf241f779.tar.zst
mandoc-bf0fd15ae05f0d1f622f054ecae840faf241f779.zip
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 'term.h')
-rw-r--r--term.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/term.h b/term.h
index 0fdad78a..79b738ca 100644
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.78 2011/01/03 13:59:21 kristaps Exp $ */
+/* $Id: term.h,v 1.79 2011/01/05 15:37:23 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -78,7 +78,7 @@ struct termp_tbl {
struct termp {
enum termtype type;
- struct termp_tbl *tbl; /* table configuration */
+ struct rofftbl tbl; /* table configuration */
size_t defrmargin; /* Right margin of the device. */
size_t rmargin; /* Current right margin. */
size_t maxrmargin; /* Max right margin. */