From c01f06709971213832254a6157702dd146daa687 Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Thu, 26 Jul 2012 10:41:48 +0000
Subject: [PATCH] Cherry-pick vendor changes to mdoc:

: 2012-07-17  Ingo Schwarze  <schwarze@usta.de>
:
:         [mdoc] Make `Fl' correctly restore fonts.
:
:         * tmac/doc.tmac (doc-flag-recursion): Do it.
:
: 2012-01-25  Ingo Schwarze  <schwarze@usta.de>
:
:         [mdoc] * tmac/doc-syms: Fix meaning of XBD acronym.
:
: 2012-01-03  Kristaps Dzonsons  <kristaps@bsd.lv>
:
:         [mdoc] Add `-isoC-2011'.
:
:         * tmac/doc-syms (doc-str-St--isoC-2011): Add it.
:         * tmac/groff_mdoc.man: Document it.
---
 tmac/doc-syms       | 4 +++-
 tmac/doc.tmac       | 2 +-
 tmac/groff_mdoc.man | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tmac/doc-syms b/tmac/doc-syms
index 30c406f731c7..dfb09b30b22c 100644
--- a/tmac/doc-syms
+++ b/tmac/doc-syms
@@ -605,6 +605,8 @@
 .ds doc-str-St--isoC           \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1990
 .as doc-str-St--isoC           " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St]\*[Rq])
 .als doc-str-St--isoC-90 doc-str-St--isoC
+.ds doc-str-St--isoC-2011      \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:2011
+.as doc-str-St--isoC-2011      " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^11\*[doc-str-St]\*[Rq])
 .ds doc-str-St--isoC-99        \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999
 .as doc-str-St--isoC-99        " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq])
 .ds doc-str-St--isoC-amd1       \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995
@@ -659,7 +661,7 @@
 .as doc-str-St--susv3          " (\*[Lq]\*[doc-Tn-font-size]SUSv3\*[doc-str-St]\*[Rq])
 .ds doc-str-St--svid4          System\~V Interface Definition, Fourth Edition
 .as doc-str-St--svid4          " (\*[Lq]\*[doc-Tn-font-size]SVID\*[doc-str-St]\^4\*[Rq])
-.ds doc-str-St--xbd5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] System Interface Definitions Issue\~5
+.ds doc-str-St--xbd5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Base Definitions Issue\~5
 .as doc-str-St--xbd5           " (\*[Lq]\*[doc-Tn-font-size]XBD\*[doc-str-St]\^5\*[Rq])
 .ds doc-str-St--xcu5           \*[doc-Tn-font-size]X/Open\*[doc-str-St] Commands and Utilities Issue\~5
 .as doc-str-St--xcu5           " (\*[Lq]\*[doc-Tn-font-size]XCU\*[doc-str-St]\^5\*[Rq])
diff --git a/tmac/doc.tmac b/tmac/doc.tmac
index 0bb7f3014abb..bbec7c5b481f 100644
--- a/tmac/doc.tmac
+++ b/tmac/doc.tmac
@@ -438,7 +438,7 @@
 .      \" last argument
 .      if (\n[doc-reg-dfr1] == 4) \
 .        nop \|\-\c
-.      nop \f[]\s[0]\c
+.      nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\c
 .      doc-print-and-reset
 .    \}
 .    el \{\
diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index 05b93051fafb..279dedd41853 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -2036,6 +2036,8 @@ are:
 .St -isoC-90
 .It Li \-isoC\-99
 .St -isoC-99
+.It Li \-isoC\-2011
+.St -isoC-2011
 .El
 .Pp
 .