=================================================================== RCS file: /cvs/mandoc/roff.h,v retrieving revision 1.43 retrieving revision 1.67 diff -u -p -r1.43 -r1.67 --- mandoc/roff.h 2017/05/04 17:48:29 1.43 +++ mandoc/roff.h 2018/12/31 07:08:12 1.67 @@ -1,7 +1,7 @@ -/* $Id: roff.h,v 1.43 2017/05/04 17:48:29 schwarze Exp $ */ +/* $Id: roff.h,v 1.67 2018/12/31 07:08:12 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze + * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,11 +14,15 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Common data types for all syntax trees and related functions. */ struct ohash; struct mdoc_arg; union mdoc_data; +struct tbl_span; +struct eqn_box; enum roff_macroset { MACROSET_NONE = 0, @@ -61,12 +65,24 @@ enum roff_type { ROFFT_TAIL, ROFFT_ELEM, ROFFT_TEXT, + ROFFT_COMMENT, ROFFT_TBL, ROFFT_EQN }; enum roff_tok { ROFF_br = 0, + ROFF_ce, + ROFF_fi, + ROFF_ft, + ROFF_ll, + ROFF_mc, + ROFF_nf, + ROFF_po, + ROFF_rj, + ROFF_sp, + ROFF_ta, + ROFF_ti, ROFF_MAX, ROFF_ab, ROFF_ad, @@ -95,7 +111,6 @@ enum roff_tok { ROFF_brpnl, ROFF_c2, ROFF_cc, - ROFF_ce, ROFF_cf, ROFF_cflags, ROFF_ch, @@ -147,7 +162,6 @@ enum roff_tok { ROFF_fcolor, ROFF_fdeferlig, ROFF_feature, - /* MAN_fi; ignored in mdoc(7) */ ROFF_fkern, ROFF_fl, ROFF_flig, @@ -156,7 +170,6 @@ enum roff_tok { ROFF_fschar, ROFF_fspacewidth, ROFF_fspecial, - /* MAN_ft; ignored in mdoc(7) */ ROFF_ftr, ROFF_fzoom, ROFF_gcolor, @@ -196,21 +209,18 @@ enum roff_tok { ROFF_lg, ROFF_lhang, ROFF_linetabs, - /* MAN_ll, MDOC_ll */ ROFF_lnr, ROFF_lnrf, ROFF_lpfx, ROFF_ls, ROFF_lsm, ROFF_lt, - ROFF_mc, ROFF_mediasize, ROFF_minss, ROFF_mk, ROFF_mso, ROFF_na, ROFF_ne, - /* MAN_nf; ignored in mdoc(7) */ ROFF_nh, ROFF_nhychar, ROFF_nm, @@ -235,7 +245,6 @@ enum roff_tok { ROFF_pm, ROFF_pn, ROFF_pnr, - ROFF_po, ROFF_ps, ROFF_psbb, ROFF_pshape, @@ -248,7 +257,6 @@ enum roff_tok { ROFF_return, ROFF_rfschar, ROFF_rhang, - ROFF_rj, ROFF_rm, ROFF_rn, ROFF_rnn, @@ -261,7 +269,6 @@ enum roff_tok { ROFF_shift, ROFF_sizes, ROFF_so, - /* MAN_sp, MDOC_sp */ ROFF_spacewidth, ROFF_special, ROFF_spreadwarn, @@ -271,11 +278,9 @@ enum roff_tok { ROFF_sv, ROFF_sy, ROFF_T_, - ROFF_ta, ROFF_tc, ROFF_TE, ROFF_TH, - ROFF_ti, ROFF_tkf, ROFF_tl, ROFF_tm, @@ -309,6 +314,7 @@ enum roff_tok { ROFF_writem, ROFF_xflag, ROFF_cblock, + ROFF_RENAMED, ROFF_USERDEF, TOKEN_NONE, MDOC_Dd, @@ -429,15 +435,14 @@ enum roff_tok { MDOC_En, MDOC_Dx, MDOC__Q, - MDOC_sp, MDOC__U, MDOC_Ta, - MDOC_ll, MDOC_MAX, MAN_TH, MAN_SH, MAN_SS, MAN_TP, + MAN_TQ, MAN_LP, MAN_PP, MAN_P, @@ -454,9 +459,6 @@ enum roff_tok { MAN_I, MAN_IR, MAN_RI, - MAN_sp, - MAN_nf, - MAN_fi, MAN_RE, MAN_RS, MAN_DT, @@ -464,21 +466,18 @@ enum roff_tok { MAN_PD, MAN_AT, MAN_in, - MAN_ft, + MAN_SY, + MAN_YS, MAN_OP, MAN_EX, MAN_EE, MAN_UR, MAN_UE, - MAN_ll, + MAN_MT, + MAN_ME, MAN_MAX }; -enum roff_next { - ROFF_NEXT_SIBLING = 0, - ROFF_NEXT_CHILD -}; - /* * Indicates that a BODY's formatting has ended, but * the scope is still open. Used for badly nested blocks. @@ -488,6 +487,12 @@ enum mdoc_endbody { ENDBODY_SPACE /* Is broken: append a space. */ }; +enum mandoc_os { + MANDOC_OS_OTHER = 0, + MANDOC_OS_NETBSD, + MANDOC_OS_OPENBSD +}; + struct roff_node { struct roff_node *parent; /* Parent AST node. */ struct roff_node *child; /* First child AST node. */ @@ -500,8 +505,8 @@ struct roff_node { struct mdoc_arg *args; /* BLOCK/ELEM */ union mdoc_data *norm; /* Normalized arguments. */ char *string; /* TEXT */ - const struct tbl_span *span; /* TBL */ - const struct eqn *eqn; /* EQN */ + struct tbl_span *span; /* TBL */ + struct eqn_box *eqn; /* EQN */ int line; /* Input file line number. */ int pos; /* Input file column number. */ int flags; @@ -524,6 +529,7 @@ struct roff_node { }; struct roff_meta { + struct roff_node *first; /* The first node parsed. */ char *msec; /* Manual section, usually a digit. */ char *vol; /* Manual volume title. */ char *os; /* Operating system. */ @@ -531,48 +537,14 @@ struct roff_meta { char *title; /* Manual title, usually CAPS. */ char *name; /* Leading manual name. */ char *date; /* Normalized date. */ + char *sodest; /* .so target file name or NULL. */ int hasbody; /* Document is not empty. */ -}; - -struct roff_man { - struct roff_meta meta; /* Document meta-data. */ - struct mparse *parse; /* Parse pointer. */ - struct roff *roff; /* Roff parser state data. */ - struct ohash *mdocmac; /* Mdoc macro lookup table. */ - struct ohash *manmac; /* Man macro lookup table. */ - const char *defos; /* Default operating system. */ - struct roff_node *first; /* The first node parsed. */ - struct roff_node *last; /* The last node parsed. */ - struct roff_node *last_es; /* The most recent Es node. */ - int quick; /* Abort parse early. */ - int flags; /* Parse flags. */ -#define MDOC_LITERAL (1 << 1) /* In a literal scope. */ -#define MDOC_PBODY (1 << 2) /* In the document body. */ -#define MDOC_NEWLINE (1 << 3) /* First macro/text in a line. */ -#define MDOC_PHRASE (1 << 4) /* In a Bl -column phrase. */ -#define MDOC_PHRASELIT (1 << 5) /* Literal within a phrase. */ -#define MDOC_FREECOL (1 << 6) /* `It' invocation should close. */ -#define MDOC_SYNOPSIS (1 << 7) /* SYNOPSIS-style formatting. */ -#define MDOC_KEEP (1 << 8) /* In a word keep. */ -#define MDOC_SMOFF (1 << 9) /* Spacing is off. */ -#define MDOC_NODELIMC (1 << 10) /* Disable closing delimiter handling. */ -#define MAN_ELINE (1 << 11) /* Next-line element scope. */ -#define MAN_BLINE (1 << 12) /* Next-line block scope. */ -#define MDOC_PHRASEQF (1 << 13) /* Quote first word encountered. */ -#define MDOC_PHRASEQL (1 << 14) /* Quote last word of this phrase. */ -#define MDOC_PHRASEQN (1 << 15) /* Quote first word of the next phrase. */ -#define MAN_LITERAL MDOC_LITERAL -#define MAN_NEWLINE MDOC_NEWLINE + int rcsids; /* Bits indexed by enum mandoc_os. */ + enum mandoc_os os_e; /* Operating system. */ enum roff_macroset macroset; /* Kind of high-level macros used. */ - enum roff_sec lastsec; /* Last section seen. */ - enum roff_sec lastnamed; /* Last standard section seen. */ - enum roff_next next; /* Where to put the next node. */ }; extern const char *const *roff_name; void deroff(char **, const struct roff_node *); -struct ohash *roffhash_alloc(enum roff_tok, enum roff_tok); -enum roff_tok roffhash_find(struct ohash *, const char *, size_t); -void roffhash_free(struct ohash *);