[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.80 and 1.87

version 1.80, 2015/12/23 20:50:13 version 1.87, 2017/10/25 20:48:48
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, 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 98  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, int);  static  void              ps_setwidth(struct termp *, int, int);
Line 540  pspdf_alloc(const struct manoutput *outopts)
Line 538  pspdf_alloc(const struct manoutput *outopts)
         size_t           marginx, marginy, lineheight;          size_t           marginx, marginy, lineheight;
         const char      *pp;          const char      *pp;
   
         p = mandoc_calloc(1, sizeof(struct termp));          p = mandoc_calloc(1, sizeof(*p));
           p->tcol = p->tcols = mandoc_calloc(1, sizeof(*p->tcol));
           p->maxtcol = 1;
   
         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(*p->fontq));
         p->fontq[0] = p->fontl = TERMFONT_NONE;          p->fontq[0] = p->fontl = TERMFONT_NONE;
         p->ps = mandoc_calloc(1, sizeof(struct termp_ps));          p->ps = mandoc_calloc(1, sizeof(*p->ps));
   
         p->advance = ps_advance;          p->advance = ps_advance;
         p->begin = ps_begin;          p->begin = ps_begin;
Line 741  ps_closepage(struct termp *p)
Line 742  ps_closepage(struct termp *p)
         ps_printf(p, "%s", p->ps->psmarg);          ps_printf(p, "%s", p->ps->psmarg);
   
         if (TERMTYPE_PS != p->type) {          if (TERMTYPE_PS != p->type) {
                 ps_printf(p, "ET\n");  
   
                 len = p->ps->pdfbytes - p->ps->pdflastpg;                  len = p->ps->pdfbytes - p->ps->pdflastpg;
                 base = p->ps->pages * 4 + p->ps->pdfbody;                  base = p->ps->pages * 4 + p->ps->pdfbody;
   
Line 758  ps_closepage(struct termp *p)
Line 757  ps_closepage(struct termp *p)
                 ps_printf(p, "/Font <<\n");                  ps_printf(p, "/Font <<\n");
                 for (i = 0; i < (int)TERMFONT__MAX; i++)                  for (i = 0; i < (int)TERMFONT__MAX; i++)
                         ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);                          ps_printf(p, "/F%d %d 0 R\n", i, 3 + i);
                 ps_printf(p, ">>\n>>\n");                  ps_printf(p, ">>\n>>\nendobj\n");
   
                 /* Page node. */                  /* Page node. */
                 pdf_obj(p, base + 3);                  pdf_obj(p, base + 3);
Line 782  ps_end(struct termp *p)
Line 781  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 820  ps_end(struct termp *p)
Line 822  ps_end(struct termp *p)
         ps_printf(p, "<<\n");          ps_printf(p, "<<\n");
         ps_printf(p, "/Type /Catalog\n");          ps_printf(p, "/Type /Catalog\n");
         ps_printf(p, "/Pages 2 0 R\n");          ps_printf(p, "/Pages 2 0 R\n");
         ps_printf(p, ">>\n");          ps_printf(p, ">>\nendobj\n");
         xref = p->ps->pdfbytes;          xref = p->ps->pdfbytes;
         ps_printf(p, "xref\n");          ps_printf(p, "xref\n");
         ps_printf(p, "0 %zu\n", base + 1);          ps_printf(p, "0 %zu\n", base + 1);
Line 914  ps_begin(struct termp *p)
Line 916  ps_begin(struct termp *p)
                         ps_printf(p, "/Subtype /Type1\n");                          ps_printf(p, "/Subtype /Type1\n");
                         ps_printf(p, "/Name /F%d\n", i);                          ps_printf(p, "/Name /F%d\n", i);
                         ps_printf(p, "/BaseFont /%s\n", fonts[i].name);                          ps_printf(p, "/BaseFont /%s\n", fonts[i].name);
                         ps_printf(p, ">>\n");                          ps_printf(p, ">>\nendobj\n");
                 }                  }
         }          }
   
Line 1025  ps_pclose(struct termp *p)
Line 1027  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 1123  ps_letter(struct termp *p, int arg)
Line 1139  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 1192  ps_advance(struct termp *p, size_t len)
Line 1177  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 1202  ps_endline(struct termp *p)
Line 1188  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 1233  ps_endline(struct termp *p)
Line 1220  ps_endline(struct termp *p)
         }          }
   
         ps_closepage(p);          ps_closepage(p);
   
           p->tcol->offset -= p->ti;
           p->ti = 0;
 }  }
   
 static void  static void
Legend:
Removed from v.1.80  
changed lines
  Added in v.1.87
CVSweb