fix generated html adding spaces because of too many new lines and indents

ArthurHub · ArthurHub · commit 5114cb4f96fe · 2014-04-26T10:51:13.000+03:00
diff --git a/Source/HtmlRenderer/Utils/DomUtils.cs b/Source/HtmlRenderer/Utils/DomUtils.cs
@@ -13,8 +13,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
 using System.Text;
 using HtmlRenderer.Dom;
 using HtmlRenderer.Entities;
@@ -616,17 +614,16 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene
 
                     if (styleGen == HtmlGenerationStyle.InHeader && box.HtmlTag.Name == "html" && box.HtmlContainer.CssData != null)
                     {
-                        sb.Append(new string(' ', indent * 4));
+                        sb.Append(new string(' ', indent * 2));
                         sb.AppendLine("<head>");
                         WriteStylesheet(sb, box.HtmlContainer.CssData, indent + 1);
-                        sb.Append(new string(' ', indent * 4));
+                        sb.Append(new string(' ', indent * 2));
                         sb.AppendLine("</head>");
                     }
                 }
 
                 if (box.Words.Count > 0)
                 {
-                    sb.Append(new string(' ', indent * 4));
                     foreach (var word in box.Words)
                     {
                         if (selectedTags == null || word.Selected)
@@ -635,7 +632,6 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene
                             sb.Append(HtmlUtils.EncodeHtml(wordText));
                         }
                     }
-                    sb.AppendLine();
                 }
 
                 foreach (var childBox in box.Boxes)
@@ -645,9 +641,9 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene
 
                 if (box.HtmlTag != null && !box.HtmlTag.IsSingle)
                 {
-                    sb.Append(new string(' ', Math.Max((indent - 1) * 4, 0)));
                     sb.AppendFormat("</{0}>", box.HtmlTag.Name);
-                    sb.AppendLine();
+                    if (!box.IsInline && !box.IsBrElement)
+                        sb.AppendLine();
                 }
             }
         }
@@ -661,7 +657,8 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene
         /// <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)
         {
-            sb.Append(new string(' ', indent * 4));
+            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
@@ -725,7 +722,8 @@ private static void WriteHtmlTag(StringBuilder sb, CssBox box, int indent, HtmlG
             }
 
             sb.AppendFormat("{0}>", box.HtmlTag.IsSingle ? "/" : "");
-            sb.AppendLine();
+            if (!box.IsInline && !box.IsBrElement)
+                sb.AppendLine();
         }
 
         /// <summary>
@@ -768,11 +766,11 @@ private static Dictionary<string, string> StripDefaultStyles(CssBox box, Diction
         /// <param name="indent">the indent to use for nice formatting</param>
         private static void WriteStylesheet(StringBuilder sb, CssData cssData, int indent)
         {
-            sb.Append(new string(' ', indent * 4));
+            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) * 4));
+                sb.Append(new string(' ', (indent + 1) * 2));
                 sb.Append(cssBlocks.Key);
                 sb.Append(" { ");
                 foreach (var cssBlock in cssBlocks.Value)
@@ -786,7 +784,7 @@ private static void WriteStylesheet(StringBuilder sb, CssData cssData, int inden
                 sb.Append(" }");
                 sb.AppendLine();
             }
