clarify the difference between .Cm and .Ic;

[mandoc.git] / out.h

diff --git a/out.h b/out.h
index 425c727b2eaffd5a9b237c7391cbf664074c555c..dec6a8f873247bde1fd0c446aa80f00da7069824 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,6 +1,7 @@
-/*     $Id: out.h,v 1.17 2011/03/07 01:35:51 schwarze Exp $ */
+/*     $Id: out.h,v 1.33 2018/08/18 20:18:14 schwarze Exp $ */

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

+ * Copyright (c) 2014, 2017, 2018 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


@@ -14,76 +15,54 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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 */
 
 struct roffcol {
        size_t           width; /* width of cell */

+       size_t           nwidth; /* max. width of number in cell */

        size_t           decimal; /* decimal position in cell */
        size_t           decimal; /* decimal position in cell */

+       size_t           spacing; /* spacing after the column */
+       int              flags; /* layout flags, see tbl_cell */

 };
 
 };
 

-typedef        size_t (*tbl_strlen)(const char *, void *);
-typedef        size_t (*tbl_len)(size_t, void *);
+struct roffsu {
+       enum roffscale    unit;
+       double            scale;
+};
+
+typedef        size_t  (*tbl_sulen)(const struct roffsu *, void *);
+typedef        size_t  (*tbl_strlen)(const char *, void *);
+typedef        size_t  (*tbl_len)(size_t, void *);

 
 struct rofftbl {
 
 struct rofftbl {

+       tbl_sulen        sulen; /* calculate scaling unit length */

        tbl_strlen       slen; /* calculate string length */
        tbl_len          len; /* produce width of empty space */
        struct roffcol  *cols; /* master column specifiers */
        tbl_strlen       slen; /* calculate string length */
        tbl_len          len; /* produce width of empty space */
        struct roffcol  *cols; /* master column specifiers */

-       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
+       void            *arg; /* passed to sulen, slen, and len */

 };
 
 };
 

-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) \
 #define        SCALE_HS_INIT(p, v) \

-       do { (p)->unit = SCALE_BU; \
+       do { (p)->unit = SCALE_EN; \

             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 
             (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*/
+const char      *a2roffsu(const char *, struct roffsu *, enum roffscale);
+void             tblcalc(struct rofftbl *tbl,
+                       const struct tbl_span *, size_t, size_t);