=================================================================== RCS file: /cvs/mandoc/term.h,v retrieving revision 1.118 retrieving revision 1.120 diff -u -p -r1.118 -r1.120 --- mandoc/term.h 2015/11/07 14:01:16 1.118 +++ mandoc/term.h 2017/05/07 17:31:45 1.120 @@ -1,7 +1,7 @@ -/* $Id: term.h,v 1.118 2015/11/07 14:01:16 schwarze Exp $ */ +/* $Id: term.h,v 1.120 2017/05/07 17:31:45 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011-2015 Ingo Schwarze + * Copyright (c) 2011-2015, 2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -38,7 +38,10 @@ enum termfont { #define TERM_MAXMARGIN 100000 /* FIXME */ +struct eqn; struct roff_meta; +struct roff_node; +struct tbl_span; struct termp; typedef void (*term_margin)(struct termp *, const struct roff_meta *); @@ -61,7 +64,6 @@ struct termp { size_t maxrmargin; /* Max right margin. */ size_t maxcols; /* Max size of buf. */ size_t offset; /* Margin offest. */ - size_t tabwidth; /* Distance of tab positions. */ size_t col; /* Bytes in buf. */ size_t viscol; /* Chars on current line. */ size_t trailspace; /* See termp_flushln(). */ @@ -106,11 +108,10 @@ struct termp { }; -struct tbl_span; -struct eqn; - const char *ascii_uc2str(int); +void roff_term_pre(struct termp *, const struct roff_node *); + void term_eqn(struct termp *, const struct eqn *); void term_tbl(struct termp *, const struct tbl_span *); void term_free(struct termp *); @@ -127,6 +128,9 @@ int term_hspan(const struct termp *, const struct r int term_vspan(const struct termp *, const struct roffsu *); size_t term_strlen(const struct termp *, const char *); size_t term_len(const struct termp *, size_t); + +void term_tab_set(const struct termp *, const char *); +size_t term_tab_next(size_t); void term_fontpush(struct termp *, enum termfont); void term_fontpop(struct termp *);