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

Diff for /mandoc/mandoc.h between version 1.111 and 1.121

version 1.111, 2013/10/05 20:30:05 version 1.121, 2014/06/20 17:24:00
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2010-2014 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 20 
Line 20 
   
 #define ASCII_NBRSP      31  /* non-breaking space */  #define ASCII_NBRSP      31  /* non-breaking space */
 #define ASCII_HYPH       30  /* breakable hyphen */  #define ASCII_HYPH       30  /* breakable hyphen */
   #define ASCII_BREAK      29  /* breakable zero-width space */
   
 /*  /*
  * Status level.  This refers to both internal status (i.e., whilst   * Status level.  This refers to both internal status (i.e., whilst
Line 48  enum mandocerr {
Line 49  enum mandocerr {
         MANDOCERR_WARNING, /* ===== start of warnings ===== */          MANDOCERR_WARNING, /* ===== start of warnings ===== */
   
         /* related to the prologue */          /* related to the prologue */
         MANDOCERR_NOTITLE, /* no title in document */          MANDOCERR_TH_MISSING, /* no TH macro in document */
         MANDOCERR_UPPERCASE, /* document title should be all caps */          MANDOCERR_TITLE_CASE, /* document title should be all caps */
         MANDOCERR_BADMSEC, /* unknown manual section */          MANDOCERR_MSEC_BAD, /* unknown manual section */
         MANDOCERR_BADVOLARCH, /* unknown manual volume or arch */          MANDOCERR_ARCH_BAD, /* unknown manual volume or arch */
         MANDOCERR_NODATE, /* date missing, using today's date */          MANDOCERR_DATE_MISSING, /* date missing, using today's date */
         MANDOCERR_BADDATE, /* cannot parse date, using it verbatim */          MANDOCERR_DATE_BAD, /* cannot parse date, using it verbatim */
         MANDOCERR_PROLOGOOO, /* prologue macros out of order */          MANDOCERR_PROLOG_ORDER, /* prologue macros out of order */
         MANDOCERR_PROLOGREP, /* duplicate prologue macro */          MANDOCERR_PROLOG_REP, /* duplicate prologue macro */
         MANDOCERR_BADPROLOG, /* macro not allowed in prologue */          MANDOCERR_PROLOG_BAD, /* macro not allowed in prologue */
         MANDOCERR_BADBODY, /* macro not allowed in body */          MANDOCERR_PROLOG_ONLY, /* macro not allowed in body */
   
         /* related to document structure */          /* related to document structure */
         MANDOCERR_SO, /* .so is fragile, better use ln(1) */          MANDOCERR_SO, /* .so is fragile, better use ln(1) */
