If PATH_INFO contains a complete and correct path to a manual page

[mandoc.git] / out.h

diff --git a/out.h b/out.h
index 425c727b2eaffd5a9b237c7391cbf664074c555c..2c1cf3fe9701986b45c547155700c5a95d78c8e1 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,4 +1,4 @@
-/*     $Id: out.h,v 1.17 2011/03/07 01:35:51 schwarze Exp $ */
+/*     $Id: out.h,v 1.27 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,18 +14,34 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef OUT_H
-#define OUT_H
 
-__BEGIN_DECLS
+enum   roffscale {
+       SCALE_CM, /* centimeters (c) */
+       SCALE_IN, /* inches (i) */
+       SCALE_PC, /* pica (P) */
+       SCALE_PT, /* points (p) */
+       SCALE_EM, /* ems (m) */
+       SCALE_MM, /* mini-ems (M) */
+       SCALE_EN, /* ens (n) */
+       SCALE_BU, /* default horizontal (u) */
+       SCALE_VS, /* default vertical (v) */
+       SCALE_FS, /* syn. for u (f) */
+       SCALE_MAX
+};
 
 struct roffcol {
        size_t           width; /* width of cell */
        size_t           decimal; /* decimal position in cell */
+       int              flags; /* layout flags, see tbl_cell */
+};
+
+struct roffsu {
+       enum roffscale    unit;
+       double            scale;
 };
 
-typedef        size_t (*tbl_strlen)(const char *, void *);
-typedef        size_t (*tbl_len)(size_t, void *);
+typedef        size_t  (*tbl_strlen)(const char *, void *);
+typedef        size_t  (*tbl_len)(size_t, void *);
 
 struct rofftbl {
        tbl_strlen       slen; /* calculate string length */
@@ -34,56 +50,19 @@ struct      rofftbl {
        void            *arg; /* passed to slen and len */
 };
 
-enum   roffscale {
-       SCALE_CM,
-       SCALE_IN,
-       SCALE_PC,
-       SCALE_PT,
-       SCALE_EM,
-       SCALE_MM,
-       SCALE_EN,
-       SCALE_BU,
-       SCALE_VS,
-       SCALE_FS,
-       SCALE_MAX
-};
-
-enum   roffdeco {
-       DECO_NONE,
-       DECO_NUMBERED, /* numbered character */
-       DECO_SPECIAL, /* special character */
-       DECO_SSPECIAL, /* single-char special */
-       DECO_RESERVED, /* reserved word */
-       DECO_BOLD, /* bold font */
-       DECO_ITALIC, /* italic font */
-       DECO_ROMAN, /* "normal" undecorated font */
-       DECO_PREVIOUS, /* revert to previous font */
-       DECO_NOSPACE, /* suppress spacing */
-       DECO_FONT, /* font */
-       DECO_FFONT, /* font family */
-       DECO_MAX
-};
-
-struct roffsu {
-       enum roffscale    unit;
-       double            scale;
-};
-
 #define        SCALE_VS_INIT(p, v) \
        do { (p)->unit = SCALE_VS; \
             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 
 #define        SCALE_HS_INIT(p, v) \
-       do { (p)->unit = SCALE_BU; \
+       do { (p)->unit = SCALE_EN; \
             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 
-int      a2roffsu(const char *, struct roffsu *, enum roffscale);
-int      a2roffdeco(enum roffdeco *, const char **, size_t *);
-void     time2a(time_t, char *, size_t);
-void     tblcalc(struct rofftbl *tbl, const struct tbl_span *);
 
-__END_DECLS
+struct tbl_span;
 
-#endif /*!OUT_H*/
+int              a2roffsu(const char *, struct roffsu *, enum roffscale);
+void             tblcalc(struct rofftbl *tbl,
+                       const struct tbl_span *, size_t);