=================================================================== RCS file: /cvs/mandoc/term.h,v retrieving revision 1.32 retrieving revision 1.60 diff -u -p -r1.32 -r1.60 --- mandoc/term.h 2009/03/23 15:20:51 1.32 +++ mandoc/term.h 2010/06/08 15:00:17 1.60 @@ -1,103 +1,117 @@ -/* $Id: term.h,v 1.32 2009/03/23 15:20:51 kristaps Exp $ */ +/* $Id: term.h,v 1.60 2010/06/08 15:00:17 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifndef TERM_H #define TERM_H -#include "mdoc.h" -#include "man.h" +__BEGIN_DECLS -/* FIXME - clean up tabs. */ +struct termp; -#define INDENT 6 +enum termenc { + TERMENC_ASCII +}; -__BEGIN_DECLS +enum termtype { + TERMTYPE_CHAR, + TERMTYPE_PS +}; -enum termenc { - TERMENC_ASCII, - TERMENC_LATIN1, - TERMENC_UTF8 +enum termfont { + TERMFONT_NONE = 0, + TERMFONT_BOLD, + TERMFONT_UNDER }; +#define TERM_MAXMARGIN 100000 /* FIXME */ + +typedef void (*term_margin)(struct termp *, const void *); + +struct termp_ps { + int psstate; /* -Tps: state of ps output */ +#define PS_INLINE (1 << 0) +#define PS_MARGINS (1 << 1) + size_t pscol; /* -Tps: visible column */ + size_t psrow; /* -Tps: visible row */ + size_t pspage; /* -Tps: current page */ +}; + struct termp { + enum termtype type; + size_t defrmargin; /* Right margin of the device.. */ size_t rmargin; /* Current right margin. */ 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. */ + int overstep; /* See termp_flushln(). */ int flags; -#define TERMP_NOSPACE (1 << 0) /* No space before words. */ -#define TERMP_NOLPAD (1 << 1) /* No leftpad before flush. */ -#define TERMP_NOBREAK (1 << 2) /* No break after flush. */ -#define TERMP_LITERAL (1 << 3) /* Literal words. */ -#define TERMP_IGNDELIM (1 << 4) /* Delims like regulars. */ -#define TERMP_NONOSPACE (1 << 5) /* No space (no autounset). */ -#define TERMP_NONOBREAK (1 << 7) /* Don't newln NOBREAK. */ -#define TERMP_STYLE 0x0300 /* Style mask. */ -#define TERMP_BOLD (1 << 8) /* Styles... */ -#define TERMP_UNDER (1 << 9) +#define TERMP_SENTENCE (1 << 1) /* Space before a sentence. */ +#define TERMP_NOSPACE (1 << 2) /* No space before words. */ +#define TERMP_NOLPAD (1 << 3) /* See term_flushln(). */ +#define TERMP_NOBREAK (1 << 4) /* See term_flushln(). */ +#define TERMP_IGNDELIM (1 << 6) /* Delims like regulars. */ +#define TERMP_NONOSPACE (1 << 7) /* No space (no autounset). */ +#define TERMP_DANGLE (1 << 8) /* See term_flushln(). */ +#define TERMP_HANG (1 << 9) /* See term_flushln(). */ +#define TERMP_TWOSPACE (1 << 10) /* See term_flushln(). */ +#define TERMP_NOSPLIT (1 << 11) /* See termp_an_pre/post(). */ +#define TERMP_SPLIT (1 << 12) /* See termp_an_pre/post(). */ +#define TERMP_ANPREC (1 << 13) /* See termp_an_pre(). */ char *buf; /* Output buffer. */ enum termenc enc; /* Type of encoding. */ void *symtab; /* Encoded-symbol table. */ + enum termfont fontl; /* Last font set. */ + enum termfont fontq[10]; /* Symmetric fonts. */ + int fonti; /* Index of font stack. */ + term_margin headf; /* invoked to print head */ + term_margin footf; /* invoked to print foot */ + void (*letter)(struct termp *, char); + void (*begin)(struct termp *); + void (*end)(struct termp *); + void (*endline)(struct termp *); + void (*advance)(struct termp *, size_t); + const void *argf; /* arg for headf/footf */ + union { + struct termp_ps ps; + } engine; }; -/* XXX - clean this up. */ - -struct termpair { - struct termpair *ppair; - int type; -#define TERMPAIR_FLAG (1 << 0) - int flag; - size_t offset; - size_t rmargin; - int count; -}; - -#define TERMPAIR_SETFLAG(termp, p, fl) \ - do { \ - assert(! (TERMPAIR_FLAG & (p)->type)); \ - (termp)->flags |= (fl); \ - (p)->flag = (fl); \ - (p)->type |= TERMPAIR_FLAG; \ - } while ( /* CONSTCOND */ 0) - -struct termact { - int (*pre)(struct termp *, struct termpair *, - const struct mdoc_meta *, - const struct mdoc_node *); - void (*post)(struct termp *, struct termpair *, - const struct mdoc_meta *, - const struct mdoc_node *); -}; - -void *term_ascii2htab(void); -const char *term_a2ascii(void *, const char *, size_t, size_t *); -void term_asciifree(void *); - +struct termp *term_alloc(enum termenc); +void term_free(struct termp *); void term_newln(struct termp *); void term_vspace(struct termp *); void term_word(struct termp *, const char *); void term_flushln(struct termp *); -void term_node(struct termp *, struct termpair *, - const struct mdoc_meta *, - const struct mdoc_node *); +void term_begin(struct termp *, term_margin, + term_margin, const void *); +void term_end(struct termp *); -const struct termact *termacts; +size_t term_hspan(const struct roffsu *); +size_t term_vspan(const struct roffsu *); + +enum termfont term_fonttop(struct termp *); +const void *term_fontq(struct termp *); +void term_fontpush(struct termp *, enum termfont); +void term_fontpop(struct termp *); +void term_fontpopq(struct termp *, const void *); +void term_fontrepl(struct termp *, enum termfont); +void term_fontlast(struct termp *); __END_DECLS