Fossil SCM

Add experimental support for WYSIWYG editing of wiki pages.

drh 2012-08-10 19:59 UTC trunk

Commit 6cd9847f5479336ffbce9fe7460e5926e2832140

Parent 717cd2782c41add…

7 files changed +11 -1 +1 +26 -9 +286 +10 -4 +11 -1 +10 -3

~ src/main.mk ~ src/makemake.tcl ~ src/wiki.c + src/wysiwyg.c ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc

M src/main.mk

+11 -1

		--- src/main.mk
		+++ src/main.mk
		@@ -106,10 +106,11 @@
106	106	$(SRCDIR)/verify.c \
107	107	$(SRCDIR)/vfile.c \
108	108	$(SRCDIR)/wiki.c \
109	109	$(SRCDIR)/wikiformat.c \
110	110	$(SRCDIR)/winhttp.c \
	111	+ $(SRCDIR)/wysiwyg.c \
111	112	$(SRCDIR)/xfer.c \
112	113	$(SRCDIR)/xfersetup.c \
113	114	$(SRCDIR)/zip.c
114	115
115	116	TRANS_SRC = \
		@@ -205,10 +206,11 @@
205	206	$(OBJDIR)/verify_.c \
206	207	$(OBJDIR)/vfile_.c \
207	208	$(OBJDIR)/wiki_.c \
208	209	$(OBJDIR)/wikiformat_.c \
209	210	$(OBJDIR)/winhttp_.c \
	211	+ $(OBJDIR)/wysiwyg_.c \
210	212	$(OBJDIR)/xfer_.c \
211	213	$(OBJDIR)/xfersetup_.c \
212	214	$(OBJDIR)/zip_.c
213	215
214	216	OBJ = \
		@@ -304,10 +306,11 @@
304	306	$(OBJDIR)/verify.o \
305	307	$(OBJDIR)/vfile.o \
306	308	$(OBJDIR)/wiki.o \
307	309	$(OBJDIR)/wikiformat.o \
308	310	$(OBJDIR)/winhttp.o \
	311	+ $(OBJDIR)/wysiwyg.o \
309	312	$(OBJDIR)/xfer.o \
310	313	$(OBJDIR)/xfersetup.o \
311	314	$(OBJDIR)/zip.o
312	315
313	316	APPNAME = fossil$(E)
		@@ -375,11 +378,11 @@
375	378
376	379
377	380	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
378	381	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
379	382	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
380		- $(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)/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)/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)/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
	383	+ $(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)/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)/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
