Grrr, patch(1) merged the new function to the wrong place in this file.

[mandoc.git] / demandoc.c

diff --git a/demandoc.c b/demandoc.c
index 76548de0e59d1b53728148a8d66d3441ec5f19b4..dc1781dccb8ba66ed0584692a98a56ec590db371 100644 (file)
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: demandoc.c,v 1.5 2011/09/01 22:09:50 kristaps Exp $ */
+/*     $Id: demandoc.c,v 1.11 2014/08/10 23:54:41 schwarze Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -14,9 +14,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -76,7 +76,7 @@ main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

-       mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);
+       mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, NULL);

        assert(mp);
 
        if (0 == argc)
        assert(mp);
 
        if (0 == argc)


@@ -110,7 +110,7 @@ pmandoc(struct mparse *mp, int fd, const char *fn, int list)
                return;
        }
 
                return;
        }
 

-       mparse_result(mp, &mdoc, &man);
+       mparse_result(mp, &mdoc, &man, NULL);

        line = 1;
        col = 0;
 
        line = 1;
        col = 0;
 


@@ -132,7 +132,7 @@ static void
 pstring(const char *p, int col, int *colp, int list)
 {
        enum mandoc_esc  esc;
 pstring(const char *p, int col, int *colp, int list)
 {
        enum mandoc_esc  esc;

-       const char      *start;
+       const char      *start, *end;

        int              emit;
 
        /*
        int              emit;
 
        /*


@@ -161,8 +161,20 @@ again:
                        } else if (isspace((unsigned char)*p))
                                break;
 
                        } else if (isspace((unsigned char)*p))
                                break;
 

-               if (emit && p - start >= 2) {
-                       for ( ; start != p; start++)
+               end = p - 1;
+
+               while (end > start)
+                       if ('.' == *end || ',' == *end || 
+                                       '\'' == *end || '"' == *end ||
+                                       ')' == *end || '!' == *end ||
+                                       '?' == *end || ':' == *end ||
+                                       ';' == *end)
+                               end--;
+                       else
+                               break;
+
+               if (emit && end - start >= 1) {
+                       for ( ; start <= end; start++)

                                if (ASCII_HYPH == *start)
                                        putchar('-');
                                else
                                if (ASCII_HYPH == *start)
                                        putchar('-');
                                else