Clarifying styles.

[mandoc.git] / out.h

diff --git a/out.h b/out.h
index baebab08123c865eb8bd14e82350c459db5678b2..13665e46248972e4e3a63cbdc85e9f7f5379599e 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,6 +1,6 @@
-/*     $Id: out.h,v 1.7 2009/11/07 08:26:45 kristaps Exp $ */
+/*     $Id: out.h,v 1.14 2010/07/21 20:35:03 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * 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


@@ -37,31 +37,37 @@ enum        roffscale {
 
 enum   roffdeco {
        DECO_NONE,
 
 enum   roffdeco {
        DECO_NONE,

-       DECO_SPECIAL,
-       DECO_RESERVED,
+       DECO_SPECIAL, /* special character */
+       DECO_SSPECIAL, /* single-char special */
+       DECO_RESERVED, /* reserved word */

        DECO_BOLD,
        DECO_ITALIC,
        DECO_ROMAN,
        DECO_PREVIOUS,
        DECO_BOLD,
        DECO_ITALIC,
        DECO_ROMAN,
        DECO_PREVIOUS,

+       DECO_NOSPACE,
+       DECO_FONT, /* font */
+       DECO_FFONT, /* font family */

        DECO_MAX
 };
 
 struct roffsu {
        enum roffscale    unit;
        double            scale;
        DECO_MAX
 };
 
 struct roffsu {
        enum roffscale    unit;
        double            scale;

-       int               pt;

 };
 
 #define        SCALE_INVERT(p) \
 };
 
 #define        SCALE_INVERT(p) \

-       do { (p)->scale = -(p)->scale; } while (/*CONSTCOND*/0)
+       do { (p)->scale = -(p)->scale; } \
+       while (/* CONSTCOND */ 0)
+

 #define        SCALE_VS_INIT(p, v) \
        do { (p)->unit = SCALE_VS; \
 #define        SCALE_VS_INIT(p, v) \
        do { (p)->unit = SCALE_VS; \

-            (p)->scale = (v); \
-            (p)->pt = 0; } while (/*CONSTCOND*/0)
+            (p)->scale = (v); } \
+       while (/* CONSTCOND */ 0)
+

 #define        SCALE_HS_INIT(p, v) \
        do { (p)->unit = SCALE_BU; \
 #define        SCALE_HS_INIT(p, v) \
        do { (p)->unit = SCALE_BU; \

-            (p)->scale = (v); \
-            (p)->pt = 0; } while (/*CONSTCOND*/0)
+            (p)->scale = (v); } \
+       while (/* CONSTCOND */ 0)

 
 int              a2roffsu(const char *, 
                        struct roffsu *, enum roffscale);
 
 int              a2roffsu(const char *, 
                        struct roffsu *, enum roffscale);