Correctly print `Lk' arguments in -Tascii. Issue raised by Aldis Berzoja.

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index d38450e5baa5f552b72e0be75d02f7ee20b804fa..e6024f26b8c2360ebdc51c120b04fc96417600c9 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,6 +1,6 @@
-/*     $Id: term_ascii.c,v 1.2 2010/06/08 15:06:01 kristaps Exp $ */
+/*     $Id: term_ascii.c,v 1.9 2010/07/13 23:53:20 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2010 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


@@ -30,11 +30,14 @@
 #include "term.h"
 #include "main.h"
 
 #include "term.h"
 #include "main.h"
 

-static void              ascii_endline(struct termp *);
-static void              ascii_letter(struct termp *, char);
-static void              ascii_begin(struct termp *);
+static double            ascii_hspan(const struct termp *,
+                               const struct roffsu *);
+static size_t            ascii_width(const struct termp *, char);

 static void              ascii_advance(struct termp *, size_t);
 static void              ascii_advance(struct termp *, size_t);

+static void              ascii_begin(struct termp *);

 static void              ascii_end(struct termp *);
 static void              ascii_end(struct termp *);

+static void              ascii_endline(struct termp *);
+static void              ascii_letter(struct termp *, char);

 
 
 void *
 
 
 void *


@@ -47,12 +50,17 @@ ascii_alloc(char *outopts)
        if (NULL == (p = term_alloc(TERMENC_ASCII)))
                return(NULL);
 
        if (NULL == (p = term_alloc(TERMENC_ASCII)))
                return(NULL);
 

-       p->type = TERMTYPE_CHAR;
-       p->letter = ascii_letter;
+       p->tabwidth = 5;
+       p->defrmargin = 78;
+
+       p->advance = ascii_advance;

        p->begin = ascii_begin;
        p->end = ascii_end;
        p->endline = ascii_endline;
        p->begin = ascii_begin;
        p->end = ascii_end;
        p->endline = ascii_endline;

-       p->advance = ascii_advance;
+       p->hspan = ascii_hspan;
+       p->letter = ascii_letter;
+       p->type = TERMTYPE_CHAR;
+       p->width = ascii_width;

 
        toks[0] = "width";
        toks[1] = NULL;
 
        toks[0] = "width";
        toks[1] = NULL;


@@ -74,6 +82,15 @@ ascii_alloc(char *outopts)
 }
 
 
 }
 
 

+/* ARGSUSED */
+static size_t
+ascii_width(const struct termp *p, char c)
+{
+
+       return(1);
+}
+
+

 void
 ascii_free(void *arg)
 {
 void
 ascii_free(void *arg)
 {


@@ -87,7 +104,6 @@ static void
 ascii_letter(struct termp *p, char c)
 {
        
 ascii_letter(struct termp *p, char c)
 {
        

-       /* Just push onto the screen. */

        putchar(c);
 }
 
        putchar(c);
 }
 


@@ -127,3 +143,43 @@ ascii_advance(struct termp *p, size_t len)
        for (i = 0; i < len; i++)
                putchar(' ');
 }
        for (i = 0; i < len; i++)
                putchar(' ');
 }

+
+
+/* ARGSUSED */
+static double
+ascii_hspan(const struct termp *p, const struct roffsu *su)
+{
+       double           r;
+
+       /*
+        * Approximate based on character width.  These are generated
+        * entirely by eyeballing the screen, but appear to be correct.
+        */
+
+       switch (su->unit) {
+       case (SCALE_CM):
+               r = 4 * su->scale;
+               break;
+       case (SCALE_IN):
+               r = 10 * su->scale;
+               break;
+       case (SCALE_PC):
+               r = (10 * su->scale) / 6;
+               break;
+       case (SCALE_PT):
+               r = (10 * su->scale) / 72;
+               break;
+       case (SCALE_MM):
+               r = su->scale / 1000;
+               break;
+       case (SCALE_VS):
+               r = su->scale * 2 - 1;
+               break;
+       default:
+               r = su->scale;
+               break;
+       }
+
+       return(r);
+}
+