greenmat 3.2.0.2 → 3.2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640a48e0309d3ad49841f279024df4b6bfad325f
-  data.tar.gz: 6d5c03df89ba11808bb57ca7c156336e4f300a92
+  metadata.gz: c56dac9366c03995652ee0bc85e40215c3abbb1f
+  data.tar.gz: 083dc87803beeb23ab9d2fcad89bc41b2cb96cfc
 SHA512:
-  metadata.gz: 1c6ed914f324b245051525b3a8ff1189ac7a7144ad370254245448e0d857bcae235b1c202e9e66597a51df931f59c042ff2f345580c5765ba2160b81aa8a45fe
-  data.tar.gz: e7479bf0e3e018566ea1640e09981d7eddb36d8eebe3e4b64946130abf0951220f08e923b1032769ad20d941a836cc0be129fe0b70ef729f460a2215987f4581
+  metadata.gz: f3dfbca086ab162186b40bfe338f147f9b63d3feb006265e0cf253c693375e9430e7bb825267b4e25d55dbe24d66574f7b257ba7f216b38f6e2cc4bd4d215333
+  data.tar.gz: b870e9c370fd479629b51c55425a6eee6723787fd9e70dde2d42807d52ea17d81f28d2998d40a7d8493c347a9786b8503845f7113dcef0433f75027a02d1846b

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v3.2.2.0
+
+* Update base Redcarpet version to 3.2.2.
+
 ## v3.2.0.2
 
 * Fix missing `greenmat/version` in the gem package.

data/README.md

@@ -13,6 +13,39 @@ Greenmat follows Redcarpet's updates by merging the upstream changes.
 The version format is `MAJOR.MINOR.PATCH.FORK`.
 `MAJOR.MINOR.PATCH` is the same as the version of Redcarpet that Greenmat is based on. `FORK` is incremented on each release of Greenmat itself and reset to zero when any of `MAJOR.MINOR.PATCH` is bumped.
 
+## Development
+
+### Initial setup
+
+Clone the Greenmat repository:
+
+```bash
+$ git clone git@github.com:increments/greenmat.git
+$ cd greenmat
+```
+
+Set up git remote for Redcarpet as `upstream`:
+
+```bash
+$ rake greenmat:setup_upstream
+```
+
+### Merging upstream changes
+
+Run the following task to merge `upstream/master` branch into the current branch:
+
+```bash
+$ rake greenmat:merge_upstream
+```
+
+Note that this task does _not_ automatically commit the merge, so you need to commit the changes after checking each diff. Also it forces conflicting hunks to be auto-resolved cleanly by favoring upstream version.
+
+If you want to merge a branch other than `upstream/master`, specify the name as `BRANCH` environment variable:
+
+```bash
+$ rake greenmat:merge_upstream BRANCH=branch_name
+```
+
 ## Acknowledgment
 
 We appreciate Redcarpet project and the contributors for the great efforts!

data/bin/greenmat

@@ -1,7 +1,43 @@
 #!/usr/bin/env ruby
