From 0c0dc49bd145828df58302e85111938b46fc9a58 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 5 Jun 2007 20:01:16 +1000
Subject: [PATCH]  - (dtucker) [mdoc2man.awk] Add support for %R references,
 used for RFCs.

---
 ChangeLog    |  3 ++-
 mdoc2man.awk | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dcc44ab9e..636417ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
    OpenBSD's cvs now adds.
  - (dtucker) [mdoc2man.awk] Remove trailing "$" from Mdocdate regex so
    mindrot's cvs doesn't expand it on us.
+ - (dtucker) [mdoc2man.awk] Add support for %R references, used for RFCs.
 
 20070520
  - (dtucker) OpenBSD CVS Sync
@@ -2971,4 +2972,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4678 2007/06/05 09:30:47 dtucker Exp $
+$Id: ChangeLog,v 1.4679 2007/06/05 10:01:16 dtucker Exp $
diff --git a/mdoc2man.awk b/mdoc2man.awk
index ff771a9db..9d1126769 100644
--- a/mdoc2man.awk
+++ b/mdoc2man.awk
@@ -1,6 +1,6 @@
 #!/usr/bin/awk
 #
-# $Id: mdoc2man.awk,v 1.7 2007/06/05 09:30:48 dtucker Exp $
+# $Id: mdoc2man.awk,v 1.8 2007/06/05 10:01:16 dtucker Exp $
 #
 # Version history:
 #  v4+ Adapted for OpenSSH Portable (see cvs Id and history)
@@ -166,6 +166,7 @@ function add(str) {
       refissue=""
       refdate=""
       refopt=""
+      refreport=""
       reference=1
       next
     } else if(match(words[w],"^Re$")) {
@@ -177,9 +178,14 @@ function add(str) {
       }
       if(nrefauthors>1)
 	add(" and ")
-      add(refauthors[0] ", \\fI" reftitle "\\fP")
+      if(nrefauthors>0)
+        add(refauthors[0] ", ")
+      add("\\fI" reftitle "\\fP")
       if(length(refissue))
 	add(", " refissue)
+      if(length(refreport)) {
+	add(", " refreport)
+      }
       if(length(refdate))
 	add(", " refdate)
       if(length(refopt))
@@ -196,6 +202,7 @@ function add(str) {
       if(match(words[w],"^%N$")) { refissue=wtail() }
       if(match(words[w],"^%D$")) { refdate=wtail() }
       if(match(words[w],"^%O$")) { refopt=wtail() }
+      if(match(words[w],"^%R$")) { refreport=wtail() }
     } else if(match(words[w],"^Nm$")) {
       if(synopsis) {
 	add(".br")