fix order of messages

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index 93a8a285658f8fed7b6bbade1a785f7111242801..80a4f3c6ebd784ad0a89cadbc27328d78db9ff1b 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.222 2017/06/03 15:55:24 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.227 2017/06/10 01:48:53 schwarze Exp $ */

 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -48,7 +48,10 @@ enum mandocerr {
 
        MANDOCERR_MACRO_USELESS, /* useless macro: macro */
        MANDOCERR_BX, /* consider using OS macro: macro */
 
        MANDOCERR_MACRO_USELESS, /* useless macro: macro */
        MANDOCERR_BX, /* consider using OS macro: macro */

+       MANDOCERR_ER_ORDER, /* errnos out of order: Er ... */
+       MANDOCERR_ER_REP, /* duplicate errno: Er ... */

        MANDOCERR_ND_DOT, /* description line ends with a full stop */
        MANDOCERR_ND_DOT, /* description line ends with a full stop */

+       MANDOCERR_DELIM, /* no blank before trailing delimiter: macro ... */

 
        MANDOCERR_WARNING, /* ===== start of warnings ===== */
 
 
        MANDOCERR_WARNING, /* ===== start of warnings ===== */
 


@@ -133,6 +136,7 @@ enum        mandocerr {
        MANDOCERR_AT_BAD, /* unknown AT&T UNIX version: At version */
        MANDOCERR_FA_COMMA, /* comma in function argument: arg */
        MANDOCERR_FN_PAREN, /* parenthesis in function name: arg */
        MANDOCERR_AT_BAD, /* unknown AT&T UNIX version: At version */
        MANDOCERR_FA_COMMA, /* comma in function argument: arg */
        MANDOCERR_FN_PAREN, /* parenthesis in function name: arg */

+       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_FT_BAD, /* unknown font, skipping request: ft font */
        MANDOCERR_RS_BAD, /* invalid content in Rs block: macro */
        MANDOCERR_SM_BAD, /* invalid Boolean argument: macro arg */
        MANDOCERR_FT_BAD, /* unknown font, skipping request: ft font */


@@ -185,6 +189,7 @@ enum        mandocerr {
        MANDOCERR_BD_FILE, /* NOT IMPLEMENTED: Bd -file */
        MANDOCERR_BD_NOARG, /* skipping display without arguments: Bd */
        MANDOCERR_BL_NOTYPE, /* missing list type, using -item: Bl */
        MANDOCERR_BD_FILE, /* NOT IMPLEMENTED: Bd -file */
        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_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 */
        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 */


@@ -242,9 +247,10 @@ enum       tbl_cellt {
  */
 struct tbl_cell {
        struct tbl_cell  *next;
  */
 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               vert; /* width of subsequent vertical line */

-       enum tbl_cellt    pos;
-       size_t            spacing;

        int               col; /* column number, starting from 0 */
        int               flags;
 #define        TBL_CELL_TALIGN  (1 << 0) /* t, T */
        int               col; /* column number, starting from 0 */
        int               flags;
 #define        TBL_CELL_TALIGN  (1 << 0) /* t, T */


@@ -255,6 +261,7 @@ struct      tbl_cell {
 #define        TBL_CELL_UP      (1 << 5) /* u, U */
 #define        TBL_CELL_WIGN    (1 << 6) /* z, Z */
 #define        TBL_CELL_WMAX    (1 << 7) /* x, X */
 #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;

 };
 
 /*
 };
 
 /*


@@ -282,9 +289,10 @@ enum       tbl_datt {
  */
 struct tbl_dat {
        struct tbl_cell  *layout; /* layout cell */
  */
 struct tbl_dat {
        struct tbl_cell  *layout; /* layout cell */

-       int               spans; /* how many spans follow */

        struct tbl_dat   *next;
        char             *string; /* data (NULL if not TBL_DATA_DATA) */
        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_datt     pos;
 };