381	384	touch $(OBJDIR)/headers
382	385	$(OBJDIR)/headers: Makefile
383	386	$(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
384	387	Makefile:
385	388	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
		@@ -1038,10 +1041,17 @@
1038	1041
1039	1042	$(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h
1040	1043	$(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c
1041	1044
1042	1045	$(OBJDIR)/winhttp.h: $(OBJDIR)/headers
	1046	+$(OBJDIR)/wysiwyg_.c: $(SRCDIR)/wysiwyg.c $(OBJDIR)/translate
	1047	+ $(OBJDIR)/translate $(SRCDIR)/wysiwyg.c >$(OBJDIR)/wysiwyg_.c
	1048	+
	1049	+$(OBJDIR)/wysiwyg.o: $(OBJDIR)/wysiwyg_.c $(OBJDIR)/wysiwyg.h $(SRCDIR)/config.h
	1050	+ $(XTCC) -o $(OBJDIR)/wysiwyg.o -c $(OBJDIR)/wysiwyg_.c
	1051	+
	1052	+$(OBJDIR)/wysiwyg.h: $(OBJDIR)/headers
1043	1053	$(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(OBJDIR)/translate
1044	1054	$(OBJDIR)/translate $(SRCDIR)/xfer.c >$(OBJDIR)/xfer_.c
1045	1055
1046	1056	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1047	1057	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1048	1058

	--- src/main.mk
	+++ src/main.mk
	@@ -106,10 +106,11 @@
106	$(SRCDIR)/verify.c \
107	$(SRCDIR)/vfile.c \
108	$(SRCDIR)/wiki.c \
109	$(SRCDIR)/wikiformat.c \
110	$(SRCDIR)/winhttp.c \

111	$(SRCDIR)/xfer.c \
112	$(SRCDIR)/xfersetup.c \
113	$(SRCDIR)/zip.c
114
115	TRANS_SRC = \
	@@ -205,10 +206,11 @@
205	$(OBJDIR)/verify_.c \
206	$(OBJDIR)/vfile_.c \
207	$(OBJDIR)/wiki_.c \
208	$(OBJDIR)/wikiformat_.c \
209	$(OBJDIR)/winhttp_.c \

210	$(OBJDIR)/xfer_.c \
211	$(OBJDIR)/xfersetup_.c \
212	$(OBJDIR)/zip_.c
213
214	OBJ = \
	@@ -304,10 +306,11 @@
304	$(OBJDIR)/verify.o \
305	$(OBJDIR)/vfile.o \
306	$(OBJDIR)/wiki.o \
307	$(OBJDIR)/wikiformat.o \
308	$(OBJDIR)/winhttp.o \

309	$(OBJDIR)/xfer.o \
310	$(OBJDIR)/xfersetup.o \
311	$(OBJDIR)/zip.o
312
313	APPNAME = fossil$(E)
	@@ -375,11 +378,11 @@
375
376
377	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
378	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
379	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
380	$(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)/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)/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)/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
381	touch $(OBJDIR)/headers
382	$(OBJDIR)/headers: Makefile
383	$(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
384	Makefile:
385	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -1038,10 +1041,17 @@
1038
1039	$(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h
1040	$(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c
1041
1042	$(OBJDIR)/winhttp.h: $(OBJDIR)/headers







1043	$(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(OBJDIR)/translate
1044	$(OBJDIR)/translate $(SRCDIR)/xfer.c >$(OBJDIR)/xfer_.c
1045
1046	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1047	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1048

	--- src/main.mk
	+++ src/main.mk
	@@ -106,10 +106,11 @@
106	$(SRCDIR)/verify.c \
107	$(SRCDIR)/vfile.c \
108	$(SRCDIR)/wiki.c \
109	$(SRCDIR)/wikiformat.c \
110	$(SRCDIR)/winhttp.c \
111	$(SRCDIR)/wysiwyg.c \
112	$(SRCDIR)/xfer.c \
113	$(SRCDIR)/xfersetup.c \
114	$(SRCDIR)/zip.c
115
116	TRANS_SRC = \
	@@ -205,10 +206,11 @@
206	$(OBJDIR)/verify_.c \
207	$(OBJDIR)/vfile_.c \
208	$(OBJDIR)/wiki_.c \
209	$(OBJDIR)/wikiformat_.c \
210	$(OBJDIR)/winhttp_.c \
211	$(OBJDIR)/wysiwyg_.c \
212	$(OBJDIR)/xfer_.c \
213	$(OBJDIR)/xfersetup_.c \
214	$(OBJDIR)/zip_.c
215
216	OBJ = \
	@@ -304,10 +306,11 @@
306	$(OBJDIR)/verify.o \
307	$(OBJDIR)/vfile.o \
308	$(OBJDIR)/wiki.o \
309	$(OBJDIR)/wikiformat.o \
310	$(OBJDIR)/winhttp.o \
311	$(OBJDIR)/wysiwyg.o \
312	$(OBJDIR)/xfer.o \
313	$(OBJDIR)/xfersetup.o \
314	$(OBJDIR)/zip.o
315
316	APPNAME = fossil$(E)
	@@ -375,11 +378,11 @@
378
379
380	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
381	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
382	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
383	$(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)/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)/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
384	touch $(OBJDIR)/headers
385	$(OBJDIR)/headers: Makefile
386	$(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
387	Makefile:
388	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -1038,10 +1041,17 @@
1041
1042	$(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h
1043	$(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c
1044
1045	$(OBJDIR)/winhttp.h: $(OBJDIR)/headers
1046	$(OBJDIR)/wysiwyg_.c: $(SRCDIR)/wysiwyg.c $(OBJDIR)/translate
1047	$(OBJDIR)/translate $(SRCDIR)/wysiwyg.c >$(OBJDIR)/wysiwyg_.c
1048
1049	$(OBJDIR)/wysiwyg.o: $(OBJDIR)/wysiwyg_.c $(OBJDIR)/wysiwyg.h $(SRCDIR)/config.h
1050	$(XTCC) -o $(OBJDIR)/wysiwyg.o -c $(OBJDIR)/wysiwyg_.c
1051
1052	$(OBJDIR)/wysiwyg.h: $(OBJDIR)/headers
1053	$(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(OBJDIR)/translate
1054	$(OBJDIR)/translate $(SRCDIR)/xfer.c >$(OBJDIR)/xfer_.c
1055
1056	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1057	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1058

M src/makemake.tcl

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -109,10 +109,11 @@
109	109	verify
110	110	vfile
111	111	wiki
112	112	wikiformat
113	113	winhttp
	114	+ wysiwyg
114	115	xfer
115	116	xfersetup
116	117	zip
117	118	http_ssl
118	119	}
119	120

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -109,10 +109,11 @@
109	verify
110	vfile
111	wiki
112	wikiformat
113	winhttp

114	xfer
115	xfersetup
116	zip
117	http_ssl
118	}
119

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -109,10 +109,11 @@
109	verify
110	vfile
111	wiki
112	wikiformat
113	winhttp
114	wysiwyg
115	xfer
116	xfersetup
117	zip
118	http_ssl
119	}
120

M src/wiki.c

+26 -9

		--- src/wiki.c
		+++ src/wiki.c
		@@ -187,10 +187,12 @@
187	187	}
188	188	if( !g.isHome ){
189	189	if( (rid && g.perm.WrWiki) \|\| (!rid && g.perm.NewWiki) ){
190	190	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
191	191	g.zTop, zPageName);
	192	+ style_submenu_element("Wysiwyg", "Wysiwyg Editor",
	193	+ "%s/wikiedit?name=%T&wysiwyg", g.zTop, zPageName);
192	194	}
193	195	if( rid && g.perm.ApndWiki && g.perm.Attach ){
194	196	style_submenu_element("Attach", "Add An Attachment",
195	197	"%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
196	198	g.zTop, zPageName, g.zTop, zPageName);
		@@ -336,13 +338,13 @@
336	338	if( zBody==0 ){
337	339	zBody = mprintf("<i>Empty Page</i>");
338	340	}
339	341	zHtmlPageName = mprintf("Edit: %s", zPageName);
340	342	style_header(zHtmlPageName);
	343	+ blob_zero(&wiki);
	344	+ blob_append(&wiki, zBody, -1);
341	345	if( P("preview")!=0 ){
342		- blob_zero(&wiki);
343		- blob_append(&wiki, zBody, -1);
344	346	@ Preview:<hr />
345	347	wiki_convert(&wiki, 0, 0);
346	348	@ <hr />
347	349	blob_reset(&wiki);
348	350	}
		@@ -349,21 +351,36 @@
349	351	for(n=2, z=zBody; z[0]; z++){
350	352	if( z[0]=='\n' ) n++;
351	353	}
352	354	if( n<20 ) n = 20;
353	355	if( n>40 ) n = 40;
354		- @ <form method="post" action="%s(g.zTop)/wikiedit"><div>
	356	+ if( P("wysiwyg")==0 ){
	357	+ /* Traditional markup-only editing */
	358	+ @ <form method="post" action="%s(g.zTop)/wikiedit"><div>
	359	+ @ <textarea name="w" class="wikiedit" cols="80"
	360	+ @ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
	361	+ @ <br />
	362	+ @ <input type="submit" name="preview" value="Preview Your Changes" />
	363	+ }else{
	364	+ /* Wysiwyg editing */
	365	+ Blob html;
	366	+ @ <form method="post" action="%s(g.zTop)/wikiedit"
	367	+ @ onsubmit="wysiwygSubmit()"><div>
	368	+ @ <input type="hidden" name="wysiwyg" value="1" />
	369	+ blob_zero(&html);
	370	+ wiki_convert(&wiki, &html, 0);
	371	+ wysiwygEditor("w", blob_str(&html), 60, n);
	372	+ blob_reset(&html);
	373	+ @ <br />
	374	+ }
	375	+ @ <input type="submit" name="submit" value="Apply These Changes" />
355	376	login_insert_csrf_secret();
356	377	@ <input type="hidden" name="name" value="%h(zPageName)" />
357		- @ <textarea name="w" class="wikiedit" cols="80"
358		- @ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
359		- @ <br />
360		- @ <input type="submit" name="preview" value="Preview Your Changes" />
361		- @ <input type="submit" name="submit" value="Apply These Changes" />
362	378	@ <input type="submit" name="cancel" value="Cancel" />
363	379	@ </div></form>
364	380	manifest_destroy(pWiki);
	381	+ blob_reset(&wiki);
365	382	style_footer();
366	383	}
367	384
368	385	/*
369	386	** WEBPAGE: wikinew
		@@ -379,11 +396,11 @@
379	396	login_needed();
380	397	return;
381	398	}
382	399	zName = PD("name","");
383	400	if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
384		- cgi_redirectf("wikiedit?name=%T", zName);
	401	+ cgi_redirectf("wikiedit?name=%T&wysiwyg", zName);
385	402	}
386	403	style_header("Create A New Wiki Page");
387	404	@ <p>Rules for wiki page names:</p>
388	405	well_formed_wiki_name_rules();
389	406	@ <form method="post" action="%s(g.zTop)/wikinew">
390	407
391	408	ADDED src/wysiwyg.c

	--- src/wiki.c
	+++ src/wiki.c
	@@ -187,10 +187,12 @@
187	}
188	if( !g.isHome ){
189	if( (rid && g.perm.WrWiki) \|\| (!rid && g.perm.NewWiki) ){
190	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
191	g.zTop, zPageName);


192	}
193	if( rid && g.perm.ApndWiki && g.perm.Attach ){
194	style_submenu_element("Attach", "Add An Attachment",
195	"%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
196	g.zTop, zPageName, g.zTop, zPageName);
	@@ -336,13 +338,13 @@
336	if( zBody==0 ){
337	zBody = mprintf("<i>Empty Page</i>");
338	}
339	zHtmlPageName = mprintf("Edit: %s", zPageName);
340	style_header(zHtmlPageName);


341	if( P("preview")!=0 ){
342	blob_zero(&wiki);
343	blob_append(&wiki, zBody, -1);
344	@ Preview:<hr />
345	wiki_convert(&wiki, 0, 0);
346	@ <hr />
347	blob_reset(&wiki);
348	}
	@@ -349,21 +351,36 @@
349	for(n=2, z=zBody; z[0]; z++){
350	if( z[0]=='\n' ) n++;
351	}
352	if( n<20 ) n = 20;
353	if( n>40 ) n = 40;
354	@ <form method="post" action="%s(g.zTop)/wikiedit"><div>



















355	login_insert_csrf_secret();
356	@ <input type="hidden" name="name" value="%h(zPageName)" />
357	@ <textarea name="w" class="wikiedit" cols="80"
358	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
359	@ <br />
360	@ <input type="submit" name="preview" value="Preview Your Changes" />
361	@ <input type="submit" name="submit" value="Apply These Changes" />
362	@ <input type="submit" name="cancel" value="Cancel" />
363	@ </div></form>
364	manifest_destroy(pWiki);

365	style_footer();
366	}
367
368	/*
369	** WEBPAGE: wikinew
	@@ -379,11 +396,11 @@
379	login_needed();
380	return;
381	}
382	zName = PD("name","");
383	if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
384	cgi_redirectf("wikiedit?name=%T", zName);
385	}
386	style_header("Create A New Wiki Page");
387	@ <p>Rules for wiki page names:</p>
388	well_formed_wiki_name_rules();
389	@ <form method="post" action="%s(g.zTop)/wikinew">
390
391	DDED src/wysiwyg.c

	--- src/wiki.c
	+++ src/wiki.c
	@@ -187,10 +187,12 @@
187	}
188	if( !g.isHome ){
189	if( (rid && g.perm.WrWiki) \|\| (!rid && g.perm.NewWiki) ){
190	style_submenu_element("Edit", "Edit Wiki Page", "%s/wikiedit?name=%T",
191	g.zTop, zPageName);
192	style_submenu_element("Wysiwyg", "Wysiwyg Editor",
193	"%s/wikiedit?name=%T&wysiwyg", g.zTop, zPageName);
194	}
195	if( rid && g.perm.ApndWiki && g.perm.Attach ){
196	style_submenu_element("Attach", "Add An Attachment",
197	"%s/attachadd?page=%T&from=%s/wiki%%3fname=%T",
198	g.zTop, zPageName, g.zTop, zPageName);
	@@ -336,13 +338,13 @@
338	if( zBody==0 ){
339	zBody = mprintf("<i>Empty Page</i>");
340	}
341	zHtmlPageName = mprintf("Edit: %s", zPageName);
342	style_header(zHtmlPageName);
343	blob_zero(&wiki);
344	blob_append(&wiki, zBody, -1);
345	if( P("preview")!=0 ){


346	@ Preview:<hr />
347	wiki_convert(&wiki, 0, 0);
348	@ <hr />
349	blob_reset(&wiki);
350	}
	@@ -349,21 +351,36 @@
351	for(n=2, z=zBody; z[0]; z++){
352	if( z[0]=='\n' ) n++;
353	}
354	if( n<20 ) n = 20;
355	if( n>40 ) n = 40;
356	if( P("wysiwyg")==0 ){
357	/* Traditional markup-only editing */
358	@ <form method="post" action="%s(g.zTop)/wikiedit"><div>
359	@ <textarea name="w" class="wikiedit" cols="80"
360	@ rows="%d(n)" wrap="virtual">%h(zBody)</textarea>
361	@ <br />
362	@ <input type="submit" name="preview" value="Preview Your Changes" />
363	}else{
364	/* Wysiwyg editing */
365	Blob html;
366	@ <form method="post" action="%s(g.zTop)/wikiedit"
367	@ onsubmit="wysiwygSubmit()"><div>
368	@ <input type="hidden" name="wysiwyg" value="1" />
369	blob_zero(&html);
370	wiki_convert(&wiki, &html, 0);
371	wysiwygEditor("w", blob_str(&html), 60, n);
372	blob_reset(&html);
373	@ <br />
374	}
375	@ <input type="submit" name="submit" value="Apply These Changes" />
376	login_insert_csrf_secret();
377	@ <input type="hidden" name="name" value="%h(zPageName)" />





378	@ <input type="submit" name="cancel" value="Cancel" />
379	@ </div></form>
380	manifest_destroy(pWiki);
381	blob_reset(&wiki);
382	style_footer();
383	}
384
385	/*
386	** WEBPAGE: wikinew
	@@ -379,11 +396,11 @@
396	login_needed();
397	return;
398	}
399	zName = PD("name","");
400	if( zName[0] && wiki_name_is_wellformed((const unsigned char *)zName) ){
401	cgi_redirectf("wikiedit?name=%T&wysiwyg", zName);
402	}
403	style_header("Create A New Wiki Page");
404	@ <p>Rules for wiki page names:</p>
405	well_formed_wiki_name_rules();
406	@ <form method="post" action="%s(g.zTop)/wikinew">
407
408	DDED src/wysiwyg.c

A src/wysiwyg.c

+286

		--- a/src/wysiwyg.c
		+++ b/src/wysiwyg.c
		@@ -0,0 +1,286 @@
	1	+/*
	2	+** Copyright (c) 2012 D. Richard Hipp
	3	+**
	4	+** This program is free software; you can redistribute it and/or
	5	+** modify it under the terms of the Simplified BSD License (also
	6	+** known as the "2-Clause License" or "FreeBSD License".)
	7	+**
	8	+** This program is distributed in the hope that it will be useful,
	9	+** but without any warranty; without even the implied warranty of
	10	+** merchantability or fitness for a particular purpose.
	11	+**
	12	+** Author contact information:
	13	+** [email protected]
	14	+** http://www.hwaci.com/drh/
	15	+**
	16	+*******************************************************************************
	17	+**
	18	+** This file contains code that generates WYSIWYG text editors on<assert.h>
	19	+#i** web pages.
	20	+*/
	21	+#iinclude <ctype.h>
	22	+#include "wysiwyg.h"
	23	+
	24	+
	25	+/*
	26	+** Output code for a WYSIWYG editor. The caller must have already generated
	27	+** the <form> that will contain the editor, and the call must generate the
	28	+** corresponding </form> after this routine returns. The caller must include
	29	+** an onsubmit= attribute on the <form> element that invokes the
	30	+** wysiwygSubmit() function.
	31	+**
	32	+** There can only be a single WYSIWYG editor per frame.
	33	+*/
	34	+void wysiwygEditor(
	35	+ const char zId, / ID for this editor */
	36	+ const char zContent, / Initial content (HTML) */
	37	+ int w, int h /* Initial width and height */
	38	+){
	39	+
	40	+ @ <style type="text/css">
	41	+ @ .intLink { cursor: pointer; }
	42	+ @ img.intLink { border: 0; }
	43	+ @ #wysiwygBox {
	44	+ @ border: 1px #000000 solid;
	45	+ @ padding: 12px;
	46	+ @ }
	47	+ @ #editMode label { cursor: pointer; }
	48	+ @ </style>
	49	+
	50	+ @ <input id="wysiwygValue" type="hidden" name="%s(zId)">
	51	+ @ <div id="editModeDiv">Edit mode:
	52	+ @ <select id="editMode" size=1 onchange="/yH5BAEAAB8ALAAAAAAWABYAAAVu4C"
	53	+** wysiwygSubmit() fsize=1>
	54	+ @ <option value="0">WYSIWYG</option>
	55	+ @ <option value="1">Raw HTML</option>
	56	+ onchange="formatDoc('formatblock'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;">
	57	+ @ <option selected>- formatting -</option>
	58	+ @ <option value="h1">Title 1 <h1></option>
	59	+ @ <option value="h2">Title 2 <h2></option>
	60	+ @ <option value="h3">Title 3 <h3></option>
	61	+ @ <option value="h4">Title 4 <h4></option>
	62	+ @ <option value="h5">Title 5 <h5></option>
	63	+ @ <option value="h6">Subtitle <h6></option>
	64	+ @ <option value="p">Paragraph <p></option>
	65	+ @ <option value="pre">Preformatted <pre></option>onchange="formatDoc('fontname'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
	66	+*/
	67	+#include "config.h"
	68	+#include <assert.h>
	69	+#include <ctype.h>
	70	+#include "wysiwyg.h"
	71	+
	72	+
	73	+/*
	74	+** Output code for a WYSIWYG editor. The caller must have already generated
	75	+** the <form> that will contain the editonchange="formatDoc('fontsize'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
	76	+*/
	77	+#in </form> after this routine returns. The caller must include
	78	+** an onsubmit= attribute on the <form> element that invokes the
	79	+** wysiwygSubmit() function.
	80	+**
	81	+** There can only be a single WYSIWYG editor per frame.
	82	+*/
	83	+void wysiwygEditor(
	84	+ const char zId, / ID for this editor */
	85	+ const char zContent, / Initionchange="formatDoc('forecolor'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
	86	+*/
	87	+#ins">
	88	+ @ .intLink { cursor: pointer; }
	89	+ @ img.intLink { border: 0; }
	90	+ @ #wysiwygBox {
	91	+ @ border: 1px #000000 solid;
	92	+ @ padding: 12px;
	93	+ @ }
	94	+ @ #editMode label { cursor: pointer; }
	95	+ @ </style>
	96	+
	97	+ @ <input id="wysiwygValue" type="hidden" name="%s(zId)">
	98	+ onclick="formatDoc('undo');"
	99	+ @ src="data:ima size=1>
	100	+ @ <option value="0">WYSIWYG</option>
	101	+ @ <option value="1">Raw HTML</option>
	102	+ @ </select></div>
	103	+ @ <div id="toolBar1">
	104	+ @ <select class="format" data-format="formatblock">
	105	+ @ <option selected>- formatting -</option>
	106	+ @ <option value="h1">Title 1 &lonclick="formatDoc('redo');"
	107	+ @ src="data:imation>
	108	+ @ <option value="h3">Title 3 <h3></option>
	109	+ @ <option value="h4">Title 4 <h4></option>
	110	+ @ <option value="h5">Title 5 <h5></option>
	111	+ @ <option value="h6">Subtitle <h6></o
	112	+ @ onclick"
	113	+ @ src="data:image/</option>
	114	+ @ <option value="pre">Preformatted <pre></option>
	115	+ @ </select>
	116	+ @ <select class="format" data-format="fontname">
	117	+ @ <option class="heading" selected>- font -</option>
	118	+ @ <option>Arial</option>
	119	+ @ <option>Arial Black</option>
	120	+ @ <option>Courier New</option>
	121	+ @ <option>Times New Roman</option>
	122	+ @ </select>
	123	+ @ <select class="format" data-format="fontsize">
	124	+ @ <option class="heading" selected>- size -</option>
	125	+ @ <option value="1">Very small</option>
	126	+ @ <option value="2">A bit small</option>
	127	+ @ <option value="3">Normal</option>
	128	+ @ <option value="4">Medium-large</option>
	129	+ @ <option value="5">Big</option>
	130	+ @ <option value="6">Very big</option>
	131	+ @ <option value="7">Maximum</option>
	132	+ @ </select>
	133	+ @ <select class="format" data-format="forecolor">
	134	+ @ <option class="heading" selected>- color -</option>
	135	+ @ <option value="red">Red</option>
	136	+ @ <option value="blue">Blue</option>
	137	+ @ <option value="green">Green</option>
	138	+ @ <option value="black">Black</option>
	139	+ @ </select>
	140	+ @ </div>
	141	+ @ <div id="toolBar2">
	142	+ @ <img class="intLink" title="Undo" data-format="undo"
	143	+ @ src="data:image/gif;base64,R0lGODlhFgAWAOMKADljwliE33mOrpGjuYKl8aezxqPD+7
	144	+ @ /I19DV3NHa7P///////////////////////yH5BAEKAA8ALAAAAAAWABYAAARR8MlJq704680
	145	+ @ 7TkaYeJJBnES4EeUJvIGapWYAC0CsocQ7SDlWonclick="formatDoc('bold');"
	146	+ @ src="data:imagD/AMDAwAAAACH5BnhI+pa+H9mJy0LhdgtrxzDG5WGFVk6aXqyk6Y9kXvKKNuLbb6zgMFADs=" />
	147	+
	148	+ @ <img clasonclick="formatDoc('italic');"
	149	+ @ src="data:image/gif;base64,R0lGODlhFgAWAKEDAAAAAF9vj5WIbf///yH5BAEAAAMALA
	150	+ @ AAAAAWABYAAAIjnI+py+0Po5x0gXvruEKHrF2BB1YiCWgbMFIYpsbyTNd2UwAAOw==" />
	151	+
	152	+ @ <img class="onclick="formatDoc('underline');"
	153	+ @ src="data:imaKECAAAAAF9vj////////yH5BAEAAAIALA
	154	+ @ AAAAAWABYAAAIrlI+py+0Po5zUgAsEzvEeL4Ea15EiJJ5PSqJmuwKBEKgxVuXWtun+DwxCCgA
	155	+ @ 7" />
	156	+
	157	+ @ <img class="
	158	+ @ onclick try the"useCSS", 0, true); } // IE9/10
	159	+ @ catch (e) { } D License (also
	160	+** known as the "2-Clause License" or "FreeBSD License".)
	161	+**
	162	+** This program is distributed in the hope that it will be useful,
	163	+** but without any warranty; without even the implied warranty of
	164	+** merchantability or fitness for a particular purpose.
	165	+**
	166	+** Author contact information:
	167	+** [email protected]
	168	+ http://www.hwacAdd**********************************************************
	169	+**
	170	+** This file contains code that generates WYSIWYG text editors on
	171	+** web pages.
	172	+*/
	173	+#include "config.h"
	174	+#include <assert.h>
	175	+#include <ctype.h>
	176	+#include "wysiwyg.h"
	177	+
	178	+
	179	+/*
	180	+ Output code for a WYSIWYG editor. The caller ***************indenI+pa+H9mJy0LhdgtrxzDG5W
	181	+ @ #wysiwygBox {
	182	+ @ border: 1px #000000 solid;
	183	+ @ padding: 12px;
	184	+ @ }
	185	+ @ #editMode label { cursor: pointer; }
	186	+ @ </style>
	187	+
	188	+ @ <input id="wysiwygValue" type="hidden" name="%s(zId)">
	189	+ @ <div id="editModeDiv">Edit mode:
	190	+ @ <select id="editMode" size=1 onchange="/yH5BAEAAB8ALAAAAAAWABYAAAVu4C"
	191	+** wysiwygSubmit() fsize=1>
	192	+ @ <option value="0">WYSIWYG</option>
	193	+ @ <option value="1">Raw HTML</option>
	194	+ onchange="formatDoc('formatblock'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;">
	195	+ @ <option selected>- formatting -</option>
	196	+ @ <option value="h1">Title 1 <h1></option>
	197	+ @ <option value="h2">Title 2 <h2></option>
	198	+ @ <option value="h3">Title 3 <h3></option>
	199	+ @ <option value="h4">Title 4 <h4></option>
	200	+ @ <option value="h5">Title 5 <h5></option>
	201	+ @ <option value="h6">Subtitle <h6></option>
	202	+ @ <option value="p">Paragraph <p></option>
	203	+ @ <option value="pre">Preformatted <pre></option>onchange="formatDoc('fontname'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
	204	+*/
	205	+#include "config.h"
	206	+#include <assert.h>
	207	+#include <ctype.h>
	208	+#include "wysiwyg.h"
	209	+
	210	+
	211	+/*
	212	+** Output code for a WYSIWYG editor. The caller must have already generated
	213	+** the <form> that will contain the editonchange="formatDoc('fontsize'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
	214	+*/
	215	+#in </form> after this routine returns. The caller must include
	216	+** an onsubmit= attribute on the <form> element that invokes the
	217	+** wysiwygSubmit() function.
	218	+**
	219	+** There can only be a single WYSIWYG editor per frame.
	220	+*/
	221	+void wysiwygEditor(
	222	+ const char zId, / ID for this editor */
	223	+ const char zContent, / Initionchange="formatDoc('forecolor'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
	224	+*/
	225	+#ins">
	226	+ @ .intLink { cursor: pointer; }
	227	+ @ img.intLink { border: 0; }
	228	+ @ #wysiwygBox {
	229	+ @ border: 1px #000000 solid;
	230	+ @ padding: 12px;
	231	+ @ }
	232	+ @ #editMode label { cursor: pointer; }
	233	+ @ </style>
	234	+
	235	+ @ <input id="wysiwygValue" type="hidden" name="%s(zId)">
	236	+ onclick="formatDoc('undo');"
	237	+ @ src="data:ima size=1>
	238	+ @ <option value="0">WYSIWYG</option>
	239	+ @ <option value="1">Raw HTML</option>
	240	+ @ </select></div>
	241	+ @ <div id="toolBar1">
	242	+ @ <select class="format" data-format="formatblock">
	243	+ @ <option selected>- formatting -</option>
	244	+ @ <option value="h1">Title 1 &lonclick="formatDoc('redo');"
	245	+ @ src="data:imation>
	246	+ @ <option valCutoption>
	247	+ @ <option value=cu*
	248	+** Copyright (c) 2012 ard Hipp
	249	+**
	250	+** This program is free software; you can redistribute it and/or
	251	+** modify it under the terms of the Simplified BSD License (also
	252	+** known as the "2-Clause License" or "FreeBSD License".)
	253	+**
	254	+** This program is distributed in the hope that it will be useful,
	255	+** but without any warranty; without even the implied warranty of
	256	+** merchantability or fitness for a particular purpose.
	257	+**
	258	+** Author contact information:
	259	+** [email protected]
	260	+** http://www.hwaci.com/drh/
	261	+**
	262	+*******************************************************************************
	263	+**
	264	+** This file contains code that generates WYSIWYG text editors on<assert.h>
	265	+#i** web pages.
	266	+*/
	267	+#iinclude <ctype.h>
	268	+#include "wysiwyg.h"
	269	+
	270	+
	271	+/*
	272	+** Output code for a WYSIWYG editor. The caller must have already generated
	273	+** the <form> that will contain the editor, and the call must generate the
	274	+** corresponding </form> after this routine returns. The caller must include
	275	+** an onsubmit= attribute on the <form> element that invokes the
	276	+** wysiwygSubmit() function.
	277	+**
	278	+** There can only be a single WYSIWYG editor per frame.
	279	+*/
	280	+void wysiwygEditor(
	281	+ const char zId, / ID for this editor */
	282	+ const char zContent, / Initial content (HTML) */
	283	+ int w, int h /* Initial width and height */
	284	+){
	285	+
	286	+ @ <style type="texon sele

	--- a/src/wysiwyg.c
	+++ b/src/wysiwyg.c
	@@ -0,0 +1,286 @@

	--- a/src/wysiwyg.c
	+++ b/src/wysiwyg.c
	@@ -0,0 +1,286 @@
1	/*
2	** Copyright (c) 2012 D. Richard Hipp
3	**
4	** This program is free software; you can redistribute it and/or
5	** modify it under the terms of the Simplified BSD License (also
6	** known as the "2-Clause License" or "FreeBSD License".)
7	**
8	** This program is distributed in the hope that it will be useful,
9	** but without any warranty; without even the implied warranty of
10	** merchantability or fitness for a particular purpose.
11	**
12	** Author contact information:
13	** [email protected]
14	** http://www.hwaci.com/drh/
15	**
16	*******************************************************************************
17	**
18	** This file contains code that generates WYSIWYG text editors on<assert.h>
19	#i** web pages.
20	*/
21	#iinclude <ctype.h>
22	#include "wysiwyg.h"
23
24
25	/*
26	** Output code for a WYSIWYG editor. The caller must have already generated
27	** the <form> that will contain the editor, and the call must generate the
28	** corresponding </form> after this routine returns. The caller must include
29	** an onsubmit= attribute on the <form> element that invokes the
30	** wysiwygSubmit() function.
31	**
32	** There can only be a single WYSIWYG editor per frame.
33	*/
34	void wysiwygEditor(
35	const char zId, / ID for this editor */
36	const char zContent, / Initial content (HTML) */
37	int w, int h /* Initial width and height */
38	){
39
40	@ <style type="text/css">
41	@ .intLink { cursor: pointer; }
42	@ img.intLink { border: 0; }
43	@ #wysiwygBox {
44	@ border: 1px #000000 solid;
45	@ padding: 12px;
46	@ }
47	@ #editMode label { cursor: pointer; }
48	@ </style>
49
50	@ <input id="wysiwygValue" type="hidden" name="%s(zId)">
51	@ <div id="editModeDiv">Edit mode:
52	@ <select id="editMode" size=1 onchange="/yH5BAEAAB8ALAAAAAAWABYAAAVu4C"
53	** wysiwygSubmit() fsize=1>
54	@ <option value="0">WYSIWYG</option>
55	@ <option value="1">Raw HTML</option>
56	onchange="formatDoc('formatblock'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;">
57	@ <option selected>- formatting -</option>
58	@ <option value="h1">Title 1 <h1></option>
59	@ <option value="h2">Title 2 <h2></option>
60	@ <option value="h3">Title 3 <h3></option>
61	@ <option value="h4">Title 4 <h4></option>
62	@ <option value="h5">Title 5 <h5></option>
63	@ <option value="h6">Subtitle <h6></option>
64	@ <option value="p">Paragraph <p></option>
65	@ <option value="pre">Preformatted <pre></option>onchange="formatDoc('fontname'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
66	*/
67	#include "config.h"
68	#include <assert.h>
69	#include <ctype.h>
70	#include "wysiwyg.h"
71
72
73	/*
74	** Output code for a WYSIWYG editor. The caller must have already generated
75	** the <form> that will contain the editonchange="formatDoc('fontsize'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
76	*/
77	#in </form> after this routine returns. The caller must include
78	** an onsubmit= attribute on the <form> element that invokes the
79	** wysiwygSubmit() function.
80	**
81	** There can only be a single WYSIWYG editor per frame.
82	*/
83	void wysiwygEditor(
84	const char zId, / ID for this editor */
85	const char zContent, / Initionchange="formatDoc('forecolor'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
86	*/
87	#ins">
88	@ .intLink { cursor: pointer; }
89	@ img.intLink { border: 0; }
90	@ #wysiwygBox {
91	@ border: 1px #000000 solid;
92	@ padding: 12px;
93	@ }
94	@ #editMode label { cursor: pointer; }
95	@ </style>
96
97	@ <input id="wysiwygValue" type="hidden" name="%s(zId)">
98	onclick="formatDoc('undo');"
99	@ src="data:ima size=1>
100	@ <option value="0">WYSIWYG</option>
101	@ <option value="1">Raw HTML</option>
102	@ </select></div>
103	@ <div id="toolBar1">
104	@ <select class="format" data-format="formatblock">
105	@ <option selected>- formatting -</option>
106	@ <option value="h1">Title 1 &lonclick="formatDoc('redo');"
107	@ src="data:imation>
108	@ <option value="h3">Title 3 <h3></option>
109	@ <option value="h4">Title 4 <h4></option>
110	@ <option value="h5">Title 5 <h5></option>
111	@ <option value="h6">Subtitle <h6></o
112	@ onclick"
113	@ src="data:image/</option>
114	@ <option value="pre">Preformatted <pre></option>
115	@ </select>
116	@ <select class="format" data-format="fontname">
117	@ <option class="heading" selected>- font -</option>
118	@ <option>Arial</option>
119	@ <option>Arial Black</option>
120	@ <option>Courier New</option>
121	@ <option>Times New Roman</option>
122	@ </select>
123	@ <select class="format" data-format="fontsize">
124	@ <option class="heading" selected>- size -</option>
125	@ <option value="1">Very small</option>
126	@ <option value="2">A bit small</option>
127	@ <option value="3">Normal</option>
128	@ <option value="4">Medium-large</option>
129	@ <option value="5">Big</option>
130	@ <option value="6">Very big</option>
131	@ <option value="7">Maximum</option>
132	@ </select>
133	@ <select class="format" data-format="forecolor">
134	@ <option class="heading" selected>- color -</option>
135	@ <option value="red">Red</option>
136	@ <option value="blue">Blue</option>
137	@ <option value="green">Green</option>
138	@ <option value="black">Black</option>
139	@ </select>
140	@ </div>
141	@ <div id="toolBar2">
142	@ <img class="intLink" title="Undo" data-format="undo"
143	@ src="data:image/gif;base64,R0lGODlhFgAWAOMKADljwliE33mOrpGjuYKl8aezxqPD+7
144	@ /I19DV3NHa7P///////////////////////yH5BAEKAA8ALAAAAAAWABYAAARR8MlJq704680
145	@ 7TkaYeJJBnES4EeUJvIGapWYAC0CsocQ7SDlWonclick="formatDoc('bold');"
146	@ src="data:imagD/AMDAwAAAACH5BnhI+pa+H9mJy0LhdgtrxzDG5WGFVk6aXqyk6Y9kXvKKNuLbb6zgMFADs=" />
147
148	@ <img clasonclick="formatDoc('italic');"
149	@ src="data:image/gif;base64,R0lGODlhFgAWAKEDAAAAAF9vj5WIbf///yH5BAEAAAMALA
150	@ AAAAAWABYAAAIjnI+py+0Po5x0gXvruEKHrF2BB1YiCWgbMFIYpsbyTNd2UwAAOw==" />
151
152	@ <img class="onclick="formatDoc('underline');"
153	@ src="data:imaKECAAAAAF9vj////////yH5BAEAAAIALA
154	@ AAAAAWABYAAAIrlI+py+0Po5zUgAsEzvEeL4Ea15EiJJ5PSqJmuwKBEKgxVuXWtun+DwxCCgA
155	@ 7" />
156
157	@ <img class="
158	@ onclick try the"useCSS", 0, true); } // IE9/10
159	@ catch (e) { } D License (also
160	** known as the "2-Clause License" or "FreeBSD License".)
161	**
162	** This program is distributed in the hope that it will be useful,
163	** but without any warranty; without even the implied warranty of
164	** merchantability or fitness for a particular purpose.
165	**
166	** Author contact information:
167	** [email protected]
168	http://www.hwacAdd**********************************************************
169	**
170	** This file contains code that generates WYSIWYG text editors on
171	** web pages.
172	*/
173	#include "config.h"
174	#include <assert.h>
175	#include <ctype.h>
176	#include "wysiwyg.h"
177
178
179	/*
180	Output code for a WYSIWYG editor. The caller ***************indenI+pa+H9mJy0LhdgtrxzDG5W
181	@ #wysiwygBox {
182	@ border: 1px #000000 solid;
183	@ padding: 12px;
184	@ }
185	@ #editMode label { cursor: pointer; }
186	@ </style>
187
188	@ <input id="wysiwygValue" type="hidden" name="%s(zId)">
189	@ <div id="editModeDiv">Edit mode:
190	@ <select id="editMode" size=1 onchange="/yH5BAEAAB8ALAAAAAAWABYAAAVu4C"
191	** wysiwygSubmit() fsize=1>
192	@ <option value="0">WYSIWYG</option>
193	@ <option value="1">Raw HTML</option>
194	onchange="formatDoc('formatblock'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;">
195	@ <option selected>- formatting -</option>
196	@ <option value="h1">Title 1 <h1></option>
197	@ <option value="h2">Title 2 <h2></option>
198	@ <option value="h3">Title 3 <h3></option>
199	@ <option value="h4">Title 4 <h4></option>
200	@ <option value="h5">Title 5 <h5></option>
201	@ <option value="h6">Subtitle <h6></option>
202	@ <option value="p">Paragraph <p></option>
203	@ <option value="pre">Preformatted <pre></option>onchange="formatDoc('fontname'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
204	*/
205	#include "config.h"
206	#include <assert.h>
207	#include <ctype.h>
208	#include "wysiwyg.h"
209
210
211	/*
212	** Output code for a WYSIWYG editor. The caller must have already generated
213	** the <form> that will contain the editonchange="formatDoc('fontsize'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
214	*/
215	#in </form> after this routine returns. The caller must include
216	** an onsubmit= attribute on the <form> element that invokes the
217	** wysiwygSubmit() function.
218	**
219	** There can only be a single WYSIWYG editor per frame.
220	*/
221	void wysiwygEditor(
222	const char zId, / ID for this editor */
223	const char zContent, / Initionchange="formatDoc('forecolor'BeVSus2CgrCxHptLBbO CxHptLBbOQxCSNCCaF1GUqwQbBd=0;b pages.
224	*/
225	#ins">
226	@ .intLink { cursor: pointer; }
227	@ img.intLink { border: 0; }
228	@ #wysiwygBox {
229	@ border: 1px #000000 solid;
230	@ padding: 12px;
231	@ }
232	@ #editMode label { cursor: pointer; }
233	@ </style>
234
235	@ <input id="wysiwygValue" type="hidden" name="%s(zId)">
236	onclick="formatDoc('undo');"
237	@ src="data:ima size=1>
238	@ <option value="0">WYSIWYG</option>
239	@ <option value="1">Raw HTML</option>
240	@ </select></div>
241	@ <div id="toolBar1">
242	@ <select class="format" data-format="formatblock">
243	@ <option selected>- formatting -</option>
244	@ <option value="h1">Title 1 &lonclick="formatDoc('redo');"
245	@ src="data:imation>
246	@ <option valCutoption>
247	@ <option value=cu*
248	** Copyright (c) 2012 ard Hipp
249	**
250	** This program is free software; you can redistribute it and/or
251	** modify it under the terms of the Simplified BSD License (also
252	** known as the "2-Clause License" or "FreeBSD License".)
253	**
254	** This program is distributed in the hope that it will be useful,
255	** but without any warranty; without even the implied warranty of
256	** merchantability or fitness for a particular purpose.
257	**
258	** Author contact information:
259	** [email protected]
260	** http://www.hwaci.com/drh/
261	**
262	*******************************************************************************
263	**
264	** This file contains code that generates WYSIWYG text editors on<assert.h>
265	#i** web pages.
266	*/
267	#iinclude <ctype.h>
268	#include "wysiwyg.h"
269
270
271	/*
272	** Output code for a WYSIWYG editor. The caller must have already generated
273	** the <form> that will contain the editor, and the call must generate the
274	** corresponding </form> after this routine returns. The caller must include
275	** an onsubmit= attribute on the <form> element that invokes the
276	** wysiwygSubmit() function.
277	**
278	** There can only be a single WYSIWYG editor per frame.
279	*/
280	void wysiwygEditor(
281	const char zId, / ID for this editor */
282	const char zContent, / Initial content (HTML) */
283	int w, int h /* Initial width and height */
284	){
285
286	@ <style type="texon sele

M win/Makefile.dmc

+10 -4

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -26,13 +26,13 @@
26	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28	28
29	29	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
30	30
31		-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 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 verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
	31	+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 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 verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
32	32
33		-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)\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)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
	33	+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)\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)\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
