[BACK]Return to mdoc_term.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / mandoc

Diff for /src/usr.bin/mandoc/mdoc_term.c between version 1.154 and 1.155

version 1.154, 2013/12/24 19:10:34 version 1.155, 2013/12/24 20:45:21
Line 303 
Line 303 
         /*          /*
          * 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
          * invoked in a prior line, revert it to PREKEEP.           * invoked in a prior line, revert it to PREKEEP.
          *  
          * Also let SYNPRETTY sections behave as if they were wrapped  
          * in a `Bk' block.  
          */           */
   
         if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {          if (TERMP_KEEP & p->flags) {
                 if (n->prev ? (n->prev->lastline != n->line) :                  if (n->prev ? (n->prev->lastline != n->line) :
                     (n->parent && n->parent->line != n->line)) {                      (n->parent && n->parent->line != n->line)) {
                         p->flags &= ~TERMP_KEEP;                          p->flags &= ~TERMP_KEEP;
Line 317 
Line 314 
         }          }
   
         /*          /*
          * Since SYNPRETTY sections aren't "turned off" with `Ek',  
          * we have to intuit whether we should disable formatting.  
          */  
   
         if ( ! (MDOC_SYNPRETTY & n->flags) &&  
             ((n->prev   && MDOC_SYNPRETTY & n->prev->flags) ||  
              (n->parent && MDOC_SYNPRETTY & n->parent->flags)))  
                 p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);  
   
         /*  
          * After the keep flags have been set up, we may now           * After the keep flags have been set up, we may now
          * produce output.  Note that some pre-handlers do so.           * produce output.  Note that some pre-handlers do so.
          */           */
Line 1006 
Line 993 
 termp_nm_pre(DECL_ARGS)  termp_nm_pre(DECL_ARGS)
 {  {
   
         if (MDOC_BLOCK == n->type)          if (MDOC_BLOCK == n->type) {
                   p->flags |= TERMP_PREKEEP;
                 return(1);                  return(1);
           }
   
         if (MDOC_BODY == n->type) {          if (MDOC_BODY == n->type) {
                 if (NULL == n->child)                  if (NULL == n->child)
Line 1056 
Line 1045 
 termp_nm_post(DECL_ARGS)  termp_nm_post(DECL_ARGS)
 {  {
   
         if (MDOC_HEAD == n->type && n->next->child) {          if (MDOC_BLOCK == n->type) {
                   p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
           } else if (MDOC_HEAD == n->type && n->next->child) {
                 term_flushln(p);                  term_flushln(p);
                 p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);                  p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
                 p->trailspace = 0;                  p->trailspace = 0;
Line 2236 
Line 2227 
 termp_bk_post(DECL_ARGS)  termp_bk_post(DECL_ARGS)
 {  {
   
         if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags))          if (MDOC_BODY == n->type)
                 p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);                  p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }  }
   
Legend:
Removed from v.1.154  
changed lines
  Added in v.1.155