[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.83

version 1.72, 2015/01/21 19:40:54 version 1.83, 2017/02/17 14:31:52
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, 2015 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2014, 2015, 2016 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 20 
Line 20 
 #include <sys/types.h>  #include <sys/types.h>
   
 #include <assert.h>  #include <assert.h>
   #if HAVE_ERR
   #include <err.h>
   #endif
 #include <stdarg.h>  #include <stdarg.h>
 #include <stdint.h>  #include <stdint.h>
 #include <stdio.h>  #include <stdio.h>
Line 30 
Line 33 
 #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 90  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 94  static void    ps_begin(struct termp *);
Line 98  static void    ps_begin(struct termp *);
 static  void              ps_closepage(struct termp *);  static  void              ps_closepage(struct termp *);
 static  void              ps_end(struct termp *);  static  void              ps_end(struct termp *);
 static  void              ps_endline(struct termp *);  static  void              ps_endline(struct termp *);
 static  void              ps_fclose(struct termp *);  
 static  void              ps_growbuf(struct termp *, size_t);  static  void              ps_growbuf(struct termp *, size_t);
 static  void              ps_letter(struct termp *, int);  static  void              ps_letter(struct termp *, int);
 static  void              ps_pclose(struct termp *);  static  void              ps_pclose(struct termp *);
   static  void              ps_plast(struct termp *);
 static  void              ps_pletter(struct termp *, int);  static  void              ps_pletter(struct termp *, int);
 #if __GNUC__ - 0 >= 4  static  void              ps_printf(struct termp *, const char *, ...)
 __attribute__((__format__ (__printf__, 2, 3)))                                  __attribute__((__format__ (__printf__, 2, 3)));
 #endif  
 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 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 manoutput *outopts)
 {  {
         struct termp    *p;          struct termp    *p;
   
         if (NULL != (p = pspdf_alloc(mchars, outopts)))          if (NULL != (p = pspdf_alloc(outopts)))
                 p->type = TERMTYPE_PDF;                  p->type = TERMTYPE_PDF;
   
         return(p);          return p;
 }  }
   
 void *  void *
 ps_alloc(const struct mchars *mchars, char *outopts)  ps_alloc(const struct manoutput *outopts)
 {  {
         struct termp    *p;          struct termp    *p;
   
         if (NULL != (p = pspdf_alloc(mchars, outopts)))          if (NULL != (p = pspdf_alloc(outopts)))
                 p->type = TERMTYPE_PS;                  p->type = TERMTYPE_PS;
   
         return(p);          return p;
 }  }
   
 static struct termp *  static struct termp *
 pspdf_alloc(const struct mchars *mchars, char *outopts)  pspdf_alloc(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->fontq = mandoc_reallocarray(NULL,
             (p->fontsz = 8), sizeof(enum termfont));              (p->fontsz = 8), sizeof(enum termfont));
Line 555  pspdf_alloc(const struct mchars *mchars, char *outopts
Line 554  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 566  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 595  pspdf_alloc(const struct mchars *mchars, char *outopts
Line 581  pspdf_alloc(const struct mchars *mchars, char *outopts
                         pagex = 216;                          pagex = 216;
                         pagey = 356;                          pagey = 356;
                 } else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey))                  } else if (2 != sscanf(pp, "%ux%u", &pagex, &pagey))
                         fprintf(stderr, "%s: Unknown paper\n", pp);                          warnx("%s: Unknown paper", pp);
         }          }
   
         /*          /*
Line 629  pspdf_alloc(const struct mchars *mchars, char *outopts
Line 615  pspdf_alloc(const struct mchars *mchars, char *outopts
         p->ps->lineheight = lineheight;          p->ps->lineheight = lineheight;
   
         p->defrmargin = pagex - (marginx * 2);          p->defrmargin = pagex - (marginx * 2);
         return(p);          return p;
 }  }
   
 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 627  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 656  pspdf_free(void *arg)
Line 642  pspdf_free(void *arg)
   
         p = (struct termp *)arg;          p = (struct termp *)arg;
   
         if (p->ps->psmarg)          free(p->ps->psmarg);
                 free(p->ps->psmarg);          free(p->ps->pdfobjs);
         if (p->ps->pdfobjs)  
                 free(p->ps->pdfobjs);  
   
         free(p->ps);          free(p->ps);
         term_free(p);          term_free(p);
Line 796  ps_end(struct termp *p)
Line 780  ps_end(struct termp *p)
 {  {
         size_t           i, xref, base;          size_t           i, xref, base;
   
           ps_plast(p);
           ps_pclose(p);
   
         /*          /*
          * At the end of the file, do one last showpage.  This is the           * At the end of the file, do one last showpage.  This is the
          * same behaviour as groff(1) and works for multiple pages as           * same behaviour as groff(1) and works for multiple pages as
Line 998  ps_pletter(struct termp *p, int c)
Line 985  ps_pletter(struct termp *p, int c)
   
         switch (c) {          switch (c) {
         case '(':          case '(':
                 /* FALLTHROUGH */  
         case ')':          case ')':
                 /* FALLTHROUGH */  
         case '\\':          case '\\':
                 ps_putchar(p, '\\');                  ps_putchar(p, '\\');
                 break;                  break;