34	34
35	35
36	36	RC=$(DMDIR)\bin\rcc
37	37	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
38	38
		@@ -46,11 +46,11 @@
46	46
47	47	$(OBJDIR)\fossil.res: $B\win\fossil.rc
48	48	$(RC) $(RCFLAGS) -o$@ $**
49	49
50	50	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
51		- +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 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 verify vfile wiki wikiformat winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
	51	+ +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 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 verify vfile wiki wikiformat winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
52	52	+echo fossil >> $@
53	53	+echo fossil >> $@
54	54	+echo $(LIBS) >> $@
55	55	+echo. >> $@
56	56	+echo fossil >> $@
		@@ -673,10 +673,16 @@
673	673	$(OBJDIR)\winhttp$O : winhttp_.c winhttp.h
674	674	$(TCC) -o$@ -c winhttp_.c
675	675
676	676	winhttp_.c : $(SRCDIR)\winhttp.c
677	677	+translate$E $** > $@
	678	+
	679	+$(OBJDIR)\wysiwyg$O : wysiwyg_.c wysiwyg.h
	680	+ $(TCC) -o$@ -c wysiwyg_.c
	681	+
	682	+wysiwyg_.c : $(SRCDIR)\wysiwyg.c
	683	+ +translate$E $** > $@
678	684
679	685	$(OBJDIR)\xfer$O : xfer_.c xfer.h
680	686	$(TCC) -o$@ -c xfer_.c
681	687
682	688	xfer_.c : $(SRCDIR)\xfer.c
		@@ -693,7 +699,7 @@
