From 229307174e166025d16f135ea5f320077cecd2f4 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@illinois.edu>
Date: Mon, 20 Apr 2015 12:47:05 -0500
Subject: [PATCH] BIT-1380: Improve Broxygen output of &default expressions.

---
 CHANGES     |  5 +++++
 VERSION     |  2 +-
 src/Attr.cc | 21 +++++++++++++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 27b3020272..1c8bd91aab 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.3-721 | 2015-04-20 12:47:05 -0500
+
+  * BIT-1380: Improve Broxygen output of &default expressions.
+    (Jon Siwek)
+
 2.3-720 | 2015-04-17 14:18:26 -0700
 
   * Updating NEWS.
diff --git a/VERSION b/VERSION
index 4953236124..0316e00ca0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3-720
+2.3-721
diff --git a/src/Attr.cc b/src/Attr.cc
index fc8d3000d1..dad51c608e 100644
--- a/src/Attr.cc
+++ b/src/Attr.cc
@@ -76,11 +76,28 @@ void Attr::DescribeReST(ODesc* d) const
 			d->Add("`");
 			}
 
-		else
+		else if ( expr->Tag() == EXPR_CONST )
 			{
 			d->Add("``");
 			expr->Describe(d);
-			d-> Add("``");
+			d->Add("``");
+			}
+
+		else
+			{
+			d->Add("``");
+			Val* v = expr->Eval(0);
+			ODesc dd;
+			v->Describe(&dd);
+			Unref(v);
+			string s = dd.Description();
+
+			for ( size_t i = 0; i < s.size(); ++i )
+				if ( s[i] == '\n' )
+					s[i] = ' ';
+
+			d->Add(s);
+			d->Add("``");
 			}
 		}
 	}