Bumped version.

Added \| (non-breaking space, like \&).
Fixed termsym (TERMSYM_ALL).

diff --git a/Makefile b/Makefile
index 2824a0effc26b179510ea4b870e41c3b4ffba990..dae5bf57a08bb4a5d52aad1108d1c78e971172c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 .SUFFIXES:     .html .sgml
 
-VERSION        = 1.4.14
-VDATE  = 13 March 2009
+VERSION        = 1.4.15
+VDATE  = 14 March 2009
 
 BINDIR         = $(PREFIX)/bin
 INCLUDEDIR     = $(PREFIX)/include

diff --git a/mdocterm.c b/mdocterm.c
index a41747b2c62e568fc092ddae115c0cf5654aaa2e..644bbe354dc33e3227bb5db3e088d119eb076b50 100644 (file)
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -1,4 +1,4 @@
-/* $Id: mdocterm.c,v 1.40 2009/03/12 06:32:17 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.41 2009/03/14 05:36:07 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -70,6 +70,7 @@ static        struct termenc    termenc1[] = {
        { "&",            TERMSYM_BREAK },
        { "e",            TERMSYM_SLASH },
        { "q",            TERMSYM_DQUOTE },
+       { "|",            TERMSYM_BREAK },
        { NULL,           0 }
 };
 
@@ -125,7 +126,7 @@ static      struct termenc    termenc2[] = {
        { NULL,           0 }
 };
 
-static struct termsym    termsym_ansi[] = {
+static struct termsym    termsym_ansi[TERMSYM_MAX] = {
        { "]", 1 },             /* TERMSYM_RBRACK */
        { "[", 1 },             /* TERMSYM_LBRACK */
        { "<-", 2 },            /* TERMSYM_LARROW */

diff --git a/strings.c b/strings.c
index b67c44b6d5acadb1a9b809749a80ce1754b4f572..3860ebaf03732e48f735df66f256e334836d025a 100644 (file)
--- a/strings.c
+++ b/strings.c
@@ -1,4 +1,4 @@
-/* $Id: strings.c,v 1.28 2009/03/13 07:46:10 kristaps Exp $ */
+/* $Id: strings.c,v 1.29 2009/03/14 05:36:07 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -89,6 +89,8 @@ mdoc_isescape(const char *p)
                /* FALLTHROUGH */
        case (' '):
                /* FALLTHROUGH */
+       case ('|'):
+               /* FALLTHROUGH */
        case ('&'):
                /* FALLTHROUGH */
        case ('.'):
@@ -204,9 +206,9 @@ mdoc_atotime(const char *p)
 
        (void)memset(&tm, 0, sizeof(struct tm));
 
-       if (xstrcmp(p, "$Mdocdate: March 13 2009 $"))
+       if (xstrcmp(p, "$Mdocdate: March 14 2009 $"))
                return(time(NULL));
-       if ((pp = strptime(p, "$Mdocdate: March 13 2009 $", &tm)) && 0 == *pp)
+       if ((pp = strptime(p, "$Mdocdate: March 14 2009 $", &tm)) && 0 == *pp)
                return(mktime(&tm));
        /* XXX - this matches "June 1999", which is wrong. */
        if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)

diff --git a/term.h b/term.h
index 91202195bd2ca54411c11d494a8ed8231f17808c..4e1c557a84771a7b85be67232da836a698a6dd4d 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/* $Id: term.h,v 1.20 2009/03/11 00:39:58 kristaps Exp $ */
+/* $Id: term.h,v 1.21 2009/03/14 05:36:07 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -66,7 +66,8 @@ enum  tsym {
        TERMSYM_LANGLE =        37,
        TERMSYM_RANGLE =        38,
        TERMSYM_LBRACE =        39,
-       TERMSYM_RBRACE =        40
+       TERMSYM_RBRACE =        40,
+       TERMSYM_MAX =           41
 };