[BACK]Return to roff_term.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff_term.c between version 1.11 and 1.15

version 1.11, 2017/06/14 13:00:31 version 1.15, 2018/08/10 20:40:45
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2010,2014,2015,2017,2018 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 19 
Line 19 
 #include <assert.h>  #include <assert.h>
 #include <stddef.h>  #include <stddef.h>
   
   #include "mandoc.h"
 #include "roff.h"  #include "roff.h"
 #include "out.h"  #include "out.h"
 #include "term.h"  #include "term.h"
Line 32  static void   roff_term_pre_ce(ROFF_TERM_ARGS);
Line 33  static void   roff_term_pre_ce(ROFF_TERM_ARGS);
 static  void      roff_term_pre_ft(ROFF_TERM_ARGS);  static  void      roff_term_pre_ft(ROFF_TERM_ARGS);
 static  void      roff_term_pre_ll(ROFF_TERM_ARGS);  static  void      roff_term_pre_ll(ROFF_TERM_ARGS);
 static  void      roff_term_pre_mc(ROFF_TERM_ARGS);  static  void      roff_term_pre_mc(ROFF_TERM_ARGS);
   static  void      roff_term_pre_po(ROFF_TERM_ARGS);
 static  void      roff_term_pre_sp(ROFF_TERM_ARGS);  static  void      roff_term_pre_sp(ROFF_TERM_ARGS);
 static  void      roff_term_pre_ta(ROFF_TERM_ARGS);  static  void      roff_term_pre_ta(ROFF_TERM_ARGS);
 static  void      roff_term_pre_ti(ROFF_TERM_ARGS);  static  void      roff_term_pre_ti(ROFF_TERM_ARGS);
Line 42  static const roff_term_pre_fp roff_term_pre_acts[ROFF_
Line 44  static const roff_term_pre_fp roff_term_pre_acts[ROFF_
         roff_term_pre_ft,  /* ft */          roff_term_pre_ft,  /* ft */
         roff_term_pre_ll,  /* ll */          roff_term_pre_ll,  /* ll */
         roff_term_pre_mc,  /* mc */          roff_term_pre_mc,  /* mc */
           roff_term_pre_po,  /* po */
         roff_term_pre_ce,  /* rj */          roff_term_pre_ce,  /* rj */
         roff_term_pre_sp,  /* sp */          roff_term_pre_sp,  /* sp */
         roff_term_pre_ta,  /* ta */          roff_term_pre_ta,  /* ta */
Line 108  roff_term_pre_ce(ROFF_TERM_ARGS)
Line 111  roff_term_pre_ce(ROFF_TERM_ARGS)
 static void  static void
 roff_term_pre_ft(ROFF_TERM_ARGS)  roff_term_pre_ft(ROFF_TERM_ARGS)
 {  {
         switch (*n->child->string) {          const char      *cp;
   
           if (*(cp = n->child->string) == 'C')
                   cp++;
   
           switch (*cp) {
         case '4':          case '4':
         case '3':          case '3':
         case 'B':          case 'B':
Line 153  roff_term_pre_mc(ROFF_TERM_ARGS)
Line 161  roff_term_pre_mc(ROFF_TERM_ARGS)
 }  }
   
 static void  static void
   roff_term_pre_po(ROFF_TERM_ARGS)
   {
           struct roffsu    su;
           static int       po, polast;
           int              ponew;
   
           if (n->child != NULL &&
               a2roffsu(n->child->string, &su, SCALE_EM) != NULL) {
                   ponew = term_hen(p, &su);
                   if (*n->child->string == '+' ||
                       *n->child->string == '-')
                           ponew += po;
           } else
                   ponew = polast;
           polast = po;
           po = ponew;
   
           ponew = po - polast + (int)p->tcol->offset;
           p->tcol->offset = ponew > 0 ? ponew : 0;
   }
   
   static void
 roff_term_pre_sp(ROFF_TERM_ARGS)  roff_term_pre_sp(ROFF_TERM_ARGS)
 {  {
         struct roffsu    su;          struct roffsu    su;
Line 205  roff_term_pre_ti(ROFF_TERM_ARGS)
Line 235  roff_term_pre_ti(ROFF_TERM_ARGS)
   
         if (a2roffsu(cp, &su, SCALE_EM) == NULL)          if (a2roffsu(cp, &su, SCALE_EM) == NULL)
                 return;                  return;
         len = term_hspan(p, &su) / 24;          len = term_hen(p, &su);
   
         if (sign == 0) {          if (sign == 0) {
                 p->ti = len - p->tcol->offset;                  p->ti = len - p->tcol->offset;

Legend:
Removed from v.1.11  
changed lines
  Added in v.1.15

CVSweb