summaryrefslogtreecommitdiffstats
path: root/libman.h
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-12-02 07:34:06 +0000
committerbapt <bapt@FreeBSD.org>2014-12-02 07:34:06 +0000
commite00686f8f18c8c3eb3a800468a031699ed0bbc8f (patch)
tree95f51dd036cb6d9094d95488706762fc8414d115 /libman.h
parenteb03421ddbdfb35eb3ab61dbe59c906ce9e5db96 (diff)
downloadFreeBSD-src-e00686f8f18c8c3eb3a800468a031699ed0bbc8f.zip
FreeBSD-src-e00686f8f18c8c3eb3a800468a031699ed0bbc8f.tar.gz
Import CVS version of mandoc as of 20141201
Diffstat (limited to 'libman.h')
-rw-r--r--libman.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/libman.h b/libman.h
index e852927..8f66013 100644
--- a/libman.h
+++ b/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
OpenPOWER on IntegriCloud