Line 1041  ps_pclose(struct termp *p)
Line 1026  ps_pclose(struct termp *p)
         p->ps->flags &= ~PS_INLINE;          p->ps->flags &= ~PS_INLINE;
 }  }
   
   /* If we have a `last' char that wasn't printed yet, print it now. */
 static void  static void
 ps_fclose(struct termp *p)  ps_plast(struct termp *p)
 {  {
           size_t   wx;
   
           if (p->ps->last == '\0')
                   return;
   
           /* Check the font mode; open a new scope if it doesn't match. */
   
           if (p->ps->nextf != p->ps->lastf) {
                   ps_pclose(p);
                   ps_setfont(p, p->ps->nextf);
           }
           p->ps->nextf = TERMFONT_NONE;
   
         /*          /*
          * Strong closure: if we have a last-char, spit it out after           * For an overstrike, if a previous character
          * checking that we're in the right font mode.  This will of           * was wider, advance to center the new one.
          * course open a new scope, if applicable.  
          *  
          * Following this, close out any scope that's open.  
          */           */
   
         if (p->ps->last != '\0') {          if (p->ps->pscolnext) {
                 assert( ! (p->ps->flags & PS_BACKSP));                  wx = fonts[p->ps->lastf].gly[(int)p->ps->last-32].wx;
                 if (p->ps->nextf != p->ps->lastf) {                  if (p->ps->pscol + wx < p->ps->pscolnext)
                         ps_pclose(p);                          p->ps->pscol = (p->ps->pscol +
                         ps_setfont(p, p->ps->nextf);                              p->ps->pscolnext - wx) / 2;
                 }  
                 p->ps->nextf = TERMFONT_NONE;  
                 ps_pletter(p, p->ps->last);  
                 p->ps->last = '\0';  
         }          }
   
         if ( ! (PS_INLINE & p->ps->flags))          ps_pletter(p, p->ps->last);
                 return;          p->ps->last = '\0';
   
         ps_pclose(p);          /*
            * 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;
           }
 }  }
   
 static void  static void
 ps_letter(struct termp *p, int arg)  ps_letter(struct termp *p, int arg)
 {  {
         size_t          savecol, wx;          size_t          savecol;
         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 1138  ps_letter(struct termp *p, int arg)
          * Use them and print it.           * Use them and print it.
          */           */
   
         if (p->ps->last != '\0') {          ps_plast(p);
                 if (p->ps->nextf != p->ps->lastf) {  
                         ps_pclose(p);  
                         ps_setfont(p, p->ps->nextf);  
                 }  
                 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);  
   
                 /*  
                  * 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;  
                 }  
         }  
   
         /*          /*
          * Do not print the current character yet because font           * Do not print the current character yet because font
          * instructions might follow; only remember it.           * instructions might follow; only remember the character.
          * For the first character, nothing else is done.           * It will get printed later from ps_plast().
          * The final character will get printed from ps_fclose().  
          */           */
   
         p->ps->last = c;          p->ps->last = c;
Line 1208  ps_advance(struct termp *p, size_t len)
Line 1176  ps_advance(struct termp *p, size_t len)
          * and readjust our column settings.           * and readjust our column settings.
          */           */
   
         ps_fclose(p);          ps_plast(p);
           ps_pclose(p);
         p->ps->pscol += len;          p->ps->pscol += len;
 }  }
   
Line 1218  ps_endline(struct termp *p)
Line 1187  ps_endline(struct termp *p)
   
         /* Close out any scopes we have open: we're at eoln. */          /* Close out any scopes we have open: we're at eoln. */
   
         ps_fclose(p);          ps_plast(p);
           ps_pclose(p);
   
         /*          /*
          * If we're in the margin, don't try to recalculate our current           * If we're in the margin, don't try to recalculate our current
Line 1283  ps_width(const struct termp *p, int c)
Line 1253  ps_width(const struct termp *p, int c)
         else          else
                 c -= 32;                  c -= 32;
   
         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 1308  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.83
CVSweb