Moved printing of empty word [back] into mdoc_action.c so that it's not

mirrored across front-ends.

diff --git a/mdoc_action.c b/mdoc_action.c
index 76003caf329b0717b1a274f5ab9e9ceae21965aa..7fa1bf6b775db38ce26533572f8ffec350a10cb5 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.61 2010/05/24 11:59:37 joerg Exp $ */
+/*     $Id: mdoc_action.c,v 1.62 2010/05/29 18:58:52 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -57,6 +57,7 @@ static        int       post_dd(POST_ARGS);
 static int       post_display(POST_ARGS);
 static int       post_dt(POST_ARGS);
 static int       post_lb(POST_ARGS);
+static int       post_li(POST_ARGS);
 static int       post_nm(POST_ARGS);
 static int       post_os(POST_ARGS);
 static int       post_pa(POST_ARGS);
@@ -102,7 +103,7 @@ static      const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ft */ 
        { NULL, NULL }, /* Ic */ 
        { NULL, NULL }, /* In */ 
-       { NULL, NULL }, /* Li */
+       { NULL, post_li }, /* Li */
        { NULL, NULL }, /* Nd */ 
        { NULL, post_nm }, /* Nm */ 
        { NULL, NULL }, /* Op */
@@ -836,6 +837,27 @@ post_pa(POST_ARGS)
 }
 
 
+/*
+ * Empty `Li' macros get an empty string to make front-ends add an extra
+ * space.
+ */
+static int
+post_li(POST_ARGS)
+{
+       struct mdoc_node *np;
+
+       if (n->child)
+               return(1);
+       
+       np = n;
+       m->next = MDOC_NEXT_CHILD;
+       if ( ! mdoc_word_alloc(m, n->line, n->pos, ""))
+               return(0);
+       m->last = np;
+       return(1);
+}
+
+
 /*
  * The `Ar' macro defaults to two strings "file ..." if no value is
  * provided as an argument.

diff --git a/mdoc_html.c b/mdoc_html.c
index a62ec1561f37152f1eac6322eb8875f3566eb59f..62d392431549c723fc20d53d6cbac46c52672b95 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.68 2010/05/29 18:47:54 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.69 2010/05/29 18:58:52 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -2091,8 +2091,6 @@ mdoc_li_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "lit");
        print_otag(h, TAG_SPAN, 1, &tag);
-       if (NULL == n->child)
-               print_text(h, "");
        return(1);
 }
 

diff --git a/mdoc_term.c b/mdoc_term.c
index 0e48959d807fc5f0fbb724dbb40c68f26f432da5..9342abd0b9f67f6a714ab65c6bdcff40582f1f4b 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.132 2010/05/29 18:47:54 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.133 2010/05/29 18:58:52 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -2098,8 +2098,6 @@ termp_li_pre(DECL_ARGS)
 {
 
        term_fontpush(p, TERMFONT_NONE);
-       if (NULL == n->child)
-               term_word(p, "");
        return(1);
 }