[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.67 and 1.74

version 1.67, 2014/10/27 20:41:58 version 1.74, 2015/04/04 17:47:18
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2014, 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
  * 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 27 
Line 27 
 #include <string.h>  #include <string.h>
 #include <unistd.h>  #include <unistd.h>
   
 #include "mandoc.h"  
 #include "mandoc_aux.h"  #include "mandoc_aux.h"
 #include "out.h"  #include "out.h"
 #include "main.h"  
 #include "term.h"  #include "term.h"
   #include "manconf.h"
   #include "main.h"
   
 /* These work the buffer used by the header and footer. */  /* These work the buffer used by the header and footer. */
 #define PS_BUFSLOP        128  #define PS_BUFSLOP        128
Line 61  struct termp_ps {
Line 61  struct termp_ps {
 #define PS_NEWPAGE       (1 << 2)       /* new page, no words yet */  #define PS_NEWPAGE       (1 << 2)       /* new page, no words yet */
 #define PS_BACKSP        (1 << 3)       /* last character was backspace */  #define PS_BACKSP        (1 << 3)       /* last character was backspace */
         size_t            pscol;        /* visible column (AFM units) */          size_t            pscol;        /* visible column (AFM units) */
           size_t            pscolnext;    /* used for overstrike */
         size_t            psrow;        /* visible row (AFM units) */          size_t            psrow;        /* visible row (AFM units) */
         char             *psmarg;       /* margin buf */          char             *psmarg;       /* margin buf */
         size_t            psmargsz;     /* margin buf size */          size_t            psmargsz;     /* margin buf size */
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(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(char *outopts)  pdf_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {  {
         struct termp    *p;          struct termp    *p;
   
         if (NULL != (p = pspdf_alloc(outopts)))          if (NULL != (p = pspdf_alloc(mchars, outopts)))
                 p->type = TERMTYPE_PDF;                  p->type = TERMTYPE_PDF;
   
         return(p);          return(p);
 }  }
   
 void *  void *
 ps_alloc(char *outopts)  ps_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {  {
         struct termp    *p;          struct termp    *p;
   
         if (NULL != (p = pspdf_alloc(outopts)))          if (NULL != (p = pspdf_alloc(mchars, outopts)))
                 p->type = TERMTYPE_PS;                  p->type = TERMTYPE_PS;
   
         return(p);          return(p);
 }  }
   
 static struct termp *  static struct termp *
 pspdf_alloc(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->enc = TERMENC_ASCII;          p->enc = TERMENC_ASCII;
           p->fontq = mandoc_reallocarray(NULL,
               (p->fontsz = 8), sizeof(enum termfont));
           p->fontq[0] = p->fontl = TERMFONT_NONE;
         p->ps = mandoc_calloc(1, sizeof(struct termp_ps));          p->ps = mandoc_calloc(1, sizeof(struct termp_ps));
   
         p->advance = ps_advance;          p->advance = ps_advance;
Line 551  pspdf_alloc(char *outopts)
Line 555  pspdf_alloc(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 577  pspdf_alloc(char *outopts)
Line 567  pspdf_alloc(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 629  pspdf_alloc(char *outopts)
Line 620  pspdf_alloc(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;
   
         lastwidth = p->ps->width;          lastwidth = p->ps->width;
         if (0 < iop)          if (iop > 0)
                 p->ps->width += width;                  p->ps->width += width;
         else if (0 > iop)          else if (iop == 0)
                   p->ps->width = width ? (size_t)width : p->ps->lastwidth;
           else if (p->ps->width > (size_t)width)
                 p->ps->width -= width;                  p->ps->width -= width;
         else          else
                 p->ps->width = width ? width : p->ps->lastwidth;                  p->ps->width = 0;
         p->ps->lastwidth = lastwidth;          p->ps->lastwidth = lastwidth;
 }  }
   
Line 1067  ps_fclose(struct termp *p)
Line 1060  ps_fclose(struct termp *p)
 static void  static void
 ps_letter(struct termp *p, int arg)  ps_letter(struct termp *p, int arg)
 {  {
         size_t          savecol;          size_t          savecol, wx;
         char            c;          char            c;
   
         c = arg >= 128 || arg <= 0 ? '?' : arg;          c = arg >= 128 || arg <= 0 ? '?' : arg;
Line 1139  ps_letter(struct termp *p, int arg)
Line 1132  ps_letter(struct termp *p, int arg)
                         ps_setfont(p, p->ps->nextf);                          ps_setfont(p, p->ps->nextf);
                 }                  }
                 p->ps->nextf = TERMFONT_NONE;                  p->ps->nextf = TERMFONT_NONE;
   
                   /*
                    * For an overstrike, if a previous character
                    * was wider, advance to center the new one.
                    */
   
                   if (p->ps->pscolnext) {
                           wx = fonts[p->ps->lastf].gly[(int)p->ps->last-32].wx;
                           if (p->ps->pscol + wx < p->ps->pscolnext)
                                   p->ps->pscol = (p->ps->pscol +
                                       p->ps->pscolnext - wx) / 2;
                   }
   
                 ps_pletter(p, p->ps->last);                  ps_pletter(p, p->ps->last);
   
                   /*
                    * For an overstrike, if a previous character
                    * was wider, advance to the end of the old one.
                    */
   
                   if (p->ps->pscol < p->ps->pscolnext) {
                           ps_pclose(p);
                           p->ps->pscol = p->ps->pscolnext;
                   }
         }          }
   
         /*          /*
Line 1153  ps_letter(struct termp *p, int arg)
Line 1169  ps_letter(struct termp *p, int arg)
   
         /*          /*
          * For an overstrike, back up to the previous position.           * For an overstrike, back up to the previous position.
            * If the previous character is wider than any it overstrikes,
            * remember the current position, because it might also be
            * wider than all that will overstrike it.
          */           */
   
         if (savecol != SIZE_MAX) {          if (savecol != SIZE_MAX) {
                   if (p->ps->pscolnext < p->ps->pscol)
                           p->ps->pscolnext = p->ps->pscol;
                 ps_pclose(p);                  ps_pclose(p);
                 p->ps->pscol = savecol;                  p->ps->pscol = savecol;
                 p->ps->flags &= ~PS_BACKSP;                  p->ps->flags &= ~PS_BACKSP;
         }          } else
                   p->ps->pscolnext = 0;
 }  }
   
 static void  static void
Line 1251  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 1303  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.67  
changed lines
  Added in v.1.74
CVSweb