From 292b0bdad1aa79483a7498e72028bbff8134cebb Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 12 Jan 2015 20:28:17 -0800 Subject: Moved python, rb, lua wrappers to wrappers subdirectory. --- README.md | 7 +- wrapper.lua | 201 --------------------------------------------------- wrapper.py | 23 ------ wrapper.rb | 15 ---- wrapper3.py | 25 ------- wrappers/wrapper.lua | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++ wrappers/wrapper.py | 23 ++++++ wrappers/wrapper.rb | 15 ++++ wrappers/wrapper3.py | 25 +++++++ 9 files changed, 267 insertions(+), 268 deletions(-) delete mode 100755 wrapper.lua delete mode 100755 wrapper.py delete mode 100755 wrapper.rb delete mode 100755 wrapper3.py create mode 100755 wrappers/wrapper.lua create mode 100755 wrappers/wrapper.py create mode 100755 wrappers/wrapper.rb create mode 100755 wrappers/wrapper3.py diff --git a/README.md b/README.md index cf7b33c..597d5b0 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,7 @@ written in standard C99 and has no library dependencies. The parser is very fast (see [benchmarks](benchmarks.md)). It is easy to use `libcmark` in python, lua, ruby, and other dynamic -languages: see `wrapper.py`, `wrapper.lua`, and `wrapper.rb` in the -repository for simple examples. +languages: see the `wrappers/` subdirectory for some simple examples. The JavaScript implementation is a single JavaScript file, with no dependencies, that can be linked to in an HTML page. Here @@ -30,8 +29,8 @@ var parsed = reader.parse("Hello *world*"); var result = writer.render(parsed); ``` -A node package is also available; it includes a command-line tool called -`commonmark`. +A node package is also available (`npm install commonmark`). It includes +a command-line tool called `commonmark`. **A note on security:** Neither implementation attempts to sanitize link attributes or diff --git a/wrapper.lua b/wrapper.lua deleted file mode 100755 index 11c5183..0000000 --- a/wrapper.lua +++ /dev/null @@ -1,201 +0,0 @@ -#!/usr/bin/env luajit - -local ffi = require("ffi") - -cmark = ffi.load("libcmark") - -ffi.cdef[[ - - char *cmark_markdown_to_html(const char *text, int len); - typedef enum { - /* Block */ - CMARK_NODE_DOCUMENT, - CMARK_NODE_BLOCK_QUOTE, - CMARK_NODE_LIST, - CMARK_NODE_LIST_ITEM, - CMARK_NODE_CODE_BLOCK, - CMARK_NODE_HTML, - CMARK_NODE_PARAGRAPH, - CMARK_NODE_HEADER, - CMARK_NODE_HRULE, - CMARK_NODE_REFERENCE_DEF, - - CMARK_NODE_FIRST_BLOCK = CMARK_NODE_DOCUMENT, - CMARK_NODE_LAST_BLOCK = CMARK_NODE_REFERENCE_DEF, - - /* Inline */ - CMARK_NODE_TEXT, - CMARK_NODE_SOFTBREAK, - CMARK_NODE_LINEBREAK, - CMARK_NODE_INLINE_CODE, - CMARK_NODE_INLINE_HTML, - CMARK_NODE_EMPH, - CMARK_NODE_STRONG, - CMARK_NODE_LINK, - CMARK_NODE_IMAGE, - - CMARK_NODE_FIRST_INLINE = CMARK_NODE_TEXT, - CMARK_NODE_LAST_INLINE = CMARK_NODE_IMAGE, - } cmark_node_type; - - typedef enum { - CMARK_NO_LIST, - CMARK_BULLET_LIST, - CMARK_ORDERED_LIST - } cmark_list_type; - - typedef enum { - CMARK_PERIOD_DELIM, - CMARK_PAREN_DELIM - } cmark_delim_type; - - typedef struct cmark_node cmark_node; - typedef struct cmark_parser cmark_parser; - - cmark_node* cmark_node_new(cmark_node_type type); - - void - cmark_node_free(cmark_node *node); - - cmark_node* cmark_node_next(cmark_node *node); - - cmark_node* cmark_node_previous(cmark_node *node); - - cmark_node* cmark_node_parent(cmark_node *node); - - cmark_node* cmark_node_first_child(cmark_node *node); - - cmark_node* cmark_node_last_child(cmark_node *node); - - cmark_node_type cmark_node_get_type(cmark_node *node); - - const char* cmark_node_get_string_content(cmark_node *node); - - int cmark_node_set_string_content(cmark_node *node, const char *content); - - int cmark_node_get_header_level(cmark_node *node); - - int cmark_node_set_header_level(cmark_node *node, int level); - - cmark_list_type cmark_node_get_list_type(cmark_node *node); - - int cmark_node_set_list_type(cmark_node *node, cmark_list_type type); - - int cmark_node_get_list_start(cmark_node *node); - - int cmark_node_set_list_start(cmark_node *node, int start); - - int cmark_node_get_list_tight(cmark_node *node); - - int cmark_node_set_list_tight(cmark_node *node, int tight); - - const char* cmark_node_get_fence_info(cmark_node *node); - - int cmark_node_set_fence_info(cmark_node *node, const char *info); - - const char* cmark_node_get_url(cmark_node *node); - - int cmark_node_set_url(cmark_node *node, const char *url); - - const char* cmark_node_get_title(cmark_node *node); - - int cmark_node_set_title(cmark_node *node, const char *title); - - int cmark_node_get_start_line(cmark_node *node); - - int cmark_node_get_start_column(cmark_node *node); - - int cmark_node_get_end_line(cmark_node *node); - - void cmark_node_unlink(cmark_node *node); - - int cmark_node_insert_before(cmark_node *node, cmark_node *sibling); - - int cmark_node_insert_after(cmark_node *node, cmark_node *sibling); - - int cmark_node_prepend_child(cmark_node *node, cmark_node *child); - - int cmark_node_append_child(cmark_node *node, cmark_node *child); - - cmark_parser *cmark_parser_new(); - - void cmark_parser_free(cmark_parser *parser); - - cmark_node *cmark_parser_finish(cmark_parser *parser); - - void cmark_parser_feed(cmark_parser *parser, const char *buffer, size_t len); - - cmark_node *cmark_parse_document(const char *buffer, size_t len); - - char *cmark_render_ast(cmark_node *root); - - char *cmark_render_html(cmark_node *root); - - ]] - -local inp = io.read("*all") -local doc = cmark.cmark_parse_document(inp, string.len(inp)) - -local cur = doc -local next -local child - -local walk = function(action) - level = 0 - while cur ~= nil do - action(cur, level) - child = cmark.cmark_node_first_child(cur) - if child == nil then - next = cmark.cmark_node_next(cur) - while next == nil do - cur = cmark.cmark_node_parent(cur) - level = level - 1 - if cur == nil then - break - else - next = cmark.cmark_node_next(cur) - end - end - cur = next - else - level = level + 1 - cur = child - end - end -end - -local type_table = { - 'BLOCK_QUOTE', - 'LIST', - 'LIST_ITEM', - 'CODE_BLOCK', - 'HTML', - 'PARAGRAPH', - 'HEADER', - 'HRULE', - 'REFERENCE_DEF', - 'TEXT', - 'SOFTBREAK', - 'LINEBREAK', - 'INLINE_CODE', - 'INLINE_HTML', - 'EMPH', - 'STRONG', - 'LINK', - 'IMAGE', -} -type_table[0] = 'DOCUMENT' - -local function print_type(node, level) - local t = tonumber(cmark.cmark_node_get_type(node)) - io.write(string.rep(' ', level) .. type_table[t]) - if t == cmark.CMARK_NODE_TEXT then - io.write(' ' .. ffi.string(cmark.cmark_node_get_string_content(node))) - end - io.write('\n') -end - -walk(print_type) - --- local html = ffi.string(cmark.cmark_render_html(doc)) --- print(html) diff --git a/wrapper.py b/wrapper.py deleted file mode 100755 index 52cbfc7..0000000 --- a/wrapper.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python - -# Example for using the shared library from python - -from ctypes import CDLL, c_char_p, c_long -import sys -import platform - -sysname = platform.system() - -if sysname == 'Darwin': - cmark = CDLL("build/src/libcmark.dylib") -else: - cmark = CDLL("build/src/libcmark.so") - -markdown = cmark.cmark_markdown_to_html -markdown.restype = c_char_p -markdown.argtypes = [c_char_p, c_long] - -def md2html(text): - return markdown(text, len(text)) - -sys.stdout.write(md2html(sys.stdin.read())) diff --git a/wrapper.rb b/wrapper.rb deleted file mode 100755 index 59a9b87..0000000 --- a/wrapper.rb +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env ruby -require 'ffi' - -module CMark - extend FFI::Library - ffi_lib ['libcmark', 'cmark'] - attach_function :cmark_markdown_to_html, [:string, :int], :string -end - -def markdown_to_html(s) - len = s.bytesize - CMark::cmark_markdown_to_html(s, len) -end - -STDOUT.write(markdown_to_html(ARGF.read())) diff --git a/wrapper3.py b/wrapper3.py deleted file mode 100755 index 7a777fa..0000000 --- a/wrapper3.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python3 - -# Example for using the shared library from python - -from ctypes import CDLL, c_char_p, c_long -import sys -import platform - -sysname = platform.system() - -if sysname == 'Darwin': - cmark = CDLL("build/src/libcmark.dylib") -else: - cmark = CDLL("build/src/libcmark.so") - -markdown = cmark.cmark_markdown_to_html -markdown.restype = c_char_p -markdown.argtypes = [c_char_p, c_long] - -def md2html(text): - textbytes = text.encode('utf-8') - textlen = len(textbytes) - return markdown(textbytes, textlen).decode('utf-8') - -sys.stdout.write(md2html(sys.stdin.read())) diff --git a/wrappers/wrapper.lua b/wrappers/wrapper.lua new file mode 100755 index 0000000..11c5183 --- /dev/null +++ b/wrappers/wrapper.lua @@ -0,0 +1,201 @@ +#!/usr/bin/env luajit + +local ffi = require("ffi") + +cmark = ffi.load("libcmark") + +ffi.cdef[[ + + char *cmark_markdown_to_html(const char *text, int len); + typedef enum { + /* Block */ + CMARK_NODE_DOCUMENT, + CMARK_NODE_BLOCK_QUOTE, + CMARK_NODE_LIST, + CMARK_NODE_LIST_ITEM, + CMARK_NODE_CODE_BLOCK, + CMARK_NODE_HTML, + CMARK_NODE_PARAGRAPH, + CMARK_NODE_HEADER, + CMARK_NODE_HRULE, + CMARK_NODE_REFERENCE_DEF, + + CMARK_NODE_FIRST_BLOCK = CMARK_NODE_DOCUMENT, + CMARK_NODE_LAST_BLOCK = CMARK_NODE_REFERENCE_DEF, + + /* Inline */ + CMARK_NODE_TEXT, + CMARK_NODE_SOFTBREAK, + CMARK_NODE_LINEBREAK, + CMARK_NODE_INLINE_CODE, + CMARK_NODE_INLINE_HTML, + CMARK_NODE_EMPH, + CMARK_NODE_STRONG, + CMARK_NODE_LINK, + CMARK_NODE_IMAGE, + + CMARK_NODE_FIRST_INLINE = CMARK_NODE_TEXT, + CMARK_NODE_LAST_INLINE = CMARK_NODE_IMAGE, + } cmark_node_type; + + typedef enum { + CMARK_NO_LIST, + CMARK_BULLET_LIST, + CMARK_ORDERED_LIST + } cmark_list_type; + + typedef enum { + CMARK_PERIOD_DELIM, + CMARK_PAREN_DELIM + } cmark_delim_type; + + typedef struct cmark_node cmark_node; + typedef struct cmark_parser cmark_parser; + + cmark_node* cmark_node_new(cmark_node_type type); + + void + cmark_node_free(cmark_node *node); + + cmark_node* cmark_node_next(cmark_node *node); + + cmark_node* cmark_node_previous(cmark_node *node); + + cmark_node* cmark_node_parent(cmark_node *node); + + cmark_node* cmark_node_first_child(cmark_node *node); + + cmark_node* cmark_node_last_child(cmark_node *node); + + cmark_node_type cmark_node_get_type(cmark_node *node); + + const char* cmark_node_get_string_content(cmark_node *node); + + int cmark_node_set_string_content(cmark_node *node, const char *content); + + int cmark_node_get_header_level(cmark_node *node); + + int cmark_node_set_header_level(cmark_node *node, int level); + + cmark_list_type cmark_node_get_list_type(cmark_node *node); + + int cmark_node_set_list_type(cmark_node *node, cmark_list_type type); + + int cmark_node_get_list_start(cmark_node *node); + + int cmark_node_set_list_start(cmark_node *node, int start); + + int cmark_node_get_list_tight(cmark_node *node); + + int cmark_node_set_list_tight(cmark_node *node, int tight); + + const char* cmark_node_get_fence_info(cmark_node *node); + + int cmark_node_set_fence_info(cmark_node *node, const char *info); + + const char* cmark_node_get_url(cmark_node *node); + + int cmark_node_set_url(cmark_node *node, const char *url); + + const char* cmark_node_get_title(cmark_node *node); + + int cmark_node_set_title(cmark_node *node, const char *title); + + int cmark_node_get_start_line(cmark_node *node); + + int cmark_node_get_start_column(cmark_node *node); + + int cmark_node_get_end_line(cmark_node *node); + + void cmark_node_unlink(cmark_node *node); + + int cmark_node_insert_before(cmark_node *node, cmark_node *sibling); + + int cmark_node_insert_after(cmark_node *node, cmark_node *sibling); + + int cmark_node_prepend_child(cmark_node *node, cmark_node *child); + + int cmark_node_append_child(cmark_node *node, cmark_node *child); + + cmark_parser *cmark_parser_new(); + + void cmark_parser_free(cmark_parser *parser); + + cmark_node *cmark_parser_finish(cmark_parser *parser); + + void cmark_parser_feed(cmark_parser *parser, const char *buffer, size_t len); + + cmark_node *cmark_parse_document(const char *buffer, size_t len); + + char *cmark_render_ast(cmark_node *root); + + char *cmark_render_html(cmark_node *root); + + ]] + +local inp = io.read("*all") +local doc = cmark.cmark_parse_document(inp, string.len(inp)) + +local cur = doc +local next +local child + +local walk = function(action) + level = 0 + while cur ~= nil do + action(cur, level) + child = cmark.cmark_node_first_child(cur) + if child == nil then + next = cmark.cmark_node_next(cur) + while next == nil do + cur = cmark.cmark_node_parent(cur) + level = level - 1 + if cur == nil then + break + else + next = cmark.cmark_node_next(cur) + end + end + cur = next + else + level = level + 1 + cur = child + end + end +end + +local type_table = { + 'BLOCK_QUOTE', + 'LIST', + 'LIST_ITEM', + 'CODE_BLOCK', + 'HTML', + 'PARAGRAPH', + 'HEADER', + 'HRULE', + 'REFERENCE_DEF', + 'TEXT', + 'SOFTBREAK', + 'LINEBREAK', + 'INLINE_CODE', + 'INLINE_HTML', + 'EMPH', + 'STRONG', + 'LINK', + 'IMAGE', +} +type_table[0] = 'DOCUMENT' + +local function print_type(node, level) + local t = tonumber(cmark.cmark_node_get_type(node)) + io.write(string.rep(' ', level) .. type_table[t]) + if t == cmark.CMARK_NODE_TEXT then + io.write(' ' .. ffi.string(cmark.cmark_node_get_string_content(node))) + end + io.write('\n') +end + +walk(print_type) + +-- local html = ffi.string(cmark.cmark_render_html(doc)) +-- print(html) diff --git a/wrappers/wrapper.py b/wrappers/wrapper.py new file mode 100755 index 0000000..52cbfc7 --- /dev/null +++ b/wrappers/wrapper.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python + +# Example for using the shared library from python + +from ctypes import CDLL, c_char_p, c_long +import sys +import platform + +sysname = platform.system() + +if sysname == 'Darwin': + cmark = CDLL("build/src/libcmark.dylib") +else: + cmark = CDLL("build/src/libcmark.so") + +markdown = cmark.cmark_markdown_to_html +markdown.restype = c_char_p +markdown.argtypes = [c_char_p, c_long] + +def md2html(text): + return markdown(text, len(text)) + +sys.stdout.write(md2html(sys.stdin.read())) diff --git a/wrappers/wrapper.rb b/wrappers/wrapper.rb new file mode 100755 index 0000000..59a9b87 --- /dev/null +++ b/wrappers/wrapper.rb @@ -0,0 +1,15 @@ +#!/usr/bin/env ruby +require 'ffi' + +module CMark + extend FFI::Library + ffi_lib ['libcmark', 'cmark'] + attach_function :cmark_markdown_to_html, [:string, :int], :string +end + +def markdown_to_html(s) + len = s.bytesize + CMark::cmark_markdown_to_html(s, len) +end + +STDOUT.write(markdown_to_html(ARGF.read())) diff --git a/wrappers/wrapper3.py b/wrappers/wrapper3.py new file mode 100755 index 0000000..7a777fa --- /dev/null +++ b/wrappers/wrapper3.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python3 + +# Example for using the shared library from python + +from ctypes import CDLL, c_char_p, c_long +import sys +import platform + +sysname = platform.system() + +if sysname == 'Darwin': + cmark = CDLL("build/src/libcmark.dylib") +else: + cmark = CDLL("build/src/libcmark.so") + +markdown = cmark.cmark_markdown_to_html +markdown.restype = c_char_p +markdown.argtypes = [c_char_p, c_long] + +def md2html(text): + textbytes = text.encode('utf-8') + textlen = len(textbytes) + return markdown(textbytes, textlen).decode('utf-8') + +sys.stdout.write(md2html(sys.stdin.read())) -- cgit v1.2.3