From 9972bf87b4f27d9c8f358ef8414ac1ab957a2f0f Mon Sep 17 00:00:00 2001
From: Jo Shields <directhex@apebox.org>
Date: Wed, 19 Feb 2014 22:12:43 +0000
Subject: Imported Upstream version 3.2.8+dfsg

---
 .../monodoc/Monodoc/generators/html/Man2Html.cs     |  2 +-
 mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs      | 21 ++++++++++++++++-----
 mcs/class/monodoc/Resources/ecmaspec.css            |  1 -
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'mcs/class/monodoc')

diff --git a/mcs/class/monodoc/Monodoc/generators/html/Man2Html.cs b/mcs/class/monodoc/Monodoc/generators/html/Man2Html.cs
index d4f9cc2665..a065daf212 100644
--- a/mcs/class/monodoc/Monodoc/generators/html/Man2Html.cs
+++ b/mcs/class/monodoc/Monodoc/generators/html/Man2Html.cs
@@ -240,7 +240,7 @@ namespace Monodoc.Generators.Html
 
 		static void ClearUntil (StateInfo s, string required)
 		{
-			string e;
+			string e = null;
 			while (s.tags.Count > 0 && 
 			       (e = s.tags.Peek ().ToString ()) != required) {
 				s.output.Append (s.tags.Pop ().ToString ());
diff --git a/mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs b/mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs
index 360889f6a7..efdeedf63a 100644
--- a/mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs
+++ b/mcs/class/monodoc/Monodoc/providers/EcmaDoc.cs
@@ -54,7 +54,17 @@ namespace Monodoc.Providers
 						nsSummaries[nsName] = nsElements = new XElement ("elements",
 						                                                 new XElement ("summary"),
 						                                                 new XElement ("remarks"));
-
+			        //Add namespace summary and remarks data from file, if available
+					var nsFileName = Path.Combine(asm, String.Format("ns-{0}.xml", nsName));
+					if(File.Exists(nsFileName)){
+						var nsEl = XElement.Load (nsFileName);
+
+						nsElements.Element ("summary").ReplaceWith (nsEl.Descendants ("summary").First ());
+						nsElements.Element ("remarks").ReplaceWith (nsEl.Descendants ("remarks").First ());
+					}else{
+						Console.WriteLine ("Error reading namespace XML for " + nsName);
+					}
+			       
 					foreach (var type in ns.Elements ("Type")) {
 						// Add the XML file corresponding to the type to our storage
 						var id = indexGenerator (type);
@@ -541,10 +551,11 @@ namespace Monodoc.Providers
 				break;
 			// binary operators: overloading is possible [ECMA-335 §10.3.2]
 			default:
-				memberSignature =
-					nicename + "("
-					+ string.Join (",", member.Element ("Parameters").Elements ("Parameter").Select (p => (string)p.Attribute ("Type")))
-					+ ")";
+				if (member.Element ("Parameters") != null)
+					memberSignature =
+						nicename + "("
+						+ string.Join (",", member.Element ("Parameters").Elements ("Parameter").Select (p => (string)p.Attribute ("Type")))
+						+ ")";
 				break;
 			}
 
diff --git a/mcs/class/monodoc/Resources/ecmaspec.css b/mcs/class/monodoc/Resources/ecmaspec.css
index 341f439b96..97937fc442 100644
--- a/mcs/class/monodoc/Resources/ecmaspec.css
+++ b/mcs/class/monodoc/Resources/ecmaspec.css
@@ -10,7 +10,6 @@
 }
 
 p {
-	text-align: justify;
 	margin-top: .5em;
 	margin-bottom: .5em;
 }
-- 
cgit v1.2.3