=================================================================== RCS file: /cvs/mandoc/Attic/private.h,v retrieving revision 1.76 retrieving revision 1.84 diff -u -p -r1.76 -r1.84 --- mandoc/Attic/private.h 2009/02/20 23:35:36 1.76 +++ mandoc/Attic/private.h 2009/02/28 13:47:36 1.84 @@ -1,4 +1,4 @@ -/* $Id: private.h,v 1.76 2009/02/20 23:35:36 kristaps Exp $ */ +/* $Id: private.h,v 1.84 2009/02/28 13:47:36 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -38,6 +38,7 @@ struct mdoc { struct mdoc_node *first; struct mdoc_meta meta; enum mdoc_sec lastnamed; + enum mdoc_sec lastsec; }; @@ -123,24 +124,20 @@ void mdoc_sibling(struct mdoc *, int, struct mdoc_n void *mdoc_tokhash_alloc(void); int mdoc_tokhash_find(const void *, const char *); void mdoc_tokhash_free(void *); -int mdoc_isdelim(const char *); int mdoc_iscdelim(char); +size_t mdoc_isescape(const char *); enum mdoc_sec mdoc_atosec(const char *); enum mdoc_msec mdoc_atomsec(const char *); enum mdoc_vol mdoc_atovol(const char *); enum mdoc_arch mdoc_atoarch(const char *); -enum mdoc_att mdoc_atoatt(const char *); time_t mdoc_atotime(const char *); +size_t mdoc_macro2len(int); -/* FIXME: these three are only for output channels. */ -char *mdoc_arch2a(enum mdoc_arch); -char *mdoc_vol2a(enum mdoc_vol); -char *mdoc_msec2a(enum mdoc_msec); - char *mdoc_type2a(enum mdoc_type); char *mdoc_node2a(struct mdoc_node *); -int mdoc_valid_pre(struct mdoc *, struct mdoc_node *); +int mdoc_valid_pre(struct mdoc *, + const struct mdoc_node *); int mdoc_valid_post(struct mdoc *); int mdoc_action_pre(struct mdoc *, struct mdoc_node *); int mdoc_action_post(struct mdoc *); @@ -167,17 +164,9 @@ int xstrlcpy(char *, const char *, size_t); int xstrcmp(const char *, const char *); int xstrncmp(const char *, const char *, size_t); void *xcalloc(size_t, size_t); +void *xrealloc(void *, size_t); char *xstrdup(const char *); -int macro_obsolete(MACRO_PROT_ARGS); -int macro_constant(MACRO_PROT_ARGS); -int macro_constant_scoped(MACRO_PROT_ARGS); -int macro_constant_delimited(MACRO_PROT_ARGS); -int macro_text(MACRO_PROT_ARGS); -int macro_scoped(MACRO_PROT_ARGS); -int macro_scoped_close(MACRO_PROT_ARGS); -int macro_scoped_line(MACRO_PROT_ARGS); -int macro_prologue(MACRO_PROT_ARGS); int macro_end(struct mdoc *); __END_DECLS