=================================================================== RCS file: /cvs/mandoc/Attic/private.h,v retrieving revision 1.86 retrieving revision 1.91 diff -u -p -r1.86 -r1.91 --- mandoc/Attic/private.h 2009/03/08 11:41:22 1.86 +++ mandoc/Attic/private.h 2009/03/21 13:09:29 1.91 @@ -1,4 +1,4 @@ -/* $Id: private.h,v 1.86 2009/03/08 11:41:22 kristaps Exp $ */ +/* $Id: private.h,v 1.91 2009/03/21 13:09:29 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -33,6 +33,7 @@ struct mdoc { int linetok; int flags; #define MDOC_HALT (1 << 0) +#define MDOC_LITERAL (1 << 1) int pflags; enum mdoc_next next; struct mdoc_node *last; @@ -53,6 +54,8 @@ struct mdoc_macro { #define MDOC_PARSED (1 << 1) #define MDOC_EXPLICIT (1 << 2) #define MDOC_PROLOGUE (1 << 3) +#define MDOC_IGNDELIM (1 << 4) + /* Reserved words in arguments treated as text. */ }; #define mdoc_nwarn(mdoc, node, type, fmt, ...) \ @@ -97,7 +100,6 @@ void mdoc_vmsg(struct mdoc *, int, int, const char *, ...); int mdoc_verr(struct mdoc *, int, int, const char *, ...); - int mdoc_macro(MACRO_PROT_ARGS); int mdoc_word_alloc(struct mdoc *, int, int, const char *); @@ -111,28 +113,24 @@ int mdoc_tail_alloc(struct mdoc *, int, int, int); int mdoc_body_alloc(struct mdoc *, int, int, int); void mdoc_node_free(struct mdoc_node *); void mdoc_node_freelist(struct mdoc_node *); -void mdoc_sibling(struct mdoc *, int, struct mdoc_node **, - struct mdoc_node **, struct mdoc_node *); void *mdoc_tokhash_alloc(void); int mdoc_tokhash_find(const void *, const char *); void mdoc_tokhash_free(void *); int mdoc_iscdelim(char); +int mdoc_isdelim(const char *); size_t mdoc_isescape(const char *); enum mdoc_sec mdoc_atosec(const char *); -enum mdoc_msec mdoc_atomsec(const char *); time_t mdoc_atotime(const char *); size_t mdoc_macro2len(int); - const char *mdoc_a2arch(const char *); const char *mdoc_a2vol(const char *); const char *mdoc_a2msec(const char *); - 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_pre(struct mdoc *, + const struct mdoc_node *); int mdoc_action_post(struct mdoc *); - int mdoc_argv(struct mdoc *, int, int, struct mdoc_arg **, int *, char *); #define ARGV_ERROR (-1) @@ -148,16 +146,13 @@ int mdoc_args(struct mdoc *, int, #define ARGS_PUNCT (2) #define ARGS_QWORD (3) #define ARGS_PHRASE (4) - int xstrlcpys(char *, const struct mdoc_node *, size_t); int xstrlcat(char *, const char *, size_t); 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_end(struct mdoc *); __END_DECLS