\n"; - print "

Example $example

\n\n"; + print "

\n\n"; print "````````````````````````````````````````````````````````` markdown\n"; } elsif ($stage == 1) { print "`````````````````````````````````````````````````````````\n\n"; -- cgit v1.2.3 From 76df41816c4e57a6c8ada845a2ead90d4d3b5b97 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 26 Oct 2014 18:52:10 -0700 Subject: Have index.html on web page redirect to latest version. --- Makefile | 14 ++++++-------- spec.redirect.in | 11 +++++++++++ 2 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 spec.redirect.in diff --git a/Makefile b/Makefile index 2c293d1..c2899ea 100644 --- a/Makefile +++ b/Makefile @@ -89,27 +89,25 @@ fuzztest: for i in `seq 1 10`; do \ time cat /dev/urandom | head -c 100000 | iconv -f latin1 -t utf-8 | $(PROG) >/dev/null; done -index.md: _site/$(SPECVERSION)/index.html - echo "% CommonMark Spec\n" > $@ - for vers in $(shell cd _site; ls -d -t 0.*) ; do \ - echo "- [Version $$vers](/$$vers/)" >> $@ ; done +_site/spec.html: spec.redirect.in + perl -pe 's/VERSION/$(SPECVERSION)/g' $< > $@ -_site/index.html: index.md - pandoc --template template.html -S -s -t html5 -o $@ $< +_site/index.html: _site/spec.html + cp $< $@ _site/$(SPECVERSION)/index.html: spec.html mkdir -p _site/$(SPECVERSION) cp $< $@ cd _site; git add $(SPECVERSION)/index.html; git commit -a -m "Added version $(SPECVERSION) of spec"; cd .. -update-site: spec.html js/commonmark.js _site/index.html _site/$(SPECVERSION)/index.html +update-site: spec.html js/commonmark.js _site/index.html _site/$(SPECVERSION)/index.html _site/spec.html cp js/index.html _site/js/ cp js/commonmark.js _site/js/ cp js/LICENSE _site/js/ (cd _site ; git pull ; git commit -a -m "Updated site for latest spec, js" ; git push; cd ..) clean: - -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o libcmark.so index.md + -rm -f test $(SRCDIR)/*.o $(SRCDIR)/scanners.c $(SRCDIR)/html/*.o libcmark.so -rm js/commonmark.js -rm -rf *.dSYM -rm -f README.html diff --git a/spec.redirect.in b/spec.redirect.in new file mode 100644 index 0000000..1727497 --- /dev/null +++ b/spec.redirect.in @@ -0,0 +1,11 @@ + + + + CommonMark Spec + + + +

The most recent version of the CommonMark Spec can be found +at http://spec.commonmark.org/VERSION/.

+ + -- cgit v1.2.3 From f22281f2d15a786d512269ddd546b5b4c0462f4c Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 26 Oct 2014 20:50:01 -0700 Subject: Added clear and permalink to dingus. Serve dingus from dingus.html. Add redirect page as index.html. --- js/dingus.html | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ js/index.html | 118 +++++--------------------------------------------- 2 files changed, 145 insertions(+), 107 deletions(-) create mode 100644 js/dingus.html diff --git a/js/dingus.html b/js/dingus.html new file mode 100644 index 0000000..ecaeb33 --- /dev/null +++ b/js/dingus.html @@ -0,0 +1,134 @@ + + + + + commonmark.js demo + + + + + + + + +

commonmark.js dingus

Parsed in + ms. Rendered in ms.

clear permalink

+ +

Preview
HTML
AST

+ + diff --git a/js/index.html b/js/index.html index 6f462a9..3f6c904 100644 --- a/js/index.html +++ b/js/index.html @@ -1,108 +1,12 @@ - - - - - commonmark.js demo - - - - - - - - -

commonmark.js dingus

Parsed in - ms. Rendered in ms.

- -

Preview
HTML
AST

- + + + + CommonMark dingus + + + +

The most recent version of the CommonMark dingus can be found +at /dingus.html/.

