Minimal implementation of the \h (horizontal motion) escape sequence.

[mandoc.git] / roff_term.c

diff --git a/roff_term.c b/roff_term.c
index cd9fba37146c359f84572b02bd9b05102f6f9648..3c2f24a9f4702383c08839d421688bc87226b72a 100644 (file)
--- a/roff_term.c
+++ b/roff_term.c
@@ -1,6 +1,6 @@
 /*     $OpenBSD$ */
 /*
- * Copyright (c) 2010, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2014, 2015, 2017 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
@@ -17,6 +17,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#include <stddef.h>
 
 #include "roff.h"
 #include "out.h"
@@ -28,10 +29,18 @@ typedef     void    (*roff_term_pre_fp)(ROFF_TERM_ARGS);
 
 static void      roff_term_pre_br(ROFF_TERM_ARGS);
 static void      roff_term_pre_ft(ROFF_TERM_ARGS);
+static void      roff_term_pre_ll(ROFF_TERM_ARGS);
+static void      roff_term_pre_sp(ROFF_TERM_ARGS);
+static void      roff_term_pre_ta(ROFF_TERM_ARGS);
+static void      roff_term_pre_ti(ROFF_TERM_ARGS);
 
 static const roff_term_pre_fp roff_term_pre_acts[ROFF_MAX] = {
        roff_term_pre_br,  /* br */
        roff_term_pre_ft,  /* ft */
+       roff_term_pre_ll,  /* ft */
+       roff_term_pre_sp,  /* sp */
+       roff_term_pre_ta,  /* ta */
+       roff_term_pre_ti,  /* ti */
 };
 
 
@@ -78,3 +87,79 @@ roff_term_pre_ft(ROFF_TERM_ARGS)
                break;
        }
 }
+
+static void
+roff_term_pre_ll(ROFF_TERM_ARGS)
+{
+       term_setwidth(p, n->child != NULL ? n->child->string : NULL);
+}
+
+static void
+roff_term_pre_sp(ROFF_TERM_ARGS)
+{
+       struct roffsu    su;
+       int              len;
+
+       if (n->child != NULL) {
+               if (a2roffsu(n->child->string, &su, SCALE_VS) == 0)
+                       su.scale = 1.0;
+               len = term_vspan(p, &su);
+       } else
+               len = 1;
+
+       if (len < 0)
+               p->skipvsp -= len;
+       else
+               while (len--)
+                       term_vspace(p);
+
+       roff_term_pre_br(p, n);
+}
+
+static void
+roff_term_pre_ta(ROFF_TERM_ARGS)
+{
+       term_tab_set(p, NULL);
+       for (n = n->child; n != NULL; n = n->next)
+               term_tab_set(p, n->string);
+}
+
+static void
+roff_term_pre_ti(ROFF_TERM_ARGS)
+{
+       struct roffsu    su;
+       const char      *cp;
+       int              len, sign;
+
+       roff_term_pre_br(p, n);
+
+       if (n->child == NULL)
+               return;
+       cp = n->child->string;
+       if (*cp == '+') {
+               sign = 1;
+               cp++;
+       } else if (*cp == '-') {
+               sign = -1;
+               cp++;
+       } else
+               sign = 0;
+
+       if (a2roffsu(cp, &su, SCALE_EM) == 0)
+               return;
+       len = term_hspan(p, &su) / 24;
+
+       if (sign == 0) {
+               p->ti = len - p->offset;
+               p->offset = len;
+       } else if (sign == 1) {
+               p->ti = len;
+               p->offset += len;
+       } else if ((size_t)len < p->offset) {
+               p->ti = -len;
+               p->offset -= len;
+       } else {
+               p->ti = -p->offset;
+               p->offset = 0;
+       }
+}