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

Diff for /mandoc/mdoc.c between version 1.271 and 1.275

version 1.271, 2018/12/14 05:18:02 version 1.275, 2020/04/06 10:16:17
Line 1 
Line 1 
 /*      $Id$ */  /* $Id$ */
 /*  /*
    * Copyright (c) 2010, 2012-2018, 2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2018 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 14 
Line 14 
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN   * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
    *
    * Top level and utility functions of the mdoc(7) parser for mandoc(1).
  */   */
 #include "config.h"  #include "config.h"
   
Line 210  mdoc_ptext(struct roff_man *mdoc, int line, char *buf,
Line 212  mdoc_ptext(struct roff_man *mdoc, int line, char *buf,
                          * Strip trailing tabs in literal context only;                           * Strip trailing tabs in literal context only;
                          * outside, they affect the next line.                           * outside, they affect the next line.
                          */                           */
                         if (MDOC_LITERAL & mdoc->flags)                          if (mdoc->flags & ROFF_NOFILL)
                                 continue;                                  continue;
                         break;                          break;
                 case '\\':                  case '\\':
Line 235  mdoc_ptext(struct roff_man *mdoc, int line, char *buf,
Line 237  mdoc_ptext(struct roff_man *mdoc, int line, char *buf,
          * but add a single vertical space elsewhere.           * but add a single vertical space elsewhere.
          */           */
   
         if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {          if (buf[offs] == '\0' && (mdoc->flags & ROFF_NOFILL) == 0) {
                 switch (mdoc->last->type) {                  switch (mdoc->last->type) {
                 case ROFFT_TEXT:                  case ROFFT_TEXT:
                         sp = mdoc->last->string;                          sp = mdoc->last->string;
Line 260  mdoc_ptext(struct roff_man *mdoc, int line, char *buf,
Line 262  mdoc_ptext(struct roff_man *mdoc, int line, char *buf,
   
         roff_word_alloc(mdoc, line, offs, buf+offs);          roff_word_alloc(mdoc, line, offs, buf+offs);
   
         if (mdoc->flags & MDOC_LITERAL)          if (mdoc->flags & ROFF_NOFILL)
                 return 1;                  return 1;
   
         /*          /*
Line 352  mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, 
Line 354  mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, 
                 mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL);                  mandoc_msg(MANDOCERR_SPACE_EOL, ln, offs - 1, NULL);
   
         /*          /*
          * If an initial macro or a list invocation, divert directly           * If an initial or transparent macro or a list invocation,
          * into macro processing.           * divert directly into macro processing.
          */           */
   
         n = mdoc->last;          n = mdoc->last;
         if (n == NULL || tok == MDOC_It || tok == MDOC_El) {          if (n == NULL || tok == MDOC_It || tok == MDOC_El ||
               roff_tok_transparent(tok)) {
                 (*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);                  (*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);
                 return 1;                  return 1;
         }          }
Line 427  mdoc_isdelim(const char *p)
Line 430  mdoc_isdelim(const char *p)
                 return DELIM_MIDDLE;                  return DELIM_MIDDLE;
   
         return DELIM_NONE;          return DELIM_NONE;
 }  
   
 void  
 mdoc_validate(struct roff_man *mdoc)  
 {  
   
         mdoc->last = mdoc->first;  
         mdoc_node_validate(mdoc);  
         mdoc_state_reset(mdoc);  
 }  }
Legend:
Removed from v.1.271  
changed lines
  Added in v.1.275
CVSweb