improve SQL style: avoid "SELECT *", be explicit in what columns we want;

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index 9c209ee3874e304e39e9bdac26edcfee151d0367..ff59463916f9a9b3f0f7931c6991fcc6f80d0bfd 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,7 +1,7 @@
-/*     $Id: mandoc.h,v 1.114 2014/01/05 20:26:36 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.120 2014/04/20 16:46:04 schwarze Exp $ */

 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2012, 2013, 2014 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
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -20,6 +20,7 @@
 
 #define ASCII_NBRSP     31  /* non-breaking space */
 #define        ASCII_HYPH       30  /* breakable hyphen */
 
 #define ASCII_NBRSP     31  /* non-breaking space */
 #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


@@ -239,6 +240,7 @@ struct      tbl_row {
        struct tbl_row   *next;
        struct tbl_cell  *first;
        struct tbl_cell  *last;
        struct tbl_row   *next;
        struct tbl_cell  *first;
        struct tbl_cell  *last;

+       int               vert; /* trailing vertical line */

 };
 
 enum   tbl_datt {
 };
 
 enum   tbl_datt {


@@ -361,7 +363,7 @@ 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 {
        char             *name; /* identifier (or NULL) */
  */
 struct eqn {
        char             *name; /* identifier (or NULL) */


@@ -371,15 +373,12 @@ struct    eqn {
 };
 
 /*
 };
 
 /*

- * The type of parse sequence.  This value is usually passed via the
- * mandoc(1) command line of -man and -mdoc.  It's almost exclusively
- * -mandoc but the others have been retained for compatibility.
+ * Parse options.

  */
  */

-enum   mparset {
-       MPARSE_AUTO, /* magically determine the document type */
-       MPARSE_MDOC, /* assume -mdoc */
-       MPARSE_MAN /* assume -man */
-};
+#define        MPARSE_MDOC     1  /* assume -mdoc */
+#define        MPARSE_MAN      2  /* assume -man */
+#define        MPARSE_SO       4  /* honour .so requests */
+#define        MPARSE_QUICK    8  /* abort the parse early */

 
 enum   mandoc_esc {
        ESCAPE_ERROR = 0, /* bail! unparsable escape */
 
 enum   mandoc_esc {
        ESCAPE_ERROR = 0, /* bail! unparsable escape */


@@ -407,30 +406,24 @@ 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 char **, 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);
 void             mchars_free(struct mchars *);
 struct mchars   *mchars_alloc(void);
 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,
-                       mandocmsg, char *, int);
+struct mparse   *mparse_alloc(int, enum mandoclevel, mandocmsg, char *);

 void             mparse_free(struct mparse *);
 void             mparse_keep(struct mparse *);
 enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);
 enum mandoclevel  mparse_readmem(struct mparse *, const void *, size_t,
                        const char *);
 void             mparse_reset(struct mparse *);
 void             mparse_free(struct mparse *);
 void             mparse_keep(struct mparse *);
 enum mandoclevel  mparse_readfd(struct mparse *, int, const char *);
 enum mandoclevel  mparse_readmem(struct mparse *, const void *, size_t,
                        const char *);
 void             mparse_reset(struct mparse *);

-void             mparse_result(struct mparse *, 
-                       struct mdoc **, struct man **);
+void             mparse_result(struct mparse *,
+                       struct mdoc **, struct man **, char **);

 const char      *mparse_getkeep(const struct mparse *);
 const char      *mparse_strerror(enum mandocerr);
 const char      *mparse_strlevel(enum mandoclevel);
 const char      *mparse_getkeep(const struct mparse *);
 const char      *mparse_strerror(enum mandocerr);
 const char      *mparse_strlevel(enum mandoclevel);