X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fgofetch%2Foutput%2FGopher.java;h=2fa0c913b31d9951a1007b0269acd50324b2416a;hb=100a839503d23e324d2db3f6d3e47892def3bf81;hp=3fa6035c328d3f0731f5bc3a81ce7e38f3220abb;hpb=93e09a08a68ffd69eed42ecbf95f317b518357d7;p=gofetch.git

diff --git a/src/be/nikiroo/gofetch/output/Gopher.java b/src/be/nikiroo/gofetch/output/Gopher.java
index 3fa6035..2fa0c91 100644
--- a/src/be/nikiroo/gofetch/output/Gopher.java
+++ b/src/be/nikiroo/gofetch/output/Gopher.java
@@ -65,13 +65,30 @@ public class Gopher extends Output {
 			space = space.substring(0, LINE_SIZE - 20);
 		}
 
-		appendLeft(builder, comment.getTitle(), ">> ", "   ", space);
+		appendLeft(builder, comment.getTitle(), "** ", "   ", space);
 		appendLeft(builder, "(" + comment.getAuthor() + ")", "   ", "   ",
 				space);
 
 		builder.append("i\r\n");
 
-		appendLeft(builder, comment.getContent(), "   ", "   ", space);
+		for (String line : comment.getContentLines()) {
+			int depth = 0;
+			while (line.length() > depth && line.charAt(depth) == '>') {
+				depth++;
+			}
+			line = line.substring(depth).trim();
+
+			String prep = "   ";
+			for (int i = 0; i < depth; i++) {
+				prep += ">";
+			}
+
+			if (depth > 0) {
+				prep += " ";
+			}
+
+			appendLeft(builder, line, prep, prep, space);
+		}
 
 		builder.append("i\r\n");
 		for (Comment subComment : comment) {
@@ -131,9 +148,11 @@ public class Gopher extends Output {
 	// note: adds "i"
 	private static void appendJustified(StringBuilder builder, String text,
 			String space) {
-		for (String line : StringJustifier.full(text,
-				LINE_SIZE - space.length())) {
-			builder.append("i").append(line).append("\r\n");
+		for (String line : text.split("\n")) {
+			for (String subline : StringJustifier.full(line,
+					LINE_SIZE - space.length())) {
+				builder.append("i").append(subline).append("\r\n");
+			}
 		}
 	}
 
@@ -147,11 +166,13 @@ public class Gopher extends Output {
 	private static void appendLeft(StringBuilder builder, String text,
 			String prependFirst, String prependOthers, String space) {
 		String prepend = prependFirst;
-		for (String line : StringJustifier.left(text,
-				LINE_SIZE - space.length())) {
-			builder.append("i").append(space).append(prepend).append(line)
-					.append("\r\n");
-			prepend = prependOthers;
+		for (String line : text.split("\n")) {
+			for (String subline : StringJustifier.left(line,
+					LINE_SIZE - space.length())) {
+				builder.append("i").append(space).append(prepend)
+						.append(subline).append("\r\n");
+				prepend = prependOthers;
+			}
 		}
 	}
 }