sync to 1.9.9, featuring:

 * -Thtml output mode
 * roff scaling units
 * and some minor fixes
for full changelogs, see http://bsd.lv/cgi-bin/cvsweb.cgi/

1 files changed, 58 insertions, 0 deletions

diff --git a/usr.bin/mandoc/out.h b/usr.bin/mandoc/out.h
new file mode 100644
index 00000000000..672b9959fd6
--- /dev/null
+++ b/usr.bin/mandoc/out.h
@@ -0,0 +1,58 @@
+/*	$Id: out.h,v 1.1 2009/10/21 19:13:51 schwarze Exp $ */
+/*
+ * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * 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,
+	SCALE_IN,
+	SCALE_PC,
+	SCALE_PT,
+	SCALE_EM,
+	SCALE_MM,
+	SCALE_EN,
+	SCALE_BU,
+	SCALE_VS,
+	SCALE_FS,
+	SCALE_MAX
+};
+
+struct	roffsu {
+	enum roffscale	  unit;
+	double		  scale;
+	int		  pt;
+};
+
+#define	SCALE_INVERT(p) \
+	do { (p)->scale = -(p)->scale; } while (/*CONSTCOND*/0)
+#define	SCALE_VS_INIT(p, v) \
+	do { (p)->unit = SCALE_VS; \
+	     (p)->scale = (v); \
+	     (p)->pt = 0; } while (/*CONSTCOND*/0)
+#define	SCALE_HS_INIT(p, v) \
+	do { (p)->unit = SCALE_BU; \
+	     (p)->scale = (v); \
+	     (p)->pt = 0; } while (/*CONSTCOND*/0)
+
+int		  a2roffsu(const char *, 
+			struct roffsu *, enum roffscale);
+
+__END_DECLS
+
+#endif /*!HTML_H*/