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

version 1.30, 2010/07/04 19:57:26 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 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 483  ps_alloc(char *outopts)
Line 468  ps_alloc(char *outopts)
         marginy = /* LINTED */          marginy = /* LINTED */
                 (size_t)((double)pagey / 9.0);                  (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;

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31

CVSweb