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

Diff for /mandoc/mdoc_man.c between version 1.47 and 1.51

version 1.47, 2012/12/31 22:34:48 version 1.51, 2013/06/02 18:16:57
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2011, 2012, 2013 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 182  static const struct manact manacts[MDOC_MAX + 1] = {
Line 182  static const struct manact manacts[MDOC_MAX + 1] = {
         { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */          { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
         { NULL, NULL, NULL, NULL, NULL }, /* Db */          { NULL, NULL, NULL, NULL, NULL }, /* Db */
         { NULL, NULL, NULL, NULL, NULL }, /* Dc */          { NULL, NULL, NULL, NULL, NULL }, /* Dc */
         { cond_body, pre_enc, post_enc, "``", "''" }, /* Do */          { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Do */
         { cond_body, pre_enc, post_enc, "``", "''" }, /* Dq */          { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Dq */
         { NULL, NULL, NULL, NULL, NULL }, /* Ec */          { NULL, NULL, NULL, NULL, NULL }, /* Ec */
         { NULL, NULL, NULL, NULL, NULL }, /* Ef */          { NULL, NULL, NULL, NULL, NULL }, /* Ef */
         { NULL, pre_em, post_font, NULL, NULL }, /* Em */          { NULL, pre_em, post_font, NULL, NULL }, /* Em */
Line 199  static const struct manact manacts[MDOC_MAX + 1] = {
Line 199  static const struct manact manacts[MDOC_MAX + 1] = {
         { cond_body, pre_enc, post_enc, "(", ")" }, /* Po */          { cond_body, pre_enc, post_enc, "(", ")" }, /* Po */
         { cond_body, pre_enc, post_enc, "(", ")" }, /* Pq */          { cond_body, pre_enc, post_enc, "(", ")" }, /* Pq */
         { NULL, NULL, NULL, NULL, NULL }, /* Qc */          { NULL, NULL, NULL, NULL, NULL }, /* Qc */
         { cond_body, pre_enc, post_enc, "`", "'" }, /* Ql */          { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* Ql */
         { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qo */          { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qo */
         { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qq */          { cond_body, pre_enc, post_enc, "\"", "\"" }, /* Qq */
         { NULL, NULL, NULL, NULL, NULL }, /* Re */          { NULL, NULL, NULL, NULL, NULL }, /* Re */
         { cond_body, pre_rs, NULL, NULL, NULL }, /* Rs */          { cond_body, pre_rs, NULL, NULL, NULL }, /* Rs */
         { NULL, NULL, NULL, NULL, NULL }, /* Sc */          { NULL, NULL, NULL, NULL, NULL }, /* Sc */
         { cond_body, pre_enc, post_enc, "`", "'" }, /* So */          { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* So */
         { cond_body, pre_enc, post_enc, "`", "'" }, /* Sq */          { cond_body, pre_enc, post_enc, "\\(oq", "\\(cq" }, /* Sq */
         { NULL, pre_sm, NULL, NULL, NULL }, /* Sm */          { NULL, pre_sm, NULL, NULL, NULL }, /* Sm */
         { NULL, pre_em, post_font, NULL, NULL }, /* Sx */          { NULL, pre_em, post_font, NULL, NULL }, /* Sx */
         { NULL, pre_sy, post_font, NULL, NULL }, /* Sy */          { NULL, pre_sy, post_font, NULL, NULL }, /* Sy */
Line 408  print_offs(const char *v)
Line 408  print_offs(const char *v)
         struct roffsu     su;          struct roffsu     su;
         size_t            sz;          size_t            sz;
   
           print_line(".RS", MMAN_Bk_susp);
   
         /* Convert v into a number (of characters). */          /* Convert v into a number (of characters). */
         if (NULL == v || '\0' == *v || 0 == strcmp(v, "left"))          if (NULL == v || '\0' == *v || 0 == strcmp(v, "left"))
                 sz = 0;                  sz = 0;
Line 427  print_offs(const char *v)
Line 429  print_offs(const char *v)
                          * in terms of different units.                           * in terms of different units.
                          */                           */
                         print_word(v);                          print_word(v);
                           outflags |= MMAN_nl;
                         return;                          return;
                 }                  }
         } else          } else
Line 441  print_offs(const char *v)
Line 444  print_offs(const char *v)
   
         snprintf(buf, sizeof(buf), "%ldn", sz);          snprintf(buf, sizeof(buf), "%ldn", sz);
         print_word(buf);          print_word(buf);
           outflags |= MMAN_nl;
 }  }
   
 /*  /*
Line 825  pre_bd(DECL_ARGS)
Line 829  pre_bd(DECL_ARGS)
                 print_line(".nf", 0);                  print_line(".nf", 0);
         if (0 == n->norm->Bd.comp && NULL != n->parent->prev)          if (0 == n->norm->Bd.comp && NULL != n->parent->prev)
                 outflags |= MMAN_sp;                  outflags |= MMAN_sp;
         print_line(".RS", MMAN_Bk_susp);  
         print_offs(n->norm->Bd.offs);          print_offs(n->norm->Bd.offs);
         outflags |= MMAN_nl;  
         return(1);          return(1);
 }  }
   
Line 899  static void
Line 901  static void
 post_bk(DECL_ARGS)  post_bk(DECL_ARGS)
 {  {
   
         if (MDOC_BODY == n->type)          if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags))
                 outflags &= ~MMAN_Bk;                  outflags &= ~MMAN_Bk;
 }  }
   
Line 908  pre_bl(DECL_ARGS)
Line 910  pre_bl(DECL_ARGS)
 {  {
         size_t           icol;          size_t           icol;
   
           /*
            * print_offs() will increase the -offset to account for
            * a possible enclosing .It, but any enclosed .It blocks
            * just nest and do not add up their indentation.
            */
           if (n->norm->Bl.offs) {
                   print_offs(n->norm->Bl.offs);
                   Bl_stack[Bl_stack_len++] = 0;
           }
   
         switch (n->norm->Bl.type) {          switch (n->norm->Bl.type) {
         case (LIST_enum):          case (LIST_enum):
                 n->norm->Bl.count = 0;                  n->norm->Bl.count = 0;
Line 940  post_bl(DECL_ARGS)
Line 952  post_bl(DECL_ARGS)
         default:          default:
                 break;                  break;
         }          }
         outflags |= MMAN_PP | MMAN_nl;  
         outflags &= ~(MMAN_sp | MMAN_br);  
   
           if (n->norm->Bl.offs) {
                   print_line(".RE", MMAN_nl);
                   assert(Bl_stack_len);
                   Bl_stack_len--;
                   assert(0 == Bl_stack[Bl_stack_len]);
           } else {
                   outflags |= MMAN_PP | MMAN_nl;
                   outflags &= ~(MMAN_sp | MMAN_br);
           }
   
         /* Maybe we are inside an enclosing list? */          /* Maybe we are inside an enclosing list? */
         if (NULL != n->parent->next)          if (NULL != n->parent->next)
                 mid_it();                  mid_it();
Line 981  static int
Line 1001  static int
 pre_dl(DECL_ARGS)  pre_dl(DECL_ARGS)
 {  {
   
         print_line(".RS", MMAN_Bk_susp);  
         print_offs("6n");          print_offs("6n");
         outflags |= MMAN_nl;  
         return(1);          return(1);
 }  }
   
Legend:
Removed from v.1.47  
changed lines
  Added in v.1.51
CVSweb