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

Diff for /mandoc/roff.h between version 1.60 and 1.65

version 1.60, 2018/08/16 23:43:37 version 1.65, 2018/12/14 06:33:14
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, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2013,2014,2015,2017,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.
    *
    * Common data types for all syntax trees and related functions.
  */   */
   
 struct  ohash;  struct  ohash;
Line 464  enum roff_tok {
Line 466  enum roff_tok {
         MAN_PD,          MAN_PD,
         MAN_AT,          MAN_AT,
         MAN_in,          MAN_in,
           MAN_SY,
           MAN_YS,
         MAN_OP,          MAN_OP,
         MAN_EX,          MAN_EX,
         MAN_EE,          MAN_EE,
Line 488  enum mdoc_endbody {
Line 492  enum mdoc_endbody {
         ENDBODY_SPACE   /* Is broken: append a space. */          ENDBODY_SPACE   /* Is broken: append a space. */
 };  };
   
   enum    mandoc_os {
           MANDOC_OS_OTHER = 0,
           MANDOC_OS_NETBSD,
           MANDOC_OS_OPENBSD
   };
   
 struct  roff_node {  struct  roff_node {
         struct roff_node *parent;  /* Parent AST node. */          struct roff_node *parent;  /* Parent AST node. */
         struct roff_node *child;   /* First child AST node. */          struct roff_node *child;   /* First child AST node. */
Line 500  struct roff_node {
Line 510  struct roff_node {
         struct mdoc_arg  *args;    /* BLOCK/ELEM */          struct mdoc_arg  *args;    /* BLOCK/ELEM */
         union mdoc_data  *norm;    /* Normalized arguments. */          union mdoc_data  *norm;    /* Normalized arguments. */
         char             *string;  /* TEXT */          char             *string;  /* TEXT */
         const struct tbl_span *span; /* TBL */          struct tbl_span  *span;    /* TBL */
         struct eqn_box   *eqn;     /* EQN */          struct eqn_box   *eqn;     /* EQN */
         int               line;    /* Input file line number. */          int               line;    /* Input file line number. */
         int               pos;     /* Input file column number. */          int               pos;     /* Input file column number. */
Line 538  struct roff_meta {
Line 548  struct roff_meta {
   
 struct  roff_man {  struct  roff_man {
         struct roff_meta  meta;    /* Document meta-data. */          struct roff_meta  meta;    /* Document meta-data. */
         struct mparse    *parse;   /* Parse pointer. */  
         struct roff      *roff;    /* Roff parser state data. */          struct roff      *roff;    /* Roff parser state data. */
         struct ohash     *mdocmac; /* Mdoc macro lookup table. */          struct ohash     *mdocmac; /* Mdoc macro lookup table. */
         struct ohash     *manmac;  /* Man macro lookup table. */          struct ohash     *manmac;  /* Man macro lookup table. */
Line 575  extern const char *const *roff_name;
Line 584  extern const char *const *roff_name;
   
   
 void             deroff(char **, const struct roff_node *);  void             deroff(char **, const struct roff_node *);
 struct ohash    *roffhash_alloc(enum roff_tok, enum roff_tok);  
 enum roff_tok    roffhash_find(struct ohash *, const char *, size_t);  
 void             roffhash_free(struct ohash *);  
 void             roff_validate(struct roff_man *);  void             roff_validate(struct roff_man *);
Legend:
Removed from v.1.60  
changed lines
  Added in v.1.65
CVSweb