=================================================================== RCS file: /cvs/mandoc/term.h,v retrieving revision 1.7 retrieving revision 1.13 diff -u -p -r1.7 -r1.13 --- mandoc/term.h 2009/02/25 12:27:37 1.7 +++ mandoc/term.h 2009/03/02 12:09:32 1.13 @@ -1,4 +1,4 @@ -/* $Id: term.h,v 1.7 2009/02/25 12:27:37 kristaps Exp $ */ +/* $Id: term.h,v 1.13 2009/03/02 12:09:32 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -21,6 +21,8 @@ #include "mdoc.h" +#define INDENT 6 + __BEGIN_DECLS struct termp { @@ -37,19 +39,24 @@ struct termp { #define TERMP_NOBREAK (1 << 4) /* No break after flush. */ #define TERMP_LITERAL (1 << 5) /* Literal words. */ #define TERMP_IGNDELIM (1 << 6) /* Delims like regulars. */ +#define TERMP_NONOSPACE (1 << 7) /* No space (no autounset). */ char *buf; }; 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(p, fl) \ +#define TERMPAIR_SETFLAG(termp, p, fl) \ do { \ assert(! (TERMPAIR_FLAG & (p)->type)); \ + (termp)->flags |= (fl); \ (p)->flag = (fl); \ (p)->type |= TERMPAIR_FLAG; \ } while (0)