693	699
694	700	zip_.c : $(SRCDIR)\zip.c
695	701	+translate$E $** > $@
696	702
697	703	headers: makeheaders$E page_index.h VERSION.h
698		- +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 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 verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.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
	704	+ +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 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 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
699	705	@copy /Y nul: headers
700	706

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -26,13 +26,13 @@
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	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
30
31	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 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 verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
32
33	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)\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)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
34
35
36	RC=$(DMDIR)\bin\rcc
37	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
38
	@@ -46,11 +46,11 @@
46
47	$(OBJDIR)\fossil.res: $B\win\fossil.rc
48	$(RC) $(RCFLAGS) -o$@ $**
49
50	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
51	+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 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 verify vfile wiki wikiformat winhttp xfer xfersetup zip shell sqlite3 th th_lang > $@
52	+echo fossil >> $@
53	+echo fossil >> $@
54	+echo $(LIBS) >> $@
55	+echo. >> $@
56	+echo fossil >> $@
	@@ -673,10 +673,16 @@
673	$(OBJDIR)\winhttp$O : winhttp_.c winhttp.h
674	$(TCC) -o$@ -c winhttp_.c
675
676	winhttp_.c : $(SRCDIR)\winhttp.c
677	+translate$E $** > $@






678
679	$(OBJDIR)\xfer$O : xfer_.c xfer.h
680	$(TCC) -o$@ -c xfer_.c
681
682	xfer_.c : $(SRCDIR)\xfer.c
	@@ -693,7 +699,7 @@
