[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.20 and 1.25

version 1.20, 2009/07/04 11:07:34 version 1.25, 2009/07/12 16:34:16
Line 532  arg_width(const struct mdoc_argv *arg, int pos)
Line 532  arg_width(const struct mdoc_argv *arg, int pos)
   
         assert(pos < (int)arg->sz && pos >= 0);          assert(pos < (int)arg->sz && pos >= 0);
         assert(arg->value[pos]);          assert(arg->value[pos]);
         if (0 == strcmp(arg->value[pos], "indent"))  
                 return(INDENT + 3);  
         if (0 == strcmp(arg->value[pos], "indent-two"))  
                 return(INDENT * 2 + 2);  
   
         if (0 == (len = (int)strlen(arg->value[pos])))          if (0 == (len = (int)strlen(arg->value[pos])))
                 return(0);                  return(0);
Line 1139  static int
Line 1135  static int
 termp_nd_pre(DECL_ARGS)  termp_nd_pre(DECL_ARGS)
 {  {
   
           if (MDOC_BODY != node->type)
                   return(1);
           /*
            * XXX: signed off by jmc@openbsd.org.  This technically
            * produces a minus sign after the Nd, which is wrong, but is
            * consistent with the historic OpenBSD tmac file.
            */
   #ifdef __OpenBSD__
         term_word(p, "\\-");          term_word(p, "\\-");
   #else
           term_word(p, "\\(em");
   #endif
         return(1);          return(1);
 }  }
   
Line 1842  static int
Line 1849  static int
 termp_in_pre(DECL_ARGS)  termp_in_pre(DECL_ARGS)
 {  {
   
           /* XXX This conforms to new-groff style. */
         TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);          TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);
         term_word(p, "#include");  
           if (SEC_SYNOPSIS == node->sec)
                   term_word(p, "#include");
   
         term_word(p, "<");          term_word(p, "<");
         p->flags |= TERMP_NOSPACE;          p->flags |= TERMP_NOSPACE;
         return(1);          return(1);
Line 1858  termp_in_post(DECL_ARGS)
Line 1869  termp_in_post(DECL_ARGS)
         p->flags |= TERMP_NOSPACE;          p->flags |= TERMP_NOSPACE;
         term_word(p, ">");          term_word(p, ">");
   
         term_newln(p);  
         if (SEC_SYNOPSIS != node->sec)          if (SEC_SYNOPSIS != node->sec)
                 return;                  return;
   
           term_newln(p);
           /*
            * XXX Not entirely correct.  If `.In foo bar' is specified in
            * the SYNOPSIS section, then it produces a single break after
            * the <foo>; mandoc asserts a vertical space.  Since this
            * construction is rarely used, I think it's fine.
            */
         if (node->next && MDOC_In != node->next->tok)          if (node->next && MDOC_In != node->next->tok)
                 term_vspace(p);                  term_vspace(p);
 }  }
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.25
CVSweb