Install sources with mode 0644. Noted by Jack Nagel. Ok schwarze@.

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index f15082bfd2710d5ab0b256bb25f653ada9c2be06..03d1b91cb799ffcc3fd391c7ab6b77e17793b985 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_macro.c,v 1.104 2011/03/20 16:02:05 kristaps Exp $ */
+/*     $Id: mdoc_macro.c,v 1.109 2011/04/30 10:18:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
@@ -50,6 +51,8 @@ static        int             in_line(MACRO_PROT_ARGS);
 static int             obsolete(MACRO_PROT_ARGS);
 static int             phrase_ta(MACRO_PROT_ARGS);
 
+static int             dword(struct mdoc *, int, int, 
+                               const char *, enum mdelim);
 static int             append_delims(struct mdoc *, 
                                int, int *, char *);
 static enum mdoct      lookup(enum mdoct, const char *);
@@ -580,6 +583,40 @@ rew_sub(enum mdoc_type t, struct mdoc *m,
        return(1);
 }
 
+/*
+ * Allocate a word and check whether it's punctuation or not.
+ * Punctuation consists of those tokens found in mdoc_isdelim().
+ */
+static int
+dword(struct mdoc *m, int line, 
+               int col, const char *p, enum mdelim d)
+{
+       
+       if (DELIM_MAX == d)
+               d = mdoc_isdelim(p);
+
+       if ( ! mdoc_word_alloc(m, line, col, p))
+               return(0);
+
+       if (DELIM_OPEN == d)
+               m->last->flags |= MDOC_DELIMO;
+
+       /*
+        * Closing delimiters only suppress the preceding space
+        * when they follow something, not when they start a new
+        * block or element, and not when they follow `No'.
+        *
+        * XXX  Explicitly special-casing MDOC_No here feels
+        *      like a layering violation.  Find a better way
+        *      and solve this in the code related to `No'!
+        */
+
+       else if (DELIM_CLOSE == d && m->last->prev &&
+                       m->last->prev->tok != MDOC_No)
+               m->last->flags |= MDOC_DELIMC;
+
+       return(1);
+}
 
 static int
 append_delims(struct mdoc *m, int line, int *pos, char *buf)
@@ -593,27 +630,25 @@ append_delims(struct mdoc *m, int line, int *pos, char *buf)
 
        for (;;) {
                la = *pos;
-               ac = mdoc_zargs(m, line, pos, buf, ARGS_NOWARN, &p);
+               ac = mdoc_zargs(m, line, pos, buf, &p);
 
                if (ARGS_ERROR == ac)
                        return(0);
                else if (ARGS_EOLN == ac)
                        break;
 
-               assert(DELIM_NONE != mandoc_isdelim(p));
-               if ( ! mdoc_word_alloc(m, line, la, p))
-                       return(0);
+               dword(m, line, la, p, DELIM_MAX);
 
                /*
                 * If we encounter end-of-sentence symbols, then trigger
                 * the double-space.
                 *
-                * XXX: it's easy to allow this to propogate outward to
+                * XXX: it's easy to allow this to propagate outward to
                 * the last symbol, such that `. )' will cause the
                 * correct double-spacing.  However, (1) groff isn't
                 * smart enough to do this and (2) it would require
                 * knowing which symbols break this behaviour, for
-                * example, `.  ;' shouldn't propogate the double-space.
+                * example, `.  ;' shouldn't propagate the double-space.
                 */
                if (mandoc_eos(p, strlen(p), 0))
                        m->last->flags |= MDOC_EOS;
@@ -746,7 +781,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
 
                if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, lastarg, p))
+                       if ( ! dword(m, line, lastarg, p, DELIM_MAX))
                                return(0);
                        continue;
                }
@@ -870,7 +905,7 @@ in_line(MACRO_PROT_ARGS)
                 * the word. 
                 */
 
