Print this page
Update to 1.12.3.

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/mandoc/term.h
          +++ new/usr/src/cmd/mandoc/term.h
   1      -/*      $Id: term.h,v 1.90 2011/12/04 23:10:52 schwarze Exp $ */
        1 +/*      $Id: term.h,v 1.97 2013/12/25 00:39:31 schwarze Exp $ */
   2    2  /*
   3    3   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
        4 + * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
   4    5   *
   5    6   * Permission to use, copy, modify, and distribute this software for any
   6    7   * purpose with or without fee is hereby granted, provided that the above
   7    8   * copyright notice and this permission notice appear in all copies.
   8    9   *
   9   10   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  10   11   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  11   12   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  12   13   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  13   14   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
↓ open down ↓ 16 lines elided ↑ open up ↑
  30   31  enum    termtype {
  31   32          TERMTYPE_CHAR,
  32   33          TERMTYPE_PS,
  33   34          TERMTYPE_PDF
  34   35  };
  35   36  
  36   37  enum    termfont {
  37   38          TERMFONT_NONE = 0,
  38   39          TERMFONT_BOLD,
  39   40          TERMFONT_UNDER,
       41 +        TERMFONT_BI,
  40   42          TERMFONT__MAX
  41   43  };
  42   44  
  43   45  #define TERM_MAXMARGIN    100000 /* FIXME */
  44   46  
  45   47  typedef void    (*term_margin)(struct termp *, const void *);
  46   48  
  47   49  struct  termp_tbl {
  48   50          int               width;        /* width in fixed chars */
  49   51          int               decimal;      /* decimal point position */
  50   52  };
  51   53  
  52   54  struct  termp {
  53   55          enum termtype     type;
  54   56          struct rofftbl    tbl;          /* table configuration */
  55   57          int               mdocstyle;    /* imitate mdoc(7) output */
  56   58          size_t            defindent;    /* Default indent for text. */
  57   59          size_t            defrmargin;   /* Right margin of the device. */
  58   60          size_t            rmargin;      /* Current right margin. */
  59   61          size_t            maxrmargin;   /* Max right margin. */
  60      -        int               maxcols;      /* Max size of buf. */
       62 +        size_t            maxcols;      /* Max size of buf. */
  61   63          size_t            offset;       /* Margin offest. */
  62   64          size_t            tabwidth;     /* Distance of tab positions. */
  63      -        int               col;          /* Bytes in buf. */
       65 +        size_t            col;          /* Bytes in buf. */
  64   66          size_t            viscol;       /* Chars on current line. */
       67 +        size_t            trailspace;   /* See termp_flushln(). */
  65   68          int               overstep;     /* See termp_flushln(). */
       69 +        int               skipvsp;      /* Vertical space to skip. */
  66   70          int               flags;
  67   71  #define TERMP_SENTENCE   (1 << 1)       /* Space before a sentence. */
  68   72  #define TERMP_NOSPACE    (1 << 2)       /* No space before words. */
  69      -#define TERMP_NOBREAK    (1 << 4)       /* See term_flushln(). */
  70      -#define TERMP_IGNDELIM   (1 << 6)       /* Delims like regulars. */
  71      -#define TERMP_NONOSPACE  (1 << 7)       /* No space (no autounset). */
  72      -#define TERMP_DANGLE     (1 << 8)       /* See term_flushln(). */
  73      -#define TERMP_HANG       (1 << 9)       /* See term_flushln(). */
  74      -#define TERMP_TWOSPACE   (1 << 10)      /* See term_flushln(). */
       73 +#define TERMP_NONOSPACE  (1 << 3)       /* No space (no autounset). */
       74 +#define TERMP_NBRWORD    (1 << 4)       /* Make next word nonbreaking. */
       75 +#define TERMP_KEEP       (1 << 5)       /* Keep words together. */
       76 +#define TERMP_PREKEEP    (1 << 6)       /* ...starting with the next one. */
       77 +#define TERMP_SKIPCHAR   (1 << 7)       /* Skip the next character. */
       78 +#define TERMP_NOBREAK    (1 << 8)       /* See term_flushln(). */
       79 +#define TERMP_DANGLE     (1 << 9)       /* See term_flushln(). */
       80 +#define TERMP_HANG       (1 << 10)      /* See term_flushln(). */
  75   81  #define TERMP_NOSPLIT    (1 << 11)      /* See termp_an_pre/post(). */
  76   82  #define TERMP_SPLIT      (1 << 12)      /* See termp_an_pre/post(). */
  77   83  #define TERMP_ANPREC     (1 << 13)      /* See termp_an_pre(). */
  78      -#define TERMP_KEEP       (1 << 14)      /* Keep words together. */
  79      -#define TERMP_PREKEEP    (1 << 15)      /* ...starting with the next one. */
  80   84          int              *buf;          /* Output buffer. */
  81   85          enum termenc      enc;          /* Type of encoding. */
  82   86          struct mchars    *symtab;       /* Encoded-symbol table. */
  83   87          enum termfont     fontl;        /* Last font set. */
  84   88          enum termfont     fontq[10];    /* Symmetric fonts. */
  85   89          int               fonti;        /* Index of font stack. */
  86   90          term_margin       headf;        /* invoked to print head */
  87   91          term_margin       footf;        /* invoked to print foot */
  88   92          void            (*letter)(struct termp *, int);
  89   93          void            (*begin)(struct termp *);
↓ open down ↓ 39 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX