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

Diff for /mandoc/libmdoc.h between version 1.88 and 1.96

version 1.88, 2014/08/01 17:40:34 version 1.96, 2014/12/01 04:05:32
Line 1 
Line 1 
 /*      $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2013, 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 15 
Line 15 
  * 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.
  */   */
 #ifndef LIBMDOC_H  
 #define LIBMDOC_H  
   
 enum    mdoc_next {  enum    mdoc_next {
         MDOC_NEXT_SIBLING = 0,          MDOC_NEXT_SIBLING = 0,
Line 37  struct mdoc {
Line 35  struct mdoc {
 #define MDOC_SYNOPSIS    (1 << 7) /* SYNOPSIS-style formatting */  #define MDOC_SYNOPSIS    (1 << 7) /* SYNOPSIS-style formatting */
 #define MDOC_KEEP        (1 << 8) /* in a word keep */  #define MDOC_KEEP        (1 << 8) /* in a word keep */
 #define MDOC_SMOFF       (1 << 9) /* spacing is off */  #define MDOC_SMOFF       (1 << 9) /* spacing is off */
   #define MDOC_NODELIMC    (1 << 10) /* disable closing delimiter handling */
         enum mdoc_next    next; /* where to put the next node */          enum mdoc_next    next; /* where to put the next node */
         struct mdoc_node *last; /* the last node parsed */          struct mdoc_node *last; /* the last node parsed */
         struct mdoc_node *first; /* the first node parsed */          struct mdoc_node *first; /* the first node parsed */
Line 55  struct mdoc {
Line 54  struct mdoc {
                         char *buf                          char *buf
   
 struct  mdoc_macro {  struct  mdoc_macro {
         int             (*fp)(MACRO_PROT_ARGS);          void            (*fp)(MACRO_PROT_ARGS);
         int               flags;          int               flags;
 #define MDOC_CALLABLE    (1 << 0)  #define MDOC_CALLABLE    (1 << 0)
 #define MDOC_PARSED      (1 << 1)  #define MDOC_PARSED      (1 << 1)
Line 76  enum margserr {
Line 75  enum margserr {
         ARGS_PEND /* last phrase (-column) */          ARGS_PEND /* last phrase (-column) */
 };  };
   
 enum    margverr {  
         ARGV_ERROR,  
         ARGV_EOLN, /* end of line */  
         ARGV_ARG, /* valid argument */  
         ARGV_WORD /* normal word (or bad argument---same thing) */  
 };  
   
 /*  /*
  * A punctuation delimiter is opening, closing, or "middle mark"   * A punctuation delimiter is opening, closing, or "middle mark"
  * punctuation.  These govern spacing.   * punctuation.  These govern spacing.
Line 104  extern const struct mdoc_macro *const mdoc_macros;
Line 96  extern const struct mdoc_macro *const mdoc_macros;
   
 __BEGIN_DECLS  __BEGIN_DECLS
   
 int               mdoc_macro(MACRO_PROT_ARGS);  void              mdoc_macro(MACRO_PROT_ARGS);
 int               mdoc_word_alloc(struct mdoc *,  void              mdoc_word_alloc(struct mdoc *, int, int, const char *);
                         int, int, const char *);  
 void              mdoc_word_append(struct mdoc *, const char *);  void              mdoc_word_append(struct mdoc *, const char *);
 int               mdoc_elem_alloc(struct mdoc *, int, int,  void              mdoc_elem_alloc(struct mdoc *, int, int,
                         enum mdoct, struct mdoc_arg *);                          enum mdoct, struct mdoc_arg *);
 int               mdoc_block_alloc(struct mdoc *, int, int,  struct mdoc_node *mdoc_block_alloc(struct mdoc *, int, int,
                         enum mdoct, struct mdoc_arg *);                          enum mdoct, struct mdoc_arg *);
 int               mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);  struct mdoc_node *mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);
 int               mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);  void              mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);
 int               mdoc_body_alloc(struct mdoc *, int, int, enum mdoct);  struct mdoc_node *mdoc_body_alloc(struct mdoc *, int, int, enum mdoct);
 int               mdoc_endbody_alloc(struct mdoc *, int, int, enum mdoct,  void              mdoc_endbody_alloc(struct mdoc *, int, int, enum mdoct,
                         struct mdoc_node *, enum mdoc_endbody);                          struct mdoc_node *, enum mdoc_endbody);
 void              mdoc_node_delete(struct mdoc *, struct mdoc_node *);  void              mdoc_node_delete(struct mdoc *, struct mdoc_node *);
 int               mdoc_node_relink(struct mdoc *, struct mdoc_node *);  void              mdoc_node_relink(struct mdoc *, struct mdoc_node *);
 void              mdoc_hash_init(void);  void              mdoc_hash_init(void);
 enum mdoct        mdoc_hash_find(const char *);  enum mdoct        mdoc_hash_find(const char *);
 const char       *mdoc_a2att(const char *);  const char       *mdoc_a2att(const char *);
 const char       *mdoc_a2lib(const char *);  const char       *mdoc_a2lib(const char *);
 const char       *mdoc_a2st(const char *);  const char       *mdoc_a2st(const char *);
 const char       *mdoc_a2arch(const char *);  const char       *mdoc_a2arch(const char *);
 const char       *mdoc_a2vol(const char *);  void              mdoc_valid_pre(struct mdoc *, struct mdoc_node *);
 int               mdoc_valid_pre(struct mdoc *, struct mdoc_node *);  void              mdoc_valid_post(struct mdoc *);
 int               mdoc_valid_post(struct mdoc *);  void              mdoc_argv(struct mdoc *, int, enum mdoct,
 enum margverr     mdoc_argv(struct mdoc *, int, enum mdoct,  
                         struct mdoc_arg **, int *, char *);                          struct mdoc_arg **, int *, char *);
 void              mdoc_argv_free(struct mdoc_arg *);  void              mdoc_argv_free(struct mdoc_arg *);
 enum margserr     mdoc_args(struct mdoc *, int,  enum margserr     mdoc_args(struct mdoc *, int,
                         int *, char *, enum mdoct, char **);                          int *, char *, enum mdoct, char **);
 enum margserr     mdoc_zargs(struct mdoc *, int,  void              mdoc_macroend(struct mdoc *);
                         int *, char *, char **);  
 int               mdoc_macroend(struct mdoc *);  
 enum mdelim       mdoc_isdelim(const char *);  enum mdelim       mdoc_isdelim(const char *);
   
 __END_DECLS  __END_DECLS
   
 #endif /*!LIBMDOC_H*/  
Legend:
Removed from v.1.88  
changed lines
  Added in v.1.96
CVSweb