remove generated html indent support

ArthurHub · ArthurHub · commit 87de60c0289f · 2014-04-26T11:12:18.000+03:00
diff --git a/Source/HtmlRenderer/Utils/ClipboardHelper.cs b/Source/HtmlRenderer/Utils/ClipboardHelper.cs
@@ -81,7 +81,8 @@ internal static class ClipboardHelper
         public static DataObject CreateDataObject(string html, string plainText)
         {
             var dataObject = new DataObject();
-            dataObject.SetData(DataFormats.Html, !string.IsNullOrEmpty(html) ? GetHtmlDataString(html) : html);
+            var htmlFragment = !string.IsNullOrEmpty(html) ? GetHtmlDataString(html) : html;
+            dataObject.SetData(DataFormats.Html, htmlFragment);
             dataObject.SetData(DataFormats.Text, plainText);
             return dataObject;
         }
diff --git a/Source/HtmlRenderer/Utils/DomUtils.cs b/Source/HtmlRenderer/Utils/DomUtils.cs
@@ -437,7 +437,7 @@ public static string GenerateHtml(CssBox root, HtmlGenerationStyle styleGen = Ht
             var sb = new StringBuilder();
             if (root != null)
             {
-                WriteHtml(sb, root, 0, styleGen, onlySelected ? CollectSelectedHtmlTags(root) : null);
+                WriteHtml(sb, root, styleGen, onlySelected ? CollectSelectedHtmlTags(root) : null);
             }
             return sb.ToString();
         }
