Make any un-recognised font be considered a call for the Roman font.

This makes sequences of \f[unknown] \fP not completely puke.  From a
TODO by schwarze@.

diff --git a/TODO b/TODO
index 1b57cece24be6ee19a6a5fcfec6699103f0db7e4..c9236872c0431a56a6f825e1dbbc928128b9c560 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
 ************************************************************************
 * Official mandoc TODO.
 ************************************************************************
 * Official mandoc TODO.

-* $Id: TODO,v 1.105 2011/05/18 09:45:21 kristaps Exp $
+* $Id: TODO,v 1.106 2011/05/18 23:59:08 kristaps Exp $

 ************************************************************************
 
 ************************************************************************
 ************************************************************************
 
 ************************************************************************


@@ -56,11 +56,6 @@
 
 - \c (interrupted text) occurs in chat(8)
 
 
 - \c (interrupted text) occurs in chat(8)
 

-- \f(CW (constant width font) occurs in rsyncd.conf(5).
-  I think we should treat unknown/unavailable fonts as \fR
-  such that switching back with \fP works correctly -
-  and doesn't revert the _previous_ \fP.
-

 --- missing mdoc features ----------------------------------------------
 
 - fix bad block nesting involving multiple identical explicit blocks
 --- missing mdoc features ----------------------------------------------
 
 - fix bad block nesting involving multiple identical explicit blocks

diff --git a/html.c b/html.c
index fd696284da16c411505bcc8ae920e964da4af817..08e2086c05ecd04a424d9c2bc232a975e2ef34ae 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.144 2011/05/17 11:50:20 kristaps Exp $ */
+/*     $Id: html.c,v 1.145 2011/05/18 23:59:08 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -272,6 +272,8 @@ print_metaf(struct html *h, enum mandoc_esc deco)
        case (ESCAPE_FONTBOLD):
                font = HTMLFONT_BOLD;
                break;
        case (ESCAPE_FONTBOLD):
                font = HTMLFONT_BOLD;
                break;

+       case (ESCAPE_FONT):
+               /* FALLTHROUGH */

        case (ESCAPE_FONTROMAN):
                font = HTMLFONT_NONE;
                break;
        case (ESCAPE_FONTROMAN):
                font = HTMLFONT_NONE;
                break;


@@ -392,6 +394,8 @@ print_encode(struct html *h, const char *p, int norecurse)
                case (ESCAPE_SPECIAL):
                        print_spec(h, seq, len);
                        break;
                case (ESCAPE_SPECIAL):
                        print_spec(h, seq, len);
                        break;

+               case (ESCAPE_FONT):
+                       /* FALLTHROUGH */

                case (ESCAPE_FONTPREV):
                        /* FALLTHROUGH */
                case (ESCAPE_FONTBOLD):
                case (ESCAPE_FONTPREV):
                        /* FALLTHROUGH */
                case (ESCAPE_FONTBOLD):

diff --git a/term.c b/term.c
index 04d55d6730583bb940c467172906cdb979397be4..97a9ecab8e5ab28eb1f060eb631f98954e9fc51c 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.194 2011/05/17 22:32:45 kristaps Exp $ */
+/*     $Id: term.c,v 1.195 2011/05/18 23:59:08 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -471,6 +471,8 @@ term_word(struct termp *p, const char *word)
                case (ESCAPE_FONTITALIC):
                        term_fontrepl(p, TERMFONT_UNDER);
                        break;
                case (ESCAPE_FONTITALIC):
                        term_fontrepl(p, TERMFONT_UNDER);
                        break;

+               case (ESCAPE_FONT):
+                       /* FALLTHROUGH */

                case (ESCAPE_FONTROMAN):
                        term_fontrepl(p, TERMFONT_NONE);
                        break;
                case (ESCAPE_FONTROMAN):
                        term_fontrepl(p, TERMFONT_NONE);
                        break;