X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FHtml.java;h=385df8bf8da919416ccf672a623fa9288c0ab585;hb=3e62b034c1981ae6329f06b3f8c0ee25c3683789;hp=33c99c81f8874d4a8b249dddee43e0f56ff69a0c;hpb=27008a8782c0ed96e07c8dc39ff0ed1f5163a9d0;p=gofetch.git

diff --git a/src/be/nikiroo/gofetch/output/Html.java b/src/be/nikiroo/gofetch/output/Html.java
index 33c99c8..385df8b 100644
--- a/src/be/nikiroo/gofetch/output/Html.java
+++ b/src/be/nikiroo/gofetch/output/Html.java
@@ -2,7 +2,8 @@ package be.nikiroo.gofetch.output;
 
 import be.nikiroo.gofetch.data.Comment;
 import be.nikiroo.gofetch.data.Story;
-import be.nikiroo.gofetch.support.BasicSupport.Type;
+import be.nikiroo.gofetch.support.Type;
+import be.nikiroo.utils.StringUtils;
 
 public class Html extends Output {
 	public Html(Type type, String hostname, String preselector, int port) {
@@ -99,7 +100,8 @@ public class Html extends Output {
 				.append("<div class='comment' style='display: block; margin-left: 80px'>\n");
 		builder.append(space).append("  <h2>").append(comment.getTitle())
 				.append("</h2>\n");
-		builder.append(space).append("  <div class='by'>")
+		builder.append(space)
+				.append("  <div class='by' style='font-style: italic;'>")
 				.append(comment.getAuthor()).append("</div>\n");
 		builder.append(space).append("  <div class='comment_content'>");
 		for (String line : comment.getContentLines()) {
@@ -120,8 +122,14 @@ public class Html extends Output {
 		} else {
 			builder.append("	<h1>" + story.getTitle() + "</h1>\n");
 		}
-		builder.append("	<div class='details'>(" + story.getDetails()
-				+ ")</div>\n");
+
+		builder.append("	<div class='details'>");
+		if (story.getDetails() != null && !story.getDetails().isEmpty()) {
+			builder.append("(")
+					.append(StringUtils.xmlEscape(story.getDetails()))
+					.append(")");
+		}
+		builder.append("</div>\n");
 		builder.append("	<br/>\n");
 
 		if (!resume) {
@@ -138,9 +146,13 @@ public class Html extends Output {
 
 		builder.append("	<div class='content' style='text-align: justify'>\n");
 		if (resume) {
-			builder.append("		" + story.getContent() + "\n");
+			builder.append("		" + StringUtils.xmlEscape(story.getContent())
+					+ "\n");
 		} else {
-			builder.append("		" + story.getFullContent() + "\n");
+			builder.append("		"
+					+ StringUtils.xmlEscape(story.getFullContent())
+							.replace("\n", "<br/>").replace("[ ", "<h2>")
+							.replace(" ]", "</h2>") + "\n");
 		}
 		builder.append("	</div>\n");