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

Diff for /src/usr.bin/mandoc/mdoc_macro.c between version 1.42 and 1.43

version 1.42, 2010/05/15 15:37:53 version 1.43, 2010/05/15 15:53:29
Line 636 
Line 636 
                 assert(DELIM_NONE != mdoc_isdelim(p));                  assert(DELIM_NONE != mdoc_isdelim(p));
                 if ( ! mdoc_word_alloc(m, line, la, p))                  if ( ! mdoc_word_alloc(m, line, la, p))
                         return(0);                          return(0);
   
                 /*                  /*
                  * If we encounter end-of-sentence symbols, then trigger                   * If we encounter end-of-sentence symbols, then trigger
                  * the double-space.                   * the double-space.
Line 897 
Line 898 
 static int  static int
 blk_full(MACRO_PROT_ARGS)  blk_full(MACRO_PROT_ARGS)
 {  {
         int               la;          int               la, nl;
         struct mdoc_arg  *arg;          struct mdoc_arg  *arg;
         struct mdoc_node *head; /* save of head macro */          struct mdoc_node *head; /* save of head macro */
         struct mdoc_node *body; /* save of body macro */          struct mdoc_node *body; /* save of body macro */
Line 907 
Line 908 
         enum margverr     av;          enum margverr     av;
         char             *p;          char             *p;
   
           nl = MDOC_NEWLINE & m->flags;
   
         /* Close out prior implicit scope. */          /* Close out prior implicit scope. */
   
         if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {          if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
Line 1035 
Line 1038 
                 head = m->last;                  head = m->last;
         }          }
   
         if (1 == ppos && ! append_delims(m, line, pos, buf))          if (nl && ! append_delims(m, line, pos, buf))
                 return(0);                  return(0);
   
         /* If we've already opened our body, exit now. */          /* If we've already opened our body, exit now. */
Line 1072 
Line 1075 
 static int  static int
 blk_part_imp(MACRO_PROT_ARGS)  blk_part_imp(MACRO_PROT_ARGS)
 {  {
         int               la;          int               la, nl;
         enum mdoct        ntok;          enum mdoct        ntok;
         enum margserr     ac;          enum margserr     ac;
         char             *p;          char             *p;
Line 1080 
Line 1083 
         struct mdoc_node *body; /* saved body context */          struct mdoc_node *body; /* saved body context */
         struct mdoc_node *n;          struct mdoc_node *n;
   
           nl = MDOC_NEWLINE & m->flags;
   
         /*          /*
          * A macro that spans to the end of the line.  This is generally           * A macro that spans to the end of the line.  This is generally
          * (but not necessarily) called as the first macro.  The block           * (but not necessarily) called as the first macro.  The block
Line 1187 
Line 1192 
   
         /* Standard appending of delimiters. */          /* Standard appending of delimiters. */
   
         if (1 == ppos && ! append_delims(m, line, pos, buf))          if (nl && ! append_delims(m, line, pos, buf))
                 return(0);                  return(0);
   
         /* Rewind scope, if applicable. */          /* Rewind scope, if applicable. */
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.43