diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2009-08-13 11:45:29 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2009-08-13 11:45:29 +0000 |
| commit | f7add3eaf5bbb4a516a7dc5a828444b82ea8cd2d (patch) | |
| tree | 4a4d15fec09b08c5baf6a1752fd68cd08dce18f7 /libman.h | |
| parent | 1027567a5466c0202f71a6dedc0cefa0a4f1382c (diff) | |
| download | mandoc-f7add3eaf5bbb4a516a7dc5a828444b82ea8cd2d.tar.gz mandoc-f7add3eaf5bbb4a516a7dc5a828444b82ea8cd2d.tar.zst mandoc-f7add3eaf5bbb4a516a7dc5a828444b82ea8cd2d.zip | |
Significant overhaul in libman. Macros are now block- and line-scoped (with
next-line scope extensions possible). man.7 reflects block and line scoping,
and also includes a REFERENCE section that will be used as a template for the
big mdoc reference. Many fixes in next-line behaviour for both inline and
block macros. Added some macros for compatibility (from me.7). Corrected
quoted-literal handling for libman.
Diffstat (limited to 'libman.h')
| -rw-r--r-- | libman.h | 36 |
1 files changed, 31 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: libman.h,v 1.15 2009/07/24 20:22:24 kristaps Exp $ */ +/* $Id: libman.h,v 1.16 2009/08/13 11:45:29 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -31,7 +31,8 @@ struct man { int pflags; int flags; #define MAN_HALT (1 << 0) -#define MAN_NLINE (1 << 1) +#define MAN_ELINE (1 << 1) /* Next-line element scope. */ +#define MAN_BLINE (1 << 2) /* Next-line block scope. */ enum man_next next; struct man_node *last; struct man_node *first; @@ -50,9 +51,26 @@ enum merr { WNOTITLE, WESCAPE, WNUMFMT, + WHEADARGS, + WBODYARGS, + WNHEADARGS, + WMACRO, + WMACROFORM, + WEXITSCOPE, WERRMAX }; +#define MACRO_PROT_ARGS struct man *m, int tok, int line, \ + int ppos, int *pos, char *buf + +struct man_macro { + int (*fp)(MACRO_PROT_ARGS); + int flags; +#define MAN_SCOPED (1 << 0) +}; + +extern const struct man_macro *const man_macros; + __BEGIN_DECLS #define man_perr(m, l, p, t) \ @@ -64,21 +82,29 @@ __BEGIN_DECLS #define man_nwarn(m, n, t) \ man_err((m), (n)->line, (n)->pos, 0, (t)) -int man_err(struct man *, int, int, int, enum merr); int man_word_alloc(struct man *, int, int, const char *); +int man_block_alloc(struct man *, int, int, int); +int man_head_alloc(struct man *, int, int, int); +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_hash_alloc(void); -int man_macro(struct man *, int, - int, int, int *, char *); int man_hash_find(const void *, const char *); void man_hash_free(void *); int man_macroend(struct man *); +int man_args(struct man *, int, int *, char *, char **); +#define ARGS_ERROR (-1) +#define ARGS_EOLN (0) +#define ARGS_WORD (1) +#define ARGS_QWORD (1) +int man_err(struct man *, int, int, int, enum merr); int man_vwarn(struct man *, int, int, const char *, ...); int man_verr(struct man *, int, int, const char *, ...); int man_valid_post(struct man *); +int man_valid_pre(struct man *, const struct man_node *); int man_action_post(struct man *); +int man_unscope(struct man *, const struct man_node *); __END_DECLS |