=================================================================== RCS file: /cvs/mandoc/libmdoc.h,v retrieving revision 1.56 retrieving revision 1.64 diff -u -p -r1.56 -r1.64 --- mandoc/libmdoc.h 2010/06/27 15:52:41 1.56 +++ mandoc/libmdoc.h 2011/03/17 01:23:28 1.64 @@ -1,6 +1,6 @@ -/* $Id: libmdoc.h,v 1.56 2010/06/27 15:52:41 kristaps Exp $ */ +/* $Id: libmdoc.h,v 1.64 2011/03/17 01:23:28 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -17,7 +17,6 @@ #ifndef LIBMDOC_H #define LIBMDOC_H -#include "regs.h" #include "mdoc.h" enum mdoc_next { @@ -36,14 +35,14 @@ struct mdoc { #define MDOC_PHRASELIT (1 << 4) /* literal within a partila phrase */ #define MDOC_PPHRASE (1 << 5) /* within a partial phrase */ #define MDOC_FREECOL (1 << 6) /* `It' invocation should close */ - int pflags; +#define MDOC_SYNOPSIS (1 << 7) /* SYNOPSIS-style formatting */ enum mdoc_next next; /* where to put the next node */ struct mdoc_node *last; /* the last node parsed */ struct mdoc_node *first; /* the first node parsed */ struct mdoc_meta meta; /* document meta-data */ enum mdoc_sec lastnamed; enum mdoc_sec lastsec; - const struct regset *regs; /* readonly registers */ + struct regset *regs; /* registers */ }; #define MACRO_PROT_ARGS struct mdoc *m, \ @@ -109,10 +108,13 @@ int mdoc_block_alloc(struct mdoc *, int, int, int mdoc_head_alloc(struct mdoc *, int, int, enum mdoct); int mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct); int mdoc_body_alloc(struct mdoc *, int, int, enum mdoct); +int mdoc_endbody_alloc(struct mdoc *m, int line, int pos, + enum mdoct tok, struct mdoc_node *body, + enum mdoc_endbody end); void mdoc_node_delete(struct mdoc *, struct mdoc_node *); void mdoc_hash_init(void); enum mdoct mdoc_hash_find(const char *); -enum mdelim mdoc_iscdelim(char); +#define DELIMSZ 6 /* maximum size of a delimiter string */ enum mdelim mdoc_isdelim(const char *); size_t mdoc_isescape(const char *); enum mdoc_sec mdoc_str2sec(const char *); @@ -126,9 +128,6 @@ const char *mdoc_a2vol(const char *); const char *mdoc_a2msec(const char *); int mdoc_valid_pre(struct mdoc *, struct mdoc_node *); int mdoc_valid_post(struct mdoc *); -int mdoc_action_pre(struct mdoc *, - struct mdoc_node *); -int mdoc_action_post(struct mdoc *); enum margverr mdoc_argv(struct mdoc *, int, enum mdoct, struct mdoc_arg **, int *, char *); void mdoc_argv_free(struct mdoc_arg *);