+ -- cgit v1.2.3 From 695b5f3705fbdb42dd7422e4dc88f25e895d1406 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 26 Oct 2014 21:17:10 -0700 Subject: Dingus improvements; moved to top level. --- Makefile | 4 +- dingus.html | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ js/dingus.html | 134 -------------------------------------------------------- 3 files changed, 137 insertions(+), 136 deletions(-) create mode 100644 dingus.html delete mode 100644 js/dingus.html diff --git a/Makefile b/Makefile index c2899ea..b1a950b 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ install: libcmark.so $(cmark_HDR) $(HTML_HDR) install $(HTML_HDR) $(PREFIX)/include/cmark/html/ dingus: js/commonmark.js - cd js && echo "Starting dingus server at http://localhost:9000" && python -m SimpleHTTPServer 9000 + echo "Starting dingus server at http://localhost:9000" && python -m SimpleHTTPServer 9000 leakcheck: $(PROG) cat leakcheck.md | valgrind --leak-check=full --dsymutil=yes $(PROG) @@ -101,7 +101,7 @@ _site/$(SPECVERSION)/index.html: spec.html cd _site; git add $(SPECVERSION)/index.html; git commit -a -m "Added version $(SPECVERSION) of spec"; cd .. update-site: spec.html js/commonmark.js _site/index.html _site/$(SPECVERSION)/index.html _site/spec.html - cp js/index.html _site/js/ + cp dingus.html _site/ cp js/commonmark.js _site/js/ cp js/LICENSE _site/js/ (cd _site ; git pull ; git commit -a -m "Updated site for latest spec, js" ; git push; cd ..) diff --git a/dingus.html b/dingus.html new file mode 100644 index 0000000..8c35fe5 --- /dev/null +++ b/dingus.html @@ -0,0 +1,135 @@ + + + + + commonmark.js demo + + + + + + + + +

commonmark.js dingus

Parsed in + ms. Rendered in ms.

clear permalink

+ +

Preview
HTML
AST

+ + diff --git a/js/dingus.html b/js/dingus.html deleted file mode 100644 index ecaeb33..0000000 --- a/js/dingus.html +++ /dev/null @@ -1,134 +0,0 @@ - - - - - commonmark.js demo - - - - - - - - -

commonmark.js dingus

Parsed in - ms. Rendered in ms.

clear permalink

- -

Preview
HTML
AST