-lib_path = File.expand_path('../../lib', __FILE__)
-$:.unshift(lib_path)
+# Usage: greenmat [--parse-<extension>...] [--render-<extension>...] [--smarty] [<file>...]
+# Convert one or more Markdown files to HTML and write to standard output. With
+# no <file> or when <file> is '-', read Markdown source text from standard input.
+# With <extension>s, perform additional Markdown processing before writing output.
+# With --smarty, use the SmartyHTML renderer
+if ARGV.include?('--help') or ARGV.include?('-h')
+  File.read(__FILE__).split("\n").grep(/^# /).each do |line|
+    puts line[2..-1]
+  end
+  exit 0
+end
 
-require 'greenmat/cli'
+require 'greenmat'
 
-Greenmat::CLI.process(ARGV)
+if ARGV.include?('--version') or ARGV.include?('-v')
+  puts "Greenmat #{Greenmat::VERSION}"
+  exit 0
+end
+
+root = File.expand_path('../../', __FILE__)
+$:.unshift File.expand_path('lib', root)
+
+render_extensions = {}
+parse_extensions = {}
+renderer = Greenmat::Render::HTML
+
+ARGV.delete_if do |arg|
+  if arg =~ /^--render-([\w-]+)$/
+    arg = $1.gsub('-', '_')
+    render_extensions[arg.to_sym] = true
+  elsif arg =~ /^--parse-([\w-]+)$/
+    arg = $1.gsub('-', '_')
+    parse_extensions[arg.to_sym] = true
+  elsif arg == '--smarty'
+    renderer = Greenmat::Render::SmartyHTML
+  else
+    false
+  end
+end
+
+render = renderer.new(render_extensions)
+STDOUT.write(Greenmat::Markdown.new(render, parse_extensions).render(ARGF.read))

data/ext/greenmat/buffer.c

@@ -94,14 +94,14 @@ bufnew(size_t unit)
 
 /* bufnullterm: NULL-termination of the string array */
 const char *
-bufcstr(const struct buf *buf)
+bufcstr(struct buf *buf)
 {
 	assert(buf && buf->unit);
 
 	if (buf->size < buf->asize && buf->data[buf->size] == 0)
 		return (char *)buf->data;
 
-	if (buf->size + 1 <= buf->asize || bufgrow(buf, buf->size + 1) == BUF_OK) {
+	if (buf->size + 1 <= buf->asize || bufgrow(buf, buf->size + 1) == 0) {
 		buf->data[buf->size] = 0;
 		return (char *)buf->data;
 	}
@@ -118,7 +118,7 @@ bufprintf(struct buf *buf, const char *fmt, ...)
 
 	assert(buf && buf->unit);
 
-	if (buf->size >= buf->asize && bufgrow(buf, buf->size + 1) < BUF_OK)
+	if (buf->size >= buf->asize && bufgrow(buf, buf->size + 1) < 0)
 		return;
 
 	va_start(ap, fmt);
@@ -136,7 +136,7 @@ bufprintf(struct buf *buf, const char *fmt, ...)
 	}
 
 	if ((size_t)n >= buf->asize - buf->size) {
-		if (bufgrow(buf, buf->size + n + 1) < BUF_OK)
+		if (bufgrow(buf, buf->size + n + 1) < 0)
 			return;
 
 		va_start(ap, fmt);
@@ -156,7 +156,7 @@ bufput(struct buf *buf, const void *data, size_t len)
 {
 	assert(buf && buf->unit);
 
-	if (buf->size + len > buf->asize && bufgrow(buf, buf->size + len) < BUF_OK)
+	if (buf->size + len > buf->asize && bufgrow(buf, buf->size + len) < 0)
 		return;
 
 	memcpy(buf->data + buf->size, data, len);
@@ -177,7 +177,7 @@ bufputc(struct buf *buf, int c)
 {
 	assert(buf && buf->unit);
 
-	if (buf->size + 1 > buf->asize && bufgrow(buf, buf->size + 1) < BUF_OK)
+	if (buf->size + 1 > buf->asize && bufgrow(buf, buf->size + 1) < 0)
 		return;
 
 	buf->data[buf->size] = c;

data/ext/greenmat/buffer.h

@@ -55,7 +55,7 @@ int bufgrow(struct buf *, size_t);
 struct buf *bufnew(size_t) __attribute__ ((malloc));
 
 /* bufnullterm: NUL-termination of the string array (making a C-string) */
-const char *bufcstr(const struct buf *);
+const char *bufcstr(struct buf *);
 
 /* bufprefix: compare the beginning of a buffer with a string */
 int bufprefix(const struct buf *buf, const char *prefix);

data/ext/greenmat/gm_markdown.c

@@ -125,9 +125,13 @@ static VALUE rb_greenmat_md_render(VALUE self, VALUE text)
 	if (NIL_P(text))
 		return Qnil;
 
-	struct rb_greenmat_rndr *renderer;
-	Data_Get_Struct(rb_rndr, struct rb_greenmat_rndr, renderer);
-	renderer->options.active_enc = rb_enc_get(text);
+#ifdef HAVE_RUBY_ENCODING_H
+	{
+		struct rb_greenmat_rndr *renderer;
+		Data_Get_Struct(rb_rndr, struct rb_greenmat_rndr, renderer);
+		renderer->options.active_enc = rb_enc_get(text);
+	}
+#endif
 
 	/* initialize buffers */
 	output_buf = bufnew(128);

data/ext/greenmat/gm_render.c

@@ -472,30 +472,25 @@ static VALUE rb_greenmat_html_init(int argc, VALUE *argv, VALUE self)
 static VALUE rb_greenmat_htmltoc_init(int argc, VALUE *argv, VALUE self)
 {
 	struct rb_greenmat_rndr *rndr;
-	unsigned int render_flags = HTML_TOC;
-	VALUE hash, nesting_level = Qnil;
+	int nesting_level = 6;
+	VALUE hash, key = Qnil;
 
 	Data_Get_Struct(self, struct rb_greenmat_rndr, rndr);
 
 	if (rb_scan_args(argc, argv, "01", &hash) == 1) {
 		Check_Type(hash, T_HASH);
 
-		/* escape_html */
-		if (rb_hash_aref(hash, CSTR2SYM("escape_html")) == Qtrue)
-			render_flags |= HTML_ESCAPE;
+		key = CSTR2SYM("nesting_level");
 
-		/* Nesting level */
-		nesting_level = rb_hash_aref(hash, CSTR2SYM("nesting_level"));
+		if (RTEST(rb_hash_aref(hash, key))) {
+			Check_Type(rb_hash_aref(hash, key), T_FIXNUM);
+			nesting_level = NUM2INT(rb_hash_aref(hash, key));
+		}
 	}
 
-	sdhtml_toc_renderer(&rndr->callbacks, (struct html_renderopt *)&rndr->options.html, render_flags);
+	sdhtml_toc_renderer(&rndr->callbacks, (struct html_renderopt *)&rndr->options.html, nesting_level);
 	rb_greenmat__overload(self, rb_cRenderHTML_TOC);
 
-	if (!(NIL_P(nesting_level)))
-		rndr->options.html.toc_data.nesting_level = NUM2INT(nesting_level);
-	else
-		rndr->options.html.toc_data.nesting_level = 6;
-
 	return Qnil;
 }
 

data/ext/greenmat/html.c

@@ -17,6 +17,7 @@
 
 #include "markdown.h"
 #include "html.h"
+#include "ruby.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -124,7 +125,7 @@ rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, v
 	if (lang && lang->size) {
 		size_t i, cls;
 		if (options->flags & HTML_PRETTIFY) {
-			BUFPUTSL(ob, "<pre><code class=\"prettyprint lang-");
+			BUFPUTSL(ob, "<pre><code class=\"prettyprint ");
 			cls++;
 		} else {
 			BUFPUTSL(ob, "<pre><code class=\"");
@@ -264,51 +265,17 @@ rndr_linebreak(struct buf *ob, void *opaque)
 	return 1;
 }
 
-char *header_anchor(const struct buf *buffer)
+char *header_anchor(struct buf *text)
 {
-	size_t i, j, k, size = buffer->size;
+	VALUE str = rb_str_new2(bufcstr(text));
+	VALUE space_regex = rb_reg_new(" +", 2 /* length */, 0);
+	VALUE tags_regex = rb_reg_new("<\\/?[^>]*>", 10, 0);
 
-	char text[size];
-	strcpy(text, bufcstr(buffer));
+	VALUE heading = rb_funcall(str, rb_intern("gsub"), 2, space_regex, rb_str_new2("-"));
+	heading = rb_funcall(heading, rb_intern("gsub"), 2, tags_regex, rb_str_new2(""));
+	heading = rb_funcall(heading, rb_intern("downcase"), 0);
 
-	char raw_string[size];
-
-	/* Strip down the inline HTML markup if needed */
-	if (strchr(text, '<') < strchr(text, '>')) {
-		char* part = strtok(text, "<>");
-
-		/* Once every two times, the yielded token is the
-		   content of a HTML tag so we don't need to copy it */
-		for (k = 0; part != NULL; k++) {
-			if (k == 0)
-				strcpy(raw_string, part);
-			else if (k % 2 == 0)
-				strcat(raw_string, part);
-
-			part = strtok(NULL, "<>");
-		}
-
-		size = strlen(raw_string);
-	} else {
-		strcpy(raw_string, text);
-	}
-
-	char* heading = malloc(size * sizeof(char));
-
-	/* Dasherize the string removing extra white spaces
-	   and stripped chars */
-	for (i = 0, j = 0; i < size; ++i, ++j) {
-		while ((i+1) < size && STRIPPED_CHAR(raw_string[i]) && STRIPPED_CHAR(raw_string[i+1]))
-			i++;
-
-		if (STRIPPED_CHAR(raw_string[i]))
-			heading[j] = '-';
-		else
-			heading[j] = tolower(raw_string[i]);
-	}
-
-	heading[j++] = '\0';
-	return heading;
+	return StringValueCStr(heading);
 }
 
 static void
@@ -428,30 +395,15 @@ rndr_paragraph(struct buf *ob, const struct buf *text, void *opaque)
 static void
 rndr_raw_block(struct buf *ob, const struct buf *text, void *opaque)
 {
-	size_t org, size;
-	struct html_renderopt *options = opaque;
-
-	if (!text)
-		return;
-
-	size = text->size;
-	while (size > 0 && text->data[size - 1] == '\n')
-		size--;
-
-	for (org = 0; org < size && text->data[org] == '\n'; ++org)
-
-	if (org >= size)
-		return;
-
-	/* Remove style tags if the `:no_styles` option is enabled */
-	if ((options->flags & HTML_SKIP_STYLE) != 0 &&
-		sdhtml_is_tag(text->data, size, "style"))
-		return;
-
-	if (ob->size)
-		bufputc(ob, '\n');
-
-	bufput(ob, text->data + org, size - org);
+	size_t org, sz;
+	if (!text) return;
+	sz = text->size;
+	while (sz > 0 && text->data[sz - 1] == '\n') sz--;
+	org = 0;
+	while (org < sz && text->data[org] == '\n') org++;
+	if (org >= sz) return;
+	if (ob->size) bufputc(ob, '\n');
+	bufput(ob, text->data + org, sz - org);
 	bufputc(ob, '\n');
 }
 
@@ -477,9 +429,7 @@ static int
 rndr_image(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *alt, void *opaque)
 {
 	struct html_renderopt *options = opaque;
-
-	if (link != NULL && (options->flags & HTML_SAFELINK) != 0 && !sd_autolink_issafe(link->data, link->size))
-		return 0;
+	if (!link || !link->size) return 0;
 
 	BUFPUTSL(ob, "<img src=\"");
 	escape_href(ob, link->data, link->size);
@@ -502,7 +452,7 @@ rndr_raw_html(struct buf *ob, const struct buf *text, void *opaque)
 	struct html_renderopt *options = opaque;
 
 	/* HTML_ESCAPE overrides SKIP_HTML, SKIP_STYLE, SKIP_LINKS and SKIP_IMAGES
-	   It doesn't see if there are any valid tags, just escape all of them. */
+	* It doens't see if there are any valid tags, just escape all of them. */
 	if((options->flags & HTML_ESCAPE) != 0) {
 		escape_html(ob, text->data, text->size);
 		return 1;
@@ -686,14 +636,7 @@ toc_header(struct buf *ob, const struct buf *text, int level, void *opaque)
 		}
 
 		bufprintf(ob, "<a href=\"#%s\">", header_anchor(text));
-
-		if (text) {
-			if (options->flags & HTML_ESCAPE)
-				escape_html(ob, text->data, text->size);
-			else
-				bufput(ob, text->data, text->size);
-		}
-
+		if (text) escape_html(ob, text->data, text->size);
 		BUFPUTSL(ob, "</a>\n");
 	}
 }
@@ -718,7 +661,7 @@ toc_finalize(struct buf *ob, void *opaque)
 }
 
 void
-sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options, unsigned int render_flags)
+sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options, int nesting_level)
 {
 	static const struct sd_callbacks cb_default = {
 		NULL,
@@ -759,7 +702,8 @@ sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *optio
 	};
 
 	memset(options, 0x0, sizeof(struct html_renderopt));
-	options->flags = render_flags;
+	options->flags = HTML_TOC;
+	options->toc_data.nesting_level = nesting_level;
 
 	memcpy(callbacks, &cb_default, sizeof(struct sd_callbacks));
 }

data/ext/greenmat/html.h

@@ -65,17 +65,11 @@ extern void
 sdhtml_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options_ptr, unsigned int render_flags);
 
 extern void
-sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options_ptr, unsigned int render_flags);
+sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options_ptr, int nesting_level);
 
 extern void
 sdhtml_smartypants(struct buf *ob, const uint8_t *text, size_t size);
 
