Cleanup, no functional change:

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index 0ae9b6029719cb33dca84e29029acb430451f4e3..5e3a42a90658ae020cc9a80f2b79436afb7a9564 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.h,v 1.252 2018/08/24 23:12:33 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.256 2018/12/12 21:54:35 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -158,6 +158,7 @@ enum        mandocerr {
        MANDOCERR_LB_BAD, /* unknown library name: Lb ... */
        MANDOCERR_RS_BAD, /* invalid content in Rs block: macro */
        MANDOCERR_SM_BAD, /* invalid Boolean argument: macro arg */
+       MANDOCERR_CHAR_FONT, /* argument contains two font escapes */
        MANDOCERR_FT_BAD, /* unknown font, skipping request: ft font */
        MANDOCERR_TR_ODD, /* odd number of characters in request: tr char */
 
@@ -212,6 +213,7 @@ enum        mandocerr {
        MANDOCERR_BD_NOARG, /* skipping display without arguments: Bd */
        MANDOCERR_BL_NOTYPE, /* missing list type, using -item: Bl */
        MANDOCERR_CE_NONUM, /* argument is not numeric, using 1: ce ... */
+       MANDOCERR_CHAR_ARG, /* argument is not a character: char ... */
        MANDOCERR_NM_NONAME, /* missing manual name, using "": Nm */
        MANDOCERR_OS_UNAME, /* uname(3) system call failed, using UNKNOWN */
        MANDOCERR_ST_BAD, /* unknown standard specifier: St standard */
@@ -239,110 +241,6 @@ enum      mandocerr {
        MANDOCERR_MAX
 };
 
-struct tbl_opts {
-       char              tab; /* cell-separator */
-       char              decimal; /* decimal point */
-       int               opts;
-#define        TBL_OPT_CENTRE   (1 << 0)
-#define        TBL_OPT_EXPAND   (1 << 1)
-#define        TBL_OPT_BOX      (1 << 2)
-#define        TBL_OPT_DBOX     (1 << 3)
-#define        TBL_OPT_ALLBOX   (1 << 4)
-#define        TBL_OPT_NOKEEP   (1 << 5)
-#define        TBL_OPT_NOSPACE  (1 << 6)
-#define        TBL_OPT_NOWARN   (1 << 7)
-       int               cols; /* number of columns */
-       int               lvert; /* width of left vertical line */
-       int               rvert; /* width of right vertical line */
-};
-
-enum   tbl_cellt {
-       TBL_CELL_CENTRE, /* c, C */
-       TBL_CELL_RIGHT, /* r, R */
-       TBL_CELL_LEFT, /* l, L */
-       TBL_CELL_NUMBER, /* n, N */
-       TBL_CELL_SPAN, /* s, S */
-       TBL_CELL_LONG, /* a, A */
-       TBL_CELL_DOWN, /* ^ */
-       TBL_CELL_HORIZ, /* _, - */
-       TBL_CELL_DHORIZ, /* = */
-       TBL_CELL_MAX
-};
-
-/*
- * A cell in a layout row.
- */
-struct tbl_cell {
-       struct tbl_cell  *next;
-       char             *wstr; /* min width represented as a string */
-       size_t            width; /* minimum column width */
-       size_t            spacing; /* to the right of the column */
-       int               vert; /* width of subsequent vertical line */
-       int               col; /* column number, starting from 0 */
-       int               flags;
-#define        TBL_CELL_TALIGN  (1 << 0) /* t, T */
-#define        TBL_CELL_BALIGN  (1 << 1) /* d, D */
-#define        TBL_CELL_BOLD    (1 << 2) /* fB, B, b */
-#define        TBL_CELL_ITALIC  (1 << 3) /* fI, I, i */
-#define        TBL_CELL_EQUAL   (1 << 4) /* e, E */
-#define        TBL_CELL_UP      (1 << 5) /* u, U */
-#define        TBL_CELL_WIGN    (1 << 6) /* z, Z */
-#define        TBL_CELL_WMAX    (1 << 7) /* x, X */
-       enum tbl_cellt    pos;
-};
-
-/*
- * A layout row.
- */
-struct tbl_row {
-       struct tbl_row   *next;
-       struct tbl_cell  *first;
-       struct tbl_cell  *last;
-       int               vert; /* width of left vertical line */
-};
-
-enum   tbl_datt {
-       TBL_DATA_NONE, /* has no data */
-       TBL_DATA_DATA, /* consists of data/string */
-       TBL_DATA_HORIZ, /* horizontal line */
-       TBL_DATA_DHORIZ, /* double-horizontal line */
-       TBL_DATA_NHORIZ, /* squeezed horizontal line */
-       TBL_DATA_NDHORIZ /* squeezed double-horizontal line */
-};
-
-/*
- * A cell within a row of data.  The "string" field contains the actual
- * string value that's in the cell.  The rest is layout.
- */
-struct tbl_dat {
-       struct tbl_cell  *layout; /* layout cell */
-       struct tbl_dat   *next;
-       char             *string; /* data (NULL if not TBL_DATA_DATA) */
-       int               spans; /* how many spans follow */
-       int               block; /* T{ text block T} */
-       enum tbl_datt     pos;
-};
-
-enum   tbl_spant {
-       TBL_SPAN_DATA, /* span consists of data */
-       TBL_SPAN_HORIZ, /* span is horizontal line */
-       TBL_SPAN_DHORIZ /* span is double horizontal line */
-};
-
-/*
- * A row of data in a table.
- */
-struct tbl_span {
-       struct tbl_opts  *opts;
-       struct tbl_row   *layout; /* layout row */
-       struct tbl_dat   *first;
-       struct tbl_dat   *last;
-       struct tbl_span  *prev;
-       struct tbl_span  *next;
-       int               line; /* parse line */
-       enum tbl_spant    pos;
-};
-
 enum   eqn_boxt {
        EQN_TEXT, /* text (number, variable, whatever) */
        EQN_SUBEXPR, /* nested `eqn' subexpression */
@@ -436,6 +334,7 @@ enum        mandoc_esc {
        ESCAPE_FONTITALIC, /* italic font mode */
        ESCAPE_FONTBI, /* bold italic font mode */
        ESCAPE_FONTROMAN, /* roman font mode */
+       ESCAPE_FONTCW, /* constant width font mode */
        ESCAPE_FONTPREV, /* previous font mode */
        ESCAPE_NUMBERED, /* a numbered glyph */
        ESCAPE_UNICODE, /* a unicode codepoint */