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

Diff for /mandoc/mdoc_term.c between version 1.216 and 1.217

version 1.216, 2011/02/06 21:44:36 version 1.217, 2011/02/06 22:33:38
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2010 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
Line 312  print_mdoc_node(DECL_ARGS)
Line 312  print_mdoc_node(DECL_ARGS)
   
         memset(&npair, 0, sizeof(struct termpair));          memset(&npair, 0, sizeof(struct termpair));
         npair.ppair = pair;          npair.ppair = pair;
   
         switch (n->type) {  
         case (MDOC_TEXT):  
                 if (' ' == *n->string && MDOC_LINE & n->flags)  
                         term_newln(p);  
                 term_word(p, n->string);  
                 break;  
         case (MDOC_EQN):  
                 break;  
         case (MDOC_TBL):  
                 term_tbl(p, n->span);  
                 break;  
         default:  
                 if (termacts[n->tok].pre && ENDBODY_NOT == n->end)  
                         chld = (*termacts[n->tok].pre)  
                                 (p, &npair, m, n);  
                 break;  
         }  
   
         /*          /*
          * Keeps only work until the end of a line.  If a keep was           * Keeps only work until the end of a line.  If a keep was
Line 361  print_mdoc_node(DECL_ARGS)
Line 343  print_mdoc_node(DECL_ARGS)
              (n->parent && MDOC_SYNPRETTY & n->parent->flags)))               (n->parent && MDOC_SYNPRETTY & n->parent->flags)))
                 p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);                  p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
   
           /*
            * After the keep flags have been set up, we may now
            * produce output.  Note that some pre-handlers do so.
            */
   
           switch (n->type) {
           case (MDOC_TEXT):
                   if (' ' == *n->string && MDOC_LINE & n->flags)
                           term_newln(p);
                   term_word(p, n->string);
                   break;
           case (MDOC_EQN):
                   break;
           case (MDOC_TBL):
                   term_tbl(p, n->span);
                   break;
           default:
                   if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
                           chld = (*termacts[n->tok].pre)
                                   (p, &npair, m, n);
                   break;
           }
   
         if (chld && n->child)          if (chld && n->child)
                 print_mdoc_nodelist(p, &npair, m, n->child);                  print_mdoc_nodelist(p, &npair, m, n->child);
   
Line 2191  termp__t_post(DECL_ARGS)
Line 2196  termp__t_post(DECL_ARGS)
          * If we're in an `Rs' and there's a journal present, then quote           * If we're in an `Rs' and there's a journal present, then quote
          * us instead of underlining us (for disambiguation).           * us instead of underlining us (for disambiguation).
          */           */
         if (n->parent && MDOC_Rs == n->parent->tok &&          if (n->parent && MDOC_Rs == n->parent->tok &&
                         n->parent->norm->Rs.quote_T)                          n->parent->norm->Rs.quote_T)
                 termp_quote_post(p, pair, m, n);                  termp_quote_post(p, pair, m, n);
   

Legend:
Removed from v.1.216  
changed lines
  Added in v.1.217

CVSweb