693
694	zip_.c : $(SRCDIR)\zip.c
695	+translate$E $** > $@
696
697	headers: makeheaders$E page_index.h VERSION.h
698	+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 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 verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.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
699	@copy /Y nul: headers
700

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -26,13 +26,13 @@
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32
28
29	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
30
31	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 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 verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
32
33	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)\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)\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
34
35
36	RC=$(DMDIR)\bin\rcc
37	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
38
	@@ -46,11 +46,11 @@
46
47	$(OBJDIR)\fossil.res: $B\win\fossil.rc
48	$(RC) $(RCFLAGS) -o$@ $**
49
50	$(OBJDIR)\link: $B\win\Makefile.dmc $(OBJDIR)\fossil.res
51	+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 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 verify vfile wiki wikiformat winhttp wysiwyg xfer xfersetup zip shell sqlite3 th th_lang > $@
52	+echo fossil >> $@
53	+echo fossil >> $@
54	+echo $(LIBS) >> $@
55	+echo. >> $@
56	+echo fossil >> $@
	@@ -673,10 +673,16 @@
673	$(OBJDIR)\winhttp$O : winhttp_.c winhttp.h
674	$(TCC) -o$@ -c winhttp_.c
675
676	winhttp_.c : $(SRCDIR)\winhttp.c
677	+translate$E $** > $@
678
679	$(OBJDIR)\wysiwyg$O : wysiwyg_.c wysiwyg.h
680	$(TCC) -o$@ -c wysiwyg_.c
681
682	wysiwyg_.c : $(SRCDIR)\wysiwyg.c
683	+translate$E $** > $@
684
685	$(OBJDIR)\xfer$O : xfer_.c xfer.h
686	$(TCC) -o$@ -c xfer_.c
687
688	xfer_.c : $(SRCDIR)\xfer.c
	@@ -693,7 +699,7 @@
