Adding options to prettify instead

jolros · Jan 25, 2013 · d3bc743 · d3bc743
1 parent fa720d9
commit d3bc743
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/ext/redcarpet/html.c b/ext/redcarpet/html.c
@@ -121,10 +121,14 @@ rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, v
 	if (ob->size) bufputc(ob, '\n');
 
 	if (lang && lang->size) {
-		size_t i;
-		BUFPUTSL(ob, "<pre><code class=\"prettyprint");
+		size_t i, cls;
+		BUFPUTSL(ob, "<pre><code class=\"");
+		if (render_flags & HTML_PRETTIFY) {
+			BUFPUTSL(ob, "prettyprint");
+			cls++;
+		}
 
-		for (i = 0; i < lang->size; ++i) {
+		for (i = 0, cls = 0; i < lang->size; ++i, ++cls) {
 			while (i < lang->size && isspace(lang->data[i]))
 				i++;
 
@@ -136,14 +140,16 @@ rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, v
 				if (lang->data[org] == '.')
 					org++;
 
-				bufputc(ob, ' ');
+				if (cls) bufputc(ob, ' ');
 				escape_html(ob, lang->data + org, i - org);
 			}
 		}
 
 		BUFPUTSL(ob, "\">");
-	} else
+	} else if (render_flags & HTML_PRETTIFY)
 		BUFPUTSL(ob, "<pre><code class=\"prettyprint\">");
+	} else
+		BUFPUTSL(ob, "<pre><code>");
 
 	if (text)
 		escape_html(ob, text->data, text->size);

diff --git a/ext/redcarpet/html.h b/ext/redcarpet/html.h
@@ -49,6 +49,7 @@ typedef enum {
 	HTML_HARD_WRAP = (1 << 7),
 	HTML_USE_XHTML = (1 << 8),
 	HTML_ESCAPE = (1 << 9),
+	HTML_PRETTIFY = (1 << 10),
 } html_render_mode;
 
 typedef enum {

diff --git a/ext/redcarpet/rc_render.c b/ext/redcarpet/rc_render.c
@@ -386,6 +386,10 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 		if (rb_hash_aref(hash, CSTR2SYM("no_links")) == Qtrue)
 			render_flags |= HTML_SKIP_LINKS;
 
+		/* prettify */
+		if (rb_hash_aref(hash, CSTR2SYM("prettify")) == Qtrue)
+			render_flags |= HTML_PRETTIFY;
+
 		/* filter_style */
 		if (rb_hash_aref(hash, CSTR2SYM("no_styles")) == Qtrue)
 			render_flags |= HTML_SKIP_STYLE;