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

Diff for /mandoc/out.h between version 1.23 and 1.31

version 1.23, 2014/08/12 19:28:03 version 1.31, 2017/06/27 18:25:02
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  
   
 enum    roffscale {  enum    roffscale {
         SCALE_CM, /* centimeters (c) */          SCALE_CM, /* centimeters (c) */
Line 34  enum roffscale {
Line 33  enum roffscale {
 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 */
           size_t           spacing; /* spacing after the column */
           int              flags; /* layout flags, see tbl_cell */
 };  };
   
 struct  roffsu {  struct  roffsu {
Line 41  struct roffsu {
Line 42  struct roffsu {
         double            scale;          double            scale;
 };  };
   
   typedef size_t  (*tbl_sulen)(const struct roffsu *, void *);
 typedef size_t  (*tbl_strlen)(const char *, void *);  typedef size_t  (*tbl_strlen)(const char *, void *);
 typedef size_t  (*tbl_len)(size_t, 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 */
 };  };
   
 __BEGIN_DECLS  
   
 #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); } \
Line 63  __BEGIN_DECLS
Line 64  __BEGIN_DECLS
              (p)->scale = (v); } \               (p)->scale = (v); } \
         while (/* CONSTCOND */ 0)          while (/* CONSTCOND */ 0)
   
 int               a2roffsu(const char *, struct roffsu *, enum roffscale);  
 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, size_t);
Legend:
Removed from v.1.23  
changed lines
  Added in v.1.31
CVSweb