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

Diff for /mandoc/out.h between version 1.17 and 1.29

version 1.17, 2011/03/07 01:35:51 version 1.29, 2017/06/08 18:11:22
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
    * Copyright (c) 2014, 2017 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 14 
Line 15 
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */   */
 #ifndef OUT_H  
 #define OUT_H  
   
 __BEGIN_DECLS  enum    roffscale {
           SCALE_CM, /* centimeters (c) */
           SCALE_IN, /* inches (i) */
           SCALE_PC, /* pica (P) */
           SCALE_PT, /* points (p) */
           SCALE_EM, /* ems (m) */
           SCALE_MM, /* mini-ems (M) */
           SCALE_EN, /* ens (n) */
           SCALE_BU, /* default horizontal (u) */
           SCALE_VS, /* default vertical (v) */
           SCALE_FS, /* syn. for u (f) */
           SCALE_MAX
   };
   
 struct  roffcol {  struct  roffcol {
         size_t           width; /* width of cell */          size_t           width; /* width of cell */
         size_t           decimal; /* decimal position in cell */          size_t           decimal; /* decimal position in cell */
           int              flags; /* layout flags, see tbl_cell */
 };  };
   
 typedef size_t (*tbl_strlen)(const char *, void *);  struct  roffsu {
 typedef size_t (*tbl_len)(size_t, void *);          enum roffscale    unit;
           double            scale;
   };
   
   typedef size_t  (*tbl_sulen)(const struct roffsu *, void *);
   typedef size_t  (*tbl_strlen)(const char *, void *);
   typedef size_t  (*tbl_len)(size_t, void *);
   
 struct  rofftbl {  struct  rofftbl {
           tbl_sulen        sulen; /* calculate scaling unit length */
         tbl_strlen       slen; /* calculate string length */          tbl_strlen       slen; /* calculate string length */
         tbl_len          len; /* produce width of empty space */          tbl_len          len; /* produce width of empty space */
         struct roffcol  *cols; /* master column specifiers */          struct roffcol  *cols; /* master column specifiers */
         void            *arg; /* passed to slen and len */          void            *arg; /* passed to sulen, slen, and len */
 };  };
   
 enum    roffscale {  
         SCALE_CM,  
         SCALE_IN,  
         SCALE_PC,  
         SCALE_PT,  
         SCALE_EM,  
         SCALE_MM,  
         SCALE_EN,  
         SCALE_BU,  
         SCALE_VS,  
         SCALE_FS,  
         SCALE_MAX  
 };  
   
 enum    roffdeco {  
         DECO_NONE,  
         DECO_NUMBERED, /* numbered character */  
         DECO_SPECIAL, /* special character */  
         DECO_SSPECIAL, /* single-char special */  
         DECO_RESERVED, /* reserved word */  
         DECO_BOLD, /* bold font */  
         DECO_ITALIC, /* italic font */  
         DECO_ROMAN, /* "normal" undecorated font */  
         DECO_PREVIOUS, /* revert to previous font */  
         DECO_NOSPACE, /* suppress spacing */  
         DECO_FONT, /* font */  
         DECO_FFONT, /* font family */  
         DECO_MAX  
 };  
   
 struct  roffsu {  
         enum roffscale    unit;  
         double            scale;  
 };  
   
 #define SCALE_VS_INIT(p, v) \  #define SCALE_VS_INIT(p, v) \
         do { (p)->unit = SCALE_VS; \          do { (p)->unit = SCALE_VS; \
              (p)->scale = (v); } \               (p)->scale = (v); } \
         while (/* CONSTCOND */ 0)          while (/* CONSTCOND */ 0)
   
 #define SCALE_HS_INIT(p, v) \  #define SCALE_HS_INIT(p, v) \
         do { (p)->unit = SCALE_BU; \          do { (p)->unit = SCALE_EN; \
              (p)->scale = (v); } \               (p)->scale = (v); } \
         while (/* CONSTCOND */ 0)          while (/* CONSTCOND */ 0)
   
 int       a2roffsu(const char *, struct roffsu *, enum roffscale);  
 int       a2roffdeco(enum roffdeco *, const char **, size_t *);  
 void      time2a(time_t, char *, size_t);  
 void      tblcalc(struct rofftbl *tbl, const struct tbl_span *);  
   
 __END_DECLS  struct  tbl_span;
   
 #endif /*!OUT_H*/  const char       *a2roffsu(const char *, struct roffsu *, enum roffscale);
   void              tblcalc(struct rofftbl *tbl,
                           const struct tbl_span *, size_t);

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.29

CVSweb