Fossil with Commonmark: Changes On Branch commonmark-markdown

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch commonmark-markdown Excluding Merge-Ins

This is equivalent to a diff from 83789c6e53 to a253fba0f7

2018-06-06
10:39		Merged trunk Leaf check-in: a253fba0f7 user: mjanssen tags: commonmark-markdown
2018-06-05
23:06		Fix a bug in the pivot-finder introduced by check-in [917f1c21e52a29904] from 5 days ago. Leaf check-in: 83789c6e53 user: drh tags: trunk
2018-06-04
19:52		Update the built-in SQLite to the 3.24.0 release. check-in: f39d0a7290 user: drh tags: trunk
2018-02-12
08:50		Merged trunk check-in: 270d2fb95c user: mjanssen tags: commonmark-markdown

Added src/case_fold_switch.inc.

Added src/cmark_amalgamation.c.

more than 10,000 changes

Added src/cmark_amalgamation.h.

Added src/entities.inc.

Changes to src/main.mk.

Changes to src/markdown_html.c.

Added test/commonmark_tests.json.

Added test/commonmark_tests.tcl.

Changes to test/markdown-test1.md.

︙
646 647 648 649 650 651 652 653 654 655 656 657 658 659	646 647 648 649 650 651 652 653 654 655 656 657 658 659 660	+	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \ $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \ $(LINENOISE_OBJ.$(USE_LINENOISE)) \ $(OBJDIR)/shell.o \ $(OBJDIR)/th.o \ $(OBJDIR)/th_lang.o \ $(OBJDIR)/th_tcl.o \ $(OBJDIR)/cmark_amalgamation.o \ $(OBJDIR)/cson_amalgamation.o $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ) $(OBJDIR)/codecheck1 $(TRANS_SRC) $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
︙
1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867	1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870	+ +	$(OBJDIR)/miniz.o: $(SRCDIR)/miniz.c $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR)/miniz.c -o $@ $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@ $(OBJDIR)/cmark_amalgamation.o: $(SRCDIR)/cmark_amalgamation.c $(XTCC) -c $(SRCDIR)/cmark_amalgamation.c -o $@ # # The list of all the targets that do not correspond to real files. This stops # 'make' from getting confused when someone makes an error in a rule. # .PHONY: all install test clean

︙
17 18 19 20 21 22 23 24 25 26 27 28 29 30	17 18 19 20 21 22 23 24 25 26 27 28 29 30 31	+	This file contains callbacks for the markdown parser that generate ** XHTML output. / #include "config.h" #include "markdown_html.h" #include "cmark_amalgamation.h" #if INTERFACE void markdown_to_html( struct Blob input_markdown, struct Blob output_title, struct Blob output_body);
︙
403 404 405 406 407 408 409 ~~410 411 412 413 414~~ ~~415 416~~ ~~417 418 419 420 421 422 423~~ ~~424 425 426 427~~ ~~428 429 430 431 432 433 434 435 436 437 438~~ ~~439 440 441 442~~ ~~443 444 445 446 447 448 449 450 451~~ 452	404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433	- - - - - + + + + + + + + + + + + - - + - - - - - - - + - - - - + - - - - - - - - - - - + - - - - + - - - - - - - - - + + + + +	** output_title is NULL, the document title appears in the body. / void markdown_to_html( struct Blob input_markdown, /* Markdown content to be rendered / struct Blob output_title, /* Put title here. May be NULL / struct Blob output_body /* Put document body here. / ){ ~~struct mkd~~_rend~~erer html_renderer = {~~ / ~~pro~~log an~~d epilog /~~ ~~html_pro~~log, ~~html_ep~~i~~log,~~ blob_reset(output_body); char markdown_string = blob_str(input_markdown); if( output_title ) { blob_reset(output_title); if (strlen(markdown_string) > 0 && markdown_string[0] == '#' ) { if (strlen(markdown_string + 1) > 0) { char * title_start = markdown_string + 1; int i = 0; while (markdown_string[i]!='\0' && (markdown_string[i]!='\n' && markdown_string[i]!='\r') ) { i++; } ~~~~/* block level elements /~~ ~~html_~~blo~~ckcod~~e,~~ blob_append(output_title, title_start, i); ~~html_blockquote,~~ ~~html_raw_block,~~ ~~html_header,~~ ~~html_hrule,~~ ~~html_list,~~ ~~html_list_item,~~ ~~html_p~~arag~~raph,~~ markdown_string = markdown_string+i; ~~html_table,~~ ~~html_table_cell,~~ ~~html_table_row,~~ } ~~/ span level elements /~~ ~~html_autolink,~~ ~~html_code_span,~~ ~~html_double_emphasis,~~ ~~html_emphasis,~~ ~~html_image,~~ ~~html_line_break,~~ ~~html_link,~~ ~~html_raw_span,~~ ~~html_triple_emphasis,~~ } ~~/ low level elements /~~ ~~0, / entities are copied verbatim /~~ ~~html_normal_text,~~ } ~~/ misc. parameters /~~ ~~64, / maximum stack /~~ ~~"_", /* emphasis characters /~~ ~~0 / opaque data /~~ }; html_r~~enderer.opaque =~~ output_~~title~~; ~~if( output_title )~~ blob_~~reset~~(output_~~title~~); blo~~b_reset~~(output_body); mark~~down(output_body, input_markdown, &html~~_re~~nderer~~); char cmark_result = cmark_markdown_to_html(markdown_string, strlen(markdown_string), 0 ); html_prolog(output_body,0); blob_append(output_body, cmark_result, strlen(cmark_result)); html_epilog(output_body,0); free(cmark_result); }


























































1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	package require rl_json package require tdom set f [open "commonmark_tests.json"] fconfigure $f -encoding utf-8 set data [read $f] close $f set tests [rl_json::json parse $data] proc normalize {html} { if {![catch {[[dom parse -html "<html>$html</html>"] documentElement] asHTML} res]} { return [string range $res 6 end-7] } else { return $html } } set errored 0 set failed 0 set passed 0 foreach test $tests { dict with test { puts --------------- puts -nonewline "Test: $example" set f [open "in.md" w+] fconfigure $f -encoding utf-8 puts $f [subst -nocommands -novariable $markdown]\n close $f set expected [normalize [subst -nocommands -novariables [string trim $html]]] if {[catch { set data [exec ../fossil test-markdown-render in.md] # remove pre/post amble set data [split $data \n] set data [lrange $data 1 end-2] set result [normalize [string trim [join $data \n]]] } err]} { incr errored set result "crashed" puts stderr $err puts "crashed" } elseif {$result ne $expected} { incr failed puts " failed, -: expected, +: actual:" foreach line [split $expected \n] { puts "-:$line" } foreach line [split $result \n] { puts "+:$line" } } else { incr passed puts " passed" foreach line [split $expected \n] { puts "-:$line" } foreach line [split $result \n] { puts "+:$line" } } } } puts "Passed: $passed, failed: $failed, errored: $errored" file delete in.md