Block-implicit macros now up-propogate end-of-sentence spacing. NOTE: GROFF IS NOT...

diff --git a/mandoc.c b/mandoc.c
index 4d087956eff87e7f290d4ec02061380f08052e6c..37216da61ef0540408901a1a9576b8e3c62df014 100644 (file)
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.c,v 1.12 2010/05/12 17:08:03 kristaps Exp $ */
+/*     $Id: mandoc.c,v 1.13 2010/05/14 14:09:13 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -305,7 +305,8 @@ int
 mandoc_eos(const char *p, size_t sz)
 {
 
 mandoc_eos(const char *p, size_t sz)
 {
 

-       assert(sz);
+       if (0 == sz)
+               return(0);

 
        switch (p[(int)sz - 1]) {
        case ('.'):
 
        switch (p[(int)sz - 1]) {
        case ('.'):

diff --git a/mdoc_macro.c b/mdoc_macro.c
index bb5afede44192e38ef6ae26711f9a39e15f38118..0a89e563105e421ff3241f2429b91ce8fb6e455a 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.63 2010/05/14 13:31:20 kristaps Exp $ */
+/*     $Id: mdoc_macro.c,v 1.64 2010/05/14 14:09:13 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -26,6 +26,7 @@
 #include <time.h>
 
 #include "libmdoc.h"
 #include <time.h>
 
 #include "libmdoc.h"

+#include "libmandoc.h"

 
 enum   rew {
        REWIND_REWIND,
 
 enum   rew {
        REWIND_REWIND,


@@ -1155,6 +1156,25 @@ blk_part_imp(MACRO_PROT_ARGS)
                body = m->last;
        }
 
                body = m->last;
        }
 

+       for (n = body->child; n && n->next; n = n->next)
+               /* Do nothing. */ ;
+       
+       /* 
+        * End of sentence spacing: if the last node is a text node and
+        * has a trailing period, then mark it as being end-of-sentence.
+        */
+
+       if (n && MDOC_TEXT == n->type && n->string)
+               if (mandoc_eos(n->string, strlen(n->string)))
+                       n->flags |= MDOC_EOS;
+
+       /* Up-propogate the end-of-space flag. */
+
+       if (n && (MDOC_EOS & n->flags)) {
+               body->flags |= MDOC_EOS;
+               body->parent->flags |= MDOC_EOS;
+       }
+

        /* 
         * If we can't rewind to our body, then our scope has already
         * been closed by another macro (like `Oc' closing `Op').  This
        /* 
         * If we can't rewind to our body, then our scope has already
         * been closed by another macro (like `Oc' closing `Op').  This