Index: auto.def
==================================================================
--- auto.def
+++ auto.def
@@ -11,10 +11,11 @@
internal-sqlite=1 => {Don't use the internal sqlite, use the system one}
static=0 => {Link a static executable}
lineedit=1 => {Disable line editing}
fossil-debug=0 => {Build with fossil debugging enabled}
json=0 => {Build with fossil JSON API enabled}
+ markdown=0 => {Build with markdown engine enabled}
}
# sqlite wants these types if possible
cc-with {-includes {stdint.h inttypes.h}} {
cc-check-types uint32_t uint16_t int16_t uint8_t
@@ -73,10 +74,15 @@
# have #ifdef guards around the whole file without
# reading config.h first.
define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
define FOSSIL_ENABLE_JSON
}
+
+if {[opt-bool markdown]} {
+ define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_MARKDOWN
+ define FOSSIL_ENABLE_MARKDOWN
+}
if {[opt-bool static]} {
# XXX: This will not work on all systems.
define-append EXTRA_LDFLAGS -static
}
Index: src/db.c
==================================================================
--- src/db.c
+++ src/db.c
@@ -2074,10 +2074,13 @@
{ "empty-dirs", 0, 40, 1, "" },
{ "http-port", 0, 16, 0, "8080" },
{ "localauth", 0, 0, 0, "off" },
{ "main-branch", 0, 40, 0, "trunk" },
{ "manifest", 0, 0, 1, "off" },
+#ifdef FOSSIL_ENABLE_MARKDOWN
+ { "markdown", 0, 0, 0, "off" },
+#endif
{ "max-upload", 0, 25, 0, "250000" },
{ "mtime-changes", 0, 0, 0, "on" },
{ "pgp-command", 0, 40, 0, "gpg --clearsign -o " },
{ "proxy", 0, 32, 0, "off" },
{ "relative-paths",0, 0, 0, "on" },
@@ -2205,10 +2208,15 @@
**
** manifest If enabled, automatically create files "manifest" and
** (versionable) "manifest.uuid" in every checkout. The SQLite and
** Fossil repositories both require this. Default: off.
**
+** markdown If enabled (and Fossil was compiled with markdown
+** support), the markdown engine will be used to render
+** embedded documentation conforming to the appropriate
+** content types (e.g. "text/x-markdown"). Default: off.
+**
** max-upload A limit on the size of uplink HTTP requests. The
** default is 250000 bytes.
**
** mtime-changes Use file modification times (mtimes) to detect when
** files have been modified. (Default "on".)
Index: src/doc.c
==================================================================
--- src/doc.c
+++ src/doc.c
@@ -166,16 +166,18 @@
{ "lsp", 3, "application/x-lisp" },
{ "lzh", 3, "application/octet-stream" },
{ "m", 1, "text/plain" },
{ "m3u", 3, "audio/x-mpegurl" },
{ "man", 3, "application/x-troff-man" },
+ { "markdown", 8, "text/x-markdown" },
{ "me", 2, "application/x-troff-me" },
{ "mesh", 4, "model/mesh" },
{ "mid", 3, "audio/midi" },
{ "midi", 4, "audio/midi" },
{ "mif", 3, "application/x-mif" },
{ "mime", 4, "www/mime" },
+ { "mkd", 3, "text/x-markdown" },
{ "mov", 3, "video/quicktime" },
{ "movie", 5, "video/x-sgi-movie" },
{ "mp2", 3, "audio/mpeg" },
{ "mp3", 3, "audio/mpeg" },
{ "mpe", 3, "video/mpeg" },
@@ -498,10 +500,24 @@
}else{
style_header("Documentation");
wiki_convert(&filebody, 0, WIKI_BUTTONS);
}
style_footer();
+#ifdef FOSSIL_ENABLE_MARKDOWN
+ }else if( fossil_strcmp(zMime, "text/x-markdown")==0
+ && db_get_boolean("markdown", 0) ){
+ Blob title = BLOB_INITIALIZER;
+ Blob tail = BLOB_INITIALIZER;
+ markdown_to_html(&filebody, &title, &tail);
+ if( blob_size(&title)>0 ){
+ style_header(blob_str(&title));
+ }else{
+ style_header("Documentation");
+ }
+ blob_append(cgi_output_blob(), blob_buffer(&tail), blob_size(&tail));
+ style_footer();
+#endif
}else if( fossil_strcmp(zMime, "text/plain")==0 ){
style_header("Documentation");
@ <blockquote><pre>
@ %h(blob_str(&filebody))
@ </pre></blockquote>
Index: src/main.mk
==================================================================
--- src/main.mk
+++ src/main.mk
@@ -68,10 +68,12 @@
$(SRCDIR)/json_wiki.c \
$(SRCDIR)/leaf.c \
$(SRCDIR)/login.c \
$(SRCDIR)/main.c \
$(SRCDIR)/manifest.c \
+ $(SRCDIR)/markdown.c \
+ $(SRCDIR)/markdown_html.c \
$(SRCDIR)/md5.c \
$(SRCDIR)/merge.c \
$(SRCDIR)/merge3.c \
$(SRCDIR)/moderate.c \
$(SRCDIR)/name.c \
@@ -170,10 +172,12 @@
$(OBJDIR)/json_wiki_.c \
$(OBJDIR)/leaf_.c \
$(OBJDIR)/login_.c \
$(OBJDIR)/main_.c \
$(OBJDIR)/manifest_.c \
+ $(OBJDIR)/markdown_.c \
+ $(OBJDIR)/markdown_html_.c \
$(OBJDIR)/md5_.c \
$(OBJDIR)/merge_.c \
$(OBJDIR)/merge3_.c \
$(OBJDIR)/moderate_.c \
$(OBJDIR)/name_.c \
@@ -272,10 +276,12 @@
$(OBJDIR)/json_wiki.o \
$(OBJDIR)/leaf.o \
$(OBJDIR)/login.o \
$(OBJDIR)/main.o \
$(OBJDIR)/manifest.o \
+ $(OBJDIR)/markdown.o \
+ $(OBJDIR)/markdown_html.o \
$(OBJDIR)/md5.o \
$(OBJDIR)/merge.o \
$(OBJDIR)/merge3.o \
$(OBJDIR)/moderate.o \
$(OBJDIR)/name.o \
@@ -384,11 +390,11 @@
$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
$(OBJDIR)/mkindex $(TRANS_SRC) >$@
$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
- $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
+ $(OBJDIR)/makeheaders $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
touch $(OBJDIR)/headers
$(OBJDIR)/headers: Makefile
$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
Makefile:
$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -781,10 +787,24 @@
$(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h
$(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c
$(OBJDIR)/manifest.h: $(OBJDIR)/headers
+$(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate
+ $(OBJDIR)/translate $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c
+
+$(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h
+ $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c
+
+$(OBJDIR)/markdown.h: $(OBJDIR)/headers
+$(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate
+ $(OBJDIR)/translate $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c
+
+$(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h
+ $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c
+
+$(OBJDIR)/markdown_html.h: $(OBJDIR)/headers
$(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate
$(OBJDIR)/translate $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c
$(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h
$(XTCC) -o $(OBJDIR)/md5.o -c $(OBJDIR)/md5_.c
Index: src/makemake.tcl
==================================================================
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -71,10 +71,12 @@
json_wiki
leaf
login
main
manifest
+ markdown
+ markdown_html
md5
merge
merge3
moderate
name
@@ -373,10 +375,14 @@
# FOSSIL_ENABLE_SYMBOLS = 1
#### Enable JSON (http://www.json.org) support using "cson"
#
# FOSSIL_ENABLE_JSON = 1
+
+#### Enable markdown support
+#
+# FOSSIL_ENABLE_MARKDOWN = 1
#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
#
# FOSSIL_ENABLE_SSL = 1
@@ -514,10 +520,16 @@
# With JSON support
ifdef FOSSIL_ENABLE_JSON
TCC += -DFOSSIL_ENABLE_JSON=1
RCC += -DFOSSIL_ENABLE_JSON=1
endif
+
+# With markdown support
+ifdef FOSSIL_ENABLE_MARKDOWN
+TCC += -DFOSSIL_ENABLE_MARKDOWN=1
+RCC += -DFOSSIL_ENABLE_MARKDOWN=1
+endif
#### We add the -static option here so that we can build a static
# executable that will run in a chroot jail.
#
LIB = -static
ADDED src/markdown.c
Index: src/markdown.c
==================================================================
--- src/markdown.c
+++ src/markdown.c
@@ -0,0 +1,2244 @@
+/*
+** Copyright (c) 2012 D. Richard Hipp
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the Simplified BSD License (also
+** known as the "2-Clause License" or "FreeBSD License".)
+
+** This program is distributed in the hope that it will be useful,
+** but without any warranty; without even the implied warranty of
+** merchantability or fitness for a particular purpose.
+**
+** Author contact information:
+** drh@hwaci.com
+** http://www.hwaci.com/drh/
+**
+*******************************************************************************
+**
+** This file contains code to parse a blob containing markdown text,
+** using an external renderer.
+*/
+
+#ifdef FOSSIL_ENABLE_MARKDOWN
+
+#include "config.h"
+#include "markdown.h"
+
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define MKD_LI_END 8 /* internal list flag */
+
+/********************
+ * TYPE DEFINITIONS *
+ ********************/
+
+#if INTERFACE
+
+/* mkd_autolink -- type of autolink */
+enum mkd_autolink {
+ MKDA_NOT_AUTOLINK, /* used internally when it is not an autolink*/
+ MKDA_NORMAL, /* normal http/http/ftp/etc link */
+ MKDA_EXPLICIT_EMAIL, /* e-mail link with explit mailto: */
+ MKDA_IMPLICIT_EMAIL /* e-mail link without mailto: */
+};
+
+/* mkd_renderer -- functions for rendering parsed data */
+struct mkd_renderer {
+ /* document level callbacks */
+ void (*prolog)(struct Blob *ob, void *opaque);
+ void (*epilog)(struct Blob *ob, void *opaque);
+
+ /* block level callbacks - NULL skips the block */
+ void (*blockcode)(struct Blob *ob, struct Blob *text, void *opaque);
+ void (*blockquote)(struct Blob *ob, struct Blob *text, void *opaque);
+ void (*blockhtml)(struct Blob *ob, struct Blob *text, void *opaque);
+ void (*header)(struct Blob *ob, struct Blob *text,
+ int level, void *opaque);
+ void (*hrule)(struct Blob *ob, void *opaque);
+ void (*list)(struct Blob *ob, struct Blob *text, int flags, void *opaque);
+ void (*listitem)(struct Blob *ob, struct Blob *text,
+ int flags, void *opaque);
+ void (*paragraph)(struct Blob *ob, struct Blob *text, void *opaque);
+ void (*table)(struct Blob *ob, struct Blob *head_row, struct Blob *rows,
+ void *opaque);
+ void (*table_cell)(struct Blob *ob, struct Blob *text, int flags,
+ void *opaque);
+ void (*table_row)(struct Blob *ob, struct Blob *cells, int flags,
+ void *opaque);
+
+ /* span level callbacks - NULL or return 0 prints the span verbatim */
+ int (*autolink)(struct Blob *ob, struct Blob *link,
+ enum mkd_autolink type, void *opaque);
+ int (*codespan)(struct Blob *ob, struct Blob *text, void *opaque);
+ int (*double_emphasis)(struct Blob *ob, struct Blob *text,
+ char c, void *opaque);
+ int (*emphasis)(struct Blob *ob, struct Blob *text, char c,void*opaque);
+ int (*image)(struct Blob *ob, struct Blob *link, struct Blob *title,
+ struct Blob *alt, void *opaque);
+ int (*linebreak)(struct Blob *ob, void *opaque);
+ int (*link)(struct Blob *ob, struct Blob *link, struct Blob *title,
+ struct Blob *content, void *opaque);
+ int (*raw_html_tag)(struct Blob *ob, struct Blob *tag, void *opaque);
+ int (*triple_emphasis)(struct Blob *ob, struct Blob *text,
+ char c, void *opaque);
+
+ /* low level callbacks - NULL copies input directly into the output */
+ void (*entity)(struct Blob *ob, struct Blob *entity, void *opaque);
+ void (*normal_text)(struct Blob *ob, struct Blob *text, void *opaque);
+
+ /* renderer data */
+ int max_work_stack; /* prevent arbitrary deep recursion, cf README */
+ const char *emph_chars; /* chars that trigger emphasis rendering */
+ void *opaque; /* opaque data send to every rendering callback */
+};
+
+
+
+/*********
+ * FLAGS *
+ *********/
+
+/* list/listitem flags */
+#define MKD_LIST_ORDERED 1
+#define MKD_LI_BLOCK 2 /* <li> containing block data */
+
+/* table cell flags */
+#define MKD_CELL_ALIGN_DEFAULT 0
+#define MKD_CELL_ALIGN_LEFT 1
+#define MKD_CELL_ALIGN_RIGHT 2
+#define MKD_CELL_ALIGN_CENTER 3 /* LEFT | RIGHT */
+#define MKD_CELL_ALIGN_MASK 3
+#define MKD_CELL_HEAD 4
+
+
+
+/**********************
+ * EXPORTED FUNCTIONS *
+ **********************/
+
+/* markdown -- parses the input buffer and renders it into the output buffer */
+void markdown(
+ struct Blob *ob,
+ struct Blob *ib,
+ const struct mkd_renderer *rndr);
+
+
+#endif /* INTERFACE */
+
+
+/***************
+ * LOCAL TYPES *
+ ***************/
+
+/* link_ref -- reference to a link */
+struct link_ref {
+ struct Blob id;
+ struct Blob link;
+ struct Blob title;
+};
+
+
+/* char_trigger -- function pointer to render active chars */
+/* returns the number of chars taken care of */
+/* data is the pointer of the beginning of the span */
+/* offset is the number of valid chars before data */
+struct render;
+typedef size_t (*char_trigger)(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t offset,
+ size_t size);
+
+
+/* render -- structure containing one particular render */
+struct render {
+ struct mkd_renderer make;
+ struct Blob refs;
+ char_trigger active_char[256];
+ int work_active;
+ struct Blob *work;
+};
+
+
+/* html_tag -- structure for quick HTML tag search (inspired from discount) */
+struct html_tag {
+ char *text;
+ int size;
+};
+
+
+
+/********************
+ * GLOBAL VARIABLES *
+ ********************/
+
+/* block_tags -- recognised block tags, sorted by cmp_html_tag */
+static struct html_tag block_tags[] = {
+ { "p", 1 },
+ { "dl", 2 },
+ { "h1", 2 },
+ { "h2", 2 },
+ { "h3", 2 },
+ { "h4", 2 },
+ { "h5", 2 },
+ { "h6", 2 },
+ { "ol", 2 },
+ { "ul", 2 },
+ { "del", 3 },
+ { "div", 3 },
+ { "ins", 3 },
+ { "pre", 3 },
+ { "form", 4 },
+ { "math", 4 },
+ { "table", 5 },
+ { "iframe", 6 },
+ { "script", 6 },
+ { "fieldset", 8 },
+ { "noscript", 8 },
+ { "blockquote", 10 }
+};
+
+#define INS_TAG (block_tags + 12)
+#define DEL_TAG (block_tags + 10)
+
+
+
+/***************************
+ * STATIC HELPER FUNCTIONS *
+ ***************************/
+
+/* build_ref_id -- collapse whitespace from input text to make it a ref id */
+static int build_ref_id(struct Blob *id, const char *data, size_t size){
+ size_t beg, i;
+ char *id_data;
+
+ /* skip leading whitespace */
+ while( size>0 && (data[0]==' ' || data[0]=='\t' || data[0]=='\n') ){
+ data++;
+ size--;
+ }
+
+ /* skip trailing whitespace */
+ while( size>0 && (data[size-1]==' '
+ || data[size-1]=='\t'
+ || data[size-1]=='\n')
+ ){
+ size--;
+ }
+ if( size==0 ) return -1;
+
+ /* making the ref id */
+ i = 0;
+ blob_reset(id);
+ while( i<size ){
+ /* copy non-whitespace into the output buffer */
+ beg = i;
+ while( i<size && !(data[i]==' ' || data[i]=='\t' || data[i]=='\n') ){
+ i++;
+ }
+ blob_append(id, data+beg, i-beg);
+
+ /* add a single space and skip all consecutive whitespace */
+ if( i<size ) blob_append(id, " ", 1);
+ while( i<size && (data[i]==' ' || data[i]=='\t' || data[i]=='\n') ){ i++; }
+ }
+
+ /* turn upper-case ASCII into their lower-case counterparts */
+ id_data = blob_buffer(id);
+ for(i=0; i<blob_size(id); i++){
+ if( id_data[i]>='A' && id_data[i]<='Z' ) id_data[i] += 'a' - 'A';
+ }
+ return 0;
+}
+
+
+/* cmp_link_ref -- comparison function for link_ref sorted arrays */
+static int cmp_link_ref(const void *key, const void *array_entry){
+ struct link_ref *lr = (void *)array_entry;
+ return blob_compare((void *)key, &lr->id);
+}
+
+
+/* cmp_link_ref_sort -- comparison function for link_ref qsort */
+static int cmp_link_ref_sort(const void *a, const void *b){
+ struct link_ref *lra = (void *)a;
+ struct link_ref *lrb = (void *)b;
+ return blob_compare(&lra->id, &lrb->id);
+}
+
+
+/* cmp_html_tag -- comparison function for bsearch() (stolen from discount) */
+static int cmp_html_tag(const void *a, const void *b){
+ const struct html_tag *hta = a;
+ const struct html_tag *htb = b;
+ if( hta->size!=htb->size ) return hta->size-htb->size;
+ return strncasecmp(hta->text, htb->text, hta->size);
+}
+
+
+/* find_block_tag -- returns the current block tag */
+static struct html_tag *find_block_tag(char *data, size_t size){
+ size_t i = 0;
+ struct html_tag key;
+
+ /* looking for the word end */
+ while( i<size
+ && ((data[i]>='0' && data[i]<='9')
+ || (data[i]>='A' && data[i]<='Z')
+ || (data[i]>='a' && data[i]<='z'))
+ ){
+ i++;
+ }
+ if( i>=size ) return 0;
+
+ /* binary search of the tag */
+ key.text = data;
+ key.size = i;
+ return bsearch(&key,
+ block_tags,
+ (sizeof block_tags)/(sizeof block_tags[0]),
+ sizeof block_tags[0],
+ cmp_html_tag);
+}
+
+
+/* new_work_buffer -- get a new working buffer from the stack or create one */
+static struct Blob *new_work_buffer(struct render *rndr){
+ struct Blob *ret = 0;
+
+ if( rndr->work_active < rndr->make.max_work_stack ){
+ ret = rndr->work + rndr->work_active;
+ rndr->work_active += 1;
+ blob_reset(ret);
+ }
+ return ret;
+}
+
+
+/* release_work_buffer -- release the given working buffer */
+static void release_work_buffer(struct render *rndr, struct Blob *buf){
+ if( !buf ) return;
+ assert(rndr->work_active>0 && buf==(rndr->work+rndr->work_active-1));
+ rndr->work_active -= 1;
+}
+
+
+
+/****************************
+ * INLINE PARSING FUNCTIONS *
+ ****************************/
+
+/* is_mail_autolink -- looks for the address part of a mail autolink and '>' */
+/* this is less strict than the original markdown e-mail address matching */
+static size_t is_mail_autolink(char *data, size_t size){
+ size_t i = 0, nb = 0;
+ /* address is assumed to be: [-@._a-zA-Z0-9]+ with exactly one '@' */
+ while( i<size && (data[i]=='-'
+ || data[i]=='.'
+ || data[i]=='_'
+ || data[i]=='@'
+ || (data[i]>='a' && data[i]<='z')
+ || (data[i]>='A' && data[i]<='Z')
+ || (data[i]>='0' && data[i]<='9'))
+ ){
+ if( data[i]=='@' ) nb++;
+ i++;
+ }
+ if( i>=size || data[i]!='>' || nb!=1 ) return 0;
+ return i+1;
+}
+
+
+/* tag_length -- returns the length of the given tag, or 0 is it's not valid */
+static size_t tag_length(char *data, size_t size, enum mkd_autolink *autolink){
+ size_t i, j;
+
+ /* a valid tag can't be shorter than 3 chars */
+ if( size<3 ) return 0;
+
+ /* begins with a '<' optionally followed by '/', followed by letter */
+ if( data[0]!='<' ) return 0;
+ i = (data[1]=='/') ? 2 : 1;
+ if( (data[i]<'a' || data[i]>'z') && (data[i]<'A' || data[i]>'Z') ){
+ return 0;
+ }
+
+ /* scheme test */
+ *autolink = MKDA_NOT_AUTOLINK;
+ if( size>6
+ && strncasecmp(data+1, "http", 4)==0
+ && (data[5]==':'
+ || ((data[5]=='s' || data[5]=='S') && data[6]==':'))
+ ){
+ i = (data[5]==':') ? 6 : 7;
+ *autolink = MKDA_NORMAL;
+ }else if( size>5 && strncasecmp(data+1, "ftp:", 4)==0 ){
+ i = 5;
+ *autolink = MKDA_NORMAL;
+ }else if( size>7 && strncasecmp(data+1, "mailto:", 7)==0 ){
+ i = 8;
+ /* not changing *autolink to go to the address test */
+ }
+
+ /* completing autolink test: no whitespace or ' or " */
+ if( i>=size || i=='>' ){
+ *autolink = MKDA_NOT_AUTOLINK;
+ }else if( *autolink ){
+ j = i;
+ while( i<size
+ && data[i]!='>'
+ && data[i]!='\''
+ && data[i]!='"'
+ && data[i]!=' '
+ && data[i]!='\t'
+ && data[i]!='\t'
+ ){
+ i++;
+ }
+ if( i>=size ) return 0;
+ if( i>j && data[i]=='>' ) return i+1;
+ /* one of the forbidden chars has been found */
+ *autolink = MKDA_NOT_AUTOLINK;
+ }else if( (j = is_mail_autolink(data+i, size-i))!=0 ){
+ *autolink = (i==8) ? MKDA_EXPLICIT_EMAIL : MKDA_IMPLICIT_EMAIL;
+ return i+j;
+ }
+
+ /* looking for sometinhg looking like a tag end */
+ while( i<size && data[i]!='>' ){ i++; }
+ if( i>=size ) return 0;
+ return i+1;
+}
+
+
+/* parse_inline -- parses inline markdown elements */
+static void parse_inline(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size
+){
+ size_t i = 0, end = 0;
+ char_trigger action = 0;
+ struct Blob work = BLOB_INITIALIZER;
+
+ while( i<size ){
+ /* copying inactive chars into the output */
+ while( end<size
+ && (action = rndr->active_char[(unsigned char)data[end]])==0
+ ){
+ end++;
+ }
+ if( end>i ){
+ if( rndr->make.normal_text ){
+ blob_init(&work, data+i, end-i);
+ rndr->make.normal_text(ob, &work, rndr->make.opaque);
+ }else{
+ blob_append(ob, data+i, end-i);
+ }
+ }
+ if( end>=size ) break;
+ i = end;
+
+ /* calling the trigger */
+ end = action(ob, rndr, data+i, i, size-i);
+ if( !end ){
+ /* no action from the callback */
+ end = i+1;
+ }else{
+ i += end;
+ end = i;
+ }
+ }
+}
+
+
+/* find_emph_char -- looks for the next emph char, skipping other constructs */
+static size_t find_emph_char(char *data, size_t size, char c){
+ size_t i = 1;
+
+ while( i<size ){
+ while( i<size && data[i]!=c && data[i]!='`' && data[i]!='[' ){ i++; }
+ if( i>=size ) return 0;
+ if( data[i]==c ) return i;
+
+ /* not counting escaped chars */
+ if( i && data[i-1]=='\\' ){
+ i++;
+ continue;
+ }
+
+ /* skipping a code span */
+ if( data[i]=='`' ){
+ size_t span_nb = 0, bt;
+ size_t tmp_i = 0;
+
+ /* counting the number of opening backticks */
+ while( i<size && data[i]=='`' ){
+ i++;
+ span_nb++;
+ }
+ if( i>=size ) return 0;
+
+ /* finding the matching closing sequence */
+ bt = 0;
+ while( i<size && bt<span_nb ){
+ if( !tmp_i && data[i]==c ) tmp_i = i;
+ if( data[i]=='`' ) bt += 1; else bt = 0;
+ i++;
+ }
+ if( i>=size ) return tmp_i;
+ i++;
+
+ /* skipping a link */
+ }else if( data[i]=='[' ){
+ size_t tmp_i = 0;
+ char cc;
+ i++;
+ while( i<size && data[i]!=']' ){
+ if( !tmp_i && data[i]==c ) tmp_i = i;
+ i++;
+ }
+ i++;
+ while( i<size && (data[i]==' ' || data[i]=='\t' || data[i]=='\n') ){
+ i++;
+ }
+ if( i>=size ) return tmp_i;
+ if( data[i]!='[' && data[i]!='(' ){ /* not a link*/
+ if( tmp_i ) return tmp_i; else continue;
+ }
+ cc = data[i];
+ i++;
+ while( i<size && data[i]!=cc ){
+ if( !tmp_i && data[i]==c ) tmp_i = i;
+ i++;
+ }
+ if( i>=size ) return tmp_i;
+ i++;
+ }
+ }
+ return 0;
+}
+
+
+/* parse_emph1 -- parsing single emphase */
+/* closed by a symbol not preceded by whitespace and not followed by symbol */
+static size_t parse_emph1(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size,
+ char c
+){
+ size_t i = 0, len;
+ struct Blob *work = 0;
+ int r;
+
+ if( !rndr->make.emphasis ) return 0;
+
+ /* skipping one symbol if coming from emph3 */
+ if( size>1 && data[0]==c && data[1]==c ) i = 1;
+
+ while( i<size ){
+ len = find_emph_char(data+i, size-i, c);
+ if( !len ) return 0;
+ i += len;
+ if( i>=size ) return 0;
+
+ if( i+1<size && data[i+1]==c ){
+ i++;
+ continue;
+ }
+ if( data[i]==c
+ && data[i-1]!=' '
+ && data[i-1]!='\t'
+ && data[i-1]!='\n'
+ ){
+ work = new_work_buffer(rndr);
+ if( !work ) return 0;
+ parse_inline(work, rndr, data, i);
+ r = rndr->make.emphasis(ob, work, c, rndr->make.opaque);
+ release_work_buffer(rndr, work);
+ return r ? i+1 : 0;
+ }
+ }
+ return 0;
+}
+
+
+/* parse_emph2 -- parsing single emphase */
+static size_t parse_emph2(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size,
+ char c
+){
+ size_t i = 0, len;
+ struct Blob *work = 0;
+ int r;
+
+ if( !rndr->make.double_emphasis ) return 0;
+
+ while( i<size ){
+ len = find_emph_char(data+i, size-i, c);
+ if( !len ) return 0;
+ i += len;
+ if( i+1<size
+ && data[i]==c
+ && data[i+1]==c
+ && i
+ && data[i-1]!=' '
+ && data[i-1]!='\t'
+ && data[i-1]!='\n'
+ ){
+ work = new_work_buffer(rndr);
+ if( !work ) return 0;
+ parse_inline(work, rndr, data, i);
+ r = rndr->make.double_emphasis(ob, work, c, rndr->make.opaque);
+ release_work_buffer(rndr, work);
+ return r ? i+2 : 0;
+ }
+ i++;
+ }
+ return 0;
+}
+
+
+/* parse_emph3 -- parsing single emphase */
+/* finds the first closing tag, and delegates to the other emph */
+static size_t parse_emph3(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size,
+ char c
+){
+ size_t i = 0, len;
+ int r;
+
+ while( i<size ){
+ len = find_emph_char(data+i, size-i, c);
+ if( !len ) return 0;
+ i += len;
+
+ /* skip whitespace preceded symbols */
+ if( data[i]!=c || data[i-1]==' ' || data[i-1]=='\t' || data[i-1]=='\n' ){
+ continue;
+ }
+
+ if( i+2<size
+ && data[i+1]==c
+ && data[i+2] == c
+ && rndr->make.triple_emphasis
+ ){
+ /* triple symbol found */
+ struct Blob *work = new_work_buffer(rndr);
+ if( !work ) return 0;
+ parse_inline(work, rndr, data, i);
+ r = rndr->make.triple_emphasis(ob, work, c, rndr->make.opaque);
+ release_work_buffer(rndr, work);
+ return r ? i+3 : 0;
+ }else if( i+1<size && data[i+1]==c ){
+ /* double symbol found, handing over to emph1 */
+ len = parse_emph1(ob, rndr, data-2, size+2, c);
+ return len ? len-2 : 0;
+ }else{
+ /* single symbol found, handing over to emph2 */
+ len = parse_emph2(ob, rndr, data-1, size+1, c);
+ return len ? len-1 : 0;
+ }
+ }
+ return 0;
+}
+
+
+/* char_emphasis -- single and double emphasis parsing */
+static size_t char_emphasis(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t offset,
+ size_t size
+){
+ char c = data[0];
+ size_t ret;
+
+ if( size>2 && data[1]!=c ){
+ /* whitespace cannot follow an opening emphasis */
+ if( data[1]==' '
+ || data[1]=='\t'
+ || data[1]=='\n'
+ || (ret = parse_emph1(ob, rndr, data+1, size-1, c))==0
+ ){
+ return 0;
+ }
+ return ret+1;
+ }
+
+ if( size>3 && data[1]==c && data[2]!=c ){
+ if( data[2]==' '
+ || data[2]=='\t'
+ || data[2]=='\n'
+ || (ret = parse_emph2(ob, rndr, data+2, size-2, c))==0
+ ){
+ return 0;
+ }
+ return ret+2;
+ }
+
+ if( size>4 && data[1]==c && data[2]==c && data[3]!=c ){
+ if( data[3]==' '
+ || data[3]=='\t'
+ || data[3]=='\n'
+ || (ret = parse_emph3(ob, rndr, data+3, size-3, c))==0
+ ){
+ return 0;
+ }
+ return ret+3;
+ }
+ return 0;
+}
+
+
+/* char_linebreak -- '\n' preceded by two spaces (assuming linebreak != 0) */
+static size_t char_linebreak(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t offset,
+ size_t size
+){
+ if( offset<2 || data[-1]!=' ' || data[-2]!=' ' ) return 0;
+ /* removing the last space from ob and rendering */
+ if( blob_size(ob)>0 && blob_buffer(ob)[blob_size(ob)-1]==' ' ) ob->nUsed--;
+ return rndr->make.linebreak(ob, rndr->make.opaque) ? 1 : 0;
+}
+
+
+/* char_codespan -- '`' parsing a code span (assuming codespan != 0) */
+static size_t char_codespan(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t offset,
+ size_t size
+){
+ size_t end, nb = 0, i, f_begin, f_end;
+
+ /* counting the number of backticks in the delimiter */
+ while( nb<size && data[nb]=='`' ){ nb++; }
+
+ /* finding the next delimiter */
+ i = 0;
+ for(end=nb; end<size && i<nb; end++){
+ if( data[end]=='`' ) i++; else i = 0;
+ }
+ if( i<nb && end>=size ) return 0; /* no matching delimiter */
+
+ /* trimming outside whitespaces */
+ f_begin = nb;
+ while( f_begin<end && (data[f_begin]==' ' || data[f_begin]=='\t') ){
+ f_begin++;
+ }
+ f_end = end-nb;
+ while( f_end>nb && (data[f_end-1]==' ' || data[f_end-1]=='\t') ){ f_end--; }
+
+ /* real code span */
+ if( f_begin<f_end ){
+ struct Blob work = BLOB_INITIALIZER;
+ blob_init(&work, data+f_begin, f_end-f_begin);
+ if( !rndr->make.codespan(ob, &work, rndr->make.opaque) ) end = 0;
+ }else{
+ if( !rndr->make.codespan(ob, 0, rndr->make.opaque) ) end = 0;
+ }
+ return end;
+}
+
+
+/* char_escape -- '\\' backslash escape */
+static size_t char_escape(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t offset,
+ size_t size
+){
+ struct Blob work = BLOB_INITIALIZER;
+ if( size>1 ){
+ if( rndr->make.normal_text ){
+ blob_init(&work, data+1,1);
+ rndr->make.normal_text(ob, &work, rndr->make.opaque);
+ }else{
+ blob_append(ob, data+1, 1);
+ }
+ }
+ return 2;
+}
+
+
+/* char_entity -- '&' escaped when it doesn't belong to an entity */
+/* valid entities are assumed to be anything mathing &#?[A-Za-z0-9]+; */
+static size_t char_entity(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t offset,
+ size_t size
+){
+ size_t end = 1;
+ struct Blob work = BLOB_INITIALIZER;
+ if( end<size && data[end]=='#' ) end++;
+ while( end<size
+ && ((data[end]>='0' && data[end]<='9')
+ || (data[end]>='a' && data[end]<='z')
+ || (data[end]>='A' && data[end]<='Z'))
+ ){
+ end++;
+ }
+ if( end<size && data[end]==';' ){
+ /* real entity */
+ end++;
+ }else{
+ /* lone '&' */
+ return 0;
+ }
+ if( rndr->make.entity ){
+ blob_init(&work, data, end);
+ rndr->make.entity(ob, &work, rndr->make.opaque);
+ }else{
+ blob_append(ob, data, end);
+ }
+ return end;
+}
+
+
+/* char_langle_tag -- '<' when tags or autolinks are allowed */
+static size_t char_langle_tag(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t offset,
+ size_t size
+){
+ enum mkd_autolink altype = MKDA_NOT_AUTOLINK;
+ size_t end = tag_length(data, size, &altype);
+ struct Blob work = BLOB_INITIALIZER;
+ int ret = 0;
+ if( end ){
+ if( rndr->make.autolink && altype!=MKDA_NOT_AUTOLINK ){
+ blob_init(&work, data+1, end-2);
+ ret = rndr->make.autolink(ob, &work, altype, rndr->make.opaque);
+ }else if( rndr->make.raw_html_tag ){
+ blob_init(&work, data, end);
+ ret = rndr->make.raw_html_tag(ob, &work, rndr->make.opaque);
+ }
+ }
+
+ if( !ret ){
+ return 0;
+ }else{
+ return end;
+ }
+}
+
+
+/* get_link_inline -- extract inline-style link and title from parenthesed data*/
+static int get_link_inline(
+ struct Blob *link,
+ struct Blob *title,
+ char *data,
+ size_t size
+){
+ size_t i = 0, mark;
+ size_t link_b, link_e;
+ size_t title_b = 0, title_e = 0;
+
+ /* skipping initial whitespace */
+ while( i<size && (data[i]==' ' || data[i]=='\t' || data[i]=='\n') ){ i++; }
+ link_b = i;
+
+ /* looking for link end: ' " */
+ while( i<size && data[i]!='\'' && data[i]!='"' ){ i++; }
+ link_e = i;
+
+ /* looking for title end if present */
+ if( data[i]=='\'' || data[i]=='"' ){
+ i++;
+ title_b = i;
+
+ /* skipping whitespaces after title */
+ title_e = size-1;
+ while( title_e>title_b
+ && (data[title_e]==' '
+ || data[title_e]=='\t'
+ || data[title_e]=='\n')
+ ){
+ title_e--;
+ }
+
+ /* checking for closing quote presence */
+ if (data[title_e] != '\'' && data[title_e] != '"') {
+ title_b = title_e = 0;
+ link_e = i;
+ }
+ }
+
+ /* remove whitespace at the end of the link */
+ while( link_e>link_b
+ && (data[link_e-1]==' '
+ || data[link_e-1]=='\t'
+ || data[link_e-1]=='\n')
+ ){
+ link_e--;
+ }
+
+ /* remove optional angle brackets around the link */
+ if( data[link_b]=='<' ) link_b += 1;
+ if( data[link_e-1]=='>' ) link_e -= 1;
+
+ /* escape backslashed character from link */
+ blob_reset(link);
+ i = link_b;
+ while( i<link_e ){
+ mark = i;
+ while( i<link_e && data[i]!='\\' ){ i++; }
+ blob_append(link, data+mark, i-mark);
+ while( i<link_e && data[i]=='\\' ){ i++; }
+ }
+
+ /* handing back title */
+ blob_reset(title);
+ if( title_e>title_b ) blob_append(title, data+title_b, title_e-title_b);
+
+ /* this function always succeed */
+ return 0;
+}
+
+
+/* get_link_ref -- extract referenced link and title from id */
+static int get_link_ref(
+ struct render *rndr,
+ struct Blob *link,
+ struct Blob *title,
+ char *data,
+ size_t size
+){
+ struct link_ref *lr;
+
+ /* find the link from its id (stored temporarily in link) */
+ blob_reset(link);
+ if( build_ref_id(link, data, size)<0 ) return -1;
+ lr = bsearch(link,
+ blob_buffer(&rndr->refs),
+ blob_size(&rndr->refs)/sizeof(struct link_ref),
+ sizeof (struct link_ref),
+ cmp_link_ref);
+ if( !lr ) return -1;
+
+ /* fill the output buffers */
+ blob_reset(link);
+ blob_reset(title);
+ blob_append(link, blob_buffer(&lr->link), blob_size(&lr->link));
+ blob_append(title, blob_buffer(&lr->title), blob_size(&lr->title));
+ return 0;
+}
+
+
+/* char_link -- '[': parsing a link or an image */
+static size_t char_link(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t offset,
+ size_t size
+){
+ int is_img = (offset && data[-1] == '!'), level;
+ size_t i = 1, txt_e;
+ struct Blob *content = 0;
+ struct Blob *link = 0;
+ struct Blob *title = 0;
+ int text_has_nl = 0, ret;
+
+ /* checking whether the correct renderer exists */
+ if( (is_img && !rndr->make.image) || (!is_img && !rndr->make.link) ){
+ return 0;
+ }
+
+ /* looking for the matching closing bracket */
+ for(level=1; i<size; i++){
+ if( data[i]=='\n' ) text_has_nl = 1;
+ else if( data[i-1]=='\\' ) continue;
+ else if( data[i]=='[' ) level += 1;
+ else if( data[i]==']' ){
+ level--;
+ if( level<=0 ) break;
+ }
+ }
+ if( i>=size ) return 0;
+ txt_e = i;
+ i++;
+
+ /* skip any amount of whitespace or newline */
+ /* (this is much more laxist than original markdown syntax) */
+ while( i<size && (data[i]==' ' || data[i]=='\t' || data[i]=='\n') ){ i++; }
+
+ /* allocate temporary buffers to store content, link and title */
+ content = new_work_buffer(rndr);
+ link = new_work_buffer(rndr);
+ title = new_work_buffer(rndr);
+ if( !title ) return 0;
+ ret = 0; /* error if we don't get to the callback */
+
+ /* inline style link */
+ if( i<size && data[i]=='(' ){
+ size_t span_end = i;
+ while( span_end<size
+ && !(data[span_end]==')' && (span_end==i || data[span_end-1]!='\\'))
+ ){
+ span_end++;
+ }
+
+ if( span_end>=size
+ || get_link_inline(link, title, data+i+1, span_end-(i+1))<0
+ ){
+ goto char_link_cleanup;
+ }
+
+ i = span_end+1;
+
+ /* reference style link */
+ }else if( i<size && data[i]=='[' ){
+ char *id_data;
+ size_t id_size, id_end = i;
+
+ while( id_end<size && data[id_end]!=']' ){ id_end++; }
+
+ if( id_end>=size ) goto char_link_cleanup;
+
+ if( i+1==id_end ){
+ /* implicit id - use the contents */
+ id_data = data+1;
+ id_size = txt_e-1;
+ }else{
+ /* explici id - between brackets */
+ id_data = data+i+1;
+ id_size = id_end-(i+1);
+ }
+
+ if( get_link_ref(rndr, link, title, id_data, id_size)<0 ){
+ goto char_link_cleanup;
+ }
+
+ i = id_end+1;
+
+ /* shortcut reference style link */
+ }else{
+ if( get_link_ref(rndr, link, title, data+1, txt_e-1)<0 ){
+ goto char_link_cleanup;
+ }
+
+ /* rewinding the whitespace */
+ i = txt_e+1;
+ }
+
+ /* building content: img alt is escaped, link content is parsed */
+ if( txt_e>1 ){
+ if( is_img ) blob_append(content, data+1, txt_e-1);
+ else parse_inline(content, rndr, data+1, txt_e-1);
+ }
+
+ /* calling the relevant rendering function */
+ if( is_img ){
+ if( blob_size(ob)>0 && blob_buffer(ob)[blob_size(ob)-1]=='!' ) ob->nUsed--;
+ ret = rndr->make.image(ob, link, title, content, rndr->make.opaque);
+ }else{
+ ret = rndr->make.link(ob, link, title, content, rndr->make.opaque);
+ }
+
+ /* cleanup */
+char_link_cleanup:
+ release_work_buffer(rndr, title);
+ release_work_buffer(rndr, link);
+ release_work_buffer(rndr, content);
+ return ret ? i : 0;
+}
+
+
+
+/*********************************
+ * BLOCK-LEVEL PARSING FUNCTIONS *
+ *********************************/
+
+/* is_empty -- returns the line length when it is empty, 0 otherwise */
+static size_t is_empty(char *data, size_t size){
+ size_t i;
+ for(i=0; i<size && data[i]!='\n'; i++){
+ if( data[i]!=' ' && data[i]!='\t' ) return 0;
+ }
+ return i+1;
+}
+
+
+/* is_hrule -- returns whether a line is a horizontal rule */
+static int is_hrule(char *data, size_t size){
+ size_t i = 0, n = 0;
+ char c;
+
+ /* skipping initial spaces */
+ if( size<3 ) return 0;
+ if( data[0]==' ' ){
+ i++;
+ if( data[1]==' ' ){
+ i++;
+ if( data[2]==' ' ){
+ i++;
+ }
+ }
+ }
+
+ /* looking at the hrule char */
+ if( i+2>=size || (data[i]!='*' && data[i]!='-' && data[i]!='_') ) return 0;
+ c = data[i];
+
+ /* the whole line must be the char or whitespace */
+ while (i < size && data[i] != '\n') {
+ if( data[i]==c ){
+ n += 1;
+ }else if( data[i]!=' ' && data[i]!='\t' ){
+ return 0;
+ }
+ i++;
+ }
+
+ return n>=3;
+}
+
+
+/* is_headerline -- returns whether the line is a setext-style hdr underline */
+static int is_headerline(char *data, size_t size){
+ size_t i = 0;
+
+ /* test of level 1 header */
+ if( data[i]=='=' ){
+ for(i=1; i<size && data[i]=='='; i++);
+ while( i<size && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ return (i>=size || data[i]=='\n') ? 1 : 0;
+ }
+
+ /* test of level 2 header */
+ if( data[i]=='-' ){
+ for(i=1; i<size && data[i]=='-'; i++);
+ while( i<size && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ return (i>=size || data[i]=='\n') ? 2 : 0;
+ }
+
+ return 0;
+}
+
+
+/* is_table_sep -- returns wether there is a table separator at the given pos */
+static int is_table_sep(char *data, size_t pos){
+ return data[pos]=='|' && (pos==0 || data[pos-1]!='\\');
+}
+
+
+/* is_tableline -- returns the number of column tables in the given line */
+static int is_tableline(char *data, size_t size){
+ size_t i = 0;
+ int n_sep = 0, outer_sep = 0;
+
+ /* skip initial blanks */
+ while( i<size && (data[i]==' ' || data[i]=='\t') ){ i++; }
+
+ /* check for initial '|' */
+ if( i<size && data[i]=='|') outer_sep++;
+
+ /* count the number of pipes in the line */
+ for(n_sep=0; i<size && data[i]!='\n'; i++){
+ if( is_table_sep(data, i) ) n_sep++;
+ }
+
+ /* march back to check for optional last '|' before blanks and EOL */
+ while( i && (data[i-1]==' ' || data[i-1]=='\t' || data[i-1]=='\n') ){ i--; }
+ if( i && is_table_sep(data, i-1) ) outer_sep += 1;
+
+ /* return the number of column or 0 if it's not a table line */
+ return (n_sep>0) ? (n_sep-outer_sep+1) : 0;
+}
+
+
+/* prefix_quote -- returns blockquote prefix length */
+static size_t prefix_quote(char *data, size_t size){
+ size_t i = 0;
+ if( i<size && data[i]==' ' ) i++;
+ if( i<size && data[i]==' ' ) i++;
+ if( i<size && data[i]==' ' ) i++;
+ if( i<size && data[i]=='>' ){
+ if( i+1<size && (data[i+1]==' ' || data[i+1]=='\t') ){
+ return i + 2;
+ }else{
+ return i + 1;
+ }
+ }else{
+ return 0;
+ }
+}
+
+
+/* prefix_code -- returns prefix length for block code*/
+static size_t prefix_code(char *data, size_t size){
+ if( size>0 && data[0]=='\t' ) return 1;
+ if( size>3 && data[0]==' ' && data[1]==' ' && data[2]==' ' && data[3]==' ' ){
+ return 4;
+ }
+ return 0;
+}
+
+/* prefix_oli -- returns ordered list item prefix */
+static size_t prefix_oli(char *data, size_t size){
+ size_t i = 0;
+ if( i<size && data[i]==' ') i++;
+ if( i<size && data[i]==' ') i++;
+ if( i<size && data[i]==' ') i++;
+
+ if( i>=size || data[i]<'0' || data[i]>'9' ) return 0;
+ while( i<size && data[i]>='0' && data[i]<='9' ){ i++; }
+
+ if( i+1>=size
+ || data[i]!='.'
+ || (data[i+1]!=' ' && data[i+1]!='\t')
+ ){
+ return 0;
+ }
+ i = i+2;
+ while( i<size && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ return i;
+}
+
+
+/* prefix_uli -- returns ordered list item prefix */
+static size_t prefix_uli(char *data, size_t size){
+ size_t i = 0;
+ if( i<size && data[i]==' ') i++;
+ if( i<size && data[i]==' ') i++;
+ if( i<size && data[i]==' ') i++;
+ if( i+1>=size
+ || (data[i]!='*' && data[i]!='+' && data[i]!='-')
+ || (data[i+1]!=' ' && data[i+1]!='\t')
+ ){
+ return 0;
+ }
+ i = i+2;
+ while( i<size && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ return i;
+}
+
+
+/* parse_block predeclaration */
+static void parse_block(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size);
+
+
+/* parse_blockquote -- hanldes parsing of a blockquote fragment */
+static size_t parse_blockquote(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size
+){
+ size_t beg, end = 0, pre, work_size = 0;
+ char *work_data = 0;
+ struct Blob *out = new_work_buffer(rndr);
+
+ beg = 0;
+ while( beg<size ){
+ for(end=beg+1; end<size && data[end-1]!='\n'; end++);
+ pre = prefix_quote(data+beg, end-beg);
+ if( pre ){
+ beg += pre; /* skipping prefix */
+ }else if( is_empty(data+beg, end-beg)
+ && (end>=size
+ || (prefix_quote(data+end, size-end)==0
+ && !is_empty(data+end, size-end)))
+ ){
+ /* empty line followed by non-quote line */
+ break;
+ }
+ if( beg<end ){ /* copy into the in-place working buffer */
+ if( !work_data ){
+ work_data = data+beg;
+ }else if( (data+beg)!=(work_data+work_size) ){
+ memmove(work_data+work_size, data+beg, end-beg);
+ }
+ work_size += end-beg;
+ }
+ beg = end;
+ }
+
+ if( rndr->make.blockquote ){
+ struct Blob fallback = BLOB_INITIALIZER;
+ if( out ){
+ parse_block(out, rndr, work_data, work_size);
+ }else{
+ blob_init(&fallback, work_data, work_size);
+ }
+ rndr->make.blockquote(ob, out ? out : &fallback, rndr->make.opaque);
+ }
+ release_work_buffer(rndr, out);
+ return end;
+}
+
+
+/* parse_blockquote -- hanldes parsing of a regular paragraph */
+static size_t parse_paragraph(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size
+){
+ size_t i = 0, end = 0;
+ int level = 0;
+ char *work_data = data;
+ size_t work_size = 0;
+ struct Blob fallback = BLOB_INITIALIZER;
+
+ while( i<size ){
+ for(end=i+1; end<size && data[end-1]!='\n'; end++);
+ if( is_empty(data+i, size-i)
+ || (level = is_headerline(data+i, size-i))!= 0
+ ){
+ break;
+ }
+ if( (i && data[i]=='#') || is_hrule(data+i, size-i) ){
+ end = i;
+ break;
+ }
+ i = end;
+ }
+
+ work_size = i;
+ while( work_size && data[work_size-1]=='\n' ){ work_size--; }
+
+ if( !level ){
+ if( rndr->make.paragraph ){
+ struct Blob *tmp = new_work_buffer(rndr);
+ if( tmp ){
+ parse_inline(tmp, rndr, work_data, work_size);
+ }else{
+ blob_init(&fallback, work_data, work_size);
+ }
+ rndr->make.paragraph(ob, tmp ? tmp : &fallback, rndr->make.opaque);
+ release_work_buffer(rndr, tmp);
+ }
+ }else{
+ if( work_size ){
+ size_t beg;
+ i = work_size;
+ work_size -= 1;
+ while( work_size && data[work_size]!='\n' ){ work_size--; }
+ beg = work_size+1;
+ while( work_size && data[work_size-1]=='\n'){ work_size--; }
+ if( work_size ){
+ struct Blob *tmp = new_work_buffer(rndr);
+ if( tmp ){
+ parse_inline(tmp, rndr, work_data, work_size);
+ }else{
+ blob_init (&fallback, work_data, work_size);
+ }
+ if( rndr->make.paragraph ){
+ rndr->make.paragraph(ob, tmp ? tmp : &fallback, rndr->make.opaque);
+ }
+ release_work_buffer(rndr, tmp);
+ work_data += beg;
+ work_size = i - beg;
+ }else{
+ work_size = i;
+ }
+ }
+
+ if( rndr->make.header ){
+ struct Blob *span = new_work_buffer(rndr);
+ if( span ){
+ parse_inline(span, rndr, work_data, work_size);
+ rndr->make.header(ob, span, level, rndr->make.opaque);
+ }else{
+ blob_init(&fallback, work_data, work_size);
+ rndr->make.header(ob, &fallback, level, rndr->make.opaque);
+ }
+ release_work_buffer(rndr, span);
+ }
+ }
+ return end;
+}
+
+
+/* parse_blockquote -- hanldes parsing of a block-level code fragment */
+static size_t parse_blockcode(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size
+){
+ size_t beg, end, pre;
+ struct Blob *work = new_work_buffer(rndr);
+ if( !work ) work = ob;
+
+ beg = 0;
+ while( beg<size ){
+ for(end=beg+1; end<size && data[end-1]!='\n'; end++);
+ pre = prefix_code(data+beg, end-beg);
+ if( pre ){
+ beg += pre; /* skipping prefix */
+ }else if( !is_empty(data+beg, end-beg) ){
+ /* non-empty non-prefixed line breaks the pre */
+ break;
+ }
+ if( beg<end ){
+ /* verbatim copy to the working buffer, escaping entities */
+ if( is_empty(data + beg, end - beg) ){
+ blob_append(work, "\n", 1);
+ }else{
+ blob_append(work, data+beg, end-beg);
+ }
+ }
+ beg = end;
+ }
+
+ end = blob_size(work);
+ while( end>0 && blob_buffer(work)[end-1]=='\n' ){ end--; }
+ work->nUsed = end;
+ blob_append(work, "\n", 1);
+
+ if( work!=ob ){
+ if( rndr->make.blockcode ){
+ rndr->make.blockcode(ob, work, rndr->make.opaque);
+ }
+ release_work_buffer(rndr, work);
+ }
+ return beg;
+}
+
+
+/* parse_listitem -- parsing of a single list item */
+/* assuming initial prefix is already removed */
+static size_t parse_listitem(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size,
+ int *flags
+){
+ struct Blob fallback = BLOB_INITIALIZER;
+ struct Blob *work = 0, *inter = 0;
+ size_t beg = 0, end, pre, sublist = 0, orgpre = 0, i;
+ int in_empty = 0, has_inside_empty = 0;
+
+ /* keeping track of the first indentation prefix */
+ if( size>1 && data[0]==' ' ){
+ orgpre = 1;
+ if( size>2 && data[1]==' ' ){
+ orgpre = 2;
+ if( size>3 && data[2]==' ' ){
+ orgpre = 3;
+ }
+ }
+ }
+ beg = prefix_uli(data, size);
+ if( !beg ) beg = prefix_oli(data, size);
+ if( !beg ) return 0;
+ /* skipping to the beginning of the following line */
+ end = beg;
+ while( end<size && data[end-1]!='\n' ){ end++; }
+
+ /* getting working buffers */
+ work = new_work_buffer(rndr);
+ inter = new_work_buffer(rndr);
+ if( !work ) work = &fallback;
+
+ /* putting the first line into the working buffer */
+ blob_append(work, data+beg, end-beg);
+ beg = end;
+
+ /* process the following lines */
+ while( beg<size ){
+ end++;
+ while( end<size && data[end-1]!='\n' ){ end++; }
+
+ /* process an empty line */
+ if( is_empty(data+beg, end-beg) ){
+ in_empty = 1;
+ beg = end;
+ continue;
+ }
+
+ /* computing the indentation */
+ i = 0;
+ if( end-beg>1 && data[beg]==' ' ){
+ i = 1;
+ if( end-beg>2 && data[beg+1]==' ' ){
+ i = 2;
+ if( end-beg>3 && data[beg+2]==' ' ){
+ i = 3;
+ if( end-beg>3 && data[beg+3]==' ' ){
+ i = 4;
+ }
+ }
+ }
+ }
+ pre = i;
+ if( data[beg]=='\t' ){ i = 1; pre = 8; }
+
+ /* checking for a new item */
+ if( (prefix_uli(data+beg+i, end-beg-i) && !is_hrule(data+beg+i, end-beg-i))
+ || prefix_oli(data+beg+i, end-beg-i)
+ ){
+ if( in_empty ) has_inside_empty = 1;
+ if( pre == orgpre ){ /* the following item must have */
+ break; /* the same indentation */
+ }
+ if( !sublist ) sublist = blob_size(work);
+
+ /* joining only indented stuff after empty lines */
+ }else if( in_empty && i<4 && data[beg]!='\t' ){
+ *flags |= MKD_LI_END;
+ break;
+ }else if( in_empty ){
+ blob_append(work, "\n", 1);
+ has_inside_empty = 1;
+ }
+ in_empty = 0;
+
+ /* adding the line without prefix into the working buffer */
+ blob_append(work, data+beg+i, end-beg-i);
+ beg = end;
+ }
+
+ /* non-recursive fallback when working buffer stack is full */
+ if( !inter ){
+ if( rndr->make.listitem ){
+ rndr->make.listitem(ob, work, *flags, rndr->make.opaque);
+ }
+ if( work!=&fallback ) release_work_buffer(rndr, work);
+ blob_zero(&fallback);
+ return beg;
+ }
+
+ /* render of li contents */
+ if( has_inside_empty ) *flags |= MKD_LI_BLOCK;
+ if( *flags & MKD_LI_BLOCK ){
+ /* intermediate render of block li */
+ if( sublist && sublist<blob_size(work) ){
+ parse_block(inter, rndr, blob_buffer(work), sublist);
+ parse_block(inter,
+ rndr,
+ blob_buffer(work)+sublist,
+ blob_size(work)-sublist);
+ }else{
+ parse_block(inter, rndr, blob_buffer(work), blob_size(work));
+ }
+ }else{
+ /* intermediate render of inline li */
+ if( sublist && sublist<blob_size(work) ){
+ parse_inline(inter, rndr, blob_buffer(work), sublist);
+ parse_block(inter,
+ rndr,
+ blob_buffer(work)+sublist,
+ blob_size(work)-sublist);
+ }else{
+ parse_inline(inter, rndr, blob_buffer(work), blob_size(work));
+ }
+ }
+
+ /* render of li itself */
+ if( rndr->make.listitem ){
+ rndr->make.listitem(ob, inter, *flags, rndr->make.opaque);
+ }
+ release_work_buffer(rndr, inter);
+ if( work!=&fallback ) release_work_buffer(rndr, work);
+ blob_zero(&fallback);
+ return beg;
+}
+
+
+/* parse_list -- parsing ordered or unordered list block */
+static size_t parse_list(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size,
+ int flags
+){
+ struct Blob fallback = BLOB_INITIALIZER;
+ struct Blob *work = new_work_buffer(rndr);
+ size_t i = 0, j;
+ if( !work ) work = &fallback;
+
+ while( i<size ){
+ j = parse_listitem(work, rndr, data+i, size-i, &flags);
+ i += j;
+ if( !j || (flags & MKD_LI_END) ) break;
+ }
+
+ if( rndr->make.list ) rndr->make.list(ob, work, flags, rndr->make.opaque);
+ if( work!=&fallback ) release_work_buffer(rndr, work);
+ blob_zero(&fallback);
+ return i;
+}
+
+
+/* parse_atxheader -- parsing of atx-style headers */
+static size_t parse_atxheader(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size
+){
+ int level = 0;
+ size_t i, end, skip, span_beg, span_size;
+
+ if( !size || data[0]!='#' ) return 0;
+
+ while( level<size && level<6 && data[level]=='#' ){ level++; }
+ for(i=level; i<size && (data[i]==' ' || data[i]=='\t'); i++);
+ span_beg = i;
+
+ for(end=i; end<size && data[end]!='\n'; end++);
+ skip = end;
+ if( end<=i ) return parse_paragraph(ob, rndr, data, size);
+ while( end && data[end-1]=='#' ){ end--; }
+ while( end && (data[end-1]==' ' || data[end-1]=='\t') ){ end--; }
+ if( end<=i ) return parse_paragraph(ob, rndr, data, size);
+
+ span_size = end-span_beg;
+ if( rndr->make.header ){
+ struct Blob fallback = BLOB_INITIALIZER;
+ struct Blob *span = new_work_buffer(rndr);
+
+ if( span ){
+ parse_inline(span, rndr, data+span_beg, span_size);
+ }else{
+ blob_init(&fallback, data+span_beg, span_size);
+ }
+ rndr->make.header(ob, span ? span : &fallback, level, rndr->make.opaque);
+ release_work_buffer(rndr, span);
+ }
+ return skip;
+}
+
+
+/* htmlblock_end -- checking end of HTML block : </tag>[ \t]*\n[ \t*]\n */
+/* returns the length on match, 0 otherwise */
+static size_t htmlblock_end(struct html_tag *tag, char *data, size_t size){
+ size_t i, w;
+
+ /* assuming data[0]=='<' && data[1]=='/' already tested */
+
+ /* checking tag is a match */
+ if( (tag->size+3)>=size
+ || strncasecmp(data+2, tag->text, tag->size)
+ || data[tag->size+2]!='>'
+ ){
+ return 0;
+ }
+
+ /* checking white lines */
+ i = tag->size + 3;
+ w = 0;
+ if( i<size && (w = is_empty(data+i, size-i))==0 ){
+ return 0; /* non-blank after tag */
+ }
+ i += w;
+ w = 0;
+
+ if( i<size && (w = is_empty(data + i, size - i))==0 ){
+ return 0; /* non-blank line after tag line */
+ }
+ return i+w;
+}
+
+
+/* parse_htmlblock -- parsing of inline HTML block */
+static size_t parse_htmlblock(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size
+){
+ size_t i, j = 0;
+ struct html_tag *curtag;
+ int found;
+ size_t work_size = 0;
+ struct Blob work = BLOB_INITIALIZER;
+
+ /* identification of the opening tag */
+ if( size<2 || data[0]!='<' ) return 0;
+ curtag = find_block_tag(data+1, size-1);
+
+ /* handling of special cases */
+ if( !curtag ){
+
+ /* HTML comment, laxist form */
+ if( size>5 && data[1]=='!' && data[2]=='-' && data[3]=='-' ){
+ i = 5;
+ while( i<size && !(data[i-2]=='-' && data[i-1]=='-' && data[i]=='>') ){
+ i++;
+ }
+ i++;
+ if( i<size ){
+ j = is_empty(data+i, size-i);
+ if( j ){
+ work_size = i+j;
+ if( !rndr->make.blockhtml ) return work_size;
+ blob_init(&work, data, work_size);
+ rndr->make.blockhtml(ob, &work, rndr->make.opaque);
+ return work_size;
+ }
+ }
+ }
+
+ /* HR, which is the only self-closing block tag considered */
+ if( size>4
+ && (data[1]=='h' || data[1]=='H')
+ && (data[2]=='r' || data[2]=='R')
+ ){
+ i = 3;
+ while( i<size && data[i]!='>' ){ i++; }
+ if( i+1<size ){
+ i += 1;
+ j = is_empty(data+i, size-i);
+ if( j ){
+ work_size = i+j;
+ if( !rndr->make.blockhtml ) return work_size;
+ blob_init(&work, data, work_size);
+ rndr->make.blockhtml(ob, &work, rndr->make.opaque);
+ return work_size;
+ }
+ }
+ }
+
+ /* no special case recognised */
+ return 0;
+ }
+
+ /* looking for an unindented matching closing tag */
+ /* followed by a blank line */
+ i = 1;
+ found = 0;
+#if 0
+ while( i<size ){
+ i++;
+ while( i<size && !(data[i-2]=='\n' && data[i-1]=='<' && data[i]=='/') ){
+ i++;
+ }
+ if( (i+2+curtag->size)>=size ) break;
+ j = htmlblock_end(curtag, data+i-1, size-i+1);
+ if (j) {
+ i += j-1;
+ found = 1;
+ break;
+ }
+ }
+#endif
+
+ /* if not found, trying a second pass looking for indented match */
+ /* but not if tag is "ins" or "del" (following original Markdown.pl) */
+ if( !found && curtag!=INS_TAG && curtag!=DEL_TAG ){
+ i = 1;
+ while( i<size ){
+ i++;
+ while( i<size && !(data[i-1]=='<' && data[i]=='/') ){ i++; }
+ if( (i+2+curtag->size)>=size ) break;
+ j = htmlblock_end(curtag, data+i-1, size-i+1);
+ if (j) {
+ i += j-1;
+ found = 1;
+ break;
+ }
+ }
+ }
+
+ if( !found ) return 0;
+
+ /* the end of the block has been found */
+ blob_init(&work, data, i);
+ if( rndr->make.blockhtml ){
+ rndr->make.blockhtml(ob, &work, rndr->make.opaque);
+ }
+ return i;
+}
+
+
+/* parse_table_cell -- parse a cell inside a table */
+static void parse_table_cell(
+ struct Blob *ob, /* output blob */
+ struct render *rndr, /* renderer description */
+ char *data, /* input text */
+ size_t size, /* input text size */
+ int flags /* table flags */
+){
+ struct Blob fallback = BLOB_INITIALIZER;
+ struct Blob *span = new_work_buffer(rndr);
+
+ if( span ){
+ parse_inline(span, rndr, data, size);
+ }else{
+ blob_init(&fallback, data, size);
+ }
+ rndr->make.table_cell(ob, span ? span : &fallback, flags, rndr->make.opaque);
+ release_work_buffer(rndr, span);
+}
+
+
+/* parse_table_row -- parse an input line into a table row */
+static size_t parse_table_row(
+ struct Blob *ob, /* output blob for rendering */
+ struct render *rndr, /* renderer description */
+ char *data, /* input text */
+ size_t size, /* input text size */
+ int *aligns, /* array of default alignment for columns */
+ size_t align_size, /* number of columns with default alignment */
+ int flags /* table flags */
+){
+ size_t i = 0, col = 0;
+ size_t beg, end, total = 0;
+ struct Blob *cells = new_work_buffer(rndr);
+ int align;
+
+ /* skip leading blanks and sperator */
+ while( i<size && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ if( i<size && data[i]=='|' ) i++;
+
+ /* go over all the cells */
+ while( i<size && total==0 ){
+ /* check optional left/center align marker */
+ align = 0;
+ if( data[i]==':' ){
+ align |= MKD_CELL_ALIGN_LEFT;
+ i++;
+ }
+
+ /* skip blanks */
+ while( i<size && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ beg = i;
+
+ /* forward to the next separator or EOL */
+ while( i<size && !is_table_sep(data, i) && data[i]!='\n' ){ i++; }
+ end = i;
+ if( i<size ){
+ i++;
+ if( data[i-1]=='\n' ) total = i;
+ }
+
+ /* check optional right/center align marker */
+ if( i>beg && data[end-1]==':' ){
+ align |= MKD_CELL_ALIGN_RIGHT;
+ end--;
+ }
+
+ /* remove trailing blanks */
+ while( end>beg && (data[end-1]==' ' || data[end-1]=='\t') ){ end--; }
+
+ /* skip the last cell if it was only blanks */
+ /* (because it is only the optional end separator) */
+ if( total && end<=beg ) continue;
+
+ /* fallback on default alignment if not explicit */
+ if( align==0 && aligns && col<align_size ) align = aligns[col];
+
+ /* render cells */
+ if( cells ) parse_table_cell(cells, rndr, data+beg, end-beg, align|flags);
+
+ col++;
+ }
+
+ /* render the whole row and clean up */
+ if( cells ){
+ rndr->make.table_row(ob, cells, flags, rndr->make.opaque);
+ }else{
+ struct Blob fallback = BLOB_INITIALIZER;
+ blob_init(&fallback, data, total ? total : size);
+ rndr->make.table_row(ob, &fallback, flags, rndr->make.opaque);
+ }
+ release_work_buffer(rndr, cells);
+ return total ? total : size;
+}
+
+
+/* parse_table -- parsing of a whole table */
+static size_t parse_table(
+ struct Blob *ob,
+ struct render *rndr,
+ char *data,
+ size_t size
+){
+ size_t i = 0, head_end, col;
+ size_t align_size = 0;
+ int *aligns = 0;
+ struct Blob fallback = BLOB_INITIALIZER;
+ struct Blob *head = 0;
+ struct Blob *rows = new_work_buffer(rndr);
+ if( !rows ) rows = &fallback;
+
+ /* skip the first (presumably header) line */
+ while( i<size && data[i]!='\n' ){ i++; }
+ head_end = i;
+
+ /* fallback on end of input */
+ if( i>=size ){
+ parse_table_row(rows, rndr, data, size, 0, 0, 0);
+ rndr->make.table(ob, 0, rows, rndr->make.opaque);
+ if( rows!=&fallback ) release_work_buffer(rndr, rows);
+ return i;
+ }
+
+ /* attempt to parse a table rule, i.e. blanks, dash, colons and sep */
+ i++;
+ col = 0;
+ while( i<size
+ && (data[i]==' '
+ || data[i]=='\t'
+ || data[i]=='-'
+ || data[i] == ':'
+ || data[i] =='|')
+ ){
+ if( data[i] == '|' ) align_size++;
+ if( data[i] == ':' ) col = 1;
+ i += 1;
+ }
+
+ if( i<size && data[i]=='\n' ){
+ align_size++;
+
+ /* render the header row */
+ head = new_work_buffer(rndr);
+ if( head ){
+ parse_table_row(head, rndr, data, head_end, 0, 0, MKD_CELL_HEAD);
+ }
+
+ /* parse alignments if provided */
+ if( col && (aligns=malloc(align_size * sizeof *aligns))!=0 ){
+ for(i=0; i<align_size; i++) aligns[i] = 0;
+ col = 0;
+ i = head_end+1;
+
+ /* skip initial white space and optional separator */
+ while( i<size && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ if( data[i]=='|' ) i++;
+
+ /* compute default alignment for each column */
+ while (i < size && data[i] != '\n') {
+ if (data[i] == ':')
+ aligns[col] |= MKD_CELL_ALIGN_LEFT;
+ while (i < size
+ && data[i] != '|' && data[i] != '\n')
+ i += 1;
+ if (data[i - 1] == ':')
+ aligns[col] |= MKD_CELL_ALIGN_RIGHT;
+ if (i < size && data[i] == '|')
+ i += 1;
+ col += 1; }
+ }
+
+ /* point i to the beginning of next line/row */
+ i++;
+
+ }else{
+ /* there is no valid ruler, continuing without header */
+ i = 0;
+ }
+
+ /* render the table body lines */
+ while( i<size && is_tableline(data + i, size - i) ){
+ i += parse_table_row(rows, rndr, data+i, size-i, aligns, align_size, 0);
+ }
+
+ /* render the full table */
+ rndr->make.table(ob, head, rows, rndr->make.opaque);
+
+ /* cleanup */
+ if( head ) release_work_buffer(rndr, head);
+ if( rows!=&fallback ) release_work_buffer(rndr, rows);
+ free(aligns);
+ return i;
+}
+
+
+/* parse_block -- parsing of one block, returning next char to parse */
+static void parse_block(
+ struct Blob *ob, /* output blob */
+ struct render *rndr, /* renderer internal state */
+ char *data, /* input text */
+ size_t size /* input text size */
+){
+ size_t beg, end, i;
+ char *txt_data;
+ int has_table = (rndr->make.table
+ && rndr->make.table_row
+ && rndr->make.table_cell);
+
+ beg = 0;
+ while( beg<size ){
+ txt_data = data+beg;
+ end = size-beg;
+ if( data[beg]=='#' ){
+ beg += parse_atxheader(ob, rndr, txt_data, end);
+ }else if( data[beg]=='<'
+ && rndr->make.blockhtml
+ && (i = parse_htmlblock(ob, rndr, txt_data, end))!=0
+ ){
+ beg += i;
+ }else if( (i=is_empty(txt_data, end))!=0 ){
+ beg += i;
+ }else if( is_hrule(txt_data, end) ){
+ if( rndr->make.hrule ) rndr->make.hrule(ob, rndr->make.opaque);
+ while( beg<size && data[beg]!='\n' ){ beg++; }
+ beg++;
+ }else if( prefix_quote(txt_data, end) ){
+ beg += parse_blockquote(ob, rndr, txt_data, end);
+ }else if( prefix_code(txt_data, end) ){
+ beg += parse_blockcode(ob, rndr, txt_data, end);
+ }else if( prefix_uli(txt_data, end) ){
+ beg += parse_list(ob, rndr, txt_data, end, 0);
+ }else if( prefix_oli(txt_data, end) ){
+ beg += parse_list(ob, rndr, txt_data, end, MKD_LIST_ORDERED);
+ }else if( has_table && is_tableline(txt_data, end) ){
+ beg += parse_table(ob, rndr, txt_data, end);
+ }else{
+ beg += parse_paragraph(ob, rndr, txt_data, end);
+ }
+ }
+}
+
+
+
+/*********************
+ * REFERENCE PARSING *
+ *********************/
+
+/* is_ref -- returns whether a line is a reference or not */
+static int is_ref(
+ char *data, /* input text */
+ size_t beg, /* offset of the beginning of the line */
+ size_t end, /* offset of the end of the text */
+ size_t *last, /* last character of the link */
+ struct Blob *refs /* arry of link references */
+){
+ size_t i = 0;
+ size_t id_offset, id_end;
+ size_t link_offset, link_end;
+ size_t title_offset, title_end;
+ size_t line_end;
+ struct link_ref lr = {
+ BLOB_INITIALIZER,
+ BLOB_INITIALIZER,
+ BLOB_INITIALIZER
+ };
+
+ /* up to 3 optional leading spaces */
+ if( beg+3>=end ) return 0;
+ if( data[beg]==' ' ){
+ i = 1;
+ if( data[beg+1]==' ' ){
+ i = 2;
+ if( data[beg+2]==' ' ){
+ i = 3;
+ if( data[beg+3]==' ' ) return 0;
+ }
+ }
+ }
+ i += beg;
+
+ /* id part: anything but a newline between brackets */
+ if( data[i]!='[' ) return 0;
+ i++;
+ id_offset = i;
+ while( i<end && data[i]!='\n' && data[i]!='\r' && data[i]!=']' ){ i++; }
+ if( i>=end || data[i]!=']' ) return 0;
+ id_end = i;
+
+ /* spacer: colon (space | tab)* newline? (space | tab)* */
+ i++;
+ if( i>=end || data[i]!=':' ) return 0;
+ i++;
+ while( i<end && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ if( i<end && (data[i]=='\n' || data[i]=='\r') ){
+ i++;
+ if( i<end && data[i]=='\r' && data[i-1] == '\n' ) i++;
+ }
+ while( i<end && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ if( i>=end ) return 0;
+
+ /* link: whitespace-free sequence, optionally between angle brackets */
+ if( data[i]=='<' ) i++;
+ link_offset = i;
+ while( i<end
+ && data[i]!=' '
+ && data[i]!='\t'
+ && data[i]!='\n'
+ && data[i]!='\r'
+ ){
+ i += 1;
+ }
+ if( data[i-1]=='>' ) link_end = i-1; else link_end = i;
+
+ /* optional spacer: (space | tab)* (newline | '\'' | '"' | '(' ) */
+ while( i<end && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ if( i<end
+ && data[i]!='\n'
+ && data[i]!='\r'
+ && data[i]!='\''
+ && data[i]!='"'
+ && data[i]!='('
+ ){
+ return 0;
+ }
+ line_end = 0;
+ /* computing end-of-line */
+ if( i>=end || data[i]=='\r' || data[i]=='\n' ) line_end = i;
+ if( i+1<end && data[i]=='\n' && data[i+1]=='\r' ) line_end = i+1;
+
+ /* optional (space|tab)* spacer after a newline */
+ if( line_end ){
+ i = line_end+1;
+ while( i<end && (data[i]==' ' || data[i]=='\t') ){ i++; }
+ }
+
+ /* optional title: any non-newline sequence enclosed in '"()
+ alone on its line */
+ title_offset = title_end = 0;
+ if( i+1<end && (data[i]=='\'' || data[i]=='"' || data[i]=='(') ){
+ i += 1;
+ title_offset = i;
+ /* looking for EOL */
+ while( i<end && data[i]!='\n' && data[i]!='\r' ){ i++; }
+ if( i+1<end && data[i]=='\n' && data[i+1]=='\r' ){
+ title_end = i + 1;
+ }else{
+ title_end = i;
+ }
+ /* stepping back */
+ i--;
+ while( i>title_offset && (data[i]==' ' || data[i]=='\t') ){ i--; }
+ if( i>title_offset && (data[i]=='\'' || data[i]=='"' || data[i]==')') ){
+ line_end = title_end;
+ title_end = i;
+ }
+ }
+ if( !line_end ) return 0; /* garbage after the link */
+
+ /* a valid ref has been found, filling-in return structures */
+ if( last ) *last = line_end;
+ if( !refs ) return 1;
+ if( build_ref_id(&lr.id, data+id_offset, id_end-id_offset)<0 ) return 0;
+ blob_append(&lr.link, data+link_offset, link_end-link_offset);
+ if( title_end>title_offset ){
+ blob_append(&lr.title, data+title_offset, title_end-title_offset);
+ }
+ blob_append(refs, (char *)&lr, sizeof lr);
+ return 1;
+}
+
+
+
+/**********************
+ * EXPORTED FUNCTIONS *
+ **********************/
+
+/* markdown -- parses the input buffer and renders it into the output buffer */
+void markdown(
+ struct Blob *ob, /* output blob for rendered text */
+ struct Blob *ib, /* input blob in markdown */
+ const struct mkd_renderer *rndrer /* renderer descriptor (callbacks) */
+){
+ struct link_ref *lr;
+ struct Blob text = BLOB_INITIALIZER;
+ size_t i, beg, end;
+ struct render rndr;
+ char *ib_data;
+
+ /* filling the render structure */
+ if( !rndrer ) return;
+ rndr.make = *rndrer;
+ if( rndr.make.max_work_stack<1 ) rndr.make.max_work_stack = 1;
+ rndr.work_active = 0;
+ rndr.work = fossil_malloc(rndr.make.max_work_stack * sizeof *rndr.work);
+ for(i=0; i<rndr.make.max_work_stack; i++) rndr.work[i] = text;
+ rndr.refs = text;
+ for(i=0; i<256; i++) rndr.active_char[i] = 0;
+ if( (rndr.make.emphasis
+ || rndr.make.double_emphasis
+ || rndr.make.triple_emphasis)
+ && rndr.make.emph_chars
+ ){
+ for(i=0; rndr.make.emph_chars[i]; i++){
+ rndr.active_char[(unsigned char)rndr.make.emph_chars[i]] = char_emphasis;
+ }
+ }
+ if( rndr.make.codespan ) rndr.active_char['`'] = char_codespan;
+ if( rndr.make.linebreak ) rndr.active_char['\n'] = char_linebreak;
+ if( rndr.make.image || rndr.make.link ) rndr.active_char['['] = char_link;
+ rndr.active_char['<'] = char_langle_tag;
+ rndr.active_char['\\'] = char_escape;
+ rndr.active_char['&'] = char_entity;
+
+ /* first pass: looking for references, copying everything else */
+ beg = 0;
+ ib_data = blob_buffer(ib);
+ while( beg<blob_size(ib) ){ /* iterating over lines */
+ if( is_ref(ib_data, beg, blob_size(ib), &end, &rndr.refs) ){
+ beg = end;
+ }else{ /* skipping to the next line */
+ end = beg;
+ while( end<blob_size(ib) && ib_data[end]!='\n' && ib_data[end]!='\r' ){
+ end += 1;
+ }
+ /* adding the line body if present */
+ if( end>beg ) blob_append(&text, ib_data + beg, end - beg);
+ while( end<blob_size(ib) && (ib_data[end]=='\n' || ib_data[end]=='\r') ){
+ /* add one \n per newline */
+ if( ib_data[end]=='\n'
+ || (end+1<blob_size(ib) && ib_data[end+1]!='\n')
+ ){
+ blob_append(&text, "\n", 1);
+ }
+ end += 1;
+ }
+ beg = end;
+ }
+ }
+
+ /* sorting the reference array */
+ if( blob_size(&rndr.refs) ){
+ qsort(blob_buffer(&rndr.refs),
+ blob_size(&rndr.refs)/sizeof(struct link_ref),
+ sizeof(struct link_ref),
+ cmp_link_ref_sort);
+ }
+
+ /* second pass: actual rendering */
+ if( rndr.make.prolog ) rndr.make.prolog(ob, rndr.make.opaque);
+ parse_block(ob, &rndr, blob_buffer(&text), blob_size(&text));
+ if( rndr.make.epilog ) rndr.make.epilog(ob, rndr.make.opaque);
+
+ /* clean-up */
+ blob_zero(&text);
+ lr = (struct link_ref *)blob_buffer(&rndr.refs);
+ end = blob_size(&rndr.refs)/sizeof(struct link_ref);
+ for(i=0; i<end; i++){
+ blob_zero(&lr[i].id);
+ blob_zero(&lr[i].link);
+ blob_zero(&lr[i].title);
+ }
+ blob_zero(&rndr.refs);
+ blobarray_zero(rndr.work, rndr.make.max_work_stack);
+ fossil_free(rndr.work);
+}
+
+#endif /* def FOSSIL_ENABLE_MARKDOWN */
ADDED src/markdown_html.c
Index: src/markdown_html.c
==================================================================
--- src/markdown_html.c
+++ src/markdown_html.c
@@ -0,0 +1,411 @@
+/*
+** Copyright (c) 2012 D. Richard Hipp
+**
+** This program is free software; you can redistribute it and/or
+** modify it under the terms of the Simplified BSD License (also
+** known as the "2-Clause License" or "FreeBSD License".)
+
+** This program is distributed in the hope that it will be useful,
+** but without any warranty; without even the implied warranty of
+** merchantability or fitness for a particular purpose.
+**
+** Author contact information:
+** drh@hwaci.com
+** http://www.hwaci.com/drh/
+**
+*******************************************************************************
+**
+** This file contains callbacks for the markdown parser that generate
+** XHTML output.
+*/
+
+#ifdef FOSSIL_ENABLE_MARKDOWN
+
+#include "config.h"
+#include "markdown_html.h"
+
+#if INTERFACE
+
+void markdown_to_html(
+ struct Blob *input_markdown,
+ struct Blob *output_title,
+ struct Blob *output_body);
+
+#endif /* INTERFACE */
+
+
+/* INTER_BLOCK -- skip a line between block level elements */
+#define INTER_BLOCK(ob) \
+ do { if( blob_size(ob)>0 ) blob_append(ob, "\n", 1); } while (0)
+
+/* BLOB_APPEND_LITTERAL -- append a string litteral to a blob */
+#define BLOB_APPEND_LITTERAL(blob, litteral) \
+ blob_append((blob), "" litteral, (sizeof litteral)-1)
+ /*
+ * The empty string in the second argument leads to a syntax error
+ * when the macro is not used with a string litteral. Unfortunately
+ * the error is not overly explicit.
+ */
+
+/* BLOB_APPEND_BLOB -- append blob contents to another */
+#define BLOB_APPEND_BLOB(dest, src) \
+ blob_append((dest), blob_buffer(src), blob_size(src))
+
+
+/* HTML escape */
+
+static void html_escape(struct Blob *ob, const char *data, size_t size){
+ size_t beg = 0, i = 0;
+ while( i<size ){
+ beg = i;
+ while( i<size
+ && data[i]!='<'
+ && data[i]!='>'
+ && data[i]!='"'
+ && data[i]!='&'
+ ){
+ i++;
+ }
+ blob_append(ob, data+beg, i-beg);
+ while( i<size ){
+ if( data[i]=='<' ){
+ BLOB_APPEND_LITTERAL(ob, "<");
+ }else if( data[i]=='>' ){
+ BLOB_APPEND_LITTERAL(ob, ">");
+ }else if( data[i]=='&' ){
+ BLOB_APPEND_LITTERAL(ob, "&");
+ }else if( data[i]=='"' ){
+ BLOB_APPEND_LITTERAL(ob, """);
+ }else{
+ break;
+ }
+ i++;
+ }
+ }
+}
+
+
+/* HTML block tags */
+
+static void html_raw_block(struct Blob *ob, struct Blob *text, void *opaque){
+ char *data = blob_buffer(text);
+ size_t first = 0, size = blob_size(text);
+ INTER_BLOCK(ob);
+ while( first<size && data[first]=='\n' ) first++;
+ while( size>first && data[size-1]=='\n' ) size--;
+ blob_append(ob, data+first, size-first);
+ BLOB_APPEND_LITTERAL(ob, "\n");
+}
+
+static void html_blockcode(struct Blob *ob, struct Blob *text, void *opaque){
+ INTER_BLOCK(ob);
+ BLOB_APPEND_LITTERAL(ob, "<pre><code>");
+ html_escape(ob, blob_buffer(text), blob_size(text));
+ BLOB_APPEND_LITTERAL(ob, "</code></pre>\n");
+}
+
+static void html_blockquote(struct Blob *ob, struct Blob *text, void *opaque){
+ INTER_BLOCK(ob);
+ BLOB_APPEND_LITTERAL(ob, "<blockquote>\n");
+ BLOB_APPEND_BLOB(ob, text);
+ BLOB_APPEND_LITTERAL(ob, "</blockquote>\n");
+}
+
+static void html_header(
+ struct Blob *ob,
+ struct Blob *text,
+ int level,
+ void *opaque
+){
+ struct Blob *title = opaque;
+ /* The first header at the beginning of a text is considered as
+ * a title and not output. */
+ if( blob_size(ob)==0 && blob_size(title)==0 ){
+ BLOB_APPEND_BLOB(title, text);
+ return;
+ }
+ INTER_BLOCK(ob);
+ blob_appendf(ob, "<h%d>", level);
+ BLOB_APPEND_BLOB(ob, text);
+ blob_appendf(ob, "</h%d>", level);
+}
+
+static void html_hrule(struct Blob *ob, void *opaque){
+ INTER_BLOCK(ob);
+ BLOB_APPEND_LITTERAL(ob, "<hr />\n");
+}
+
+
+static void html_list(
+ struct Blob *ob,
+ struct Blob *text,
+ int flags,
+ void *opaque
+){
+ char ol[] = "ol";
+ char ul[] = "ul";
+ char *tag = (flags & MKD_LIST_ORDERED) ? ol : ul;
+ INTER_BLOCK(ob);
+ blob_appendf(ob, "<%s>\n", tag);
+ BLOB_APPEND_BLOB(ob, text);
+ blob_appendf(ob, "</%s>\n", tag);
+}
+
+static void html_list_item(
+ struct Blob *ob,
+ struct Blob *text,
+ int flags,
+ void *opaque
+){
+ char *text_data = blob_buffer(text);
+ size_t text_size = blob_size(text);
+ while( text_size>0 && text_data[text_size-1]=='\n' ) text_size--;
+ BLOB_APPEND_LITTERAL(ob, "<li>");
+ blob_append(ob, text_data, text_size);
+ BLOB_APPEND_LITTERAL(ob, "</li>\n");
+}
+
+static void html_paragraph(struct Blob *ob, struct Blob *text, void *opaque){
+ INTER_BLOCK(ob);
+ BLOB_APPEND_LITTERAL(ob, "<p>");
+ BLOB_APPEND_BLOB(ob, text);
+ BLOB_APPEND_LITTERAL(ob, "</p>\n");
+}
+
+
+static void html_table(
+ struct Blob *ob,
+ struct Blob *head_row,
+ struct Blob *rows,
+ void *opaque
+){
+ INTER_BLOCK(ob);
+ BLOB_APPEND_LITTERAL(ob, "<table>\n");
+ if( head_row && blob_size(head_row)>0 ){
+ BLOB_APPEND_LITTERAL(ob, "<thead>\n");
+ BLOB_APPEND_BLOB(ob, head_row);
+ BLOB_APPEND_LITTERAL(ob, "</thead>\n<tbody>\n");
+ }
+ if( rows ){
+ BLOB_APPEND_BLOB(ob, rows);
+ }
+ if( head_row && blob_size(head_row)>0 ){
+ BLOB_APPEND_LITTERAL(ob, "</tbody>\n");
+ }
+ BLOB_APPEND_LITTERAL(ob, "</table>\n");
+}
+
+static void html_table_cell(
+ struct Blob *ob,
+ struct Blob *text,
+ int flags,
+ void *opaque
+){
+ if( flags & MKD_CELL_HEAD ){
+ BLOB_APPEND_LITTERAL(ob, " <th");
+ }else{
+ BLOB_APPEND_LITTERAL(ob, " <td");
+ }
+ switch( flags & MKD_CELL_ALIGN_MASK ){
+ case MKD_CELL_ALIGN_LEFT: {
+ BLOB_APPEND_LITTERAL(ob, " align=\"left\"");
+ break;
+ }
+ case MKD_CELL_ALIGN_RIGHT: {
+ BLOB_APPEND_LITTERAL(ob, " align=\"right\"");
+ break;
+ }
+ case MKD_CELL_ALIGN_CENTER: {
+ BLOB_APPEND_LITTERAL(ob, " align=\"center\"");
+ break;
+ }
+ }
+ BLOB_APPEND_LITTERAL(ob, ">");
+ BLOB_APPEND_BLOB(ob, text);
+ if( flags & MKD_CELL_HEAD ){
+ BLOB_APPEND_LITTERAL(ob, "</th>\n");
+ }else{
+ BLOB_APPEND_LITTERAL(ob, "</td>\n");
+ }
+}
+
+static void html_table_row(
+ struct Blob *ob,
+ struct Blob *cells,
+ int flags,
+ void *opaque
+){
+ BLOB_APPEND_LITTERAL(ob, " <tr>\n");
+ BLOB_APPEND_BLOB(ob, cells);
+ BLOB_APPEND_LITTERAL(ob, " </tr>\n");
+}
+
+
+
+/* HTML span tags */
+
+static int html_raw_span(struct Blob *ob, struct Blob *text, void *opaque){
+ BLOB_APPEND_BLOB(ob, text);
+ return 1;
+}
+
+static int html_autolink(
+ struct Blob *ob,
+ struct Blob *link,
+ enum mkd_autolink type,
+ void *opaque
+){
+ if( !link || blob_size(link)<=0 ) return 0;
+ BLOB_APPEND_LITTERAL(ob, "<a href=\"");
+ if( type==MKDA_IMPLICIT_EMAIL ) BLOB_APPEND_LITTERAL(ob, "mailto:");
+ html_escape(ob, blob_buffer(link), blob_size(link));
+ BLOB_APPEND_LITTERAL(ob, "\">");
+ if( type==MKDA_EXPLICIT_EMAIL && blob_size(link)>7 ){
+ /* remove "mailto:" from displayed text */
+ html_escape(ob, blob_buffer(link)+7, blob_size(link)-7);
+ }else{
+ html_escape(ob, blob_buffer(link), blob_size(link));
+ }
+ BLOB_APPEND_LITTERAL(ob, "</a>");
+ return 1;
+}
+
+static int html_code_span(struct Blob *ob, struct Blob *text, void *opaque){
+ BLOB_APPEND_LITTERAL(ob, "<code>");
+ html_escape(ob, blob_buffer(text), blob_size(text));
+ BLOB_APPEND_LITTERAL(ob, "</code>");
+ return 1;
+}
+
+static int html_double_emphasis(
+ struct Blob *ob,
+ struct Blob *text,
+ char c,
+ void *opaque
+){
+ BLOB_APPEND_LITTERAL(ob, "<strong>");
+ BLOB_APPEND_BLOB(ob, text);
+ BLOB_APPEND_LITTERAL(ob, "</strong>");
+ return 1;
+}
+
+static int html_emphasis(
+ struct Blob *ob,
+ struct Blob *text,
+ char c,
+ void *opaque
+){
+ BLOB_APPEND_LITTERAL(ob, "<em>");
+ BLOB_APPEND_BLOB(ob, text);
+ BLOB_APPEND_LITTERAL(ob, "</em>");
+ return 1;
+}
+
+static int html_image(
+ struct Blob *ob,
+ struct Blob *link,
+ struct Blob *title,
+ struct Blob *alt,
+ void *opaque
+){
+ BLOB_APPEND_LITTERAL(ob, "<img src=\"");
+ html_escape(ob, blob_buffer(link), blob_size(link));
+ BLOB_APPEND_LITTERAL(ob, "\" alt=\"");
+ html_escape(ob, blob_buffer(alt), blob_size(alt));
+ if( title && blob_size(title)>0 ){
+ BLOB_APPEND_LITTERAL(ob, "\" title=\"");
+ html_escape(ob, blob_buffer(title), blob_size(title));
+ }
+ BLOB_APPEND_LITTERAL(ob, "\" />");
+ return 1;
+}
+
+static int html_line_break(struct Blob *ob, void *opaque){
+ BLOB_APPEND_LITTERAL(ob, "<br />\n");
+ return 1;
+}
+
+static int html_link(
+ struct Blob *ob,
+ struct Blob *link,
+ struct Blob *title,
+ struct Blob *content,
+ void *opaque
+){
+ BLOB_APPEND_LITTERAL(ob, "<a href=\"");
+ html_escape(ob, blob_buffer(link), blob_size(link));
+ if( title && blob_size(title)>0 ){
+ BLOB_APPEND_LITTERAL(ob, "\" title=\"");
+ html_escape(ob, blob_buffer(title), blob_size(title));
+ }
+ BLOB_APPEND_LITTERAL(ob, "\">");
+ BLOB_APPEND_BLOB(ob, content);
+ BLOB_APPEND_LITTERAL(ob, "</a>");
+ return 1;
+}
+
+static int html_triple_emphasis(
+ struct Blob *ob,
+ struct Blob *text,
+ char c,
+ void *opaque
+){
+ BLOB_APPEND_LITTERAL(ob, "<strong><em>");
+ BLOB_APPEND_BLOB(ob, text);
+ BLOB_APPEND_LITTERAL(ob, "</em></strong>");
+ return 1;
+}
+
+
+static void html_normal_text(struct Blob *ob, struct Blob *text, void *opaque){
+ html_escape(ob, blob_buffer(text), blob_size(text));
+}
+
+
+void markdown_to_html(
+ struct Blob *input_markdown,
+ struct Blob *output_title,
+ struct Blob *output_body
+){
+ struct mkd_renderer html_renderer = {
+ 0, 0, /* no prolog or epilog */
+
+ /* block level elements */
+ html_blockcode,
+ html_blockquote,
+ html_raw_block,
+ html_header,
+ html_hrule,
+ html_list,
+ html_list_item,
+ html_paragraph,
+ 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 */
+ output_title /* opaque data */
+ };
+ blob_reset(output_title);
+ blob_reset(output_body);
+ markdown(output_body, input_markdown, &html_renderer);
+}
+
+#endif /* def FOSSIL_ENABLE_MARKDOWN */
Index: src/th_main.c
==================================================================
--- src/th_main.c
+++ src/th_main.c
@@ -265,10 +265,11 @@
**
** "json" = FOSSIL_ENABLE_JSON
** "ssl" = FOSSIL_ENABLE_SSL
** "tcl" = FOSSIL_ENABLE_TCL
** "tclStubs" = FOSSIL_ENABLE_TCL_STUBS
+** "markdown" = FOSSIL_ENABLE_MARKDOWN
**
*/
static int hasfeatureCmd(
Th_Interp *interp,
void *p,
@@ -302,10 +303,15 @@
#endif
#if defined(FOSSIL_ENABLE_TCL_STUBS)
else if( 0 == fossil_strnicmp( zArg, "tclStubs", 8 ) ){
rc = 1;
}
+#endif
+#if defined(FOSSIL_ENABLE_MARKDOWN)
+ else if( 0 == fossil_strnicmp( zArg, "markdown", 8 ) ){
+ rc = 1;
+ }
#endif
if( g.thTrace ){
Th_Trace("[hasfeature %#h] => %d<br />\n", argl[1], zArg, rc);
}
Th_SetResultInt(interp, rc);
Index: win/Makefile.dmc
==================================================================
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -26,13 +26,13 @@
TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
SQLITE_OPTIONS = -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0
-SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c utf8_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
+SRC = add_.c allrepo_.c attach_.c bag_.c bisect_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c export_.c file_.c finfo_.c glob_.c graph_.c gzip_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c login_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c path_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c sqlcmd_.c stash_.c stat_.c style_.c sync_.c tag_.c tar_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c utf8_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\path$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\wysiwyg$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
RC=$(DMDIR)\bin\rcc
RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
@@ -46,11 +46,11 @@
$(OBJDIR)\fossil.res: $B\win\fossil.rc
$(RC) $(RCFLAGS) -o$@ $**
$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
- +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest md5 merge merge3 moderate name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user utf8 verify vfile wiki wikiformat winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
+ +echo add allrepo attach bag bisect blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event export file finfo glob graph gzip http http_socket http_ssl http_transport import info json json_artifact json_branch json_config json_diff json_dir json_finfo json_login json_query json_report json_tag json_timeline json_user json_wiki leaf login main manifest markdown markdown_html md5 merge merge3 moderate name path pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins sqlcmd stash stat style sync tag tar th_main timeline tkt tktsetup undo update url user utf8 verify vfile wiki wikiformat winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
+echo fossil >> $@
+echo fossil >> $@
+echo $(LIBS) >> $@
+echo. >> $@
+echo fossil >> $@
@@ -445,10 +445,22 @@
$(OBJDIR)\manifest$O : manifest_.c manifest.h
$(TCC) -o$@ -c manifest_.c
manifest_.c : $(SRCDIR)\manifest.c
+translate$E $** > $@
+
+$(OBJDIR)\markdown$O : markdown_.c markdown.h
+ $(TCC) -o$@ -c markdown_.c
+
+markdown_.c : $(SRCDIR)\markdown.c
+ +translate$E $** > $@
+
+$(OBJDIR)\markdown_html$O : markdown_html_.c markdown_html.h
+ $(TCC) -o$@ -c markdown_html_.c
+
+markdown_html_.c : $(SRCDIR)\markdown_html.c
+ +translate$E $** > $@
$(OBJDIR)\md5$O : md5_.c md5.h
$(TCC) -o$@ -c md5_.c
md5_.c : $(SRCDIR)\md5.c
@@ -711,7 +723,7 @@
zip_.c : $(SRCDIR)\zip.c
+translate$E $** > $@
headers: makeheaders$E page_index.h VERSION.h
- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h export_.c:export.h file_.c:file.h finfo_.c:finfo.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h path_.c:path.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h wysiwyg_.c:wysiwyg.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR)\cson_amalgamation.h
@copy /Y nul: headers
Index: win/Makefile.mingw
==================================================================
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -43,10 +43,14 @@
# FOSSIL_ENABLE_SYMBOLS = 1
#### Enable JSON (http://www.json.org) support using "cson"
#
# FOSSIL_ENABLE_JSON = 1
+
+#### Enable markdown support
+#
+# FOSSIL_ENABLE_MARKDOWN = 1
#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
#
# FOSSIL_ENABLE_SSL = 1
@@ -184,10 +188,16 @@
# With JSON support
ifdef FOSSIL_ENABLE_JSON
TCC += -DFOSSIL_ENABLE_JSON=1
RCC += -DFOSSIL_ENABLE_JSON=1
endif
+
+# With markdown support
+ifdef FOSSIL_ENABLE_MARKDOWN
+TCC += -DFOSSIL_ENABLE_MARKDOWN=1
+RCC += -DFOSSIL_ENABLE_MARKDOWN=1
+endif
#### We add the -static option here so that we can build a static
# executable that will run in a chroot jail.
#
LIB = -static
@@ -299,10 +309,12 @@
$(SRCDIR)/json_wiki.c \
$(SRCDIR)/leaf.c \
$(SRCDIR)/login.c \
$(SRCDIR)/main.c \
$(SRCDIR)/manifest.c \
+ $(SRCDIR)/markdown.c \
+ $(SRCDIR)/markdown_html.c \
$(SRCDIR)/md5.c \
$(SRCDIR)/merge.c \
$(SRCDIR)/merge3.c \
$(SRCDIR)/moderate.c \
$(SRCDIR)/name.c \
@@ -401,10 +413,12 @@
$(OBJDIR)/json_wiki_.c \
$(OBJDIR)/leaf_.c \
$(OBJDIR)/login_.c \
$(OBJDIR)/main_.c \
$(OBJDIR)/manifest_.c \
+ $(OBJDIR)/markdown_.c \
+ $(OBJDIR)/markdown_html_.c \
$(OBJDIR)/md5_.c \
$(OBJDIR)/merge_.c \
$(OBJDIR)/merge3_.c \
$(OBJDIR)/moderate_.c \
$(OBJDIR)/name_.c \
@@ -503,10 +517,12 @@
$(OBJDIR)/json_wiki.o \
$(OBJDIR)/leaf.o \
$(OBJDIR)/login.o \
$(OBJDIR)/main.o \
$(OBJDIR)/manifest.o \
+ $(OBJDIR)/markdown.o \
+ $(OBJDIR)/markdown_html.o \
$(OBJDIR)/md5.o \
$(OBJDIR)/merge.o \
$(OBJDIR)/merge3.o \
$(OBJDIR)/moderate.o \
$(OBJDIR)/name.o \
@@ -662,11 +678,11 @@
$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
$(MKINDEX) $(TRANS_SRC) >$@
$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
- $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
+ $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
echo Done >$(OBJDIR)/headers
$(OBJDIR)/headers: Makefile
Makefile:
@@ -1116,10 +1132,26 @@
$(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h
$(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c
$(OBJDIR)/manifest.h: $(OBJDIR)/headers
+
+$(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate
+ $(TRANSLATE) $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c
+
+$(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h
+ $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c
+
+$(OBJDIR)/markdown.h: $(OBJDIR)/headers
+
+$(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate
+ $(TRANSLATE) $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c
+
+$(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h
+ $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c
+
+$(OBJDIR)/markdown_html.h: $(OBJDIR)/headers
$(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate
$(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c
$(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h
Index: win/Makefile.mingw.mistachkin
==================================================================
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -38,15 +38,19 @@
#
BCC = gcc
#### Enable compiling with debug symbols (much larger binary)
#
-# FOSSIL_ENABLE_SYMBOLS = 1
+FOSSIL_ENABLE_SYMBOLS = 1
#### Enable JSON (http://www.json.org) support using "cson"
#
FOSSIL_ENABLE_JSON = 1
+
+#### Enable markdown support
+#
+FOSSIL_ENABLE_MARKDOWN = 1
#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
#
FOSSIL_ENABLE_SSL = 1
@@ -184,10 +188,16 @@
# With JSON support
ifdef FOSSIL_ENABLE_JSON
TCC += -DFOSSIL_ENABLE_JSON=1
RCC += -DFOSSIL_ENABLE_JSON=1
endif
+
+# With markdown support
+ifdef FOSSIL_ENABLE_MARKDOWN
+TCC += -DFOSSIL_ENABLE_MARKDOWN=1
+RCC += -DFOSSIL_ENABLE_MARKDOWN=1
+endif
#### We add the -static option here so that we can build a static
# executable that will run in a chroot jail.
#
LIB = -static
@@ -299,10 +309,12 @@
$(SRCDIR)/json_wiki.c \
$(SRCDIR)/leaf.c \
$(SRCDIR)/login.c \
$(SRCDIR)/main.c \
$(SRCDIR)/manifest.c \
+ $(SRCDIR)/markdown.c \
+ $(SRCDIR)/markdown_html.c \
$(SRCDIR)/md5.c \
$(SRCDIR)/merge.c \
$(SRCDIR)/merge3.c \
$(SRCDIR)/moderate.c \
$(SRCDIR)/name.c \
@@ -401,10 +413,12 @@
$(OBJDIR)/json_wiki_.c \
$(OBJDIR)/leaf_.c \
$(OBJDIR)/login_.c \
$(OBJDIR)/main_.c \
$(OBJDIR)/manifest_.c \
+ $(OBJDIR)/markdown_.c \
+ $(OBJDIR)/markdown_html_.c \
$(OBJDIR)/md5_.c \
$(OBJDIR)/merge_.c \
$(OBJDIR)/merge3_.c \
$(OBJDIR)/moderate_.c \
$(OBJDIR)/name_.c \
@@ -503,10 +517,12 @@
$(OBJDIR)/json_wiki.o \
$(OBJDIR)/leaf.o \
$(OBJDIR)/login.o \
$(OBJDIR)/main.o \
$(OBJDIR)/manifest.o \
+ $(OBJDIR)/markdown.o \
+ $(OBJDIR)/markdown_html.o \
$(OBJDIR)/md5.o \
$(OBJDIR)/merge.o \
$(OBJDIR)/merge3.o \
$(OBJDIR)/moderate.o \
$(OBJDIR)/name.o \
@@ -662,11 +678,11 @@
$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
$(MKINDEX) $(TRANS_SRC) >$@
$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
- $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
+ $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/wysiwyg_.c:$(OBJDIR)/wysiwyg.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
echo Done >$(OBJDIR)/headers
$(OBJDIR)/headers: Makefile
Makefile:
@@ -1116,10 +1132,26 @@
$(OBJDIR)/manifest.o: $(OBJDIR)/manifest_.c $(OBJDIR)/manifest.h $(SRCDIR)/config.h
$(XTCC) -o $(OBJDIR)/manifest.o -c $(OBJDIR)/manifest_.c
$(OBJDIR)/manifest.h: $(OBJDIR)/headers
+
+$(OBJDIR)/markdown_.c: $(SRCDIR)/markdown.c $(OBJDIR)/translate
+ $(TRANSLATE) $(SRCDIR)/markdown.c >$(OBJDIR)/markdown_.c
+
+$(OBJDIR)/markdown.o: $(OBJDIR)/markdown_.c $(OBJDIR)/markdown.h $(SRCDIR)/config.h
+ $(XTCC) -o $(OBJDIR)/markdown.o -c $(OBJDIR)/markdown_.c
+
+$(OBJDIR)/markdown.h: $(OBJDIR)/headers
+
+$(OBJDIR)/markdown_html_.c: $(SRCDIR)/markdown_html.c $(OBJDIR)/translate
+ $(TRANSLATE) $(SRCDIR)/markdown_html.c >$(OBJDIR)/markdown_html_.c
+
+$(OBJDIR)/markdown_html.o: $(OBJDIR)/markdown_html_.c $(OBJDIR)/markdown_html.h $(SRCDIR)/config.h
+ $(XTCC) -o $(OBJDIR)/markdown_html.o -c $(OBJDIR)/markdown_html_.c
+
+$(OBJDIR)/markdown_html.h: $(OBJDIR)/headers
$(OBJDIR)/md5_.c: $(SRCDIR)/md5.c $(OBJDIR)/translate
$(TRANSLATE) $(SRCDIR)/md5.c >$(OBJDIR)/md5_.c
$(OBJDIR)/md5.o: $(OBJDIR)/md5_.c $(OBJDIR)/md5.h $(SRCDIR)/config.h
Index: win/Makefile.msc
==================================================================
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -94,10 +94,12 @@
json_wiki_.c \
leaf_.c \
login_.c \
main_.c \
manifest_.c \
+ markdown_.c \
+ markdown_html_.c \
md5_.c \
merge_.c \
merge3_.c \
moderate_.c \
name_.c \
@@ -195,10 +197,12 @@
$(OX)\json_wiki$O \
$(OX)\leaf$O \
$(OX)\login$O \
$(OX)\main$O \
$(OX)\manifest$O \
+ $(OX)\markdown$O \
+ $(OX)\markdown_html$O \
$(OX)\md5$O \
$(OX)\merge$O \
$(OX)\merge3$O \
$(OX)\moderate$O \
$(OX)\name$O \
@@ -313,10 +317,12 @@
echo $(OX)\json_wiki.obj >> $@
echo $(OX)\leaf.obj >> $@
echo $(OX)\login.obj >> $@
echo $(OX)\main.obj >> $@
echo $(OX)\manifest.obj >> $@
+ echo $(OX)\markdown.obj >> $@
+ echo $(OX)\markdown_html.obj >> $@
echo $(OX)\md5.obj >> $@
echo $(OX)\merge.obj >> $@
echo $(OX)\merge3.obj >> $@
echo $(OX)\moderate.obj >> $@
echo $(OX)\name.obj >> $@
@@ -769,10 +775,22 @@
$(OX)\manifest$O : manifest_.c manifest.h
$(TCC) /Fo$@ -c manifest_.c
manifest_.c : $(SRCDIR)\manifest.c
translate$E $** > $@
+
+$(OX)\markdown$O : markdown_.c markdown.h
+ $(TCC) /Fo$@ -c markdown_.c
+
+markdown_.c : $(SRCDIR)\markdown.c
+ translate$E $** > $@
+
+$(OX)\markdown_html$O : markdown_html_.c markdown_html.h
+ $(TCC) /Fo$@ -c markdown_html_.c
+
+markdown_html_.c : $(SRCDIR)\markdown_html.c
+ translate$E $** > $@
$(OX)\md5$O : md5_.c md5.h
$(TCC) /Fo$@ -c md5_.c
md5_.c : $(SRCDIR)\md5.c
@@ -1091,10 +1109,12 @@
json_wiki_.c:json_wiki.h \
leaf_.c:leaf.h \
login_.c:login.h \
main_.c:main.h \
manifest_.c:manifest.h \
+ markdown_.c:markdown.h \
+ markdown_html_.c:markdown_html.h \
md5_.c:md5.h \
merge_.c:merge.h \
merge3_.c:merge3.h \
moderate_.c:moderate.h \
name_.c:name.h \