opendev/gerrit
Code Issues Proposed changes

Turn off HARDWRAPS option in pegdown

Browse Source 
This option inserts a <br> at every LF. We don't really want this in
our documentation, as authors line wrap at 80 columns.

Change-Id: I900cd064d36a6b5edd425286db84d22575b8e618
This commit is contained in:
Shawn O. Pearce
2012-05-12 09:47:10 -07:00
parent da4919abf6
commit 9dcb63cd70
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/documentation/MarkdownFormatter.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.server.documentation; package com.google.gerrit.server.documentation;
import static org.pegdown.Extensions.ALL; import static org.pegdown.Extensions.ALL;
import static org.pegdown.Extensions.HARDWRAPS;
import org.eclipse.jgit.util.RawParseUtils; import org.eclipse.jgit.util.RawParseUtils;
import org.pegdown.PegDownProcessor; import org.pegdown.PegDownProcessor;
@@ -23,13 +24,13 @@ import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
public class MarkdownFormatter { public class MarkdownFormatter {
public byte[] getHtmlFromMarkdown(byte[] data, String charEnc) public byte[] getHtmlFromMarkdown(byte[] data, String charEnc)
throws UnsupportedEncodingException { throws UnsupportedEncodingException {
String decodedData = RawParseUtils.decode(Charset.forName(charEnc), data); return new PegDownProcessor(ALL & ~(HARDWRAPS))
String formatted = new PegDownProcessor(ALL).markdownToHtml(decodedData); .markdownToHtml(RawParseUtils.decode(
data = formatted.getBytes(charEnc); Charset.forName(charEnc),
return data; data))
.getBytes(charEnc);
} }
// TODO: Add a cache // TODO: Add a cache
} }