Line 152  enum mandocerr {
Line 153  enum mandocerr {
   
         MANDOCERR_FATAL, /* ===== start of fatal errors ===== */          MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
   
           MANDOCERR_TOOLARGE, /* input too large */
         MANDOCERR_NOTMANUAL, /* manual isn't really a manual */          MANDOCERR_NOTMANUAL, /* manual isn't really a manual */
         MANDOCERR_COLUMNS, /* column syntax is inconsistent */          MANDOCERR_COLUMNS, /* column syntax is inconsistent */
         MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */          MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */
Line 162  enum mandocerr {
Line 164  enum mandocerr {
         MANDOCERR_NODOCBODY, /* no document body */          MANDOCERR_NODOCBODY, /* no document body */
         MANDOCERR_NODOCPROLOG, /* no document prologue */          MANDOCERR_NODOCPROLOG, /* no document prologue */
         MANDOCERR_MEM, /* static buffer exhausted */          MANDOCERR_MEM, /* static buffer exhausted */
   
           /* ===== system errors ===== */
   
           MANDOCERR_SYSOPEN, /* cannot open file */
           MANDOCERR_SYSSTAT, /* cannot stat file */
           MANDOCERR_SYSREAD, /* cannot read file */
   
         MANDOCERR_MAX          MANDOCERR_MAX
 };  };
   
Line 231  struct tbl_row {
Line 240  struct tbl_row {
         struct tbl_row   *next;          struct tbl_row   *next;
         struct tbl_cell  *first;          struct tbl_cell  *first;
         struct tbl_cell  *last;          struct tbl_cell  *last;
           int               vert; /* trailing vertical line */
 };  };
   
 enum    tbl_datt {  enum    tbl_datt {
Line 353  struct eqn_box {
Line 363  struct eqn_box {
   
 /*  /*
  * An equation consists of a tree of expressions starting at a given   * An equation consists of a tree of expressions starting at a given
  * line and position.   * line and position.
  */   */
 struct  eqn {  struct  eqn {
         char             *name; /* identifier (or NULL) */          char             *name; /* identifier (or NULL) */
Line 363  struct eqn {
Line 373  struct eqn {
 };  };
   
 /*  /*
  * The type of parse sequence.  This value is usually passed via the   * Parse options.
  * mandoc(1) command line of -man and -mdoc.  It's almost exclusively  
  * -mandoc but the others have been retained for compatibility.  
  */   */
 enum    mparset {  #define MPARSE_MDOC     1  /* assume -mdoc */
         MPARSE_AUTO, /* magically determine the document type */  #define MPARSE_MAN      2  /* assume -man */
         MPARSE_MDOC, /* assume -mdoc */  #define MPARSE_SO       4  /* honour .so requests */
         MPARSE_MAN /* assume -man */  #define MPARSE_QUICK    8  /* abort the parse early */
 };  
   
 enum    mandoc_esc {  enum    mandoc_esc {
         ESCAPE_ERROR = 0, /* bail! unparsable escape */          ESCAPE_ERROR = 0, /* bail! unparsable escape */
Line 399  struct man;
Line 406  struct man;
   
 __BEGIN_DECLS  __BEGIN_DECLS
   
 void             *mandoc_calloc(size_t, size_t);  enum mandoc_esc   mandoc_escape(const char **, const char **, int *);
 enum mandoc_esc   mandoc_escape(const char const **,  
                         const char const **, int *);  
 void             *mandoc_malloc(size_t);  
 void             *mandoc_realloc(void *, size_t);  
 char             *mandoc_strdup(const char *);  
 char             *mandoc_strndup(const char *, size_t);  
 struct mchars    *mchars_alloc(void);  struct mchars    *mchars_alloc(void);
 void              mchars_free(struct mchars *);  void              mchars_free(struct mchars *);
 char              mchars_num2char(const char *, size_t);  char              mchars_num2char(const char *, size_t);
 int               mchars_num2uc(const char *, size_t);  int               mchars_num2uc(const char *, size_t);
 int               mchars_spec2cp(const struct mchars *,  int               mchars_spec2cp(const struct mchars *,
                         const char *, size_t);                          const char *, size_t);
 const char       *mchars_spec2str(const struct mchars *,  const char       *mchars_spec2str(const struct mchars *,
                         const char *, size_t, size_t *);                          const char *, size_t, size_t *);
 struct mparse    *mparse_alloc(enum mparset, enum mandoclevel,  struct mparse    *mparse_alloc(int, enum mandoclevel, mandocmsg, char *);
                         mandocmsg, void *, char *);  
 void              mparse_free(struct mparse *);  void              mparse_free(struct mparse *);
 void              mparse_keep(struct mparse *);  void              mparse_keep(struct mparse *);
 enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);  enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);
 enum mandoclevel  mparse_readmem(struct mparse *, const void *, size_t,  enum mandoclevel  mparse_readmem(struct mparse *, const void *, size_t,
                         const char *);                          const char *);
 void              mparse_reset(struct mparse *);  void              mparse_reset(struct mparse *);
 void              mparse_result(struct mparse *,  void              mparse_result(struct mparse *,
                         struct mdoc **, struct man **);                          struct mdoc **, struct man **, char **);
 const char       *mparse_getkeep(const struct mparse *);  const char       *mparse_getkeep(const struct mparse *);
 const char       *mparse_strerror(enum mandocerr);  const char       *mparse_strerror(enum mandocerr);
 const char       *mparse_strlevel(enum mandoclevel);  const char       *mparse_strlevel(enum mandoclevel);
Legend:
Removed from v.1.111  
changed lines
  Added in v.1.121
CVSweb