When in a <PRE>, don't print out the <BR> before lines that have leading

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 1f43817c06bc376945e74e96f477b57f42664bd8..fc00b93aaf82f488c71a36963f69fb987afd6b79 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.153 2011/01/25 10:37:49 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.154 2011/01/25 15:46:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -95,6 +95,7 @@ static        int      post_bl_block(POST_ARGS);
 static int      post_bl_block_width(POST_ARGS);
 static int      post_bl_block_tag(POST_ARGS);
 static int      post_bl_head(POST_ARGS);
+static int      post_bx(POST_ARGS);
 static int      post_dd(POST_ARGS);
 static int      post_dt(POST_ARGS);
 static int      post_defaults(POST_ARGS);
@@ -134,6 +135,7 @@ static      v_post   posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL };
 static v_post   posts_bf[] = { hwarn_le1, post_bf, NULL };
 static v_post   posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL };
 static v_post   posts_bl[] = { bwarn_ge1, post_bl, NULL };
+static v_post   posts_bx[] = { post_bx, NULL };
 static v_post   posts_bool[] = { ebool, NULL };
 static v_post   posts_eoln[] = { post_eoln, NULL };
 static v_post   posts_defaults[] = { post_defaults, NULL };
@@ -235,7 +237,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Bo */
        { NULL, NULL },                         /* Bq */
        { NULL, NULL },                         /* Bsx */
-       { NULL, NULL },                         /* Bx */
+       { NULL, posts_bx },                     /* Bx */
        { NULL, posts_bool },                   /* Db */
        { NULL, NULL },                         /* Dc */
        { NULL, NULL },                         /* Do */
@@ -2099,6 +2101,24 @@ post_prol(POST_ARGS)
        return(1);
 }
 
+static int
+post_bx(POST_ARGS)
+{
+       struct mdoc_node        *n;
+
+       /* 
+        * Make `Bx's second argument always start with an uppercase
+        * letter.  Groff checks if it's an "accepted" term, but we just
+        * uppercase blindly.
+        */
+
+       n = mdoc->last->child;
+       if (n && NULL != (n = n->next))
+               *n->string = toupper((unsigned char)*n->string);
+
+       return(1);
+}
+
 static int
 post_os(POST_ARGS)
 {