diff options
| author | bapt <bapt@FreeBSD.org> | 2014-12-02 23:24:57 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-12-02 23:24:57 +0000 |
| commit | 919f2a28755126f55b458d6553ac5e10b76203b3 (patch) | |
| tree | 6b285eca5de51692bcaade66a629a2b84eadb8c7 /contrib/mdocml/libman.h | |
| parent | d24ff3fdf2f10c9b05c568b96812b7560b5c652a (diff) | |
| parent | e00686f8f18c8c3eb3a800468a031699ed0bbc8f (diff) | |
| download | FreeBSD-src-919f2a28755126f55b458d6553ac5e10b76203b3.zip FreeBSD-src-919f2a28755126f55b458d6553ac5e10b76203b3.tar.gz | |
Update to mandoc cvs version as of 20141201
- Compatiblity with existing manpages has been improved
- Now support ".so" directive with compressed manpages (which fixes a regression
we have since we have new man(1))
Diffstat (limited to 'contrib/mdocml/libman.h')
| -rw-r--r-- | contrib/mdocml/libman.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/contrib/mdocml/libman.h b/contrib/mdocml/libman.h index e852927..8f66013 100644 --- a/contrib/mdocml/libman.h +++ b/contrib/mdocml/libman.h @@ -1,6 +1,7 @@ -/* $Id: libman.h,v 1.63 2014/08/01 21:24:17 schwarze Exp $ */ +/* $Id: libman.h,v 1.65 2014/11/28 05:51:32 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> + * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -45,7 +46,7 @@ struct man { char *buf struct man_macro { - int (*fp)(MACRO_PROT_ARGS); + void (*fp)(MACRO_PROT_ARGS); int flags; #define MAN_SCOPED (1 << 0) #define MAN_EXPLICIT (1 << 1) /* See blk_imp(). */ @@ -53,24 +54,25 @@ struct man_macro { #define MAN_NSCOPED (1 << 3) /* See in_line_eoln(). */ #define MAN_NOCLOSE (1 << 4) /* See blk_exp(). */ #define MAN_BSCOPE (1 << 5) /* Break BLINE scope. */ +#define MAN_JOIN (1 << 6) /* Join arguments together. */ }; extern const struct man_macro *const man_macros; __BEGIN_DECLS -int man_word_alloc(struct man *, int, int, const char *); -int man_block_alloc(struct man *, int, int, enum mant); -int man_head_alloc(struct man *, int, int, enum mant); -int man_tail_alloc(struct man *, int, int, enum mant); -int man_body_alloc(struct man *, int, int, enum mant); -int man_elem_alloc(struct man *, int, int, enum mant); +void man_word_alloc(struct man *, int, int, const char *); +void man_word_append(struct man *, const char *); +void man_block_alloc(struct man *, int, int, enum mant); +void man_head_alloc(struct man *, int, int, enum mant); +void man_body_alloc(struct man *, int, int, enum mant); +void man_elem_alloc(struct man *, int, int, enum mant); void man_node_delete(struct man *, struct man_node *); void man_hash_init(void); enum mant man_hash_find(const char *); -int man_macroend(struct man *); -int man_valid_post(struct man *); -int man_unscope(struct man *, const struct man_node *); +void man_macroend(struct man *); +void man_valid_post(struct man *); +void man_unscope(struct man *, const struct man_node *); __END_DECLS |
