[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.27 and 1.31

version 1.27, 2010/07/04 10:53:04 version 1.31, 2010/07/04 20:06:59
Line 33 
Line 33 
 #include "main.h"  #include "main.h"
 #include "term.h"  #include "term.h"
   
 #define MINMARGIN_MM    20      /* Minimum 2cm margins. */  
 #define MINMARGIN_PNT   56.68  
 #define DEFPAGEX_MM     216     /* Default page size is US-letter. */  
 #define DEFPAGEY_MM     279  
   
 /* Convert PostScript point "x" to an AFM unit. */  /* Convert PostScript point "x" to an AFM unit. */
 #define PNT2AFM(p, x) /* LINTED */ \  #define PNT2AFM(p, x) /* LINTED */ \
         (size_t)((double)(x) * (1000.0 / (double)(p)->engine.ps.scale))          (size_t)((double)(x) * (1000.0 / (double)(p)->engine.ps.scale))
Line 393  void *
Line 388  void *
 ps_alloc(char *outopts)  ps_alloc(char *outopts)
 {  {
         struct termp    *p;          struct termp    *p;
         size_t           pagex, pagey, margin, lineheight, m1, m2;          size_t           pagex, pagey, marginx, marginy, lineheight;
         const char      *toks[2];          const char      *toks[2];
         const char      *pp;          const char      *pp;
         char            *v;          char            *v;
Line 426  ps_alloc(char *outopts)
Line 421  ps_alloc(char *outopts)
   
         /* Default to US letter (millimetres). */          /* Default to US letter (millimetres). */
   
         pagex = DEFPAGEX_MM;          pagex = 216;
         pagey = DEFPAGEY_MM;          pagey = 279;
   
         /*          /*
          * The ISO-269 paper sizes can be calculated automatically, but           * The ISO-269 paper sizes can be calculated automatically, but
Line 454  ps_alloc(char *outopts)
Line 449  ps_alloc(char *outopts)
         } else if (NULL == pp)          } else if (NULL == pp)
                 pp = "letter";                  pp = "letter";
   
         /* Enforce minimum page size >= (2 times) min-margin. */  
   
         if ((2 * MINMARGIN_MM) >= pagex) {  
                 fprintf(stderr, "%s: Insufficient page width\n", pp);  
                 pagex = DEFPAGEX_MM;  
         } else if ((2 * MINMARGIN_MM >= pagey)) {  
                 fprintf(stderr, "%s: Insufficient page length\n", pp);  
                 pagey = DEFPAGEY_MM;  
         }  
   
         /*          /*
          * This MUST be defined before any PNT2AFM or AFM2PNT           * This MUST be defined before any PNT2AFM or AFM2PNT
          * calculations occur.           * calculations occur.
Line 476  ps_alloc(char *outopts)
Line 461  ps_alloc(char *outopts)
         pagex = PNT2AFM(p, ((double)pagex * 2.834));          pagex = PNT2AFM(p, ((double)pagex * 2.834));
         pagey = PNT2AFM(p, ((double)pagey * 2.834));          pagey = PNT2AFM(p, ((double)pagey * 2.834));
   
         /*          /* Margins are 1/9 the page x and y. */
          * Calculate margins.  First get the minimum text width: either  
          * page minus margins or width of 65 'm' characters.  Set total  
          * margins to page size minus text width.  
          */  
   
         m1 = ps_width(p, 'm') * 65;          marginx = /* LINTED */
         m2 = pagex - (2 * PNT2AFM(p, MINMARGIN_PNT));                  (size_t)((double)pagex / 9.0);
         margin = (pagex - (m1 < m2 ? m1 : m2)) / 2;          marginy = /* LINTED */
                   (size_t)((double)pagey / 9.0);
   
         lineheight = PNT2AFM(p, 16);          /* Line-height is 1.4em. */
   
           lineheight = PNT2AFM(p, ((double)p->engine.ps.scale * 1.4));
   
         p->engine.ps.width = pagex;          p->engine.ps.width = pagex;
         p->engine.ps.height = pagey;          p->engine.ps.height = pagey;
         p->engine.ps.header = pagey - (margin / 2) - (lineheight / 2);          p->engine.ps.header = pagey - (marginy / 2) - (lineheight / 2);
         p->engine.ps.top = pagey - margin;          p->engine.ps.top = pagey - marginy;
         p->engine.ps.footer = (margin / 2) - (lineheight / 2);          p->engine.ps.footer = (marginy / 2) - (lineheight / 2);
         p->engine.ps.bottom = margin;          p->engine.ps.bottom = marginy;
         p->engine.ps.left = margin;          p->engine.ps.left = marginx;
         p->engine.ps.lineheight = lineheight;          p->engine.ps.lineheight = lineheight;
   
         p->defrmargin = pagex - (margin * 2);          p->defrmargin = pagex - (marginx * 2);
         return(p);          return(p);
 }  }
   
Line 530  ps_printf(struct termp *p, const char *fmt, ...)
Line 514  ps_printf(struct termp *p, const char *fmt, ...)
          * into our growable margin buffer.           * into our growable margin buffer.
          */           */
   
         if ( ! (PS_MARGINS & p->engine.ps.psstate)) {          if ( ! (PS_MARGINS & p->engine.ps.flags)) {
                 vprintf(fmt, ap);                  vprintf(fmt, ap);
                 va_end(ap);                  va_end(ap);
                 return;                  return;
Line 559  ps_putchar(struct termp *p, char c)
Line 543  ps_putchar(struct termp *p, char c)
   
         /* See ps_printf(). */          /* See ps_printf(). */
   
         if ( ! (PS_MARGINS & p->engine.ps.psstate)) {          if ( ! (PS_MARGINS & p->engine.ps.flags)) {
                 putchar(c);                  putchar(c);
                 return;                  return;
         }          }
Line 583  ps_end(struct termp *p)
Line 567  ps_end(struct termp *p)
          * well as just one.           * well as just one.
          */           */
   
         assert(0 == p->engine.ps.psstate);          if ( ! (PS_NEWPAGE & p->engine.ps.flags)) {
         assert('\0' == p->engine.ps.last);                  assert(0 == p->engine.ps.flags);
         assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);                  assert('\0' == p->engine.ps.last);
         printf("%s", p->engine.ps.psmarg);                  assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
         p->engine.ps.pages++;                  printf("%s", p->engine.ps.psmarg);
         printf("showpage\n");                  p->engine.ps.pages++;
                   printf("showpage\n");
           }
   
         printf("%%%%Trailer\n");          printf("%%%%Trailer\n");
         printf("%%%%Pages: %zu\n", p->engine.ps.pages);          printf("%%%%Pages: %zu\n", p->engine.ps.pages);
Line 613  ps_begin(struct termp *p)
Line 599  ps_begin(struct termp *p)
         }          }
   
         p->engine.ps.psmargcur = 0;          p->engine.ps.psmargcur = 0;
         p->engine.ps.psstate = PS_MARGINS;          p->engine.ps.flags = PS_MARGINS;
         p->engine.ps.pscol = p->engine.ps.left;          p->engine.ps.pscol = p->engine.ps.left;
         p->engine.ps.psrow = p->engine.ps.header;          p->engine.ps.psrow = p->engine.ps.header;
   