- - -- cgit v1.2.3 From 9d8dba5acd00edec29e385ac859bc28c9991dae9 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 26 Oct 2014 21:42:22 -0700 Subject: Added (interact) links to spec, to open examples in dingus. --- spec2md.pl | 2 +- template.html | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/spec2md.pl b/spec2md.pl index 1426095..f93aad8 100644 --- a/spec2md.pl +++ b/spec2md.pl @@ -12,7 +12,7 @@ while () { if ($stage == 0) { $example++; print "\n

\n"; - print "

Example $example

\n\n"; + print "

Example $example (interact)

\n\n"; print "````````````````````````````````````````````````````````` markdown\n"; } elsif ($stage == 1) { print "`````````````````````````````````````````````````````````\n\n"; diff --git a/template.html b/template.html index 0eaf299..b17d285 100644 --- a/template.html +++ b/template.html @@ -47,6 +47,7 @@ pre.html span.space:after { border: 1px solid #666; } div.examplenum { font-size: 82%; text-align: left; } +a.dingus { color: red; } a.footnoteRef > sup:before { content: "["; } @@ -58,6 +59,20 @@ a.footnoteRef > sup { font-size: 100%; } + + $if(title)$ -- cgit v1.2.3 From 6c3ed4e899bfba4dddd763045fcec2375341e4fc Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 08:48:19 -0700 Subject: dingus: Show HTML tab if query has text. This should be a safer default; if someone sends you dangerous HTML, you'll see it immediately. --- dingus.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dingus.html b/dingus.html index 8c35fe5..7c3a7c7 100644 --- a/dingus.html +++ b/dingus.html @@ -20,7 +20,7 @@ function getQueryVariable(variable) var pair = vars[i].split("="); if(pair[0] == variable){return decodeURIComponent(pair[1]);} } - return(''); + return null; } @@ -64,7 +64,12 @@ $(document).ready(function() { render(); }, 0); // ms delay }; - $("#text").val(getQueryVariable("text")); + var initial_text = getQueryVariable("text"); + if (initial_text) { + $("#text").val(initial_text); + // show HTML tab if text is from query + $('#result-tabs a[href="#result"]').tab('show'); + } parseAndRender(); $("#clear-text-box").click(function(e) { $("#text").val(''); @@ -114,7 +119,7 @@ $(document).ready(function() {

Date: Mon, 27 Oct 2014 08:49:58 -0700 Subject: Updated spec date/version. --- spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec.txt b/spec.txt index 5070b3b..2459321 100644 --- a/spec.txt +++ b/spec.txt @@ -2,8 +2,8 @@ title: CommonMark Spec author: - John MacFarlane -version: 0.5 -date: 2014-10-25 +version: 0.6 +date: 2014-10-26 ... # Introduction -- cgit v1.2.3 From 57484668150bc847cb21dfa0ad9b2e8e56e2ba25 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 08:51:44 -0700 Subject: Makefile: Make sure we update redirect on every new version of spec. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b1a950b..976459c 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ fuzztest: for i in `seq 1 10`; do \ time cat /dev/urandom | head -c 100000 | iconv -f latin1 -t utf-8 | $(PROG) >/dev/null; done -_site/spec.html: spec.redirect.in +_site/spec.html: spec.redirect.in spec.txt perl -pe 's/VERSION/$(SPECVERSION)/g' $< > $@ _site/index.html: _site/spec.html -- cgit v1.2.3 From 143f3f5cf2630367fe7d614fb79d834601cad8d0 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 09:06:26 -0700 Subject: Landing page for spec is now a list with links to all versions. --- Makefile | 7 +++++-- spec.redirect.in | 11 ----------- 2 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 spec.redirect.in diff --git a/Makefile b/Makefile index 976459c..a517083 100644 --- a/Makefile +++ b/Makefile @@ -89,8 +89,11 @@ fuzztest: for i in `seq 1 10`; do \ time cat /dev/urandom | head -c 100000 | iconv -f latin1 -t utf-8 | $(PROG) >/dev/null; done -_site/spec.html: spec.redirect.in spec.txt - perl -pe 's/VERSION/$(SPECVERSION)/g' $< > $@ +_site/spec.html: spec.txt + (echo "% CommonMark Spec\n";\ + for vers in $(shell cd _site; ls -d -t 0.*) ; do \ + echo "- [Version $$vers](/$$vers/)" ; done) | \ + pandoc --template template.html -S -s -t html5 -o $@ _site/index.html: _site/spec.html cp $< $@ diff --git a/spec.redirect.in b/spec.redirect.in deleted file mode 100644 index 1727497..0000000 --- a/spec.redirect.in +++ /dev/null @@ -1,11 +0,0 @@ - - - - CommonMark Spec - - - -

The most recent version of the CommonMark Spec can be found -at http://spec.commonmark.org/VERSION/.

- - -- cgit v1.2.3 From 05bd7217ed9e33341333b1bfd47a134889eff77c Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 09:16:12 -0700 Subject: Include dates in list of versions. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a517083..30bf33a 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,8 @@ fuzztest: _site/spec.html: spec.txt (echo "% CommonMark Spec\n";\ for vers in $(shell cd _site; ls -d -t 0.*) ; do \ - echo "- [Version $$vers](/$$vers/)" ; done) | \ + date=`stat -t "%Y-%m-%d" -f "%Sa" _site/$$vers/index.html`; \ + echo "- [Version $$vers ($$date)](/$$vers/)" ; done) | \ pandoc --template template.html -S -s -t html5 -o $@ _site/index.html: _site/spec.html -- cgit v1.2.3 From 103d3d37324d8629d7dc1d549a38fbb8981b1f00 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 11:23:20 -0700 Subject: Watermark old versions of the spec. --- Makefile | 3 ++- template.html | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 30bf33a..c10a633 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,8 @@ _site/spec.html: spec.txt (echo "% CommonMark Spec\n";\ for vers in $(shell cd _site; ls -d -t 0.*) ; do \ date=`stat -t "%Y-%m-%d" -f "%Sa" _site/$$vers/index.html`; \ - echo "- [Version $$vers ($$date)](/$$vers/)" ; done) | \ + echo "- [Version $$vers ($$date)](/$$vers/)" ; \ + perl -pe 's/

<\/div>/

This is an older version of the spec. For the most recent version, see http:\/\/spec.commonmark.org<\/a>.<\/div>/' _site/$$vers/index.html; \ done) | \ pandoc --template template.html -S -s -t html5 -o $@ _site/index.html: _site/spec.html diff --git a/template.html b/template.html index b17d285..4c64524 100644 --- a/template.html +++ b/template.html @@ -46,6 +46,19 @@ pre.html { background-color: #C9CaCE; } pre.html span.space:after { border: 1px solid #666; } +#watermark { + position:fixed; + bottom:0px; + left:0px; + padding: 1em; + width: 100%; + font-size: 120%; + opacity:0.7; + z-index:99; + background-color: black; + color: white; +} +#watermark a { color: white; } div.examplenum { font-size: 82%; text-align: left; } a.dingus { color: red; } a.footnoteRef > sup:before { @@ -87,6 +100,7 @@ $for(author)$$author$$sep$; $endfor$

$toc$

$body$ -- cgit v1.2.3 From cc7788cf62999d317626301960f83d42219acb7e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 12:38:01 -0700 Subject: Improved (interact) links in spec. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Link now has pointer cursor. - → is converted to tab. Closes #174. --- template.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/template.html b/template.html index 4c64524..24b2372 100644 --- a/template.html +++ b/template.html @@ -60,7 +60,7 @@ pre.html span.space:after { } #watermark a { color: white; } div.examplenum { font-size: 82%; text-align: left; } -a.dingus { color: red; } +a.dingus { color: red; cursor: pointer; } a.footnoteRef > sup:before { content: "["; } @@ -78,7 +78,8 @@ $$(document).ready(function() { $$("div.example").each(function(e) { var t = $$(this).find('pre.markdown > code').text(); $$(this).find('a.dingus').click(function(f) { - window.open('/dingus.html?text=' + encodeURIComponent(t)); + window.open('/dingus.html?text=' + + encodeURIComponent(t.replace(/→/g,"\t"))); }); }); $$("pre.markdown").dblclick(function(e) { window.open('/dingus.html?text=' + -- cgit v1.2.3 From b77e606261c821883476aed2b856a594a642ecae Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 12:58:25 -0700 Subject: Dingus: Make tab insert a tab in the text box. instead of moving you to the next field. --- dingus.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dingus.html b/dingus.html index 7c3a7c7..373db8f 100644 --- a/dingus.html +++ b/dingus.html @@ -70,6 +70,12 @@ $(document).ready(function() { // show HTML tab if text is from query $('#result-tabs a[href="#result"]').tab('show'); } + // make tab insert a tab in the text box: + $("#text").addEventListener('keydown', function (e) { + if (e.which == 9) { + e.preventDefault(); + } + }); parseAndRender(); $("#clear-text-box").click(function(e) { $("#text").val(''); -- cgit v1.2.3 From ed71000999c85f11fe3861e7ac2a02faedbf310a Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 13:00:59 -0700 Subject: Fixed tab fix in previous commit. --- dingus.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dingus.html b/dingus.html index 373db8f..5f91523 100644 --- a/dingus.html +++ b/dingus.html @@ -71,7 +71,7 @@ $(document).ready(function() { $('#result-tabs a[href="#result"]').tab('show'); } // make tab insert a tab in the text box: - $("#text").addEventListener('keydown', function (e) { + $("#text").keydown(function (e) { if (e.which == 9) { e.preventDefault(); } -- cgit v1.2.3 From b510c424c2fc389f99bca3dab0039e5170efdcb7 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 13:04:43 -0700 Subject: Dingus: REALLY make tab insert tab in text box. --- dingus.html | 1 + 1 file changed, 1 insertion(+) diff --git a/dingus.html b/dingus.html index 5f91523..6f9193b 100644 --- a/dingus.html +++ b/dingus.html @@ -74,6 +74,7 @@ $(document).ready(function() { $("#text").keydown(function (e) { if (e.which == 9) { e.preventDefault(); + this.value += "\t"; } }); parseAndRender(); -- cgit v1.2.3 From 388b70aac60e9058e86ab922ab95d254e9f64a7b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 13:58:55 -0700 Subject: Fixed watermark. - No longer shows blank watermark on recent version. - Fixed broken Makefile. --- Makefile | 5 +++-- template.html | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c10a633..bba04dd 100644 --- a/Makefile +++ b/Makefile @@ -91,10 +91,11 @@ fuzztest: _site/spec.html: spec.txt (echo "% CommonMark Spec\n";\ - for vers in $(shell cd _site; ls -d -t 0.*) ; do \ + for vers in $(shell cd _site; ls -d -t 0.*) ; do \ + perl -pie 's/

<\/div>/

This is an older version of the spec. For the most recent version, see http:\/\/spec.commonmark.org<\/a>.<\/div>/' _site/$$vers/index.html ; \ date=`stat -t "%Y-%m-%d" -f "%Sa" _site/$$vers/index.html`; \ echo "- [Version $$vers ($$date)](/$$vers/)" ; \ - perl -pe 's/

<\/div>/

This is an older version of the spec. For the most recent version, see http:\/\/spec.commonmark.org<\/a>.<\/div>/' _site/$$vers/index.html; \ done) | \ + done) | \ pandoc --template template.html -S -s -t html5 -o $@ _site/index.html: _site/spec.html diff --git a/template.html b/template.html index 24b2372..bc5ba26 100644 --- a/template.html +++ b/template.html @@ -55,7 +55,6 @@ pre.html span.space:after { font-size: 120%; opacity:0.7; z-index:99; - background-color: black; color: white; } #watermark a { color: white; } -- cgit v1.2.3 From df762b986c5fdf80dda6768020f3c710aae9fc6e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 14:24:28 -0700 Subject: Removed the pesky dates. Closes #175. Eventually I'll write a better build script and include these. --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bba04dd..a5bc1af 100644 --- a/Makefile +++ b/Makefile @@ -91,10 +91,11 @@ fuzztest: _site/spec.html: spec.txt (echo "% CommonMark Spec\n";\ - for vers in $(shell cd _site; ls -d -t 0.*) ; do \ - perl -pie 's/

<\/div>/

This is an older version of the spec. For the most recent version, see http:\/\/spec.commonmark.org<\/a>.<\/div>/' _site/$$vers/index.html ; \ - date=`stat -t "%Y-%m-%d" -f "%Sa" _site/$$vers/index.html`; \ - echo "- [Version $$vers ($$date)](/$$vers/)" ; \ + for vers in $(shell cd _site; ls -d -1 0.* | sort -r -g) ; do \ + if [ "$$vers" != "$(SPECVERSION)" ]; then \ + perl -p -i -e 's/

.*?<\/div>/

This is an older version of the spec. For the most recent version, see http:\/\/spec.commonmark.org<\/a>.<\/div>/' _site/$$vers/index.html ; \ + fi; \ + echo "- [Version $$vers](/$$vers/)" ; \ done) | \ pandoc --template template.html -S -s -t html5 -o $@ -- cgit v1.2.3 From b193033728ad421c9e0a37ec6438d98dc1adefee Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 27 Oct 2014 22:57:37 -0700 Subject: Cleaned up Makefile a bit. --- Makefile | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index a5bc1af..e1475d5 100644 --- a/Makefile +++ b/Makefile @@ -7,9 +7,11 @@ PROG?=./cmark JSMODULES=$(wildcard js/lib/*.js) PREFIX?=/usr/local SPEC=spec.txt +SITE=_site SPECVERSION=$(shell grep version: $(SPEC) | sed -e 's/version: *//') +VERSIONS=$(shell cd $(SITE); ls -d -1 0.* | sort -r -g) -.PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs +.PHONY: all spec leakcheck clean fuzztest dingus upload jshint test testjs benchjs update-site upload-site all: $(SRCDIR)/case_fold_switch.inc $(PROG) libcmark.so @@ -89,29 +91,31 @@ fuzztest: for i in `seq 1 10`; do \ time cat /dev/urandom | head -c 100000 | iconv -f latin1 -t utf-8 | $(PROG) >/dev/null; done -_site/spec.html: spec.txt +$(SITE)/spec.html: spec.txt (echo "% CommonMark Spec\n";\ - for vers in $(shell cd _site; ls -d -1 0.* | sort -r -g) ; do \ + for vers in $(VERSIONS); do \ if [ "$$vers" != "$(SPECVERSION)" ]; then \ - perl -p -i -e 's/