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

Diff for /mandoc/mandoc.h between version 1.51 and 1.65

version 1.51, 2011/01/10 15:31:00 version 1.65, 2011/03/22 09:48:13
Line 50  enum mandocerr {
Line 50  enum mandocerr {
         MANDOCERR_NOTITLE, /* no title in document */          MANDOCERR_NOTITLE, /* no title in document */
         MANDOCERR_UPPERCASE, /* document title should be all caps */          MANDOCERR_UPPERCASE, /* document title should be all caps */
         MANDOCERR_BADMSEC, /* unknown manual section */          MANDOCERR_BADMSEC, /* unknown manual section */
         MANDOCERR_BADDATE, /* cannot parse date argument */          MANDOCERR_NODATE, /* date missing, using today's date */
           MANDOCERR_BADDATE, /* cannot parse date, using it verbatim */
         MANDOCERR_PROLOGOOO, /* prologue macros out of order */          MANDOCERR_PROLOGOOO, /* prologue macros out of order */
         MANDOCERR_PROLOGREP, /* duplicate prologue macro */          MANDOCERR_PROLOGREP, /* duplicate prologue macro */
         MANDOCERR_BADPROLOG, /* macro not allowed in prologue */          MANDOCERR_BADPROLOG, /* macro not allowed in prologue */
Line 68  enum mandocerr {
Line 69  enum mandocerr {
         /* related to macros and nesting */          /* related to macros and nesting */
         MANDOCERR_MACROOBS, /* skipping obsolete macro */          MANDOCERR_MACROOBS, /* skipping obsolete macro */
         MANDOCERR_IGNPAR, /* skipping paragraph macro */          MANDOCERR_IGNPAR, /* skipping paragraph macro */
           MANDOCERR_IGNNS, /* skipping no-space macro */
         MANDOCERR_SCOPENEST, /* blocks badly nested */          MANDOCERR_SCOPENEST, /* blocks badly nested */
         MANDOCERR_CHILD, /* child violates parent syntax */          MANDOCERR_CHILD, /* child violates parent syntax */
         MANDOCERR_NESTEDDISP, /* nested displays are not portable */          MANDOCERR_NESTEDDISP, /* nested displays are not portable */
Line 80  enum mandocerr {
Line 82  enum mandocerr {
         MANDOCERR_LISTFIRST, /* list type must come first */          MANDOCERR_LISTFIRST, /* list type must come first */
         MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */          MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */
         MANDOCERR_FONTTYPE, /* missing font type */          MANDOCERR_FONTTYPE, /* missing font type */
           MANDOCERR_WNOSCOPE, /* skipping end of block that is not open */
   
         /* related to bad macro arguments */          /* related to bad macro arguments */
         MANDOCERR_IGNARGV, /* skipping argument */          MANDOCERR_IGNARGV, /* skipping argument */
Line 114  enum mandocerr {
Line 117  enum mandocerr {
   
         MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */          MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */
         MANDOCERR_BADCHAR, /* skipping bad character */          MANDOCERR_BADCHAR, /* skipping bad character */
           MANDOCERR_NAMESC, /* escaped character not allowed in a name */
         MANDOCERR_NOTEXT, /* skipping text before the first section header */          MANDOCERR_NOTEXT, /* skipping text before the first section header */
         MANDOCERR_MACRO, /* skipping unknown macro */          MANDOCERR_MACRO, /* skipping unknown macro */
         MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */          MANDOCERR_REQUEST, /* NOT IMPLEMENTED: skipping request */
Line 257  struct tbl_span {
Line 261  struct tbl_span {
         struct tbl_row   *layout; /* layout row */          struct tbl_row   *layout; /* layout row */
         struct tbl_dat   *first;          struct tbl_dat   *first;
         struct tbl_dat   *last;          struct tbl_dat   *last;
           int               line; /* parse line */
         int               flags;          int               flags;
 #define TBL_SPAN_FIRST   (1 << 0)  #define TBL_SPAN_FIRST   (1 << 0)
 #define TBL_SPAN_LAST    (1 << 1)  #define TBL_SPAN_LAST    (1 << 1)
Line 264  struct tbl_span {
Line 269  struct tbl_span {
         struct tbl_span  *next;          struct tbl_span  *next;
 };  };
   
 /*  struct  eqn {
  * Available registers (set in libroff, accessed elsewhere).          size_t            sz;
  */          char             *data;
 enum    regs {          int               line; /* invocation line */
         REG_nS = 0,          int               pos; /* invocation position */
         REG__MAX  
 };  };
   
 /*  /*
  * A register (struct reg) can consist of many types: this consists of   * A punctuation delimiter, used only in mdoc(7) documents, is opening,
  * normalised types from the original string form.   * closing, or "middle mark" punctuation.  These govern spacing.
    * Opening punctuation (e.g., the opening parenthesis) suppresses the
    * following space; closing punctuation (e.g., the closing parenthesis)
    * suppresses the leading space; middle punctuation (e.g., the vertical
    * bar) can do either.  The middle punctuation delimiter bends the rules
    * depending on usage.
  */   */
 union   regval {  enum    mdelim {
         unsigned  u; /* unsigned integer */          DELIM_NONE = 0,
           DELIM_OPEN,
           DELIM_MIDDLE,
           DELIM_CLOSE
 };  };
   
 /*  /*
  * A single register entity.  If "set" is zero, the value of the   * The type of parse sequence.  This value is usually passed via the
  * register should be the default one, which is per-register.  It's   * mandoc(1) command line of -man and -mdoc.  It's almost exclusively
  * assumed that callers know which type in "v" corresponds to which   * -mandoc but the others have been retained for compatibility.
  * register value.  
  */   */
 struct  reg {  enum    mparset {
         int               set; /* whether set or not */          MPARSE_AUTO, /* magically determine the document type */
         union regval      v; /* parsed data */          MPARSE_MDOC, /* assume -mdoc */
           MPARSE_MAN /* assume -man */
 };  };
   
 /*  typedef void    (*mandocmsg)(enum mandocerr, enum mandoclevel,
  * The primary interface to setting register values is in libroff,                          const char *, int, int, const char *);
  * although libmdoc and libman from time to time will manipulate  
  * registers (such as `.Sh SYNOPSIS' enabling REG_nS).  
  */  
 struct  regset {  
         struct reg        regs[REG__MAX];  
 };  
   
   struct  mparse;
   struct  mdoc;
   struct  man;
   
 __BEGIN_DECLS  __BEGIN_DECLS
   
 /*  void              mparse_free(struct mparse *);
  * Callback function for warnings, errors, and fatal errors as they  void              mparse_reset(struct mparse *);
  * occur in the compilers libroff, libmdoc, and libman.  struct mparse    *mparse_alloc(enum mparset,
  */                          enum mandoclevel, mandocmsg, void *);
 typedef int             (*mandocmsg)(enum mandocerr, void *,  enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);
                                 int, int, const char *);  void              mparse_result(struct mparse *, struct mdoc **, struct man **);
   
   void             *mandoc_calloc(size_t, size_t);
   void             *mandoc_malloc(size_t);
   void             *mandoc_realloc(void *, size_t);
   #define DELIMSZ   6 /* hint: max possible size of a delimiter */
   enum mdelim       mandoc_isdelim(const char *);
   
 __END_DECLS  __END_DECLS
   
Legend:
Removed from v.1.51  
changed lines
  Added in v.1.65
CVSweb