699
700	zip_.c : $(SRCDIR)\zip.c
701	+translate$E $** > $@
702
703	headers: makeheaders$E page_index.h VERSION.h
704	+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 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 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
705	@copy /Y nul: headers
706

M win/Makefile.mingw

+11 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -265,10 +265,11 @@
265	265	$(SRCDIR)/verify.c \
266	266	$(SRCDIR)/vfile.c \
267	267	$(SRCDIR)/wiki.c \
268	268	$(SRCDIR)/wikiformat.c \
269	269	$(SRCDIR)/winhttp.c \
	270	+ $(SRCDIR)/wysiwyg.c \
270	271	$(SRCDIR)/xfer.c \
271	272	$(SRCDIR)/xfersetup.c \
272	273	$(SRCDIR)/zip.c
273	274
274	275	TRANS_SRC = \
		@@ -364,10 +365,11 @@
364	365	$(OBJDIR)/verify_.c \
365	366	$(OBJDIR)/vfile_.c \
366	367	$(OBJDIR)/wiki_.c \
367	368	$(OBJDIR)/wikiformat_.c \
368	369	$(OBJDIR)/winhttp_.c \
	370	+ $(OBJDIR)/wysiwyg_.c \
369	371	$(OBJDIR)/xfer_.c \
370	372	$(OBJDIR)/xfersetup_.c \
371	373	$(OBJDIR)/zip_.c
372	374
373	375	OBJ = \
		@@ -463,10 +465,11 @@