-/* header method used internally in Greenmat */
-char *header_anchor(const struct buf *buffer);
-
-#define STRIPPED_CHARS " -&+$,/:;=?@\"#{}|^~[]`\\*()%.!'"
-#define STRIPPED_CHAR(x) (strchr(STRIPPED_CHARS, x) != NULL)
-
 #ifdef __cplusplus
 }
 #endif

data/ext/greenmat/markdown.c

@@ -1176,7 +1176,7 @@ char_link(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset
 				title_e--;
 
 			/* checking for closing quote presence */
-			if (data[title_e] != '\'' && data[title_e] != '"') {
+			if (data[title_e] != '\'' &&  data[title_e] != '"') {
 				title_b = title_e = 0;
 				link_e = i;
 			}
@@ -1605,7 +1605,7 @@ prefix_oli(uint8_t *data, size_t size)
 	return i + 2;
 }
 
-/* prefix_uli • returns unordered list item prefix */
+/* prefix_uli • returns ordered list item prefix */
 static size_t
 prefix_uli(uint8_t *data, size_t size)
 {
@@ -1677,7 +1677,7 @@ parse_blockquote(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 static size_t
 parse_htmlblock(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size, int do_render);
 
-/* parse_paragraph • handles parsing of a regular paragraph */
+/* parse_blockquote • handles parsing of a regular paragraph */
 static size_t
 parse_paragraph(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size)
 {
@@ -2858,7 +2858,6 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 
 	struct buf *text;
 	size_t beg, end;
-	int in_fence = 0;
 
 	text = bufnew(64);
 	if (!text)
@@ -2870,8 +2869,7 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 	/* reset the references table */
 	memset(&md->refs, 0x0, REF_TABLE_SIZE * sizeof(void *));
 
-	int footnotes_enabled  = md->ext_flags & MKDEXT_FOOTNOTES;
-	int codefences_enabled = md->ext_flags & MKDEXT_FENCED_CODE;
+	int footnotes_enabled = md->ext_flags & MKDEXT_FOOTNOTES;
 
 	/* reset the footnotes lists */
 	if (footnotes_enabled) {
@@ -2887,13 +2885,10 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 	if (doc_size >= 3 && memcmp(document, UTF8_BOM, 3) == 0)
 		beg += 3;
 
-	while (beg < doc_size) { /* iterating over lines */
-		if (codefences_enabled && (is_codefence(document + beg, doc_size - beg, NULL) != 0))
-			in_fence = !in_fence;
-
-		if (!in_fence && footnotes_enabled && is_footnote(document, beg, doc_size, &end, &md->footnotes_found))
+	while (beg < doc_size) /* iterating over lines */
+		if (footnotes_enabled && is_footnote(document, beg, doc_size, &end, &md->footnotes_found))
 			beg = end;
-		else if (!in_fence && is_ref(document, beg, doc_size, &end, md->refs))
+		else if (is_ref(document, beg, doc_size, &end, md->refs))
 			beg = end;
 		else { /* skipping to the next line */
 			end = beg;
@@ -2913,7 +2908,6 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 
 			beg = end;
 		}
-	}
 
 	/* pre-grow the output buffer to minimize allocations */
 	bufgrow(ob, MARKDOWN_GROW(text->size));
@@ -2924,7 +2918,7 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 
 	if (text->size) {
 		/* adding a final newline if not already present */
-		if (text->data[text->size - 1] != '\n' && text->data[text->size - 1] != '\r')
+		if (text->data[text->size - 1] != '\n' &&  text->data[text->size - 1] != '\r')
 			bufputc(text, '\n');
 
 		parse_block(ob, md, text->data, text->size);
@@ -2937,9 +2931,6 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 	if (md->cb.doc_footer)
 		md->cb.doc_footer(ob, md->opaque);
 
-	/* Null-terminate the buffer */
-	bufcstr(ob);
-
 	/* clean-up */
 	bufrelease(text);
 	free_link_refs(md->refs);