-               d = ARGS_QWORD == ac ? DELIM_NONE : mandoc_isdelim(p);
+               d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p);
 
                if (DELIM_NONE != d) {
                        /*
@@ -905,7 +940,8 @@ in_line(MACRO_PROT_ARGS)
 
                if (DELIM_NONE == d)
                        cnt++;
-               if ( ! mdoc_word_alloc(m, line, la, p))
+
+               if ( ! dword(m, line, la, p, d))
                        return(0);
 
                /*
@@ -971,7 +1007,7 @@ blk_full(MACRO_PROT_ARGS)
        }
 
        /*
-        * This routine accomodates implicitly- and explicitly-scoped
+        * This routine accommodates implicitly- and explicitly-scoped
         * macro openings.  Implicit ones first close out prior scope
         * (seen above).  Delay opening the head until necessary to
         * allow leading punctuation to print.  Special consideration
@@ -1060,8 +1096,8 @@ blk_full(MACRO_PROT_ARGS)
                                ARGS_PHRASE != ac &&
                                ARGS_PPHRASE != ac &&
                                ARGS_QWORD != ac &&
-                               DELIM_OPEN == mandoc_isdelim(p)) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                               DELIM_OPEN == mdoc_isdelim(p)) {
+                       if ( ! dword(m, line, la, p, DELIM_OPEN))
                                return(0);
                        continue;
                }
@@ -1113,7 +1149,7 @@ blk_full(MACRO_PROT_ARGS)
                ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
 
                if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                       if ( ! dword(m, line, la, p, DELIM_MAX))
                                return(0);
                        continue;
                }
@@ -1223,8 +1259,8 @@ blk_part_imp(MACRO_PROT_ARGS)
                        break;
 
                if (NULL == body && ARGS_QWORD != ac &&
-                   DELIM_OPEN == mandoc_isdelim(p)) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                               DELIM_OPEN == mdoc_isdelim(p)) {
+                       if ( ! dword(m, line, la, p, DELIM_OPEN))
                                return(0);
                        continue;
                } 
@@ -1238,7 +1274,7 @@ blk_part_imp(MACRO_PROT_ARGS)
                ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
 
                if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                       if ( ! dword(m, line, la, p, DELIM_MAX))
                                return(0);
                        continue;
                }
@@ -1268,7 +1304,7 @@ blk_part_imp(MACRO_PROT_ARGS)
                if (mandoc_eos(n->string, strlen(n->string), 1))
                        n->flags |= MDOC_EOS;
 
-       /* Up-propogate the end-of-space flag. */
+       /* Up-propagate the end-of-space flag. */
 
        if (n && (MDOC_EOS & n->flags)) {
                body->flags |= MDOC_EOS;
@@ -1354,9 +1390,9 @@ blk_part_exp(MACRO_PROT_ARGS)
                /* Flush out leading punctuation. */
 
                if (NULL == head && ARGS_QWORD != ac &&
-                   DELIM_OPEN == mandoc_isdelim(p)) {
+                               DELIM_OPEN == mdoc_isdelim(p)) {
                        assert(NULL == body);
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                       if ( ! dword(m, line, la, p, DELIM_OPEN))
                                return(0);
                        continue;
                } 
@@ -1377,7 +1413,7 @@ blk_part_exp(MACRO_PROT_ARGS)
                        assert(head);
                        /* No check whether it's a macro! */
                        if (MDOC_Eo == tok)
-                               if ( ! mdoc_word_alloc(m, line, la, p))
+                               if ( ! dword(m, line, la, p, DELIM_MAX))
                                        return(0);
 
                        if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
@@ -1395,7 +1431,7 @@ blk_part_exp(MACRO_PROT_ARGS)
                ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
 
                if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                       if ( ! dword(m, line, la, p, DELIM_MAX))
                                return(0);
                        continue;
                }
@@ -1500,9 +1536,9 @@ in_line_argn(MACRO_PROT_ARGS)
                        break;
 
                if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && 
-                               ARGS_QWORD != ac &&
-                               0 == j && DELIM_OPEN == mandoc_isdelim(p)) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                               ARGS_QWORD != ac && 0 == j && 
+                               DELIM_OPEN == mdoc_isdelim(p)) {
+                       if ( ! dword(m, line, la, p, DELIM_OPEN))
                                return(0);
                        continue;
                } else if (0 == j)
@@ -1530,7 +1566,7 @@ in_line_argn(MACRO_PROT_ARGS)
                if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) &&
                                ARGS_QWORD != ac &&
                                ! flushed &&
-                               DELIM_NONE != mandoc_isdelim(p)) {
+                               DELIM_NONE != mdoc_isdelim(p)) {
                        if ( ! rew_elem(m, tok))
                                return(0);
                        flushed = 1;
@@ -1552,7 +1588,7 @@ in_line_argn(MACRO_PROT_ARGS)
                }
 #endif
 
-               if ( ! mdoc_word_alloc(m, line, la, p))
+               if ( ! dword(m, line, la, p, DELIM_MAX))
                        return(0);
                j++;
        }
@@ -1623,7 +1659,7 @@ in_line_eoln(MACRO_PROT_ARGS)
                ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
 
                if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                       if ( ! dword(m, line, la, p, DELIM_MAX))
                                return(0);
                        continue;
                }
@@ -1693,7 +1729,7 @@ phrase(struct mdoc *m, int line, int ppos, char *buf)
        for (pos = ppos; ; ) {
                la = pos;
 
-               ac = mdoc_zargs(m, line, &pos, buf, 0, &p);
+               ac = mdoc_zargs(m, line, &pos, buf, &p);
 
                if (ARGS_ERROR == ac)
                        return(0);
@@ -1703,7 +1739,7 @@ phrase(struct mdoc *m, int line, int ppos, char *buf)
                ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
 
                if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                       if ( ! dword(m, line, la, p, DELIM_MAX))
                                return(0);
                        continue;
                }
@@ -1738,7 +1774,7 @@ phrase_ta(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
-               ac = mdoc_zargs(m, line, pos, buf, 0, &p);
+               ac = mdoc_zargs(m, line, pos, buf, &p);
 
                if (ARGS_ERROR == ac)
                        return(0);
@@ -1748,7 +1784,7 @@ phrase_ta(MACRO_PROT_ARGS)
                ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
 
                if (MDOC_MAX == ntok) {
-                       if ( ! mdoc_word_alloc(m, line, la, p))
+                       if ( ! dword(m, line, la, p, DELIM_MAX))
                                return(0);
                        continue;
                }