summaryrefslogtreecommitdiff
path: root/usr/src/cmd/mandoc/out.h
diff options
context:
space:
mode:
authorYuri Pankov <yuri.pankov@nexenta.com>2015-10-18 14:22:06 +0300
committerGordon Ross <gwr@nexenta.com>2015-11-03 15:48:48 -0500
commit260e9a87725c090ba5835b1f9f0b62fa2f96036f (patch)
tree46ce875eadee4e0fa3586128cacfea38e5b15569 /usr/src/cmd/mandoc/out.h
parent1058dba45ec5d6876a5bbb0b9174347e13e5748d (diff)
downloadillumos-gate-260e9a87725c090ba5835b1f9f0b62fa2f96036f.tar.gz
6356 Update mdocml to 1.13.3
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com> Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/cmd/mandoc/out.h')
-rw-r--r--usr/src/cmd/mandoc/out.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/cmd/mandoc/out.h b/usr/src/cmd/mandoc/out.h
index 1c18c6c314..cc218f4fec 100644
--- a/usr/src/cmd/mandoc/out.h
+++ b/usr/src/cmd/mandoc/out.h
@@ -1,4 +1,4 @@
-/* $Id: out.h,v 1.21 2011/07/17 15:24:25 kristaps Exp $ */
+/* $Id: out.h,v 1.26 2014/12/01 08:05:52 schwarze Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -14,8 +14,6 @@
* 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
enum roffscale {
SCALE_CM, /* centimeters (c) */
@@ -34,6 +32,7 @@ enum roffscale {
struct roffcol {
size_t width; /* width of cell */
size_t decimal; /* decimal position in cell */
+ int flags; /* layout flags, see tbl_cell */
};
struct roffsu {
@@ -51,21 +50,22 @@ struct rofftbl {
void *arg; /* passed to slen and len */
};
-__BEGIN_DECLS
-
#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);
-void tblcalc(struct rofftbl *tbl, const struct tbl_span *);
+__BEGIN_DECLS
+
+struct tbl_span;
-__END_DECLS
+int a2roffsu(const char *, struct roffsu *, enum roffscale);
+void tblcalc(struct rofftbl *tbl,
+ const struct tbl_span *, size_t);
-#endif /*!OUT_H*/
+__END_DECLS