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

Diff for /mandoc/roff.h between version 1.30 and 1.35

version 1.30, 2015/04/02 23:48:20 version 1.35, 2015/10/17 00:21:07
Line 1 
Line 1 
 /*      $OpenBSD$       */  /*      $OpenBSD$       */
 /*  /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>   * Copyright (c) 2013, 2014, 2015 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 19 
Line 19 
 struct  mdoc_arg;  struct  mdoc_arg;
 union   mdoc_data;  union   mdoc_data;
   
   enum    roff_macroset {
           MACROSET_NONE = 0,
           MACROSET_MDOC,
           MACROSET_MAN
   };
   
 enum    roff_sec {  enum    roff_sec {
         SEC_NONE = 0,          SEC_NONE = 0,
         SEC_NAME,          SEC_NAME,
Line 58  enum roff_type {
Line 64  enum roff_type {
         ROFFT_EQN          ROFFT_EQN
 };  };
   
   enum    roff_next {
           ROFF_NEXT_SIBLING = 0,
           ROFF_NEXT_CHILD
   };
   
 /*  /*
  * Indicates that a BODY's formatting has ended, but   * Indicates that a BODY's formatting has ended, but
  * the scope is still open.  Used for badly nested blocks.   * the scope is still open.  Used for badly nested blocks.
Line 86  struct roff_node {
Line 97  struct roff_node {
         int               line;    /* Input file line number. */          int               line;    /* Input file line number. */
         int               pos;     /* Input file column number. */          int               pos;     /* Input file column number. */
         int               tok;     /* Request or macro ID. */          int               tok;     /* Request or macro ID. */
   #define TOKEN_NONE       (-1)      /* No request or macro. */
         int               flags;          int               flags;
 #define MDOC_VALID       (1 << 0)  /* Has been validated. */  #define MDOC_VALID       (1 << 0)  /* Has been validated. */
 #define MDOC_ENDED       (1 << 1)  /* Gone past body end mark. */  #define MDOC_ENDED       (1 << 1)  /* Gone past body end mark. */
Line 115  struct roff_meta {
Line 127  struct roff_meta {
         char             *date;    /* Normalized date. */          char             *date;    /* Normalized date. */
         int               hasbody; /* Document is not empty. */          int               hasbody; /* Document is not empty. */
 };  };
   
   struct  roff_man {
           struct roff_meta  meta;    /* Document meta-data. */
           struct mparse    *parse;   /* Parse pointer. */
           struct roff      *roff;    /* Roff parser state data. */
           const char       *defos;   /* Default operating system. */
           struct roff_node *first;   /* The first node parsed. */
           struct roff_node *last;    /* The last node parsed. */
           struct roff_node *last_es; /* The most recent Es node. */
           int               quick;   /* Abort parse early. */
           int               flags;   /* Parse flags. */
   #define MDOC_LITERAL     (1 << 1)  /* In a literal scope. */
   #define MDOC_PBODY       (1 << 2)  /* In the document body. */
   #define MDOC_NEWLINE     (1 << 3)  /* First macro/text in a line. */
   #define MDOC_PHRASE      (1 << 4)  /* In a Bl -column phrase. */
   #define MDOC_PHRASELIT   (1 << 5)  /* Literal within a phrase. */
   #define MDOC_FREECOL     (1 << 6)  /* `It' invocation should close. */
   #define MDOC_SYNOPSIS    (1 << 7)  /* SYNOPSIS-style formatting. */
   #define MDOC_KEEP        (1 << 8)  /* In a word keep. */
   #define MDOC_SMOFF       (1 << 9)  /* Spacing is off. */
   #define MDOC_NODELIMC    (1 << 10) /* Disable closing delimiter handling. */
   #define MAN_ELINE        (1 << 11) /* Next-line element scope. */
   #define MAN_BLINE        (1 << 12) /* Next-line block scope. */
   #define MDOC_PHRASEQF    (1 << 13) /* Quote first word encountered. */
   #define MDOC_PHRASEQL    (1 << 14) /* Quote last word of this phrase. */
   #define MDOC_PHRASEQN    (1 << 15) /* Quote first word of the next phrase. */
   #define MAN_LITERAL       MDOC_LITERAL
   #define MAN_NEWLINE       MDOC_NEWLINE
           enum roff_macroset macroset; /* Kind of high-level macros used. */
           enum roff_sec     lastsec; /* Last section seen. */
           enum roff_sec     lastnamed; /* Last standard section seen. */
           enum roff_next    next;    /* Where to put the next node. */
   };
   
   __BEGIN_DECLS
   
   void             deroff(char **, const struct roff_node *);
   
   __END_DECLS
Legend:
Removed from v.1.30  
changed lines
  Added in v.1.35
CVSweb