Implement FT_EMOJI!

bin/noop.c

@@ -26,6 +26,7 @@ static void rndr_code(void *target, const hoedown_buffer *code, const hoedown_re
 static void rndr_emphasis(void *target, void *content, size_t width, uint8_t delimiter, const hoedown_renderer_data *data) {}
 static void rndr_link(void *target, void *content, const hoedown_buffer *dest, const hoedown_buffer *title, int is_image, const hoedown_renderer_data *data) {}
 static void rndr_math(void *target, const hoedown_buffer *math, int is_inline, const hoedown_renderer_data *data) {}
+static void rndr_emoji(void *target, const hoedown_buffer *name, const hoedown_renderer_data *data) {}
 static void rndr_typography(void *target, const hoedown_buffer *character, const hoedown_renderer_data *data) {}
 
 /* Global callbacks */
@@ -64,6 +65,7 @@ hoedown_renderer *hoedown_noop_renderer_new() {
     rndr_emphasis,
     rndr_link,
     rndr_math,
+    rndr_emoji,
     rndr_typography,
 
     object_get,

src/document.c

@@ -1682,6 +1682,26 @@ static size_t parse_math(hoedown_document *doc, void *target, const uint8_t *dat
   return i + end.size;
 }
 
+static inline int is_emoji_name(uint8_t c) {
+  return is_lower_ascii(c) || c == '_' || c == '-' || is_digit_ascii(c);
+}
+
+// data[start] is assumed to be ':'
+static size_t parse_emoji(hoedown_document *doc, void *target, const uint8_t *data, size_t parsed, size_t start, size_t size) {
+  size_t i = start + 1, mark;
+
+  mark = i;
+  while (i < size && is_emoji_name(data[i])) i++;
+  if (mark == i || i >= size || data[i] != ':') return 0;
+
+  // Render!
+  parse_string(doc, target, data + parsed, start - parsed);
+
+  hoedown_buffer name = {(uint8_t *)data + mark, i - mark, 0, 0, NULL, NULL};
+  doc->rndr.emoji(target, &name, &doc->data);
+  return i + 1;
+}
+
 // data[start] is assumed to be '"' or '-'
 static size_t parse_typography_quote(hoedown_document *doc, void *target, const uint8_t *data, size_t parsed, size_t start, size_t size) {
   size_t end = start + 1;
@@ -1764,7 +1784,7 @@ static inline size_t parse_atx_header_end(const uint8_t *data, size_t size) {
   // Retract to skip trailing hashes
   mark = i;
   while (i > 0 && data[i-1] == '#') i--;
-  if (i == mark) return size;
+  if (mark == i) return size;
 
   // Check that they're present, and not escaped
   if (is_escaped(data, i)) return size;
@@ -1772,7 +1792,7 @@ static inline size_t parse_atx_header_end(const uint8_t *data, size_t size) {
   // Retract again to skip spaces between content and hashes
   mark = i;
   while (i > 0 && data[i-1] == ' ') i--;
-  if (i == mark && i > 0) return size;
+  if (mark == i && i > 0) return size;
 
   return i;
 }
@@ -2546,7 +2566,7 @@ static size_t collect_list_items(hoedown_document *doc, const uint8_t *data, siz
     if (i - mark >= 5) i = mark + 1;
 
     indentation = result + (i - mark);
-    if (i == mark) indentation++;
+    if (mark == i) indentation++;
 
     mark = i;
     while (i < size && data[i] != '\n') i++;
@@ -2968,6 +2988,9 @@ static void set_inline_chars(hoedown_document *doc, hoedown_features ft) {
   if (ft & HOEDOWN_FT_LINK)
     register_inline_chars(doc, "[", parse_link);
 
+  if (ft & HOEDOWN_FT_EMOJI)
+    register_inline_chars(doc, ":", parse_emoji);
+
   if (ft & HOEDOWN_FT_TYPOGRAPHY) {
     register_inline_chars(doc, "'\"", parse_typography_quote);
     register_inline_chars(doc, "-", parse_typography_dash);
@@ -3085,6 +3108,8 @@ static inline void restrict_features(const hoedown_renderer *rndr, hoedown_featu
     not_present |= HOEDOWN_FT_LINK;
   if (!rndr->math)
     not_present |= HOEDOWN_FT_MATH;
+  if (!rndr->emoji)
+    not_present |= HOEDOWN_FT_EMOJI;
   if (!rndr->typography)
     not_present |= HOEDOWN_FT_TYPOGRAPHY;
 

src/document.h

@@ -208,6 +208,7 @@ typedef struct hoedown_renderer {
   void (*emphasis)(void *target, void *content, size_t width, uint8_t delimiter, const hoedown_renderer_data *data);
   void (*link)(void *target, void *content, const hoedown_buffer *dest, const hoedown_buffer *title, int is_image, const hoedown_renderer_data *data);
   void (*math)(void *target, const hoedown_buffer *math, int is_inline, const hoedown_renderer_data *data);
+  void (*emoji)(void *target, const hoedown_buffer *name, const hoedown_renderer_data *data);
   void (*typography)(void *target, const hoedown_buffer *character, const hoedown_renderer_data *data);
 
   /* Global callbacks (mandatory) */

src/html.c

@@ -253,6 +253,14 @@ static void rndr_math(void *target, const hoedown_buffer *math, int is_inline, c
   hoedown_buffer_put(ob, (const uint8_t *)(is_inline ? "\\)" : "\\]"), 2);
 }
 
+static void rndr_emoji(void *target, const hoedown_buffer *name, const hoedown_renderer_data *data) {
+  hoedown_buffer *ob = target;
+
+  hoedown_buffer_putc(ob, ':');
+  hoedown_escape_html(ob, name->data, name->size);
+  hoedown_buffer_putc(ob, ':');
+}
+
 static void rndr_typography(void *target, const hoedown_buffer *character, const hoedown_renderer_data *data) {
   hoedown_buffer *ob = target;
 
@@ -289,6 +297,7 @@ hoedown_renderer *hoedown_html_renderer_new() {
     rndr_emphasis,
     rndr_link,
     rndr_math,
+    rndr_emoji,
     rndr_typography,
 
     object_get,