=================================================================== RCS file: /cvs/mandoc/Attic/private.h,v retrieving revision 1.27 retrieving revision 1.32 diff -u -p -r1.27 -r1.32 --- mandoc/Attic/private.h 2008/12/04 16:19:52 1.27 +++ mandoc/Attic/private.h 2008/12/07 22:40:18 1.32 @@ -1,4 +1,4 @@ -/* $Id: private.h,v 1.27 2008/12/04 16:19:52 kristaps Exp $ */ +/* $Id: private.h,v 1.32 2008/12/07 22:40:18 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -64,7 +64,10 @@ struct md_mbuf { #define ROFFTok_Infty 24 #define ROFFTok_Bar 25 #define ROFFTok_Nan 26 -#define ROFFTok_MAX 27 +#define ROFFTok_Quote 27 +#define ROFFTok_Sp_0 28 +#define ROFFTok_Slash 29 +#define ROFFTok_MAX 30 #define ROFF___ 0 #define ROFF_Dd 1 @@ -245,21 +248,21 @@ enum roffmsg { ROFF_WARN, ROFF_ERROR }; struct roffcb { void (*roffmsg)(void *, enum roffmsg, - const char *, const char *, char *); + const char *, const char *, const char *); int (*roffhead)(void *, const struct tm *, const char *, const char *, const char *, const char *); int (*rofftail)(void *); - int (*roffdata)(void *, int, const char *, char *); - int (*rofftoken)(void *, int, int); - int (*roffin)(void *, int, int *, char **); + int (*roffdata)(void *, int, const char *, const char *); + int (*roffin)(void *, int, int *, const char **); int (*roffout)(void *, int); - int (*roffblkin)(void *, int, int *, char **); + int (*roffblkin)(void *, int, int *, const char **); int (*roffblkout)(void *, int); - int (*roffblkheadin)(void *, int, int *, char **); + int (*roffblkheadin)(void *, int, int *, const char **); int (*roffblkheadout)(void *, int); - int (*roffblkbodyin)(void *, int, int *, char **); + int (*roffblkbodyin)(void *, int, int *, const char **); int (*roffblkbodyout)(void *, int); - int (*roffspecial)(void *, int, int *, char **, char **); + int (*roffspecial)(void *, int, const char *, + const int *, const char **, const char **); }; struct rofftree; @@ -289,7 +292,7 @@ struct rofftree *roff_alloc(const struct roffcb *, voi int roff_engine(struct rofftree *, char *); int roff_free(struct rofftree *, int); -int rofftok_scan(const char *); +int rofftok_scan(const char *, int *); __END_DECLS