[BACK]Return to mandoc.h CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandoc.h between version 1.182 and 1.190

version 1.182, 2015/01/15 04:26:40 version 1.190, 2015/01/27 05:21:44
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
  *   *
  * Permission to use, copy, modify, and distribute this software for any   * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
Line 31  enum mandoclevel {
Line 31  enum mandoclevel {
         MANDOCLEVEL_RESERVED,          MANDOCLEVEL_RESERVED,
         MANDOCLEVEL_WARNING, /* warnings: syntax, whitespace, etc. */          MANDOCLEVEL_WARNING, /* warnings: syntax, whitespace, etc. */
         MANDOCLEVEL_ERROR, /* input has been thrown away */          MANDOCLEVEL_ERROR, /* input has been thrown away */
         MANDOCLEVEL_FATAL, /* input is borked */          MANDOCLEVEL_UNSUPP, /* input needs unimplemented features */
         MANDOCLEVEL_BADARG, /* bad argument in invocation */          MANDOCLEVEL_BADARG, /* bad argument in invocation */
         MANDOCLEVEL_SYSERR, /* system error */          MANDOCLEVEL_SYSERR, /* system error */
         MANDOCLEVEL_MAX          MANDOCLEVEL_MAX
Line 127  enum mandocerr {
Line 127  enum mandocerr {
         MANDOCERR_ESC_BAD, /* invalid escape sequence: esc */          MANDOCERR_ESC_BAD, /* invalid escape sequence: esc */
         MANDOCERR_STR_UNDEF, /* undefined string, using "": name */          MANDOCERR_STR_UNDEF, /* undefined string, using "": name */
   
           /* related to tables */
           MANDOCERR_TBLLAYOUT_SPAN, /* tbl line starts with span */
           MANDOCERR_TBLLAYOUT_DOWN, /* tbl column starts with span */
           MANDOCERR_TBLLAYOUT_VERT, /* skipping vertical bar in tbl layout */
   
         MANDOCERR_ERROR, /* ===== start of errors ===== */          MANDOCERR_ERROR, /* ===== start of errors ===== */
   
         /* related to equations */          /* related to equations */
Line 136  enum mandocerr {
Line 141  enum mandocerr {
         MANDOCERR_EQNEOF, /* unexpected end of equation */          MANDOCERR_EQNEOF, /* unexpected end of equation */
   
         /* related to tables */          /* related to tables */
         MANDOCERR_TBL, /* bad table syntax */          MANDOCERR_TBLOPT_ALPHA, /* non-alphabetic character in tbl options */
         MANDOCERR_TBLOPT, /* bad table option */          MANDOCERR_TBLOPT_BAD, /* skipping unknown tbl option: option */
         MANDOCERR_TBLLAYOUT, /* bad table layout */          MANDOCERR_TBLOPT_NOARG, /* missing tbl option argument */
         MANDOCERR_TBLNOLAYOUT, /* no table layout cells specified */          MANDOCERR_TBLOPT_ARGSZ, /* wrong tbl option argument size */
           MANDOCERR_TBLLAYOUT_NONE, /* empty tbl layout */
           MANDOCERR_TBLLAYOUT_CHAR, /* invalid character in tbl layout: char */
           MANDOCERR_TBLLAYOUT_PAR, /* unmatched parenthesis in tbl layout */
         MANDOCERR_TBLNODATA, /* no table data cells specified */          MANDOCERR_TBLNODATA, /* no table data cells specified */
         MANDOCERR_TBLIGNDATA, /* ignore data in cell */          MANDOCERR_TBLIGNDATA, /* ignore data in cell */
         MANDOCERR_TBLBLOCK, /* data block still open */          MANDOCERR_TBLBLOCK, /* data block still open */
         MANDOCERR_TBLEXTRADAT, /* ignoring extra data cells */          MANDOCERR_TBLEXTRADAT, /* ignoring extra data cells */
         MANDOCERR_TBLMACRO, /* ignoring macro in table: macro */  
   
         /* related to document structure and macros */          /* related to document structure and macros */
         MANDOCERR_FILE, /* cannot open file */          MANDOCERR_FILE, /* cannot open file */
         MANDOCERR_TOOLARGE, /* input too large */  
         MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */          MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */
         MANDOCERR_BADCHAR, /* skipping bad character: number */          MANDOCERR_CHAR_BAD, /* skipping bad character: number */
         MANDOCERR_MACRO, /* skipping unknown macro: macro */          MANDOCERR_MACRO, /* skipping unknown macro: macro */
           MANDOCERR_REQ_INSEC, /* skipping insecure request: request */
         MANDOCERR_IT_STRAY, /* skipping item outside list: It ... */          MANDOCERR_IT_STRAY, /* skipping item outside list: It ... */
         MANDOCERR_TA_STRAY, /* skipping column outside column list: Ta */          MANDOCERR_TA_STRAY, /* skipping column outside column list: Ta */
         MANDOCERR_BLK_NOTOPEN, /* skipping end of block that is not open */          MANDOCERR_BLK_NOTOPEN, /* skipping end of block that is not open */
           MANDOCERR_RE_NOTOPEN, /* fewer RS blocks open, skipping: RE arg */
         MANDOCERR_BLK_BROKEN, /* inserting missing end of block: macro ... */          MANDOCERR_BLK_BROKEN, /* inserting missing end of block: macro ... */
         MANDOCERR_BLK_NOEND, /* appending missing end of block: macro */          MANDOCERR_BLK_NOEND, /* appending missing end of block: macro */
   
Line 173  enum mandocerr {
Line 181  enum mandocerr {
         MANDOCERR_ARG_EXCESS, /* skipping excess arguments: macro ... args */          MANDOCERR_ARG_EXCESS, /* skipping excess arguments: macro ... args */
         MANDOCERR_DIVZERO, /* divide by zero */          MANDOCERR_DIVZERO, /* divide by zero */
   
           MANDOCERR_UNSUPP, /* ===== start of unsupported features ===== */
   
           MANDOCERR_TOOLARGE, /* input too large */
           MANDOCERR_CHAR_UNSUPP, /* unsupported control character: number */
           MANDOCERR_REQ_UNSUPP, /* unsupported roff request: request */
           MANDOCERR_TBLLAYOUT_MOD, /* unsupported tbl layout modifier: m */
           MANDOCERR_TBLMACRO, /* ignoring macro in table: macro */
           MANDOCERR_TBLEQN, /* eqn in tbl */
   
         MANDOCERR_MAX          MANDOCERR_MAX
 };  };
   
 struct  tbl_opts {  struct  tbl_opts {
         char              tab; /* cell-separator */          char              tab; /* cell-separator */
         char              decimal; /* decimal point */          char              decimal; /* decimal point */
         int               linesize;  
         int               opts;          int               opts;
 #define TBL_OPT_CENTRE   (1 << 0)  #define TBL_OPT_CENTRE   (1 << 0)
 #define TBL_OPT_EXPAND   (1 << 1)  #define TBL_OPT_EXPAND   (1 << 1)
Line 188  struct tbl_opts {
Line 204  struct tbl_opts {
 #define TBL_OPT_ALLBOX   (1 << 4)  #define TBL_OPT_ALLBOX   (1 << 4)
 #define TBL_OPT_NOKEEP   (1 << 5)  #define TBL_OPT_NOKEEP   (1 << 5)
 #define TBL_OPT_NOSPACE  (1 << 6)  #define TBL_OPT_NOSPACE  (1 << 6)
   #define TBL_OPT_NOWARN   (1 << 7)
         int               cols; /* number of columns */          int               cols; /* number of columns */
           int               lvert; /* width of left vertical line */
           int               rvert; /* width of right vertical line */
 };  };
   
 /*  /*
Line 198  struct tbl_opts {
Line 217  struct tbl_opts {
  */   */
 struct  tbl_head {  struct  tbl_head {
         int               ident; /* 0 <= unique id < cols */          int               ident; /* 0 <= unique id < cols */
         int               vert; /* width of preceding vertical line */  
         struct tbl_head  *next;          struct tbl_head  *next;
         struct tbl_head  *prev;          struct tbl_head  *prev;
 };  };
Line 221  enum tbl_cellt {
Line 239  enum tbl_cellt {
  */   */
 struct  tbl_cell {  struct  tbl_cell {
         struct tbl_cell  *next;          struct tbl_cell  *next;
         int               vert; /* width of preceding vertical line */          int               vert; /* width of subsequent vertical line */
         enum tbl_cellt    pos;          enum tbl_cellt    pos;
         size_t            spacing;          size_t            spacing;
         int               flags;          int               flags;
Line 243  struct tbl_row {
Line 261  struct tbl_row {
         struct tbl_row   *next;          struct tbl_row   *next;
         struct tbl_cell  *first;          struct tbl_cell  *first;
         struct tbl_cell  *last;          struct tbl_cell  *last;
         int               vert; /* trailing vertical line */          int               vert; /* width of left vertical line */
 };  };
   
 enum    tbl_datt {  enum    tbl_datt {
Line 282  struct tbl_span {
Line 300  struct tbl_span {
         struct tbl_row   *layout; /* layout row */          struct tbl_row   *layout; /* layout row */
         struct tbl_dat   *first;          struct tbl_dat   *first;
         struct tbl_dat   *last;          struct tbl_dat   *last;
           struct tbl_span  *prev;
           struct tbl_span  *next;
         int               line; /* parse line */          int               line; /* parse line */
         int               flags;          int               flags;
 #define TBL_SPAN_FIRST   (1 << 0)  #define TBL_SPAN_FIRST   (1 << 0)
 #define TBL_SPAN_LAST    (1 << 1)  #define TBL_SPAN_LAST    (1 << 1)
         enum tbl_spant    pos;          enum tbl_spant    pos;
         struct tbl_span  *next;  
 };  };
   
 enum    eqn_boxt {  enum    eqn_boxt {
Line 394  enum mandoc_esc {
Line 413  enum mandoc_esc {
         ESCAPE_NUMBERED, /* a numbered glyph */          ESCAPE_NUMBERED, /* a numbered glyph */
         ESCAPE_UNICODE, /* a unicode codepoint */          ESCAPE_UNICODE, /* a unicode codepoint */
         ESCAPE_NOSPACE, /* suppress space if the last on a line */          ESCAPE_NOSPACE, /* suppress space if the last on a line */
         ESCAPE_SKIPCHAR /* skip the next character */          ESCAPE_SKIPCHAR, /* skip the next character */
           ESCAPE_OVERSTRIKE /* overstrike all chars in the argument */
 };  };
   
 typedef void    (*mandocmsg)(enum mandocerr, enum mandoclevel,  typedef void    (*mandocmsg)(enum mandocerr, enum mandoclevel,
Legend:
Removed from v.1.182  
changed lines
  Added in v.1.190
CVSweb