[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.28 and 1.29

version 1.28, 2010/07/04 19:24:00 version 1.29, 2010/07/04 19:42:25
Line 478  ps_alloc(char *outopts)
Line 478  ps_alloc(char *outopts)
   
         /* Margins are 1/9 the page x and y. */          /* Margins are 1/9 the page x and y. */
   
         marginx = (size_t)((double)pagex / 9.0);          marginx = /* LINTED */
         marginy = (size_t)((double)pagey / 9.0);                  (size_t)((double)pagex / 9.0);
           marginy = /* LINTED */
                   (size_t)((double)pagey / 9.0);
   
         lineheight = PNT2AFM(p, 16);          lineheight = PNT2AFM(p, 16);
   
Line 525  ps_printf(struct termp *p, const char *fmt, ...)
Line 527  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 554  ps_putchar(struct termp *p, char c)
Line 556  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 578  ps_end(struct termp *p)
Line 580  ps_end(struct termp *p)
          * well as just one.           * well as just one.
          */           */
   
         assert(0 == p->engine.ps.psstate);          assert(0 == p->engine.ps.flags);
         assert('\0' == p->engine.ps.last);          assert('\0' == p->engine.ps.last);
         assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);          assert(p->engine.ps.psmarg && p->engine.ps.psmarg[0]);
         printf("%s", p->engine.ps.psmarg);          printf("%s", p->engine.ps.psmarg);
Line 608  ps_begin(struct termp *p)
Line 610  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 623  ps_begin(struct termp *p)
Line 625  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 658  ps_begin(struct termp *p)
Line 660  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 671  ps_pletter(struct termp *p, int c)
Line 674  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_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 723  ps_pclose(struct termp *p)
Line 729  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 752  ps_fclose(struct termp *p)
Line 758  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 837  ps_endline(struct termp *p)
Line 843  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 860  ps_endline(struct termp *p)
Line 874  ps_endline(struct termp *p)
                         p->engine.ps.pages + 1,                          p->engine.ps.pages + 1,
                         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.28  
changed lines
  Added in v.1.29
CVSweb