diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-03-25 23:23:02 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-03-25 23:23:02 +0000 |
| commit | 3eb08fb47bcf0e1ec01c27c5277f79a45dc710c0 (patch) | |
| tree | 555275197591833137f80018ab4c61b77f1f1273 /usr.bin/mandoc/libman.h | |
| parent | 470d717c25312457deedde392732c5a1cb1ee2af (diff) | |
merge 1.9.16, keeping local patches
This is mostly cleanup by kristaps@ after my rather hackish patch
to tolerate the non-text macros .na, .sp, .br in next-line scope;
plus some nesting issues fixed by him, all in man(7).
This survived a full cd /usr/src; make man.
Diffstat (limited to 'usr.bin/mandoc/libman.h')
| -rw-r--r-- | usr.bin/mandoc/libman.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/mandoc/libman.h b/usr.bin/mandoc/libman.h index 5ae5c4082e1..cc225c088ec 100644 --- a/usr.bin/mandoc/libman.h +++ b/usr.bin/mandoc/libman.h @@ -1,4 +1,4 @@ -/* $Id: libman.h,v 1.11 2009/12/22 23:58:00 schwarze Exp $ */ +/* $Id: libman.h,v 1.12 2010/03/25 23:23:01 schwarze Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -30,9 +30,10 @@ struct man { int pflags; int flags; #define MAN_HALT (1 << 0) -#define MAN_ELINE (1 << 1) /* Next-line element scope. */ -#define MAN_BLINE (1 << 2) /* Next-line block scope. */ -#define MAN_LITERAL (1 << 3) /* Literal input. */ +#define MAN_ELINE (1 << 1) /* Next-line element scope. */ +#define MAN_BLINE (1 << 2) /* Next-line block scope. */ +#define MAN_ILINE (1 << 3) /* Ignored in next-line scope. */ +#define MAN_LITERAL (1 << 4) /* Literal input. */ enum man_next next; struct man_node *last; struct man_node *first; @@ -44,6 +45,7 @@ enum merr { WMSEC, WDATE, WLNSCOPE, + WLNSCOPE2, WTSPACE, WTQUOTE, WNODATA, @@ -70,6 +72,7 @@ struct man_macro { #define MAN_SCOPED (1 << 0) #define MAN_EXPLICIT (1 << 1) /* See blk_imp(). */ #define MAN_FSCOPED (1 << 2) /* See blk_imp(). */ +#define MAN_NSCOPED (1 << 3) /* See in_line_eoln(). */ }; extern const struct man_macro *const man_macros; @@ -92,6 +95,7 @@ int man_body_alloc(struct man *, int, int, int); int man_elem_alloc(struct man *, int, int, int); void man_node_free(struct man_node *); void man_node_freelist(struct man_node *); +void man_node_unlink(struct man *, struct man_node *); void man_hash_init(void); int man_hash_find(const char *); int man_macroend(struct man *); |