463	465	$(OBJDIR)/verify.o \
464	466	$(OBJDIR)/vfile.o \
465	467	$(OBJDIR)/wiki.o \
466	468	$(OBJDIR)/wikiformat.o \
467	469	$(OBJDIR)/winhttp.o \
	470	+ $(OBJDIR)/wysiwyg.o \
468	471	$(OBJDIR)/xfer.o \
469	472	$(OBJDIR)/xfersetup.o \
470	473	$(OBJDIR)/zip.o
471	474
472	475	APPNAME = fossil.exe
		@@ -537,11 +540,11 @@
537	540
538	541
539	542	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
540	543	$(MKINDEX) $(TRANS_SRC) >$@
541	544	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
542		- $(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)/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)/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)/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
	545	+ $(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)/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)/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
543	546	echo Done >$(OBJDIR)/headers
544	547
545	548	$(OBJDIR)/headers: Makefile
546	549	Makefile:
547	550	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
		@@ -1200,10 +1203,17 @@
1200	1203
1201	1204	$(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h
1202	1205	$(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c
1203	1206
1204	1207	winhttp.h: $(OBJDIR)/headers
	1208	+$(OBJDIR)/wysiwyg_.c: $(SRCDIR)/wysiwyg.c $(OBJDIR)/translate
	1209	+ $(TRANSLATE) $(SRCDIR)/wysiwyg.c >$(OBJDIR)/wysiwyg_.c
	1210	+
	1211	+$(OBJDIR)/wysiwyg.o: $(OBJDIR)/wysiwyg_.c $(OBJDIR)/wysiwyg.h $(SRCDIR)/config.h
	1212	+ $(XTCC) -o $(OBJDIR)/wysiwyg.o -c $(OBJDIR)/wysiwyg_.c
	1213	+
	1214	+wysiwyg.h: $(OBJDIR)/headers
1205	1215	$(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(OBJDIR)/translate
1206	1216	$(TRANSLATE) $(SRCDIR)/xfer.c >$(OBJDIR)/xfer_.c
1207	1217
1208	1218	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1209	1219	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1210	1220

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -265,10 +265,11 @@
265	$(SRCDIR)/verify.c \
266	$(SRCDIR)/vfile.c \
267	$(SRCDIR)/wiki.c \
268	$(SRCDIR)/wikiformat.c \
269	$(SRCDIR)/winhttp.c \

270	$(SRCDIR)/xfer.c \
271	$(SRCDIR)/xfersetup.c \
272	$(SRCDIR)/zip.c
273
274	TRANS_SRC = \
	@@ -364,10 +365,11 @@
364	$(OBJDIR)/verify_.c \
365	$(OBJDIR)/vfile_.c \
366	$(OBJDIR)/wiki_.c \
367	$(OBJDIR)/wikiformat_.c \
368	$(OBJDIR)/winhttp_.c \

369	$(OBJDIR)/xfer_.c \
370	$(OBJDIR)/xfersetup_.c \
371	$(OBJDIR)/zip_.c
372
373	OBJ = \
	@@ -463,10 +465,11 @@
463	$(OBJDIR)/verify.o \
464	$(OBJDIR)/vfile.o \
465	$(OBJDIR)/wiki.o \
466	$(OBJDIR)/wikiformat.o \
467	$(OBJDIR)/winhttp.o \

468	$(OBJDIR)/xfer.o \
469	$(OBJDIR)/xfersetup.o \
470	$(OBJDIR)/zip.o
471
472	APPNAME = fossil.exe
	@@ -537,11 +540,11 @@
537
538
539	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
540	$(MKINDEX) $(TRANS_SRC) >$@
541	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
542	$(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)/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)/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)/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
543	echo Done >$(OBJDIR)/headers
544
545	$(OBJDIR)/headers: Makefile
546	Makefile:
547	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -1200,10 +1203,17 @@
1200
1201	$(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h
1202	$(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c
1203
1204	winhttp.h: $(OBJDIR)/headers







1205	$(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(OBJDIR)/translate
1206	$(TRANSLATE) $(SRCDIR)/xfer.c >$(OBJDIR)/xfer_.c
1207
1208	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1209	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1210

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -265,10 +265,11 @@
265	$(SRCDIR)/verify.c \
266	$(SRCDIR)/vfile.c \
267	$(SRCDIR)/wiki.c \
268	$(SRCDIR)/wikiformat.c \
269	$(SRCDIR)/winhttp.c \
270	$(SRCDIR)/wysiwyg.c \
271	$(SRCDIR)/xfer.c \
272	$(SRCDIR)/xfersetup.c \
273	$(SRCDIR)/zip.c
274
275	TRANS_SRC = \
	@@ -364,10 +365,11 @@
365	$(OBJDIR)/verify_.c \
366	$(OBJDIR)/vfile_.c \
367	$(OBJDIR)/wiki_.c \
368	$(OBJDIR)/wikiformat_.c \
369	$(OBJDIR)/winhttp_.c \
370	$(OBJDIR)/wysiwyg_.c \
371	$(OBJDIR)/xfer_.c \
372	$(OBJDIR)/xfersetup_.c \
373	$(OBJDIR)/zip_.c
374
375	OBJ = \
	@@ -463,10 +465,11 @@
465	$(OBJDIR)/verify.o \
466	$(OBJDIR)/vfile.o \
467	$(OBJDIR)/wiki.o \
468	$(OBJDIR)/wikiformat.o \
469	$(OBJDIR)/winhttp.o \
470	$(OBJDIR)/wysiwyg.o \
471	$(OBJDIR)/xfer.o \
472	$(OBJDIR)/xfersetup.o \
473	$(OBJDIR)/zip.o
474
475	APPNAME = fossil.exe
	@@ -537,11 +540,11 @@
540
541
542	$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
543	$(MKINDEX) $(TRANS_SRC) >$@
544	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
545	$(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)/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)/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
546	echo Done >$(OBJDIR)/headers
547
548	$(OBJDIR)/headers: Makefile
549	Makefile:
550	$(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
	@@ -1200,10 +1203,17 @@
1203
1204	$(OBJDIR)/winhttp.o: $(OBJDIR)/winhttp_.c $(OBJDIR)/winhttp.h $(SRCDIR)/config.h
1205	$(XTCC) -o $(OBJDIR)/winhttp.o -c $(OBJDIR)/winhttp_.c
1206
1207	winhttp.h: $(OBJDIR)/headers
1208	$(OBJDIR)/wysiwyg_.c: $(SRCDIR)/wysiwyg.c $(OBJDIR)/translate
1209	$(TRANSLATE) $(SRCDIR)/wysiwyg.c >$(OBJDIR)/wysiwyg_.c
1210
1211	$(OBJDIR)/wysiwyg.o: $(OBJDIR)/wysiwyg_.c $(OBJDIR)/wysiwyg.h $(SRCDIR)/config.h
1212	$(XTCC) -o $(OBJDIR)/wysiwyg.o -c $(OBJDIR)/wysiwyg_.c
1213
1214	wysiwyg.h: $(OBJDIR)/headers
1215	$(OBJDIR)/xfer_.c: $(SRCDIR)/xfer.c $(OBJDIR)/translate
1216	$(TRANSLATE) $(SRCDIR)/xfer.c >$(OBJDIR)/xfer_.c
1217
1218	$(OBJDIR)/xfer.o: $(OBJDIR)/xfer_.c $(OBJDIR)/xfer.h $(SRCDIR)/config.h
1219	$(XTCC) -o $(OBJDIR)/xfer.o -c $(OBJDIR)/xfer_.c
1220

M win/Makefile.msc

+10 -3

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -40,13 +40,13 @@
40	40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41	41	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42	42
43	43	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
44	44
45		-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 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 verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
	45	+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 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 verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
46	46
47		-OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_config$O $(OX)\json_diff$O $(OX)\json_dir$O $(OX)\json_finfo$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\xfersetup$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
	47	+OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_config$O $(OX)\json_diff$O $(OX)\json_dir$O $(OX)\json_finfo$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\wysiwyg$O $(OX)\xfer$O $(OX)\xfersetup$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
48	48
49	49
50	50	APPNAME = $(OX)\fossil$(E)
51	51
52	52	all: $(OX) $(APPNAME)
		@@ -152,10 +152,11 @@
152	152	echo $(OX)\verify.obj >> $@
153	153	echo $(OX)\vfile.obj >> $@
154	154	echo $(OX)\wiki.obj >> $@
155	155	echo $(OX)\wikiformat.obj >> $@
156	156	echo $(OX)\winhttp.obj >> $@
	157	+ echo $(OX)\wysiwyg.obj >> $@
157	158	echo $(OX)\xfer.obj >> $@
158	159	echo $(OX)\xfersetup.obj >> $@
159	160	echo $(OX)\zip.obj >> $@
160	161	echo $(LIBS) >> $@
161	162
		@@ -782,10 +783,16 @@
782	783	$(OX)\winhttp$O : winhttp_.c winhttp.h
783	784	$(TCC) /Fo$@ -c winhttp_.c
784	785
785	786	winhttp_.c : $(SRCDIR)\winhttp.c
786	787	translate$E $** > $@
	788	+
	789	+$(OX)\wysiwyg$O : wysiwyg_.c wysiwyg.h
	790	+ $(TCC) /Fo$@ -c wysiwyg_.c
	791	+
	792	+wysiwyg_.c : $(SRCDIR)\wysiwyg.c
	793	+ translate$E $** > $@
787	794
788	795	$(OX)\xfer$O : xfer_.c xfer.h
789	796	$(TCC) /Fo$@ -c xfer_.c
790	797
791	798	xfer_.c : $(SRCDIR)\xfer.c
		@@ -802,7 +809,7 @@
802	809
803	810	zip_.c : $(SRCDIR)\zip.c
804	811	translate$E $** > $@
805	812
806	813	headers: makeheaders$E page_index.h VERSION.h
807		- 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 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 verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.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
	814	+ 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 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 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
808	815	@copy /Y nul: headers
809	816

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -40,13 +40,13 @@
40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43	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
44
45	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 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 verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c xfersetup_.c zip_.c
46
47	OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_config$O $(OX)\json_diff$O $(OX)\json_dir$O $(OX)\json_finfo$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\xfer$O $(OX)\xfersetup$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
48
49
50	APPNAME = $(OX)\fossil$(E)
51
52	all: $(OX) $(APPNAME)
	@@ -152,10 +152,11 @@
152	echo $(OX)\verify.obj >> $@
153	echo $(OX)\vfile.obj >> $@
154	echo $(OX)\wiki.obj >> $@
155	echo $(OX)\wikiformat.obj >> $@
156	echo $(OX)\winhttp.obj >> $@

157	echo $(OX)\xfer.obj >> $@
158	echo $(OX)\xfersetup.obj >> $@
159	echo $(OX)\zip.obj >> $@
160	echo $(LIBS) >> $@
161
	@@ -782,10 +783,16 @@
782	$(OX)\winhttp$O : winhttp_.c winhttp.h
783	$(TCC) /Fo$@ -c winhttp_.c
784
785	winhttp_.c : $(SRCDIR)\winhttp.c
786	translate$E $** > $@






787
788	$(OX)\xfer$O : xfer_.c xfer.h
789	$(TCC) /Fo$@ -c xfer_.c
790
791	xfer_.c : $(SRCDIR)\xfer.c
	@@ -802,7 +809,7 @@
802
803	zip_.c : $(SRCDIR)\zip.c
804	translate$E $** > $@
805
806	headers: makeheaders$E page_index.h VERSION.h
807	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 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 verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.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
808	@copy /Y nul: headers
809

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -40,13 +40,13 @@
40	LIBS = $(ZLIB) ws2_32.lib advapi32.lib $(SSLLIB)
41	LIBDIR = -LIBPATH:$(MSCDIR)\extra\lib -LIBPATH:$(ZLIBDIR)
42
43	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
44
45	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 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 verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c wysiwyg_.c xfer_.c xfersetup_.c zip_.c
46
47	OBJ = $(OX)\add$O $(OX)\allrepo$O $(OX)\attach$O $(OX)\bag$O $(OX)\bisect$O $(OX)\blob$O $(OX)\branch$O $(OX)\browse$O $(OX)\captcha$O $(OX)\cgi$O $(OX)\checkin$O $(OX)\checkout$O $(OX)\clearsign$O $(OX)\clone$O $(OX)\comformat$O $(OX)\configure$O $(OX)\content$O $(OX)\db$O $(OX)\delta$O $(OX)\deltacmd$O $(OX)\descendants$O $(OX)\diff$O $(OX)\diffcmd$O $(OX)\doc$O $(OX)\encode$O $(OX)\event$O $(OX)\export$O $(OX)\file$O $(OX)\finfo$O $(OX)\glob$O $(OX)\graph$O $(OX)\gzip$O $(OX)\http$O $(OX)\http_socket$O $(OX)\http_ssl$O $(OX)\http_transport$O $(OX)\import$O $(OX)\info$O $(OX)\json$O $(OX)\json_artifact$O $(OX)\json_branch$O $(OX)\json_config$O $(OX)\json_diff$O $(OX)\json_dir$O $(OX)\json_finfo$O $(OX)\json_login$O $(OX)\json_query$O $(OX)\json_report$O $(OX)\json_tag$O $(OX)\json_timeline$O $(OX)\json_user$O $(OX)\json_wiki$O $(OX)\leaf$O $(OX)\login$O $(OX)\main$O $(OX)\manifest$O $(OX)\md5$O $(OX)\merge$O $(OX)\merge3$O $(OX)\name$O $(OX)\path$O $(OX)\pivot$O $(OX)\popen$O $(OX)\pqueue$O $(OX)\printf$O $(OX)\rebuild$O $(OX)\report$O $(OX)\rss$O $(OX)\schema$O $(OX)\search$O $(OX)\setup$O $(OX)\sha1$O $(OX)\shun$O $(OX)\skins$O $(OX)\sqlcmd$O $(OX)\stash$O $(OX)\stat$O $(OX)\style$O $(OX)\sync$O $(OX)\tag$O $(OX)\tar$O $(OX)\th_main$O $(OX)\timeline$O $(OX)\tkt$O $(OX)\tktsetup$O $(OX)\undo$O $(OX)\update$O $(OX)\url$O $(OX)\user$O $(OX)\verify$O $(OX)\vfile$O $(OX)\wiki$O $(OX)\wikiformat$O $(OX)\winhttp$O $(OX)\wysiwyg$O $(OX)\xfer$O $(OX)\xfersetup$O $(OX)\zip$O $(OX)\shell$O $(OX)\sqlite3$O $(OX)\th$O $(OX)\th_lang$O
48
49
50	APPNAME = $(OX)\fossil$(E)
51
52	all: $(OX) $(APPNAME)
	@@ -152,10 +152,11 @@
152	echo $(OX)\verify.obj >> $@
153	echo $(OX)\vfile.obj >> $@
154	echo $(OX)\wiki.obj >> $@
155	echo $(OX)\wikiformat.obj >> $@
156	echo $(OX)\winhttp.obj >> $@
157	echo $(OX)\wysiwyg.obj >> $@
158	echo $(OX)\xfer.obj >> $@
159	echo $(OX)\xfersetup.obj >> $@
160	echo $(OX)\zip.obj >> $@
161	echo $(LIBS) >> $@
162
	@@ -782,10 +783,16 @@
783	$(OX)\winhttp$O : winhttp_.c winhttp.h
784	$(TCC) /Fo$@ -c winhttp_.c
785
786	winhttp_.c : $(SRCDIR)\winhttp.c
787	translate$E $** > $@
788
789	$(OX)\wysiwyg$O : wysiwyg_.c wysiwyg.h
790	$(TCC) /Fo$@ -c wysiwyg_.c
791
792	wysiwyg_.c : $(SRCDIR)\wysiwyg.c
793	translate$E $** > $@
794
795	$(OX)\xfer$O : xfer_.c xfer.h
796	$(TCC) /Fo$@ -c xfer_.c
797
798	xfer_.c : $(SRCDIR)\xfer.c
	@@ -802,7 +809,7 @@
809
810	zip_.c : $(SRCDIR)\zip.c
811	translate$E $** > $@
812
813	headers: makeheaders$E page_index.h VERSION.h
814	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 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 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
815	@copy /Y nul: headers
816

Fossil SCM

Keyboard Shortcuts