@@ -596,10 +596,9 @@ private static bool CollectSelectedHtmlTags(CssBox box, Dictionary<HtmlTag, bool
         /// </summary>
         /// <param name="sb">the string builder to write html into</param>
         /// <param name="box">the html sub-tree to write</param>
-        /// <param name="indent">the indent to use for nice formatting</param>
         /// <param name="styleGen">Controls the way styles are generated when html is generated</param>
         /// <param name="selectedTags">Control if to generate only selected tags, if given only tags found in collection will be generated</param>
-        private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGenerationStyle styleGen, Dictionary<HtmlTag, bool> selectedTags)
+        private static void WriteHtml(StringBuilder sb, CssBox box, HtmlGenerationStyle styleGen, Dictionary<HtmlTag, bool> selectedTags)
         {
             if (box.HtmlTag == null || selectedTags == null || selectedTags.ContainsKey(box.HtmlTag))
             {
@@ -608,16 +607,13 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene
                     if (box.HtmlTag.Name != "link" || !box.HtmlTag.Attributes.ContainsKey("href") ||
                         (!box.HtmlTag.Attributes["href"].StartsWith("property") && !box.HtmlTag.Attributes["href"].StartsWith("method")))
                     {
-                        WriteHtmlTag(sb, box, indent, styleGen);
-                        indent = indent + (box.HtmlTag.IsSingle ? 0 : 1);
+                        WriteHtmlTag(sb, box, styleGen);
                     }
 
                     if (styleGen == HtmlGenerationStyle.InHeader && box.HtmlTag.Name == "html" && box.HtmlContainer.CssData != null)
                     {
-                        sb.Append(new string(' ', indent * 2));
                         sb.AppendLine("<head>");
-                        WriteStylesheet(sb, box.HtmlContainer.CssData, indent + 1);
-                        sb.Append(new string(' ', indent * 2));
+                        WriteStylesheet(sb, box.HtmlContainer.CssData);
                         sb.AppendLine("</head>");
                     }
                 }
@@ -636,7 +632,7 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene
 
                 foreach (var childBox in box.Boxes)
                 {
-                    WriteHtml(sb, childBox, indent, styleGen, selectedTags);
+                    WriteHtml(sb, childBox, styleGen, selectedTags);
                 }
 
                 if (box.HtmlTag != null && !box.HtmlTag.IsSingle)
@@ -653,12 +649,9 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene
         /// </summary>
         /// <param name="sb">the string builder to write html into</param>
         /// <param name="box">the css box with the html tag to write</param>
-        /// <param name="indent">the indent to use for nice formatting</param>
         /// <param name="styleGen">Controls the way styles are generated when html is generated</param>
-        private static void WriteHtmlTag(StringBuilder sb, CssBox box, int indent, HtmlGenerationStyle styleGen)
+        private static void WriteHtmlTag(StringBuilder sb, CssBox box, HtmlGenerationStyle styleGen)
         {
-            if (!box.IsInline && !box.IsBrElement)
-                sb.Append(new string(' ', indent * 2));
             sb.AppendFormat("<{0}", box.HtmlTag.Name);
 
             // collect all element style properties including from stylesheet
@@ -722,8 +715,6 @@ private static void WriteHtmlTag(StringBuilder sb, CssBox box, int indent, HtmlG
             }
 
             sb.AppendFormat("{0}>", box.HtmlTag.IsSingle ? "/" : "");
-            if (!box.IsInline && !box.IsBrElement)
-                sb.AppendLine();
         }
 
         /// <summary>
@@ -763,14 +754,11 @@ private static Dictionary<string, string> StripDefaultStyles(CssBox box, Diction
         /// </summary>
         /// <param name="sb">the string builder to write stylesheet into</param>
         /// <param name="cssData">the css data to write to the head</param>
-        /// <param name="indent">the indent to use for nice formatting</param>
-        private static void WriteStylesheet(StringBuilder sb, CssData cssData, int indent)
+        private static void WriteStylesheet(StringBuilder sb, CssData cssData)
         {
-            sb.Append(new string(' ', indent * 2));
             sb.AppendLine("<style type=\"text/css\">");
             foreach (var cssBlocks in cssData.MediaBlocks["all"])
             {
-                sb.Append(new string(' ', (indent + 1) * 2));
                 sb.Append(cssBlocks.Key);
                 sb.Append(" { ");
                 foreach (var cssBlock in cssBlocks.Value)
@@ -784,7 +772,6 @@ private static void WriteStylesheet(StringBuilder sb, CssData cssData, int inden
                 sb.Append(" }");
                 sb.AppendLine();
             }
-            sb.Append(new string(' ', indent * 2));
             sb.AppendLine("</style>");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ internal static class ClipboardHelper`
`81`	`81`	`public static DataObject CreateDataObject(string html, string plainText)`
`82`	`82`	`{`
`83`	`83`	`var dataObject = new DataObject();`
`84`		`- dataObject.SetData(DataFormats.Html, !string.IsNullOrEmpty(html) ? GetHtmlDataString(html) : html);`
	`84`	`+ var htmlFragment = !string.IsNullOrEmpty(html) ? GetHtmlDataString(html) : html;`
	`85`	`+ dataObject.SetData(DataFormats.Html, htmlFragment);`
`85`	`86`	`dataObject.SetData(DataFormats.Text, plainText);`
`86`	`87`	`return dataObject;`
`87`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ public static string GenerateHtml(CssBox root, HtmlGenerationStyle styleGen = Ht`
`437`	`437`	`var sb = new StringBuilder();`
`438`	`438`	`if (root != null)`
`439`	`439`	`{`
`440`		`- WriteHtml(sb, root, 0, styleGen, onlySelected ? CollectSelectedHtmlTags(root) : null);`
	`440`	`+ WriteHtml(sb, root, styleGen, onlySelected ? CollectSelectedHtmlTags(root) : null);`
`441`	`441`	`}`
`442`	`442`	`return sb.ToString();`
`443`	`443`	`}`
`@@ -596,10 +596,9 @@ private static bool CollectSelectedHtmlTags(CssBox box, Dictionary<HtmlTag, bool`
`596`	`596`	`/// </summary>`
`597`	`597`	`/// <param name="sb">the string builder to write html into</param>`
`598`	`598`	`/// <param name="box">the html sub-tree to write</param>`
`599`		`- /// <param name="indent">the indent to use for nice formatting</param>`
`600`	`599`	`/// <param name="styleGen">Controls the way styles are generated when html is generated</param>`
`601`	`600`	`/// <param name="selectedTags">Control if to generate only selected tags, if given only tags found in collection will be generated</param>`
`602`		`- private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGenerationStyle styleGen, Dictionary<HtmlTag, bool> selectedTags)`
	`601`	`+ private static void WriteHtml(StringBuilder sb, CssBox box, HtmlGenerationStyle styleGen, Dictionary<HtmlTag, bool> selectedTags)`
`603`	`602`	`{`
`604`	`603`	`if (box.HtmlTag == null \|\| selectedTags == null \|\| selectedTags.ContainsKey(box.HtmlTag))`
`605`	`604`	`{`
`@@ -608,16 +607,13 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene`
`608`	`607`	`if (box.HtmlTag.Name != "link" \|\| !box.HtmlTag.Attributes.ContainsKey("href") \|\|`
`609`	`608`	`(!box.HtmlTag.Attributes["href"].StartsWith("property") && !box.HtmlTag.Attributes["href"].StartsWith("method")))`
`610`	`609`	`{`
`611`		`- WriteHtmlTag(sb, box, indent, styleGen);`
`612`		`- indent = indent + (box.HtmlTag.IsSingle ? 0 : 1);`
	`610`	`+ WriteHtmlTag(sb, box, styleGen);`
`613`	`611`	`}`
`614`	`612`
`615`	`613`	`if (styleGen == HtmlGenerationStyle.InHeader && box.HtmlTag.Name == "html" && box.HtmlContainer.CssData != null)`
`616`	`614`	`{`
`617`		`- sb.Append(new string(' ', indent * 2));`
`618`	`615`	`sb.AppendLine("<head>");`
`619`		`- WriteStylesheet(sb, box.HtmlContainer.CssData, indent + 1);`
`620`		`- sb.Append(new string(' ', indent * 2));`
	`616`	`+ WriteStylesheet(sb, box.HtmlContainer.CssData);`
`621`	`617`	`sb.AppendLine("</head>");`
`622`	`618`	`}`
`623`	`619`	`}`
`@@ -636,7 +632,7 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene`
`636`	`632`
`637`	`633`	`foreach (var childBox in box.Boxes)`
`638`	`634`	`{`
`639`		`- WriteHtml(sb, childBox, indent, styleGen, selectedTags);`
	`635`	`+ WriteHtml(sb, childBox, styleGen, selectedTags);`
`640`	`636`	`}`
`641`	`637`
`642`	`638`	`if (box.HtmlTag != null && !box.HtmlTag.IsSingle)`
`@@ -653,12 +649,9 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene`
`653`	`649`	`/// </summary>`
`654`	`650`	`/// <param name="sb">the string builder to write html into</param>`
`655`	`651`	`/// <param name="box">the css box with the html tag to write</param>`
`656`		`- /// <param name="indent">the indent to use for nice formatting</param>`
`657`	`652`	`/// <param name="styleGen">Controls the way styles are generated when html is generated</param>`
`658`		`- private static void WriteHtmlTag(StringBuilder sb, CssBox box, int indent, HtmlGenerationStyle styleGen)`
	`653`	`+ private static void WriteHtmlTag(StringBuilder sb, CssBox box, HtmlGenerationStyle styleGen)`
`659`	`654`	`{`
`660`		`- if (!box.IsInline && !box.IsBrElement)`
`661`		`- sb.Append(new string(' ', indent * 2));`
`662`	`655`	`sb.AppendFormat("<{0}", box.HtmlTag.Name);`
`663`	`656`
`664`	`657`	`// collect all element style properties including from stylesheet`
`@@ -722,8 +715,6 @@ private static void WriteHtmlTag(StringBuilder sb, CssBox box, int indent, HtmlG`
`722`	`715`	`}`
`723`	`716`
`724`	`717`	`sb.AppendFormat("{0}>", box.HtmlTag.IsSingle ? "/" : "");`
`725`		`- if (!box.IsInline && !box.IsBrElement)`
`726`		`- sb.AppendLine();`
`727`	`718`	`}`
`728`	`719`
`729`	`720`	`/// <summary>`
`@@ -763,14 +754,11 @@ private static Dictionary<string, string> StripDefaultStyles(CssBox box, Diction`
`763`	`754`	`/// </summary>`
`764`	`755`	`/// <param name="sb">the string builder to write stylesheet into</param>`
`765`	`756`	`/// <param name="cssData">the css data to write to the head</param>`
`766`		`- /// <param name="indent">the indent to use for nice formatting</param>`
`767`		`- private static void WriteStylesheet(StringBuilder sb, CssData cssData, int indent)`
	`757`	`+ private static void WriteStylesheet(StringBuilder sb, CssData cssData)`
`768`	`758`	`{`
`769`		`- sb.Append(new string(' ', indent * 2));`
`770`	`759`	`sb.AppendLine("<style type=\"text/css\">");`
`771`	`760`	`foreach (var cssBlocks in cssData.MediaBlocks["all"])`
`772`	`761`	`{`
`773`		`- sb.Append(new string(' ', (indent + 1) * 2));`
`774`	`762`	`sb.Append(cssBlocks.Key);`
`775`	`763`	`sb.Append(" { ");`
`776`	`764`	`foreach (var cssBlock in cssBlocks.Value)`
`@@ -784,7 +772,6 @@ private static void WriteStylesheet(StringBuilder sb, CssData cssData, int inden`
`784`	`772`	`sb.Append(" }");`
`785`	`773`	`sb.AppendLine();`
`786`	`774`	`}`
`787`		`- sb.Append(new string(' ', indent * 2));`
`788`	`775`	`sb.AppendLine("</style>");`
`789`	`776`	`}`
`790`	`777`