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

Diff for /mandoc/term_ps.c between version 1.72 and 1.74

version 1.72, 2015/01/21 19:40:54 version 1.74, 2015/04/04 17:47:18
Line 7 
Line 7 
  * purpose with or without fee is hereby granted, provided that the above   * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.   * copyright notice and this permission notice appear in all copies.
  *   *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES   * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF   * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR   * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES   * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
Line 30 
Line 30 
 #include "mandoc_aux.h"  #include "mandoc_aux.h"
 #include "out.h"  #include "out.h"
 #include "term.h"  #include "term.h"
   #include "manconf.h"
 #include "main.h"  #include "main.h"
   
 /* These work the buffer used by the header and footer. */  /* These work the buffer used by the header and footer. */
Line 86  struct termp_ps {
Line 87  struct termp_ps {
         size_t            pdfobjsz;     /* size of pdfobjs */          size_t            pdfobjsz;     /* size of pdfobjs */
 };  };
   
 static  double            ps_hspan(const struct termp *,  static  int               ps_hspan(const struct termp *,
                                 const struct roffsu *);                                  const struct roffsu *);
 static  size_t            ps_width(const struct termp *, int);  static  size_t            ps_width(const struct termp *, int);
 static  void              ps_advance(struct termp *, size_t);  static  void              ps_advance(struct termp *, size_t);
Line 105  __attribute__((__format__ (__printf__, 2, 3)))
Line 106  __attribute__((__format__ (__printf__, 2, 3)))
 static  void              ps_printf(struct termp *, const char *, ...);  static  void              ps_printf(struct termp *, const char *, ...);
 static  void              ps_putchar(struct termp *, char);  static  void              ps_putchar(struct termp *, char);
 static  void              ps_setfont(struct termp *, enum termfont);  static  void              ps_setfont(struct termp *, enum termfont);
 static  void              ps_setwidth(struct termp *, int, size_t);  static  void              ps_setwidth(struct termp *, int, int);
 static  struct termp     *pspdf_alloc(const struct mchars *, char *);  static  struct termp     *pspdf_alloc(const struct mchars *,
                                   const struct manoutput *);
 static  void              pdf_obj(struct termp *, size_t);  static  void              pdf_obj(struct termp *, size_t);
   
 /*  /*
Line 507  static const struct font fonts[TERMFONT__MAX] = {
Line 509  static const struct font fonts[TERMFONT__MAX] = {
 };  };
   
 void *  void *
 pdf_alloc(const struct mchars *mchars, char *outopts)  pdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {  {
         struct termp    *p;          struct termp    *p;
   
Line 518  pdf_alloc(const struct mchars *mchars, char *outopts)
Line 520  pdf_alloc(const struct mchars *mchars, char *outopts)
 }  }
   
 void *  void *
 ps_alloc(const struct mchars *mchars, char *outopts)  ps_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {  {
         struct termp    *p;          struct termp    *p;
   
Line 529  ps_alloc(const struct mchars *mchars, char *outopts)
Line 531  ps_alloc(const struct mchars *mchars, char *outopts)
 }  }
   
 static struct termp *  static struct termp *
 pspdf_alloc(const struct mchars *mchars, char *outopts)  pspdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {  {
         struct termp    *p;          struct termp    *p;
         unsigned int     pagex, pagey;          unsigned int     pagex, pagey;
         size_t           marginx, marginy, lineheight;          size_t           marginx, marginy, lineheight;
         const char      *toks[2];  
         const char      *pp;          const char      *pp;
         char            *v;  
   
         p = mandoc_calloc(1, sizeof(struct termp));          p = mandoc_calloc(1, sizeof(struct termp));
         p->symtab = mchars;          p->symtab = mchars;
Line 555  pspdf_alloc(const struct mchars *mchars, char *outopts
Line 555  pspdf_alloc(const struct mchars *mchars, char *outopts
         p->setwidth = ps_setwidth;          p->setwidth = ps_setwidth;
         p->width = ps_width;          p->width = ps_width;
   
         toks[0] = "paper";  
         toks[1] = NULL;  
   
         pp = NULL;  
   
         while (outopts && *outopts)  
                 switch (getsubopt(&outopts, UNCONST(toks), &v)) {  
                 case 0:  
                         pp = v;  
                         break;  
                 default:  
                         break;  
                 }  
   
         /* Default to US letter (millimetres). */          /* Default to US letter (millimetres). */
   
         pagex = 216;          pagex = 216;
Line 581  pspdf_alloc(const struct mchars *mchars, char *outopts
Line 567  pspdf_alloc(const struct mchars *mchars, char *outopts
          * only happens once, I'm not terribly concerned.           * only happens once, I'm not terribly concerned.
          */           */
   
           pp = outopts->paper;
         if (pp && strcasecmp(pp, "letter")) {          if (pp && strcasecmp(pp, "letter")) {
                 if (0 == strcasecmp(pp, "a3")) {                  if (0 == strcasecmp(pp, "a3")) {
                         pagex = 297;                          pagex = 297;
Line 633  pspdf_alloc(const struct mchars *mchars, char *outopts
Line 620  pspdf_alloc(const struct mchars *mchars, char *outopts
 }  }
   
 static void  static void
 ps_setwidth(struct termp *p, int iop, size_t width)  ps_setwidth(struct termp *p, int iop, int width)
 {  {
         size_t   lastwidth;          size_t   lastwidth;
   
Line 641  ps_setwidth(struct termp *p, int iop, size_t width)
Line 628  ps_setwidth(struct termp *p, int iop, size_t width)
         if (iop > 0)          if (iop > 0)
                 p->ps->width += width;                  p->ps->width += width;
         else if (iop == 0)          else if (iop == 0)
                 p->ps->width = width ? width : p->ps->lastwidth;                  p->ps->width = width ? (size_t)width : p->ps->lastwidth;
         else if (p->ps->width > width)          else if (p->ps->width > (size_t)width)
                 p->ps->width -= width;                  p->ps->width -= width;
         else          else
                 p->ps->width = 0;                  p->ps->width = 0;
Line 1286  ps_width(const struct termp *p, int c)
Line 1273  ps_width(const struct termp *p, int c)
         return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);          return((size_t)fonts[(int)TERMFONT_NONE].gly[c].wx);
 }  }
   
 static double  static int
 ps_hspan(const struct termp *p, const struct roffsu *su)  ps_hspan(const struct termp *p, const struct roffsu *su)
 {  {
         double           r;          double           r;
Line 1338  ps_hspan(const struct termp *p, const struct roffsu *s
Line 1325  ps_hspan(const struct termp *p, const struct roffsu *s
                 break;                  break;
         }          }
   
         return(r);          return(r * 24.0);
 }  }
   
 static void  static void
Legend:
Removed from v.1.72  
changed lines
  Added in v.1.74
CVSweb