-            sb.Append(new string(' ', indent * 4));
+            sb.Append(new string(' ', indent * 2));
             sb.AppendLine("</style>");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`	`using System;`
`14`	`14`	`using System.Collections.Generic;`
`15`	`15`	`using System.Drawing;`
`16`		`-using System.Drawing.Imaging;`
`17`		`-using System.IO;`
`18`	`16`	`using System.Text;`
`19`	`17`	`using HtmlRenderer.Dom;`
`20`	`18`	`using HtmlRenderer.Entities;`
`@@ -616,17 +614,16 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene`
`616`	`614`
`617`	`615`	`if (styleGen == HtmlGenerationStyle.InHeader && box.HtmlTag.Name == "html" && box.HtmlContainer.CssData != null)`
`618`	`616`	`{`
`619`		`- sb.Append(new string(' ', indent * 4));`
	`617`	`+ sb.Append(new string(' ', indent * 2));`
`620`	`618`	`sb.AppendLine("<head>");`
`621`	`619`	`WriteStylesheet(sb, box.HtmlContainer.CssData, indent + 1);`
`622`		`- sb.Append(new string(' ', indent * 4));`
	`620`	`+ sb.Append(new string(' ', indent * 2));`
`623`	`621`	`sb.AppendLine("</head>");`
`624`	`622`	`}`
`625`	`623`	`}`
`626`	`624`
`627`	`625`	`if (box.Words.Count > 0)`
`628`	`626`	`{`
`629`		`- sb.Append(new string(' ', indent * 4));`
`630`	`627`	`foreach (var word in box.Words)`
`631`	`628`	`{`
`632`	`629`	`if (selectedTags == null \|\| word.Selected)`
`@@ -635,7 +632,6 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene`
`635`	`632`	`sb.Append(HtmlUtils.EncodeHtml(wordText));`
`636`	`633`	`}`
`637`	`634`	`}`
`638`		`- sb.AppendLine();`
`639`	`635`	`}`
`640`	`636`
`641`	`637`	`foreach (var childBox in box.Boxes)`
`@@ -645,9 +641,9 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene`
`645`	`641`
`646`	`642`	`if (box.HtmlTag != null && !box.HtmlTag.IsSingle)`
`647`	`643`	`{`
`648`		`- sb.Append(new string(' ', Math.Max((indent - 1) * 4, 0)));`
`649`	`644`	`sb.AppendFormat("</{0}>", box.HtmlTag.Name);`
`650`		`- sb.AppendLine();`
	`645`	`+ if (!box.IsInline && !box.IsBrElement)`
	`646`	`+ sb.AppendLine();`
`651`	`647`	`}`
`652`	`648`	`}`
`653`	`649`	`}`
`@@ -661,7 +657,8 @@ private static void WriteHtml(StringBuilder sb, CssBox box, int indent, HtmlGene`
`661`	`657`	`/// <param name="styleGen">Controls the way styles are generated when html is generated</param>`
`662`	`658`	`private static void WriteHtmlTag(StringBuilder sb, CssBox box, int indent, HtmlGenerationStyle styleGen)`
`663`	`659`	`{`
`664`		`- sb.Append(new string(' ', indent * 4));`
	`660`	`+ if (!box.IsInline && !box.IsBrElement)`
	`661`	`+ sb.Append(new string(' ', indent * 2));`
`665`	`662`	`sb.AppendFormat("<{0}", box.HtmlTag.Name);`
`666`	`663`
`667`	`664`	`// collect all element style properties including from stylesheet`
`@@ -725,7 +722,8 @@ private static void WriteHtmlTag(StringBuilder sb, CssBox box, int indent, HtmlG`
`725`	`722`	`}`
`726`	`723`
`727`	`724`	`sb.AppendFormat("{0}>", box.HtmlTag.IsSingle ? "/" : "");`
`728`		`- sb.AppendLine();`
	`725`	`+ if (!box.IsInline && !box.IsBrElement)`
	`726`	`+ sb.AppendLine();`
`729`	`727`	`}`
`730`	`728`
`731`	`729`	`/// <summary>`
`@@ -768,11 +766,11 @@ private static Dictionary<string, string> StripDefaultStyles(CssBox box, Diction`
`768`	`766`	`/// <param name="indent">the indent to use for nice formatting</param>`
`769`	`767`	`private static void WriteStylesheet(StringBuilder sb, CssData cssData, int indent)`
`770`	`768`	`{`
`771`		`- sb.Append(new string(' ', indent * 4));`
	`769`	`+ sb.Append(new string(' ', indent * 2));`
`772`	`770`	`sb.AppendLine("<style type=\"text/css\">");`
`773`	`771`	`foreach (var cssBlocks in cssData.MediaBlocks["all"])`
`774`	`772`	`{`
`775`		`- sb.Append(new string(' ', (indent + 1) * 4));`
	`773`	`+ sb.Append(new string(' ', (indent + 1) * 2));`
`776`	`774`	`sb.Append(cssBlocks.Key);`
`777`	`775`	`sb.Append(" { ");`
`778`	`776`	`foreach (var cssBlock in cssBlocks.Value)`
`@@ -786,7 +784,7 @@ private static void WriteStylesheet(StringBuilder sb, CssData cssData, int inden`
`786`	`784`	`sb.Append(" }");`
`787`	`785`	`sb.AppendLine();`
`788`	`786`	`}`
`789`		`- sb.Append(new string(' ', indent * 4));`
	`787`	`+ sb.Append(new string(' ', indent * 2));`
`790`	`788`	`sb.AppendLine("</style>");`
`791`	`789`	`}`
`792`	`790`