Line 628  ps_begin(struct termp *p)
Line 614  ps_begin(struct termp *p)
         (*p->footf)(p, p->argf);          (*p->footf)(p, p->argf);
         (*p->endline)(p);          (*p->endline)(p);
   
         p->engine.ps.psstate &= ~PS_MARGINS;          p->engine.ps.flags &= ~PS_MARGINS;
   
         assert(0 == p->engine.ps.psstate);          assert(0 == p->engine.ps.flags);
         assert(p->engine.ps.psmarg);          assert(p->engine.ps.psmarg);
         assert('\0' != p->engine.ps.psmarg[0]);          assert('\0' != p->engine.ps.psmarg[0]);
   
Line 663  ps_begin(struct termp *p)
Line 649  ps_begin(struct termp *p)
         ps_setfont(p, TERMFONT_NONE);          ps_setfont(p, TERMFONT_NONE);
         p->engine.ps.pscol = p->engine.ps.left;          p->engine.ps.pscol = p->engine.ps.left;
         p->engine.ps.psrow = p->engine.ps.top;          p->engine.ps.psrow = p->engine.ps.top;
           p->engine.ps.flags |= PS_NEWPAGE;
 }  }
   
   
Line 676  ps_pletter(struct termp *p, int c)
Line 663  ps_pletter(struct termp *p, int c)
          * now at the current cursor.           * now at the current cursor.
          */           */
   
         if ( ! (PS_INLINE & p->engine.ps.psstate)) {          if (PS_NEWPAGE & p->engine.ps.flags)
                   printf("%%%%Page: %zu %zu\n",
                                   p->engine.ps.pages + 1,
                                   p->engine.ps.pages + 1);
   
           if ( ! (PS_INLINE & p->engine.ps.flags)) {
                 ps_printf(p, "%zu %zu moveto\n(",                  ps_printf(p, "%zu %zu moveto\n(",
                                 AFM2PNT(p, p->engine.ps.pscol),                                  AFM2PNT(p, p->engine.ps.pscol),
                                 AFM2PNT(p, p->engine.ps.psrow));                                  AFM2PNT(p, p->engine.ps.psrow));
                 p->engine.ps.psstate |= PS_INLINE;                  p->engine.ps.flags |= PS_INLINE;
                   p->engine.ps.flags &= ~PS_NEWPAGE;
         }          }
   
           assert( ! (PS_NEWPAGE & p->engine.ps.flags));
   
         /*          /*
          * We need to escape these characters as per the PostScript           * We need to escape these characters as per the PostScript
          * specification.  We would also escape non-graphable characters           * specification.  We would also escape non-graphable characters
Line 728  ps_pclose(struct termp *p)
Line 723  ps_pclose(struct termp *p)
          * or anything).           * or anything).
          */           */
   
         if ( ! (PS_INLINE & p->engine.ps.psstate))          if ( ! (PS_INLINE & p->engine.ps.flags))
                 return;                  return;
   
         ps_printf(p, ") show\n");          ps_printf(p, ") show\n");
         p->engine.ps.psstate &= ~PS_INLINE;          p->engine.ps.flags &= ~PS_INLINE;
 }  }
   
   
