=================================================================== RCS file: /cvs/mandoc/term.h,v retrieving revision 1.83 retrieving revision 1.90 diff -u -p -r1.83 -r1.90 --- mandoc/term.h 2011/05/15 00:58:48 1.83 +++ mandoc/term.h 2011/12/04 23:10:52 1.90 @@ -1,6 +1,6 @@ -/* $Id: term.h,v 1.83 2011/05/15 00:58:48 kristaps Exp $ */ +/* $Id: term.h,v 1.90 2011/12/04 23:10:52 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 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 @@ -22,7 +22,9 @@ __BEGIN_DECLS struct termp; enum termenc { - TERMENC_ASCII + TERMENC_ASCII, + TERMENC_LOCALE, + TERMENC_UTF8 }; enum termtype { @@ -50,6 +52,8 @@ struct termp_tbl { struct termp { enum termtype type; struct rofftbl tbl; /* table configuration */ + int mdocstyle; /* imitate mdoc(7) output */ + size_t defindent; /* Default indent for text. */ size_t defrmargin; /* Right margin of the device. */ size_t rmargin; /* Current right margin. */ size_t maxrmargin; /* Max right margin. */ @@ -62,7 +66,6 @@ struct termp { int flags; #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). */ @@ -94,7 +97,7 @@ struct termp { struct termp_ps *ps; }; -struct termp *term_alloc(enum termenc); +void term_eqn(struct termp *, const struct eqn *); void term_tbl(struct termp *, const struct tbl_span *); void term_free(struct termp *); void term_newln(struct termp *);