=================================================================== RCS file: /cvs/mandoc/Attic/private.h,v retrieving revision 1.85 retrieving revision 1.87 diff -u -p -r1.85 -r1.87 --- mandoc/Attic/private.h 2009/03/06 14:13:47 1.85 +++ mandoc/Attic/private.h 2009/03/08 19:28:09 1.87 @@ -1,4 +1,4 @@ -/* $Id: private.h,v 1.85 2009/03/06 14:13:47 kristaps Exp $ */ +/* $Id: private.h,v 1.87 2009/03/08 19:28:09 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -33,6 +33,7 @@ struct mdoc { int linetok; int flags; #define MDOC_HALT (1 << 0) + int pflags; enum mdoc_next next; struct mdoc_node *last; struct mdoc_node *first; @@ -42,14 +43,6 @@ struct mdoc { }; -/* Hard-limit of macro arguments. */ - -#define MDOC_LINEARG_MAX 9 - -/* Suggested limit of macro arguments. */ - -#define MDOC_LINEARG_SOFTMAX 9 - #define MACRO_PROT_ARGS struct mdoc *mdoc, int tok, int line, \ int ppos, int *pos, char *buf @@ -106,13 +99,12 @@ int mdoc_verr(struct mdoc *, int, int, const char *, ...); int mdoc_macro(MACRO_PROT_ARGS); -int mdoc_find(const struct mdoc *, const char *); int mdoc_word_alloc(struct mdoc *, int, int, const char *); int mdoc_elem_alloc(struct mdoc *, int, int, - int, size_t, const struct mdoc_arg *); + int, struct mdoc_arg *); int mdoc_block_alloc(struct mdoc *, int, int, - int, size_t, const struct mdoc_arg *); + int, struct mdoc_arg *); int mdoc_root_alloc(struct mdoc *); int mdoc_head_alloc(struct mdoc *, int, int, int); int mdoc_tail_alloc(struct mdoc *, int, int, int); @@ -127,7 +119,7 @@ void mdoc_tokhash_free(void *); int mdoc_iscdelim(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); @@ -141,13 +133,13 @@ int mdoc_valid_post(struct mdoc *); int mdoc_action_pre(struct mdoc *, struct mdoc_node *); int mdoc_action_post(struct mdoc *); -int mdoc_argv(struct mdoc *, int, int, - struct mdoc_arg *, int *, char *); +int mdoc_argv(struct mdoc *, int, int, + struct mdoc_arg **, int *, char *); #define ARGV_ERROR (-1) #define ARGV_EOLN (0) #define ARGV_ARG (1) #define ARGV_WORD (2) -void mdoc_argv_free(int, struct mdoc_arg *); +void mdoc_argv_free(struct mdoc_arg *); int mdoc_args(struct mdoc *, int, int *, char *, int, char **); #define ARGS_ERROR (-1)