Line 757  ps_fclose(struct termp *p)
Line 752  ps_fclose(struct termp *p)
                 p->engine.ps.last = '\0';                  p->engine.ps.last = '\0';
         }          }
   
         if ( ! (PS_INLINE & p->engine.ps.psstate))          if ( ! (PS_INLINE & p->engine.ps.flags))
                 return;                  return;
   
         ps_pclose(p);          ps_pclose(p);
Line 842  ps_endline(struct termp *p)
Line 837  ps_endline(struct termp *p)
          * lines, we'll do nasty stuff.           * lines, we'll do nasty stuff.
          */           */
   
         if (PS_MARGINS & p->engine.ps.psstate)          if (PS_MARGINS & p->engine.ps.flags)
                 return;                  return;
   
           /* Left-justify. */
   
           p->engine.ps.pscol = p->engine.ps.left;
   
           /* If we haven't printed anything, return. */
   
           if (PS_NEWPAGE & p->engine.ps.flags)
                   return;
   
         /*          /*
          * Put us down a line.  If we're at the page bottom, spit out a           * Put us down a line.  If we're at the page bottom, spit out a
          * showpage and restart our row.           * showpage and restart our row.
          */           */
   
         p->engine.ps.pscol = p->engine.ps.left;  
         if (p->engine.ps.psrow >= p->engine.ps.lineheight +          if (p->engine.ps.psrow >= p->engine.ps.lineheight +
                         p->engine.ps.bottom) {                          p->engine.ps.bottom) {
                 p->engine.ps.psrow -= p->engine.ps.lineheight;                  p->engine.ps.psrow -= p->engine.ps.lineheight;
Line 861  ps_endline(struct termp *p)
Line 864  ps_endline(struct termp *p)
         printf("%s", p->engine.ps.psmarg);          printf("%s", p->engine.ps.psmarg);
         printf("showpage\n");          printf("showpage\n");
         p->engine.ps.pages++;          p->engine.ps.pages++;
         printf("%%%%Page: %zu %zu\n",  
                         p->engine.ps.pages + 1,  
                         p->engine.ps.pages + 1);  
         p->engine.ps.psrow = p->engine.ps.top;          p->engine.ps.psrow = p->engine.ps.top;
           assert( ! (PS_NEWPAGE & p->engine.ps.flags));
           p->engine.ps.flags |= PS_NEWPAGE;
 }  }
   
   
Legend:
Removed from v.1.27  
changed lines
  Added in v.1.31
CVSweb