Move mandoc_isdelim() back into libmdoc.h. This fixes an unreported

[mandoc.git] / mandoc.h

diff --git a/mandoc.h b/mandoc.h
index 55d38c8179b56c65146199c7d723c02b2b8dbbb6..694179d1bc64cad2e701188aac4da003fd51e2bf 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.64 2011/03/20 16:05:21 kristaps Exp $ */
+/*     $Id: mandoc.h,v 1.67 2011/03/22 14:05:45 kristaps Exp $ */

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


@@ -137,6 +137,7 @@ enum        mandocerr {
 
        MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 
 
        MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 

+       MANDOCERR_NOTMANUAL, /* manual isn't really a manual */

        MANDOCERR_COLUMNS, /* column syntax is inconsistent */
        MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */
        MANDOCERR_SYNTLINESCOPE, /* line scope broken, syntax violated */
        MANDOCERR_COLUMNS, /* column syntax is inconsistent */
        MANDOCERR_BADDISP, /* NOT IMPLEMENTED: .Bd -file */
        MANDOCERR_SYNTLINESCOPE, /* line scope broken, syntax violated */


@@ -276,58 +277,6 @@ struct     eqn {
        int               pos; /* invocation position */
 };
 
        int               pos; /* invocation position */
 };
 

-/*
- * Available registers (set in libroff, accessed elsewhere).
- */
-enum   regs {
-       REG_nS = 0,
-       REG__MAX
-};
-
-/*
- * A register (struct reg) can consist of many types: this consists of
- * normalised types from the original string form.
- */
-union  regval {
-       unsigned  u; /* unsigned integer */
-};
-
-/*
- * A single register entity.  If "set" is zero, the value of the
- * register should be the default one, which is per-register.  It's
- * assumed that callers know which type in "v" corresponds to which
- * register value.
- */
-struct reg {
-       int               set; /* whether set or not */
-       union regval      v; /* parsed data */
-};
-
-/*
- * The primary interface to setting register values is in libroff,
- * 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];
-};
-
-/*
- * A punctuation delimiter, used only in mdoc(7) documents, is opening,
- * 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.
- */
-enum   mdelim {
-       DELIM_NONE = 0,
-       DELIM_OPEN,
-       DELIM_MIDDLE,
-       DELIM_CLOSE
-};
-

 /*
  * The type of parse sequence.  This value is usually passed via the
  * mandoc(1) command line of -man and -mdoc.  It's almost exclusively
 /*
  * The type of parse sequence.  This value is usually passed via the
  * mandoc(1) command line of -man and -mdoc.  It's almost exclusively


@@ -358,8 +307,6 @@ 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);
 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